From Katrin.Fischer at bsz-bw.de  Sat Jul 24 10:37:32 2010
From: Katrin.Fischer at bsz-bw.de (Katrin Fischer)
Date: Sat, 24 Jul 2010 10:37:32 +0200
Subject: [PATCH] Bug 4904: Problem with printing fines in overdue
Message-ID: <mailman.1.1277373695.20355.koha-patches@lists.koha-community.org>

notices
Content-Type: text/plain; charset=3D"utf-8"

my $formatted_fine =3D currency_format("$1", "$fine", FMT_SYMBOL);
is already utf-8.
---
 misc/cronjobs/overdue_notices.pl |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/misc/cronjobs/overdue_notices.pl
b/misc/cronjobs/overdue_notices.pl
index 4de6cdd..92e8327 100755
--- a/misc/cronjobs/overdue_notices.pl
+++ b/misc/cronjobs/overdue_notices.pl
@@ -665,7 +665,6 @@ sub parse_letter { # FIXME: this code should
probably be moved to C4::Letters:pa
                 no strict; # currency_format behaves badly if we quote
the bareword for some reason...
                 my $formatted_fine =3D currency_format("$1", "$fine",
FMT_SYMBOL);
                 use strict;
-                $formatted_fine =3D Encode::encode("utf8",
$formatted_fine);
                 $params->{'letter'}->{'content'} =3D~
s/<fine>.*<\/fine>/$formatted_fine/;
             }
             $params->{'letter'} =3D C4::Letters::parseletter(
$params->{'letter'}, 'biblio',      $item );
--=20
1.6.3.3

------_=_NextPart_001_01CB1384.33E0AA3F
Content-Type: application/octet-stream;
	name="0001-4904-Problem-with-printing-fines-in-overdue-notices.patch"
Content-Transfer-Encoding: base64
Content-Description: 0001-4904-Problem-with-printing-fines-in-overdue-notices.patch
Content-Disposition: attachment;
	filename="0001-4904-Problem-with-printing-fines-in-overdue-notices.patch"

RnJvbSA2NjEwY2JjZmUwNzA0NmJjZDZkODczYThmMTliZjgxMzBkM2RjMTgyIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBLYXRyaW4gRmlzY2hlciA8S2F0cmluLkZpc2NoZXIuODNAd2Vi
LmRlPgpEYXRlOiBTYXQsIDI0IEp1bCAyMDEwIDEwOjM3OjMyICswMjAwClN1YmplY3Q6IFtQQVRD
SF0gNDkwNDogUHJvYmxlbSB3aXRoIHByaW50aW5nIGZpbmVzIGluIG92ZXJkdWUgbm90aWNlcwpD
b250ZW50LVR5cGU6IHRleHQvcGxhaW47IGNoYXJzZXQ9InV0Zi04IgoKbXkgJGZvcm1hdHRlZF9m
aW5lID0gY3VycmVuY3lfZm9ybWF0KCIkMSIsICIkZmluZSIsIEZNVF9TWU1CT0wpOwppcyBhbHJl
YWR5IHV0Zi04LgotLS0KIG1pc2MvY3JvbmpvYnMvb3ZlcmR1ZV9ub3RpY2VzLnBsIHwgICAgMSAt
CiAxIGZpbGVzIGNoYW5nZWQsIDAgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKCmRpZmYg
LS1naXQgYS9taXNjL2Nyb25qb2JzL292ZXJkdWVfbm90aWNlcy5wbCBiL21pc2MvY3JvbmpvYnMv
b3ZlcmR1ZV9ub3RpY2VzLnBsCmluZGV4IDRkZTZjZGQuLjkyZTgzMjcgMTAwNzU1Ci0tLSBhL21p
c2MvY3JvbmpvYnMvb3ZlcmR1ZV9ub3RpY2VzLnBsCisrKyBiL21pc2MvY3JvbmpvYnMvb3ZlcmR1
ZV9ub3RpY2VzLnBsCkBAIC02NjUsNyArNjY1LDYgQEAgc3ViIHBhcnNlX2xldHRlciB7ICMgRklY
TUU6IHRoaXMgY29kZSBzaG91bGQgcHJvYmFibHkgYmUgbW92ZWQgdG8gQzQ6OkxldHRlcnM6cGEK
ICAgICAgICAgICAgICAgICBubyBzdHJpY3Q7ICMgY3VycmVuY3lfZm9ybWF0IGJlaGF2ZXMgYmFk
bHkgaWYgd2UgcXVvdGUgdGhlIGJhcmV3b3JkIGZvciBzb21lIHJlYXNvbi4uLgogICAgICAgICAg
ICAgICAgIG15ICRmb3JtYXR0ZWRfZmluZSA9IGN1cnJlbmN5X2Zvcm1hdCgiJDEiLCAiJGZpbmUi
LCBGTVRfU1lNQk9MKTsKICAgICAgICAgICAgICAgICB1c2Ugc3RyaWN0OwotICAgICAgICAgICAg
ICAgICRmb3JtYXR0ZWRfZmluZSA9IEVuY29kZTo6ZW5jb2RlKCJ1dGY4IiwgJGZvcm1hdHRlZF9m
aW5lKTsKICAgICAgICAgICAgICAgICAkcGFyYW1zLT57J2xldHRlcid9LT57J2NvbnRlbnQnfSA9
fiBzLzxmaW5lPi4qPFwvZmluZT4vJGZvcm1hdHRlZF9maW5lLzsKICAgICAgICAgICAgIH0KICAg
ICAgICAgICAgICRwYXJhbXMtPnsnbGV0dGVyJ30gPSBDNDo6TGV0dGVyczo6cGFyc2VsZXR0ZXIo
ICRwYXJhbXMtPnsnbGV0dGVyJ30sICdiaWJsaW8nLCAgICAgICRpdGVtICk7Ci0tIAoxLjYuMy4z
Cgo=

------_=_NextPart_001_01CB1384.33E0AA3F--



From oleonard at myacpl.org  Thu Jul  1 02:03:59 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 30 Jun 2010 20:03:59 -0400
Subject: [Koha-patches] [PATCH] [followup](MT3160) fix address request
In-Reply-To: <1277910231.2361.2.camel@koha-dev>
References: <1277899168-2245-1-git-send-email-nahuel.angelinetti@biblibre.com>
	<1277910231.2361.2.camel@koha-dev>
Message-ID: <AANLkTinMF7eZZYLdK7quqoRBdihCMKqwPSldvr0eovsW@mail.gmail.com>

On Wed, Jun 30, 2010 at 11:03 AM, Michael Hafen
<mdhafen at tech.washk12.org> wrote:
> I have found in Mysql that CONCAT_WS handles NULL values well. ?Have you
> looked into that? ?The syntax is a little different from CONCAT.

Aren't we trying to avoid functions which are MySQL-specific?

  -- Owen

-- 
Web Developer
Athens County Public Libraries
http://www.myacpl.org

From chrisc at catalyst.net.nz  Thu Jul  1 02:07:10 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Thu, 1 Jul 2010 12:07:10 +1200
Subject: [Koha-patches] [PATCH] [followup](MT3160) fix address request
In-Reply-To: <AANLkTinMF7eZZYLdK7quqoRBdihCMKqwPSldvr0eovsW@mail.gmail.com>
References: <1277899168-2245-1-git-send-email-nahuel.angelinetti@biblibre.com>
	<1277910231.2361.2.camel@koha-dev>
	<AANLkTinMF7eZZYLdK7quqoRBdihCMKqwPSldvr0eovsW@mail.gmail.com>
Message-ID: <20100701000710.GI9685@rorohiko>

* Owen Leonard (oleonard at myacpl.org) wrote:
> On Wed, Jun 30, 2010 at 11:03 AM, Michael Hafen
> <mdhafen at tech.washk12.org> wrote:
> > I have found in Mysql that CONCAT_WS handles NULL values well. ?Have you
> > looked into that? ?The syntax is a little different from CONCAT.
> 
> Aren't we trying to avoid functions which are MySQL-specific?

What he said, one of the major goals for 3.4 is to work equally as well
on postgres as mysql, so it would be shame to put this in, just to have
it taken out again.

Chris
> 
>   -- Owen
> 
> -- 
> Web Developer
> Athens County Public Libraries
> http://www.myacpl.org
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches

-- 
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand

From robin at catalyst.net.nz  Thu Jul  1 06:47:32 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Thu,  1 Jul 2010 16:47:32 +1200
Subject: [Koha-patches] [PATCH] The accounts page is now paged
Message-ID: <1277959652-17870-1-git-send-email-robin@catalyst.net.nz>

This prevents you getting a huge screen full of records.
---
 .../prog/en/modules/members/boraccount.tmpl        |    7 +++
 members/boraccount.pl                              |   45 +++++++++++++++++--
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
index fce5a4d..7b64602 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
@@ -64,6 +64,13 @@
   </tr>
   </tfoot>
 </table>
+<!-- TMPL_IF NAME="show_back_link" -->
+<a href="boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;first=<!-- TMPL_VAR NAME="back_first_record" -->">&lt;&lt; Newer</a>
+<!-- /TMPL_IF -->
+&nbsp;Showing <!-- TMPL_VAR NAME="current_start" --> to <!-- TMPL_VAR NAME="current_last" --> of <!-- TMPL_VAR NAME="account_count" -->&nbsp;
+<!-- TMPL_IF NAME="show_forward_link" -->
+<a href="boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;first=<!-- TMPL_VAR NAME="forward_first_record" -->">Older &gt;&gt;</a>
+<!-- /TMPL_IF -->
 </div></div>
 
 </div>
diff --git a/members/boraccount.pl b/members/boraccount.pl
index 5509f3d..6bb69a6 100755
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -48,6 +48,11 @@ my ($template, $loggedinuser, $cookie)
 my $borrowernumber=$input->param('borrowernumber');
 my $action = $input->param('action') || '';
 
+# The index of the first record to display
+my $first_record = $input->param('first') || 0;
+# The number of records to show
+my $count_record = $input->param('count') || 20;
+
 #get borrower details
 my $data=GetMember('borrowernumber' => $borrowernumber);
 
@@ -63,14 +68,36 @@ if ( $data->{'category_type'} eq 'C') {
 }
 
 #get account details
-my ($total,$accts,undef)=GetMemberAccountRecords($borrowernumber);
+my ($total,$accts,$num_records)=GetMemberAccountRecords($borrowernumber);
 my $totalcredit;
 if($total <= 0){
         $totalcredit = 1;
 }
 
+# Validate the actual boundaries we need, if they're outside a useful range,
+# just reset them to something we understand.
+$first_record = 0  if ($first_record < 0 || $first_record >= @$accts);
+$count_record = 20 if ($count_record < 0);
+my $last_record = $first_record+$count_record-1;
+$last_record = @$accts - 1 if ($last_record >= @$accts);
+
+# Take an array slice
+my @accts = @$accts[$first_record .. $last_record];
+
+my ($show_back_link, $back_first_record) = (0, undef);
+if ($first_record > 0) {
+    $show_back_link = 1;
+    $back_first_record = $first_record-$count_record;
+    $back_first_record = 0 if ($back_first_record < 0);
+}
+my ($show_forward_link, $forward_first_record) = (0, undef);
+if (@$accts > $first_record+$count_record) {
+    $show_forward_link = 1;
+    $forward_first_record = $first_record+$count_record;
+}
+
 my $reverse_col = 0; # Flag whether we need to show the reverse column
-foreach my $accountline ( @{$accts}) {
+foreach my $accountline (@accts) {
     $accountline->{amount} += 0.00;
     if ($accountline->{amount} <= 0 ) {
         $accountline->{amountcredit} = 1;
@@ -105,7 +132,7 @@ $template->param(
     cardnumber          => $data->{'cardnumber'},
     categorycode        => $data->{'categorycode'},
     category_type       => $data->{'category_type'},
-    categoryname		 => $data->{'description'},
+    categoryname	=> $data->{'description'},
     address             => $data->{'address'},
     address2            => $data->{'address2'},
     city                => $data->{'city'},
@@ -114,11 +141,19 @@ $template->param(
     phone               => $data->{'phone'},
     email               => $data->{'email'},
     branchcode          => $data->{'branchcode'},
-	branchname			=> GetBranchName($data->{'branchcode'}),
+    branchname		=> GetBranchName($data->{'branchcode'}),
     total               => sprintf("%.2f",$total),
     totalcredit         => $totalcredit,
     is_child            => ($data->{'category_type'} eq 'C'),
     reverse_col         => $reverse_col,
-    accounts            => $accts );
+    accounts            => [ @accts ],
+    account_count       => $num_records,
+    show_back_link      => $show_back_link,
+    show_forward_link   => $show_forward_link,
+    back_first_record   => $back_first_record,
+    forward_first_record=> $forward_first_record,
+    current_start       => ($first_record+1),
+    current_last        => ($last_record+1),
+);
 
 output_html_with_http_headers $input, $cookie, $template->output;
-- 
1.7.0.4


From robin at catalyst.net.nz  Thu Jul  1 06:49:16 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Thu,  1 Jul 2010 16:49:16 +1200
Subject: [Koha-patches] [PATCH] bug4891 - sort facets in search sidebar
Message-ID: <1277959756-17950-1-git-send-email-robin@catalyst.net.nz>

---
 catalogue/search.pl |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/catalogue/search.pl b/catalogue/search.pl
index 920afb7..42f269a 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -499,6 +499,12 @@ if (C4::Context->preference('NoZebra')) {
         ($error, $results_hashref, $facets) = getRecords($query,$simple_query,\@sort_by,\@servers,$results_per_page,$offset,$expanded_facet,$branches,$query_type,$scan);
     };
 }
+# This sorts the facets into alphabetical order
+if ($facets) {
+    foreach my $f (@$facets) {
+        $f->{facets} = [ sort { uc($a->{facet_title_value}) cmp uc($b->{facet_title_value}) } @{ $f->{facets} } ];
+    }
+}
 if ($@ || $error) {
     $template->param(query_error => $error.$@);
     output_html_with_http_headers $cgi, $cookie, $template->output;
-- 
1.7.0.4


From robin at catalyst.net.nz  Thu Jul  1 06:49:38 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Thu,  1 Jul 2010 16:49:38 +1200
Subject: [Koha-patches] [PATCH] Support newlines in the notes field when
	displaying
Message-ID: <1277959778-17986-1-git-send-email-robin@catalyst.net.nz>

---
 catalogue/detail.pl |    3 +++
 opac/opac-detail.pl |    4 ++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 85819c0..c3c3c74 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -93,6 +93,9 @@ my $marcseriesarray  = GetMarcSeries($record,$marcflavour);
 my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour);
 my $subtitle         = GetRecordValue('subtitle', $record, $fw);
 
+# Turn newlines into HTML-y newlines
+$_->{marcnote} =~ s{\n}{<br />}g foreach (@$marcnotesarray);
+
 # Get Branches, Itemtypes and Locations
 my $branches = GetBranches();
 my $itemtypes = GetItemTypes();
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 629ebd2..7a0f2e2 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -205,6 +205,10 @@ my $marcseriesarray  = GetMarcSeries  ($record,$marcflavour);
 my $marcurlsarray    = GetMarcUrls    ($record,$marcflavour);
 my $subtitle         = GetRecordValue('subtitle', $record, GetFrameworkCode($biblionumber));
 
+# Support newlines in the notes content
+$_->{marcnote} =~ s{\n}{<br />}g foreach (@$marcnotesarray);
+
+
     $template->param(
                      MARCNOTES               => $marcnotesarray,
                      MARCSUBJCTS             => $marcsubjctsarray,
-- 
1.7.0.4


From robin at catalyst.net.nz  Thu Jul  1 07:41:33 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Thu,  1 Jul 2010 17:41:33 +1200
Subject: [Koha-patches] [PATCH] bug4926 - Improves the ID fields when
	sending lists and carts
Message-ID: <1277962893-19905-1-git-send-email-robin@catalyst.net.nz>

---
 .../prog/en/modules/opac-sendbasketform.tmpl       |    2 +-
 .../prog/en/modules/opac-sendshelfform.tmpl        |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
index 9caef3c..4104682 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
@@ -15,7 +15,7 @@
 	
 <!-- TMPL_ELSE -->
 
-<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
+<form action="<!-- TMPL_VAR NAME="url" -->" method="post" id="sendbasketform">
 
 <fieldset class="rows"> 
 <legend>Sending your cart</legend>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl
index 9d0e717..b74bf82 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl
@@ -7,7 +7,7 @@
 //]]>
 </script>
 </head>
-<body style="padding: 1em;" id="sendbasket">
+<body style="padding: 1em;" id="sendshelf">
 <div class="container"><!-- TMPL_IF NAME="email" -->
 
     <!-- TMPL_IF NAME="SENT" -->
@@ -21,7 +21,7 @@
     
 <!-- TMPL_ELSE -->
 
-<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
+<form action="<!-- TMPL_VAR NAME="url" -->" method="post" id="sendshelfform">
 
 <fieldset class="rows"> 
 <legend>Sending your list</legend>
-- 
1.7.0.4


From nahuel.angelinetti at biblibre.com  Thu Jul  1 09:57:22 2010
From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI)
Date: Thu, 01 Jul 2010 09:57:22 +0200
Subject: [Koha-patches] [PATCH] [followup](MT3160) fix address request
In-Reply-To: <AANLkTinMF7eZZYLdK7quqoRBdihCMKqwPSldvr0eovsW@mail.gmail.com>
References: <1277899168-2245-1-git-send-email-nahuel.angelinetti@biblibre.com>	<1277910231.2361.2.camel@koha-dev>
	<AANLkTinMF7eZZYLdK7quqoRBdihCMKqwPSldvr0eovsW@mail.gmail.com>
Message-ID: <4C2C4A62.6040706@biblibre.com>

Le 01/07/2010 02:03, Owen Leonard a ?crit :
> On Wed, Jun 30, 2010 at 11:03 AM, Michael Hafen
> <mdhafen at tech.washk12.org>  wrote:
>    
>> I have found in Mysql that CONCAT_WS handles NULL values well.  Have you
>> looked into that?  The syntax is a little different from CONCAT.
>>      
> Aren't we trying to avoid functions which are MySQL-specific?
>
>    

Why ? Koha doesn't work with another DBMS...
No one is maintaining the postgre structure, and I think all code is 
MySQL specific.
My point of view, is the development of koha must do some good code for 
one DBMS, instead of bad code for all DBMS.
For the moment, koha doesn't use an ORM that permit to use some DBMS, 
and don't take care about "SQL".

bests,

-- 
Nahuel ANGELINETTI


From chrisc at catalyst.net.nz  Thu Jul  1 10:00:11 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Thu, 1 Jul 2010 20:00:11 +1200
Subject: [Koha-patches] [PATCH] [followup](MT3160) fix address request
In-Reply-To: <4C2C4A62.6040706@biblibre.com>
References: <1277899168-2245-1-git-send-email-nahuel.angelinetti@biblibre.com>
	<1277910231.2361.2.camel@koha-dev>
	<AANLkTinMF7eZZYLdK7quqoRBdihCMKqwPSldvr0eovsW@mail.gmail.com>
	<4C2C4A62.6040706@biblibre.com>
Message-ID: <20100701080011.GO9685@rorohiko>

* Nahuel ANGELINETTI (nahuel.angelinetti at biblibre.com) wrote:
> Le 01/07/2010 02:03, Owen Leonard a ?crit :
> >On Wed, Jun 30, 2010 at 11:03 AM, Michael Hafen
> ><mdhafen at tech.washk12.org>  wrote:
> >>I have found in Mysql that CONCAT_WS handles NULL values well.  Have you
> >>looked into that?  The syntax is a little different from CONCAT.
> >Aren't we trying to avoid functions which are MySQL-specific?
> >
> 
> Why ? Koha doesn't work with another DBMS...
> No one is maintaining the postgre structure, and I think all code is
> MySQL specific.
> My point of view, is the development of koha must do some good code
> for one DBMS, instead of bad code for all DBMS.
> For the moment, koha doesn't use an ORM that permit to use some
> DBMS, and don't take care about "SQL".

A major goal, for 3.4 as I have stated is for it to remove the mysql
specific sql. So while its galens call on this patch for 3.2. I wont be
accepting mysql specific sql for 3.4

CHris

> 
> bests,
> 
> -- 
> Nahuel ANGELINETTI
> 
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches

-- 
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand

From nahuel.angelinetti at biblibre.com  Thu Jul  1 10:03:53 2010
From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI)
Date: Thu, 01 Jul 2010 10:03:53 +0200
Subject: [Koha-patches] [PATCH] [followup](MT3160) fix address request
In-Reply-To: <20100701080011.GO9685@rorohiko>
References: <1277899168-2245-1-git-send-email-nahuel.angelinetti@biblibre.com>
	<1277910231.2361.2.camel@koha-dev>
	<AANLkTinMF7eZZYLdK7quqoRBdihCMKqwPSldvr0eovsW@mail.gmail.com>
	<4C2C4A62.6040706@biblibre.com> <20100701080011.GO9685@rorohiko>
Message-ID: <4C2C4BE9.4090408@biblibre.com>

Le 01/07/2010 10:00, Chris Cormack a ?crit :
> * Nahuel ANGELINETTI (nahuel.angelinetti at biblibre.com) wrote:
>    
>> Le 01/07/2010 02:03, Owen Leonard a ?crit :
>>      
>>> On Wed, Jun 30, 2010 at 11:03 AM, Michael Hafen
>>> <mdhafen at tech.washk12.org>   wrote:
>>>        
>>>> I have found in Mysql that CONCAT_WS handles NULL values well.  Have you
>>>> looked into that?  The syntax is a little different from CONCAT.
>>>>          
>>> Aren't we trying to avoid functions which are MySQL-specific?
>>>
>>>        
>> Why ? Koha doesn't work with another DBMS...
>> No one is maintaining the postgre structure, and I think all code is
>> MySQL specific.
>> My point of view, is the development of koha must do some good code
>> for one DBMS, instead of bad code for all DBMS.
>> For the moment, koha doesn't use an ORM that permit to use some
>> DBMS, and don't take care about "SQL".
>>      
> A major goal, for 3.4 as I have stated is for it to remove the mysql
> specific sql. So while its galens call on this patch for 3.2. I wont be
> accepting mysql specific sql for 3.4
>    
Why don't use an ORM to avoid ANY sql code ? And don't take care of 
writing SQL, just using functions like in Django :)

-- 
Nahuel ANGELINETTI


From chrisc at catalyst.net.nz  Thu Jul  1 10:28:37 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Thu, 1 Jul 2010 20:28:37 +1200
Subject: [Koha-patches] [PATCH] [followup](MT3160) fix address request
In-Reply-To: <4C2C4BE9.4090408@biblibre.com>
References: <1277899168-2245-1-git-send-email-nahuel.angelinetti@biblibre.com>
	<1277910231.2361.2.camel@koha-dev>
	<AANLkTinMF7eZZYLdK7quqoRBdihCMKqwPSldvr0eovsW@mail.gmail.com>
	<4C2C4A62.6040706@biblibre.com> <20100701080011.GO9685@rorohiko>
	<4C2C4BE9.4090408@biblibre.com>
Message-ID: <20100701082837.GP9685@rorohiko>

* Nahuel ANGELINETTI (nahuel.angelinetti at biblibre.com) wrote:
> Le 01/07/2010 10:00, Chris Cormack a ?crit :
> >* Nahuel ANGELINETTI (nahuel.angelinetti at biblibre.com) wrote:
> >>Le 01/07/2010 02:03, Owen Leonard a ?crit :
> >>>On Wed, Jun 30, 2010 at 11:03 AM, Michael Hafen
> >>><mdhafen at tech.washk12.org>   wrote:
> >>>>I have found in Mysql that CONCAT_WS handles NULL values well.  Have you
> >>>>looked into that?  The syntax is a little different from CONCAT.
> >>>Aren't we trying to avoid functions which are MySQL-specific?
> >>>
> >>Why ? Koha doesn't work with another DBMS...
> >>No one is maintaining the postgre structure, and I think all code is
> >>MySQL specific.
> >>My point of view, is the development of koha must do some good code
> >>for one DBMS, instead of bad code for all DBMS.
> >>For the moment, koha doesn't use an ORM that permit to use some
> >>DBMS, and don't take care about "SQL".
> >A major goal, for 3.4 as I have stated is for it to remove the mysql
> >specific sql. So while its galens call on this patch for 3.2. I wont be
> >accepting mysql specific sql for 3.4
> Why don't use an ORM to avoid ANY sql code ? And don't take care of
> writing SQL, just using functions like in Django :)

That may be a future plan, but for 3.4 being a short release cycle that
is well out of reach. I have already got a DBIx::Class Schema, and have
deployed that to postgres to get Koha running on it. Finishing combined
with all the other work set aside for 3.4 is more than a enough.

Chris
> 
> -- 
> Nahuel ANGELINETTI
> 
> _______________________________________________
> Koha-patches mailing list
> Koha-patches at lists.koha-community.org
> http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches

-- 
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand

From mdhafen at tech.washk12.org  Thu Jul  1 17:30:55 2010
From: mdhafen at tech.washk12.org (Michael Hafen)
Date: Thu, 01 Jul 2010 09:30:55 -0600
Subject: [Koha-patches] [PATCH] [followup](MT3160) fix address request
In-Reply-To: <AANLkTinMF7eZZYLdK7quqoRBdihCMKqwPSldvr0eovsW@mail.gmail.com>
References: <1277899168-2245-1-git-send-email-nahuel.angelinetti@biblibre.com>
	<1277910231.2361.2.camel@koha-dev>
	<AANLkTinMF7eZZYLdK7quqoRBdihCMKqwPSldvr0eovsW@mail.gmail.com>
Message-ID: <1277998255.7068.16.camel@koha-dev>

I wasn't sure if CONCAT_WS was part of the SQL spec.  I only mention it
as a courtesy because I've only recently learned about it myself.  I've
found it to be a pretty slick function.

With a quick google search it seems PostgreSQL does have the same
function.  I suspect that if it isn't in the SQL spec. it is
unofficially supported on some DBMS's.  I just talked with a couple of
our other guys here, and Oracle nor MS SQL have this function.

Yeah, I don't think this should be used in Koha at this point since we
are trying to avoid function specific to a certain RDBMS.

On Wed, 2010-06-30 at 20:03 -0400, Owen Leonard wrote:
> On Wed, Jun 30, 2010 at 11:03 AM, Michael Hafen
> <mdhafen at tech.washk12.org> wrote:
> > I have found in Mysql that CONCAT_WS handles NULL values well.  Have you
> > looked into that?  The syntax is a little different from CONCAT.
> 
> Aren't we trying to avoid functions which are MySQL-specific?
> 
>   -- Owen
> 

-- 
Michael Hafen
Systems Analyst and Programmer
Washington County School District
Utah, USA

for Koha checkout
http://development.washk12.org/gitweb/
or
git://development.washk12.org/koha



From oleonard at myacpl.org  Thu Jul  1 19:39:57 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  1 Jul 2010 13:39:57 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4922 - Item display tries to
	show serial info for titles with series tags
Message-ID: <1278005997-13283-1-git-send-email-oleonard@myacpl.org>

Removing check for "is this a serial record" when displaying enumchron
information. This check evaluates as true for all biblio records which
have a series title, so it's an inaccurate determiner of whether
enumchron information should be displayed. The script already
checks for the presence of enumchron data, so that will display
anyway if it exists.
---
 catalogue/detail.pl |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 85819c0..4f6c23f 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -106,7 +106,7 @@ my $dat = &GetBiblioData($biblionumber);
 my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
 my @subscriptions       = GetSubscriptions( $dat->{title}, $dat->{issn}, $biblionumber );
 my @subs;
-$dat->{'serial'}=1 if $subscriptionsnumber;
+
 foreach my $subscription (@subscriptions) {
     my %cell;
 	my $serials_to_display;
@@ -212,7 +212,7 @@ $template->param(
 	itemdata_enumchron  => $itemfields{enumchron},
 	itemdata_uri        => $itemfields{uri},
 	itemdata_copynumber => $itemfields{copynumber},
-	volinfo				=> $itemfields{enumchron} || $dat->{'serial'} ,
+	volinfo				=> $itemfields{enumchron},
 	z3950_search_params	=> C4::Search::z3950_search_args($dat),
 	C4::Search::enabled_staff_search_views,
 );
-- 
1.7.0.4


From gmcharlt at gmail.com  Fri Jul  2 01:25:58 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 1 Jul 2010 19:25:58 -0400
Subject: [Koha-patches] [PATCH] [followup](MT3160) fix address request
In-Reply-To: <1277998255.7068.16.camel@koha-dev>
References: <1277899168-2245-1-git-send-email-nahuel.angelinetti@biblibre.com>
	<1277910231.2361.2.camel@koha-dev>
	<AANLkTinMF7eZZYLdK7quqoRBdihCMKqwPSldvr0eovsW@mail.gmail.com>
	<1277998255.7068.16.camel@koha-dev>
Message-ID: <AANLkTilLBUMTRrQ-H-9gZ8ApUgiO5OwKXuZbby94UPfR@mail.gmail.com>

Hi,

On Thu, Jul 1, 2010 at 11:30 AM, Michael Hafen <mdhafen at tech.washk12.org> wrote:
> With a quick google search it seems PostgreSQL does have the same
> function. ?I suspect that if it isn't in the SQL spec. it is
> unofficially supported on some DBMS's. ?I just talked with a couple of
> our other guys here, and Oracle nor MS SQL have this function.

Actually, Postgres doesn't have CONCAT_WS().  However, what MySQL and
Postgres *do* both have is COALESCE(), which could be used to rework
the patch so that it would be more DBMS-agnostic.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From gmcharlt at gmail.com  Fri Jul  2 01:33:37 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 1 Jul 2010 19:33:37 -0400
Subject: [Koha-patches] [PATCH] Support newlines in the notes field when
	displaying
In-Reply-To: <1277959778-17986-1-git-send-email-robin@catalyst.net.nz>
References: <1277959778-17986-1-git-send-email-robin@catalyst.net.nz>
Message-ID: <AANLkTinCg7qAZPRuolFN_k0OvUfy7wy8vomORhx-W-MY@mail.gmail.com>

Hi,

On Thu, Jul 1, 2010 at 12:49 AM, Robin Sheat <robin at catalyst.net.nz> wrote:
> +# Turn newlines into HTML-y newlines
> +$_->{marcnote} =~ s{\n}{<br />}g foreach (@$marcnotesarray);
> +

This sort of HTML display logic should be pushed off to the templates
if at all possible; if newlines are significant in the notes field
(and this is slightly nonstandard in MARC, in fact, although I grant
that it certainly happens in the wild), I suggest splitting up
@$marcnotesarray on embedded newlines and passing that to the
template.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From robin at catalyst.net.nz  Fri Jul  2 02:55:46 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Fri,  2 Jul 2010 12:55:46 +1200
Subject: [Koha-patches] [PATCH] bug4929 - amended the instructions
Message-ID: <1278032146-14588-1-git-send-email-robin@catalyst.net.nz>

---
 debian/scripts/koha-create |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index 60262d4..43e7c4e 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -165,7 +165,7 @@ eof
         touch "$name-db-request.txt"
         chmod 0600 "$name-db-request.txt"
         cat > "$name-db-request.txt" << eof
-Please create a database and user on $mysqlhost as follows:
+Please create a MySQL database and user on $mysqlhost as follows:
 
 database name: $mysqldb
 database user: $mysqluser
-- 
1.7.0.4


From robin at catalyst.net.nz  Fri Jul  2 03:54:30 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Fri, 02 Jul 2010 13:54:30 +1200
Subject: [Koha-patches] [PATCH] Support newlines in the notes field when
 displaying
In-Reply-To: <AANLkTinCg7qAZPRuolFN_k0OvUfy7wy8vomORhx-W-MY@mail.gmail.com>
References: <1277959778-17986-1-git-send-email-robin@catalyst.net.nz>
	<AANLkTinCg7qAZPRuolFN_k0OvUfy7wy8vomORhx-W-MY@mail.gmail.com>
Message-ID: <1278035670.2269.35.camel@zarathud>

Op donderdag 01-07-2010 om 19:33 uur [tijdzone -0400], schreef Galen
Charlton:
> This sort of HTML display logic should be pushed off to the templates
> if at all possible; if newlines are significant in the notes field
> (and this is slightly nonstandard in MARC, in fact, although I grant
> that it certainly happens in the wild), I suggest splitting up
> @$marcnotesarray on embedded newlines and passing that to the
> template.

That would be fairly fiddly to do with the current templating system.
Given that, I'll put this on hold until the move to template toolkit is
made, where we can just run it through a filter.

-- 
Robin Sheat
Catalyst IT Ltd.
? +64 4 803 2204
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Dit berichtdeel is digitaal ondertekend
URL: </pipermail/koha-patches/attachments/20100702/57d768ad/attachment.pgp>

From nahuel.angelinetti at biblibre.com  Fri Jul  2 14:24:39 2010
From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI)
Date: Fri,  2 Jul 2010 14:24:39 +0200
Subject: [Koha-patches] [PATCH] [3.0.x](bug #4930) fix inventory
Message-ID: <1278073479-19268-1-git-send-email-nahuel.angelinetti@biblibre.com>

this delete duplicate code that generate an error in a sql query and can't work when "pass on loan items" is checked.
---
 C4/Items.pm |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index 3777834..d5a4167 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -1080,11 +1080,6 @@ END_SQL
         push @where_strings, 'issues.date_due IS NULL';
     }
 
-    if ( $ignoreissued) {
-        $query .= "LEFT JOIN issues ON items.itemnumber = issues.itemnumber ";
-        push @where_strings, 'issues.date_due IS NULL';
-    }
-
     if ( @where_strings ) {
         $query .= 'WHERE ';
         $query .= join ' AND ', @where_strings;
-- 
1.7.0.4


From gmcharlt at gmail.com  Fri Jul  2 14:48:13 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri,  2 Jul 2010 08:48:13 -0400
Subject: [Koha-patches] [PATCH 2/4] remove extraneous warns
In-Reply-To: <1278074895-7443-1-git-send-email-gmcharlt@gmail.com>
References: <1278074895-7443-1-git-send-email-gmcharlt@gmail.com>
Message-ID: <1278074895-7443-2-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 acqui/basketgroup.pl |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
index 94c5814..a3b7dc9 100755
--- a/acqui/basketgroup.pl
+++ b/acqui/basketgroup.pl
@@ -184,7 +184,6 @@ sub printbasketgrouppdf{
     
     my $pdfformat = C4::Context->preference("OrderPdfFormat");
     eval "use $pdfformat" ;
-    warn @_;
     eval "use C4::Branch";
     
     my $basketgroup = GetBasketgroup($basketgroupid);
@@ -386,9 +385,7 @@ if ( $op eq "add" ) {
     printbasketgrouppdf($basketgroupid);
 }elsif( $op eq "delete"){
     my $basketgroupid = $input->param('basketgroupid');
-    warn $basketgroupid;
     DelBasketgroup($basketgroupid);
-    warn "---------------";
     print $input->redirect('/cgi-bin/koha/acqui/basketgroup.pl?booksellerid=' . $booksellerid);
     
 }elsif ( $op eq 'reopen'){
-- 
1.7.0


From gmcharlt at gmail.com  Fri Jul  2 14:48:12 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri,  2 Jul 2010 08:48:12 -0400
Subject: [Koha-patches] [PATCH 1/4] Bug 4188 Allow acq basket group printing
	into PDF
Message-ID: <1278074895-7443-1-git-send-email-gmcharlt@gmail.com>

From: Fr?d?ric Demians <f.demians at tamil.fr>

Since new acquisition module workflow and specifications is not
documented, this fix is more an hypothesis than a patch.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 acqui/pdfformat/layout2pages.pm |    8 +++++---
 acqui/pdfformat/layout3pages.pm |    8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/acqui/pdfformat/layout2pages.pm b/acqui/pdfformat/layout2pages.pm
index 5614800..c7c1985 100755
--- a/acqui/pdfformat/layout2pages.pm
+++ b/acqui/pdfformat/layout2pages.pm
@@ -236,9 +236,11 @@ sub printfooters {
 sub printpdf {
     my ($basketgroup, $bookseller, $baskets, $orders, $GST) = @_;
     # open the default PDF that will be used for base (1st page already filled)
-    my $template = C4::Context->preference("OrderPdfTemplate");
-    $template = decode_base64($template);
-    my $pdf = PDF::API2->openScalar($template);
+    use FindBin qw( $Bin );
+    open(my $fh, "$Bin/pdfformat/layout2pages.pdf") or die "$@";
+    my @pdf = <$fh>;
+    close($fh);
+    my $pdf = PDF::API2->openScalar(join('', @pdf));
     $pdf->pageLabel( 0, {
         -style => 'roman',
     } ); # start with roman numbering
diff --git a/acqui/pdfformat/layout3pages.pm b/acqui/pdfformat/layout3pages.pm
index 6809db1..2d82b8a 100755
--- a/acqui/pdfformat/layout3pages.pm
+++ b/acqui/pdfformat/layout3pages.pm
@@ -373,9 +373,11 @@ sub printfooters {
 sub printpdf {
     my ($basketgroup, $bookseller, $baskets, $orders, $GST) = @_;
     # open the default PDF that will be used for base (1st page already filled)
-    my $template = C4::Context->preference("OrderPdfTemplate");
-    $template = decode_base64($template);
-    my $pdf = PDF::API2->openScalar($template);
+    use FindBin qw( $Bin );
+    open(my $fh, "$Bin/pdfformat/layout3pages.pdf") or die "$@";
+    my @pdf = <$fh>;
+    close($fh);
+    my $pdf = PDF::API2->openScalar(join('', @pdf));
     $pdf->pageLabel( 0, {
         -style => 'roman',
     } ); # start with roman numbering
-- 
1.7.0


From gmcharlt at gmail.com  Fri Jul  2 14:48:14 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri,  2 Jul 2010 08:48:14 -0400
Subject: [Koha-patches] [PATCH 3/4] bug 4188: move PDF templates for printed
	purchase orders
In-Reply-To: <1278074895-7443-2-git-send-email-gmcharlt@gmail.com>
References: <1278074895-7443-1-git-send-email-gmcharlt@gmail.com>
	<1278074895-7443-2-git-send-email-gmcharlt@gmail.com>
Message-ID: <1278074895-7443-3-git-send-email-gmcharlt@gmail.com>

The PDF templates for purchase orders now live in the
directory koha-tmpl/intranet-tmpl/prog/pdf to separate
them from code.  As no automatic translation system for
PDF files is currently implemented, I'm keeping them out
of the language subdirectories for now.

At present, there are two choices of templates for printing
purchase orders (AKA basket groups), controlled by setting
the OrderPdfFormat syspref:

pdfformat::layout2pages (two-page layout)
pdfformat::layout3pages (three-page layout)

To customize a template or to add a new one requires two steps:

* modifying the PDF; note that OpenOffice source files
  are included as a way of generating the PDF
* modifying the code in acqui/pdfformat/layout*.pm to
  position the order text onto the template

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 C4/Languages.pm                                   |    2 +-
 acqui/pdfformat/layout2pages.odt                  |  Bin 12688 -> 0 bytes
 acqui/pdfformat/layout2pages.pdf                  |  Bin 25541 -> 0 bytes
 acqui/pdfformat/layout2pages.pm                   |    7 ++-----
 acqui/pdfformat/layout3pages.odt                  |  Bin 12973 -> 0 bytes
 acqui/pdfformat/layout3pages.pdf                  |  Bin 26944 -> 0 bytes
 acqui/pdfformat/layout3pages.pm                   |    7 ++-----
 koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.odt |  Bin 0 -> 12688 bytes
 koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.pdf |  Bin 0 -> 25541 bytes
 koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.odt |  Bin 0 -> 12973 bytes
 koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.pdf |  Bin 0 -> 26944 bytes
 11 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 acqui/pdfformat/layout2pages.odt
 delete mode 100644 acqui/pdfformat/layout2pages.pdf
 delete mode 100644 acqui/pdfformat/layout3pages.odt
 delete mode 100644 acqui/pdfformat/layout3pages.pdf
 create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.odt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.pdf
 create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.odt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.pdf

diff --git a/C4/Languages.pm b/C4/Languages.pm
index f8f60f4..fd16596 100644
--- a/C4/Languages.pm
+++ b/C4/Languages.pm
@@ -267,7 +267,7 @@ sub _get_language_dirs {
         next if $lang_string =~/css$/;
         next if $lang_string =~/CVS$/;
         next if $lang_string =~/\.txt$/i;     #Don't read the readme.txt !
-        next if $lang_string =~/img|images|famfam|sound/;
+        next if $lang_string =~/img|images|famfam|sound|pdf/;
         push @lang_strings, $lang_string;
     }
         return (@lang_strings);
diff --git a/acqui/pdfformat/layout2pages.odt b/acqui/pdfformat/layout2pages.odt
deleted file mode 100644
index e07288329a985e27c838f90b055eb51659aef505..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12688
zcma)j1zeQN_dXzvbV`RHAl(hp2uL>qOE0k?9ny_-NOz}nhqQEuba%JpAM|?l`oH)0
z`JQF>GdpvhbI#1X?>n<+9%Ln-Kw^MB3bwd8w^k?9(-#lr$2aW5+Z<?aVB=_M0I;+)
z1L^^6fEFNnJCHt|1;83;O=n?g0MfV6vo$vW+0fY-IM~Sk!`K7<Z^3;i30Z&)fkw7g
z-_2Mv(OcU9Y;3J{0ao-saIg<9AA|TC^iX&V<WC$xPtU;2;K7WA6}_IVmDQtn2XnJ0
zV6u`hk3oY$JbpaLe}{wf(E6uYLo*A2jls`g9`Sz$^KYH7w6L_bd>8=RzdG at 6IQ)O{
zW@%+%WMyFeTlfDB`EPMPI{P(f|0~MI!ouwTMiKo>lt6QUk%2Y6AkfAfU}^n-%oD-`
zSkD4v^VeMLsn3MWu%WmdsKCMx`9Va`IMP=o*oK*_6MqKb>5QgZfYZvcp$95T^qj93
zTp`|;A?1BA=sxd>F;66QoDyzhUX5F_<VfuARq6Fsx2Ac%wA*<;muwEeI`%Kw3ckI*
z)=u=eHMyCSB<y<Lp5gDO<{4)tIDm0u?!gwB@&2 at P021%r^8kFtC>>7uCI6h*X!Q&(
zC;f>Ya(Uj7fo*8bNo9w;I%?D1c)EBS?XT`T)8PUiihFPo-V_ydH544n%fDD(JbNw@
z$f8O^1xNwy#>sDeIl=niQ@>fSDaGr?f$wBkL5i<j!-77Rnm*KqvD1;cQQxGZi(V+J
z;)<)0(_W_UDPlB9?4w>!y)im~%9sLrC(R+0Zf%Bhcy)fBu|G2tx?Kk+Ury`Hbhr-~
zx~XZ_=<pP;E6yr4Ery4Z;7*9k*ttqP3Cvgif}ER%cj|<#b at x_?-mVqflaj{d(DDV3
zFiRoNK&14WCy58(tu59B*-DG1Vqa+CJz|hmbe@?fT at 7B>`&s&;S3pGOv>*ZGNve*6
zh7wA~M<ityqY#uhDfW{Y0M(u*(UhX&Ozu&|aV^7vhDBFTllkJ3l^x|oa9b*#?gZ+W
z@@ZwOq7?a4?k3uChUzk4utnu$OhfKCN<Ht*Ff4?q8!CD$?!ilEk-}q at r2?m0<CBQv
zGZkPdzIJJlEJ9rx?Pf~Beoo*K1xe+}yaP_zQ3d6g(N5vbH$SzI5!FkS at LAJD!!*(q
z$|&#|7;yuX42p(Orm#;K*t$51i|Le>y_J9Wn^~|)k9bWKs?fA^Xg6Uu{d(Xy!&^$;
z*FKRs9F8+=wP6`j9+Q}G1k5s(*XtYcPzPsGlqUt42>a`N)snm?Yndp~s+67v;96ng
zMppMdJ~J$k6ONeflyQRZDa55n5OJC+*HYG(o94ej?=!}e7rvs#uByd6_FS&yKD{kD
zF8DmA26O6+-L`}bW7){dIhi(t_teg+arf*K($baF2^%*_c7+6{ux&acQ5I#7<U;Zc
zo|dU6aiS$EU`ZDLCG!wMYkNdu#22SwX18sISJ}*;83!!i7CKD7a%_zrv0pS?1n0i!
zn>SWh!@18)((c6j<i#8koL#~){{?yKn^DzSZW4cKkyn2<e3P*%e1x6hYgpzd%!vso
zHP|ZHI>+Egl|En8x+c5j`<e0XX~6BNSNw89KF=?@!_K~6ZI<#u=MnNLPp>I5tEp?)
z)!x@;gB(<0OQi0Eu$L6%XXvDxT_QoXW3%7H=Dj#jAC4gP$cD%&w*rH#lQZE<j7R2&
zY((Z?n^UMg#@5RB&FL#Qk~5p|9yQ);j6&u(JQOp#E&&C~HPC>~6`7hJ_0-81M6ej+
zNd}Ig>fZJ&kabQQp%`*2ypR_8P;>+X_p-IaKB;^kB2-rp_$*#DmDbDh)j$x!aomoU
zM4KPttfmZhu`FBwsradZdS7gYp{J3;7k@@<2l#u#=p%$wTfIqvHG%m`+f#=?vYct%
zyl$?j=fcrLfnYr60K^t_mwEM!uvB*Z;P~j5wk}ufVDZd2{KmdW0LFd>gwnRSWIxJL
z#$|Q1)<LPwC#rj>KC{)tChM!sbpEK(c(0``Os&&!Vh=Y<uZ9$Ywc{74#BWsIWE;y@
z_<Tea5zfZo<>FC at Vt8seSm_g1+h<9rVL{cO*>lYkzakgeNRLO|)t at f2TpHQX?FOSe
z+cakiES4WkM20Vg4S)^#2nXgN6rF*BK%$O+7Q1Yh_}-T|;B<H&)AK5E9ZaRmgjOyA
zk|RYqdbo1t<T`s74B+T-1-ieg!=USrwpxl=2t&k2xwPz>%2J!&4s_Y_sPGz|SMjGJ
zmW6fDxC3IAM#-QFia?;>XIlUzFT9Gh at 4wYU!O?-YscAI9=ULn2=H>JcrdNT^$*q9}
z%0qgl+ai_qPmq<Wt3UOaD?n|xcjC)-?`e){SMH<guPyTkB8_&r)W at WT;4Y9I!M)ru
zhx{7<8G~Y{h;7vLcq;Vko=4wwWqft`hw4#_Yi=fv*>HP((l7^}q#dNyvSHhMGJbv?
zMwku at S64&+=7d*1W@{o_j$GFbw-*TNuGTYmpn9LlXQ?z8A`p^}$#gfkEgOw{{4e~6
zPG)z7 at T)(}rm89OtxdF`#u%`DgB?s7<vbUlGw%wq;Jkkh;B>HzT~FPogp=$q5lM(1
zQ+e-c$7y{@1l`&*V}ygS5&2w(2-&t<t<l+w;9y>7(B5Lm^<v-A8B&Z_S9(F$NQda1
z?33!XkQ^z_uV>7zFwC#bx}Ql%gMv7-H0_UiGV?BtW!f%+zLagnl2&<?Hcwm~O>mXZ
ztB+RQnB2WMKWcv5Y+y*dB3Xe31B0Ufx!L%)Jq-NA+GuU#Xl7vjxJ~I-mk6C<!)Urt
z!GWK~qn(MA=mHs9iKA2qctS`|n+ixq^$VjxMI1+HFI<SrrR#TRsG)KAfvwN*HAQEx
zpCt%=d}Aj?O?Nz_!<Phw{!xr{{o6X*<;97!6?#MM^;)Gk8eyptO*)faEyZghg=`Aq
z#DZw at dFZS@6;JA7WzPOs^(|v^_>bIa(Swal*}H*qY|66?*CX)+r>cNe^X`!|hhE>W
zF(Kr0p_rmthk5kL{-v!j(GkL7;`&hI4PMJ($2T+PCF6CfK1;66Df^$Y1wpOftZJVk
zRzl;CzZaoWXu}jEk$i@$u=Jh_nZTlxh2R6Sql>s>Tu~hU9&Y}YgyJ}enTyOW0en(e
zgIa9E7Xb3Rpe7`mFPMty&z(nVU!}N#6+T($LYAicVpd4IYF<kn(SXw^-MiO|Kw^?h
zse>@~`E8#ez0mc{%6y8!f at E>r=~PDfE~<3K^a|;YHSS@*&?2#!A8@;d9ONW>VoRw;
zl3DEWd<74~!AMRc09`!+{0%EBE-XB*Mw2hfOA_I5?3PRu8!hX%koLuq6cBaBf at Gq)
zSXtZql|}AOj=FAS12c<H{H#1rvA(UMNAkc?gq?)2uWTK$T?S(b-VPg76trY!;X{4#
zUHc4{7EYSs_#tDF%X4*3uDf&vYRSQpMJ1yId;!+jWH8zZzQTU@<?SaP<ldEMPquPd
zdiUEfkf3VSt4Buxp=yG?74dm*tbN{*0ZZ59799!}GQ+~`<gH^{IMkF)B=t&Pq-rxt
zBUQJUIbnhi5H6PrjSZc{O2LULz9Ng2(|`H=9%%>|Sok5KypP)(HK|NcE@<4TbvmQm
zN)rBh%DR!<Zu<p`k`@+*qWlWU0{=(v8}E<msfgl;gv<anpt at NevyM(7c?N at Av~QTH
zSWA`f6cehK19gB_^@#fhW7`||95Od%q|7$h99aJfN{sbxhTV9AcPYEsice?5^b~`S
z#4{n*i$0Q{ZV9Uj2fD#zo`|INtG_;xmS8W55-&#yV46f5S-RyvJCF07mu_N=!`oC&
ztCk#-NWGWaH7eh-mAmfBvmZO~^CDC7#V5yh43$q at q~hlIOpwJ|DP}Is9Eew4wQV9*
zI{prJfC8fi<V;gV!`>g1$r93H1dXWczG>7j-}0s5We?9tmQoE2lNA0GSNq~!yA7O(
zF49_D25KzJ<Vm*4be at Jge?o+#u&ZM at 9<B^O6V!0FWR{)ReGAa!>14Ov#HlrTd5USD
zZ3GD7^+&m6be`rq8qGuo%&ciU)nr+!b?VjXil}cA`WCNENlF<Qc2XmS;Ik at ZV@G6I
zr81}NgW6u_2sbk-qtLQRSsYP&k~^dT7E=3nWn^U;qu()1QE6Vv=VN^KGBGjPQCvs~
z>eP}$&iC at U`Y3&swyIjg*Jh-8Sr+S}_Th30W~V9nqZ}L}jHdG9luIpxUbUJwLeY@}
z61rnku6SpcA^wIT{-}*i=yuaO(-5Z=i7jqdZ?+Sm%5 at _=p?X_xrbLpnd^Y{lp|}rG
zgpC5y?~fHm7Kc&!h~|c8Zoz~$7_T`Zi>UJP!v%{3=n2s>sw+MxI*Z;vc`ZStsw+)^
z7#-_aToy{TE|s^9szbRhwK%VC*k-`a5WE-f;=E!><7e8bc2VWuNsehNUSkjMw9MKl
z&%ovC*1~vw7&N>hy6|<ASAjB_+=YMTOWU#|g46B?af_5!RT4298_%!3=FUDR*+T;t
zI#U=-VF+$gO{&H2qb!I&qZ+q}F}^&iRE&Qi=9xpnQ0M0*Kf^z$a^l>{u7T5U8s1ri
zRsk8~F0@)FjM%ox(OCXzF7(JHhrOBy={y)+IByU0y8UqBBbp74LX{q{12pH4AZvdH
z%<qG3Dv-BSB2dK_jy7hmWDdb at W|fWCm^5>;W&UKi5q1_{gM}Tqvn}|pu|ZaI@}W5H
zvwU?c_-;;<vUtsBIeyTUuY|2zECHb(BdCmLDWR+mGyy3u9V-kQ+<fgmSg>T8(rnK{
zi>g$)35iMNy*&MXo6*9oDJW^`64vi(b|c*>HCXV=u>&me0nFxDh8QlSiy`zN-g$<H
zBdRK0!ix^R1I5?4^qDlnn86$2EJSgoFPyZ+gR0isV4FtV-w>jTS#EeE3MUYf)D^wE
zFa5Iq3Rz*}xjv;c;R^fL4zs!n?swkiw!-Q(IiCi0OPL_(#)QR at oYRy_e7xJ>CSP3y
zvRgLp&}78C!7_jXZlYG7+_o4JcW<W6BWfKceA2`8()Cd=YGh0pSZ5DLRk7CZ*V*tT
za$GNWL`IfAOsfj@>2zqVT&j}LnIu;%KxjMr)IXZzsOiecd=GJ7FRm>xmtAGqBzApC
zc51&(n at nvYf50+HEhwr~lu at Njo1R@x at 6BgOFV+}!kc)hMU$MUL_PCPD&Kjws!GM9q
zll@#tfBvv-!$6}<hXezAe1A_#7}x+F*HIq+hYw;q11sx?qy#T1BOL=Nu>nZWLLUe+
z;w4p56s6 at L<>!Ovu`o0Q>KSnT%u~=lBs2iT4^WUb*N-M%Qd=t!*Y}JD7YJZ(V9jNt
z$Mt(^gX?!~uJ4Y1)Hs*{L8iQ<#x^#VT=ewz_V#r4%ybr3M)ZuFoSgLETS@<NrLXt5
zo~5mo*>^2{J^F_{#$)otnx2u4k^ZOdV}$=}P>;I5hh$-4 at wcPLKK$t7cXvz-3 at r3N
zzLOIFH7dUi9}_9x&#`(m%E$BFw2=YmN2Y~O=E0iG_p$tLjhT+&xfBp&>p=X^2JMH$
zhKYfm4LvghgE=GXb3t36nLaHiGdm{_{T~*8cmRTcHb8(Gt)7*^V at 8Kh7GP^eENfwF
z1^|Nog8ZrS1Na^AF!!|j4`~~|hu(40GBD9Hawsw~aXtL8u>FPpryh^K9 at j4bBO@&%
zvmzq{7Xt$q3o8%(&&D4fEUkbK84Z0}UB`cm>bKV4)c^lzn7LRPxfp*&^Bwg==?BU{
z|DpdNBU(L2y at wqlA2ZWmVgFJ8Pi6hTvS@s=55bEwvr98FDExu at TjdAx@9Y0D>jt#8
z0qPNdpAH*<u9*R?o`o&QhL at Cy^hf3Qw9n7Vhx_WgriJd~y#85h`H&#`S;zR7rX|1%
zU}OcbH2%AR`L7mx3oHGfl}sFeRq7c(=<7YC-u`Z3WG1Em>jJd3eyG<sFa&}O^nb+h
zc#rauN`MS4h#CJkHKzYf?SFL2@@Va^8;R?2WPW}7dyv0Z|94jNF|DU)Y-_Fy0szgd
z>1}=%=`2A;MXE-M=si_PyeM0ZIIl1;GAT!1IbnMXMdJz!m~0X^Ru74Ulaiyp3NuWL
z9Fh};MHAmtf at 8IT#c at b>o^-m1ww<iKC}MXroOsV%ZZwg6Fyl<oF(vMo9O8!r1~#;_
zWpZ~^e+LN`2JSxAtl{TbHu~`6Bt1DhUQK*>g2tS~baD1G-BP8-68P*;Ke6vXzG5W}
z$;4~gUiv}b<Gk&6*uhXa$VMNEEG)el#k|LdDWko8;JmQP)&0$%)_z&+=iv*%Dl!=d
zjt^0=yUBO&#BWcnuU|t8>q7Qu0e0^QCW!Px>`w=h`cCz1)IK7Ub+Za3F-+p12sUYs
zQ1M1Py`T1#jM%4<pcq^ofp;Rfha1aRTIuvUmN#deuy5P<nIh0D$q9`_wmf#`es^y(
zvM|}3%ldVpS+_G_BTSi786i_wark!9?23e at VwRrGfkc+RGT>uMKcL1!U?rzUnF!NV
zh$ra7GRUYl=Zz at vMCc=giPjOqI5uhLC>`0{m*o|v4PtOxt50~(AXQ^xL?KsX;@8jc
zXek28JoV6HAf^2T#e+c+aw95ZbcJX=w at MW-^9(Nr{nUWGi|NkT9eFrLHnsy*6QgI1
zgZ9{GMq~N{sTw?SRA=KU!Cz(UnvG}XVT`0`<jVp2UFO4;$$oDe0>64|xVYHnAyCyd
zI<Omb4Wkcv+;5yxVU!EfKm3F*JVCs9x-uiT-H+^O&|imJMJ%iCdX?*sA`mN#6wb+7
zEwD<Tfp-E#?$(x&Z>HR14ej>GE3TqFpd&vr`vjnOJAu_HRO84f%*ejPL@=T=@<WzW
zy|udVEqyOh4IM0FV3p7-!>tyAm)-nqt5_TF-ibV`So}l-HsNhleOaXa+hLTcSKBRo
z(zv%d&Ryl}#Pj$<7JcA_2ij+M{Hg9y5Rw$G2K9)a9i5SMZVWdm+=yvxcCx-MX)2mu
zNT~M(<Pn|m^3jAj-Nka8Sl&85c}l?9gKa6sSg(iaPFL?L#!>D@*O9Tpfl{`xv(Ajx
z(q!lVJSirY3!MVpnOdil52ci>VDB!uPjVX<));|>|MIv$>T3GyX-`LpNv<X4EVLfS
z$0=!i at 1^6~5hsCgi9qTr+==$gS8>schSPq^*9pX$Sg2-10mKV24mm9*0<~|->trJp
zd1RGYD5?*Jmbm%P#JP9`gcF3h?lg&eH^bqHZfRO-O%UE{p78f7A4|Cs6}RKsFZCFI
zLV=QsD%O}~$5*2}AX7|2fal($m0OCd=gydb(8<}3T&T$osp*UV8bGe-c@}wW*5F at A
zg?YHGxiTWFhlsM7WVp~iUw$TMxhg{8A4sr?Ju*<N(-4)<%iEIH-H3dYgR$us)2|v?
zY7Le`kiuQ=tU$3&yL_z4fZMlRn;svi9bA1OuC)vN{B7-=!o#8M!+|Nj$BD%B`qUFn
zsbX-LvVf1n=PX<@&{_~l>R$Q8^_31{^w13i?=f4>DSEKmcD%IflIXA0d~hLjpo;UO
zD-j}tl(KhXyQQq#FE;$N^<4(44Dh0y<n0jWKlg(p5lL5dwok~!m6N{^z7F>=SMy#S
z;8o8l^cQ8`(p~}o^r29<muP+r(<RpTN=eYv<UZ<#Lk}UlsJ)o1Xj*Ygq=K at wGEBNx
zl>E6ok9tijTI4vKqf69Cf*`VMt<MdyC3AaHt=47ZF&Sy)F~{hxeKIuv{kv-&&4Wqo
z(<%zow7GBo#2eC;;3WZ^HvT{!CzFXKMXWiefSJ0w!^$T(QgLSs2UM-lZT0zzMf~K7
z+Zg#)*rz-1i=xR7+h1C7FYu1e=nEjsCMXw=q8#ZhZ0mYzaNT?W-s;KhbwTzYB58kZ
zaVCiY>c6JZzBQBi$PZFnBVuIDBEq!3;PA*aC;kfO?JLjCVUA8_&tv%Fc1;;!T$xuX
z;!BwRg49jV4&I{6%IN{CEs>ZrSL- at ft^f1+=cV&5tJ4DxxhkadfbPw&_v`4%E3!wr
zibe%`Olw>f5a~w>@b{NIMCvbN<bvaA12~7S)@Y5pxDhOZ`1f9Y>md|qqXIzgw>K0(
zvGdJlY9)>_I=+`Apc07T%l1;`p^bUDa1!T$nQ|n0c!H9F6rk;39A56R2y{nhlII3F
zvdu>f)?8){DlsKeGL5OfB9hdvF|<$0ycKR2E7{)doa-hIQMv+O=+SuEBsi2Q>?&Q1
z%&o2t4TCH{E{z6PkSwAr?(UaxlUf$G-b<=imO497*I0E*XC7Fed#01dh?n;w2idJ$
zXQrVfpWAFj49 at CXOA(qpOsTS9`U?o>JJi8AnwIkmYd=ET6{8e`4IN`jcmyH3xvp%Z
zn*1<&|ApSDMTTvWLH(NRMNBqCQnmAz%T-yE=eUe#GnI+N^;hnO`Aes4{+HG5Gb4TI
zLU-&m8`Q`-?iuUGrDtZj25{Xb_E=0#4d>m+T4*OZwf>GIxq27)xle8ZuS~LDv%AA|
z;V`1OChD9Byj%$NE$dy{^)Kk3nk~j2bU7}%T at 0^UhnfOuQA%WfqNzb8l+zWVvRpG0
zY%rRc{d|PvtW=XX8VqC8q3qf!x<FdQWtaHLSG{qNjz`bUEsK~SW~G+tglCT?_KLRL
zTYgzWEKRTF?V(eOK^%Z at x6hD0cwnE2>YYrVOsf0}U6O--rxeZN+FN7%SY~?`EbP5+
zQ}Q7J8ShCx_t-<VbJ)1Jg5N>uaBNZHdQ+DB14{Kz);ru2aMJ>EUQr(?x}MuX_ZJnR
zxx~x&leNtRn&_Fb`ak0qE%wd%3inKJ-{pFgB7}QpL3}hUPjLgmXK6NY82*Ai?F!su
zzW^>&@wO3(@9yUGZhc%A?Y<fF_Ws3MzAch8bOmDNOXaY-xS(b%ewWhslLbsi`Jcu{
zDrx9C(rOw~XQ3na#H-qrN6wb_tj<YW`k+Kf+LB?pMxGwNlnVwrm})zmDav?|IFqP@
z*&DcfyiLst<Bq_s6KG?ic54?idb19c=H|fLjt(Jux>#Q)p1&<&kSsI!k!KVcD_<Ug
ze)QJbnoBymtWAbC*^Nb!fW!a&@p{=n4NG~6&L#EWYcQEUxo0C6*5Tq)u+Q$1Kg=r(
z at uDOmG0Vx#GCQ_L%_zn;Brr8S&4s9?m)z2)q8z0kV2)}$vbn$VxaRb^mXnj~l$3K?
zspIVvZvC2Df7Q@(eoPeX$<@hRZH&0G*_D7{jqL2gZWI)`Cp`n{8{fX}6_}$J(NVsp
zZUBzk>M`AI+!Y5F>v>7o+)KMmKHrdg8TNsYvp|+gW at 2x}x+{HPDF-iOAeM_+71`!!
z$dT~)7Qw}uRlaBdrN9hPc2b<#Fs7>!xpux^zV6vq@~v0wPZz2Mr6FR%efMP}O*zy2
zaQ7mCC<M^YvRsnv+1?liRX(4PHNV!1=Tb~O at e>t09acz13>?s5Wuk494TD=7W?UOr
zbPCV*Bcjh5Yf0DnH0I6C22y96INHKmQe7)JAfMv3e_pi^_ at X!vnm=MQ%dxa!<g$=Y
zrnKc#Z{=}$EaQ{isfcFfvFn={^o1f{c|6njh1F#~Z#u<-MNU2mKgshLv34h_Kzof(
zUG}BmbVCvGic1)jC|zQ0)Sci=$`<yZIv%e|naCoi<IXC{?J$?c*8#>sC15dprP`#q
zHeZt8J4G`)n{X79^+ZUnv(3nbK7Av+uv*Dg$J at FXfBwv;nlt=m at mf_S*2Npgt}H&<
zWOCD&{_-H3Ac8MOOGkS{u7qEZD4ozOzLo46X+*u4OeJx?#efKQ9l2n5ntOQkxd1|T
z0Hjz;ED=XPC-u%PCo;dt7wGKaf$*}o?o}C8LXKFvXvf4o#@PoLi8n86z10fDT}n&l
zIg%Psi at 1nd(+5)dRaiedt%Ssy&sZ5|f3t+v7O!14>-i`ey%YV#r?KfyxM8dc_f?0c
z$mS~v&lOc$LJ6>~3xaoCvM-?~T5;VsG_O~hN2I({zNm{LeZZ!!xM+`js~jqD)D4=J
zQL5pXr7Uq>ZvR%Gsi7>rR8 at 72y(X*SY5HvQUSN8mw9k@;Z(GTeJpsaN8PXyaQB>?h
znEf^BlebW;CU@?rw#zhREo(=i*Gj1XkAy-ihry}2PgXHC5^6dkNzEN3 at Fkm?rTFHw
zQ at v8ML53sop*d$RjlG<X&ap3cZ8rE0xi7uv<ICKE1~uGWB-T2-R$mM2F)O{h^TTH8
zKZ29i%U;D#MFb at WVNvw)*5$OKk-%=xdN79-Am6ZZDZM^|eTDHM%2a8`ac<LLWlNm2
zkO%in$aozJZ(L6rd<$udgM_<bmSUjeC7&uFqnB7_%O+EVZ`5iv$rgT(XWNuympDpH
zVN1&VU?HmX9s;P at 8(}(L2sdb5t3{4um41%BVtY&-KpV8s#U}#FXQz at Z(9HEwj$cPi
z#22nrrvAX&d%lq)6b`%5&14pO$J~J^0j5Y*ZDQ+?TC?YEsJpx^zDRi(5VG;q=<3_9
z&cxSFx_vtywvye!T=p4?$r72KKHL+-GCNUu=P|j?UIJQo8mgRg^^Sg>X4bW><f5s}
zLN}<EC5Np>aFY%D>XvTy0sb}FEC=lY at q%#`&5uc#eR%!jZ3DzvEL(hd+`i5B#^HE(
z5c-EO3%45*lQ at adF5fT=zAmZ;v6s}{&hXF6^C!AWE*hPfH8k*0ZOEbuH5?<Y>IFEz
zdGS>N$alZkHG at 0EsLMkbm&1dq-qB72t&KA*U^a%^ND97{1;t-C*NytjZaX}1`(RrF
z<=qxb6V|+-Mr*dq87)?9)w!~cWB)h(4s`z at 9`cQ)>0Xl^nXPsNrG9ppCBCAB<-S_&
zp!Z5{&wNfz)jt3yh<QBI&zyh*b%(NhS00L;*sRmT<`-^-J&d6fUV5kvNq0GuzB}#c
znS7l!Cvp0_pE}=TSvfMj?@|l5A?RLA!u{04$%D}mMtP#VdL*!En1RS;f>JgzEa*J;
zo|?*-C*gzPkx65x#d-ztOC|*DX4}sToAfkYQ{k%BXKk@@YLz(pu^IZ6PY#MFS2*73
zZJHnZC2Ev7)qfRhyHEWVjYTHWu~I`u&Y>r&TqGry0+KtW%2UixueO3cWa33jl9UxQ
z{#Nn+Z9~%MP{TlU3oFM}RLGFGpqF#~6Ngmp_TIEwZ)@MbiqpmlKRYS%&r>A20gzjC
zj*!h3v=!ou_kE=1v<*`=3i94V56zIbsTE*KqpP&J3LK4!R6GmMQG~+pjfLTS=~LWk
z&`UeyWQ7-rVk9zQG<D5<VM4yRm)W!wGkkGuB6Nj%nc5Uj77WZS=!X*Xqhuo*R^1_3
zu#i>~aN|5P3L*!6yRjgx+#pu2_wG41Y=a*Bq+>gC^A=JY at Iq-Ou`ivp#Hq||0}lEg
z)O2_cNn0j#cDcKVbydF&WmwGZ_HFNQa_G)ygH8Wp?)`JlMf>4VrjbG=zxF$r$Gj&A
zRh`E+G8kAh>d(CAznvgHeLO)luzAcA{dI<@p|C8D;kuv=II8PFv9$4#&lbcGuJuhg
zo_G%9Z&Rl*M*wkm#Y^zn7R3;USZT-0c!cw!*Zxh-ZRz1w2fp_yN4=y$^Rqkz9VB~R
zwpz)vy0ug3ZLy<I8hnJ#NEn*?-h2$vA5$?1!?7<pB7Mg9>J=$fJ<zwhA;|c?cv`{p
zfK at pb9)7bSF|4X9OC?O0%gTNY<s(HAm~Jt=#!g2OXU3N@*ly1*MljGhzbdO-Fq)$F
zZh#+W3r4xMz0b<`h`0QT-?kL%I1*@;x7>+ at clM#$6uKa^BIomDRjsP_MEYD-m;qq_
z)hVEIta!uKH9K at e8a%VtYivD49onHwk6Nh at cd|O}6AMy~hF9sd$P`EL?q}<98|=B>
zorHvfQDc5j_PBivF6Y}pezEBc=CyD{I#C=|g;omUYMdaB90Aq*Tw&O*qujEH#c*#f
zdjQcHW7 at IKF)#%Z7+PBbc2Q7d=cjV>l)_h)(C{d~o;+U>LXTZ(EIg5WKJprZ-r0Qh
z4Qv>%V?=#J11Fb4CVRT&xo|*UGJla?*?H5`;VpYdv at JB1!0UQmdu!`VR^P<yx0w|L
zCJJ<K3Pf1TR at 2Hj5M8R0hBwl+mfzb|MctXiFulXTt~VIO6??56O^~`sY1s=wk56(H
z@*zdCw`pd_r1Bc<yrYeKYg>@gzqRS+1?{-a92RP(Bttwm_&Xa`Zs#HkK)52C at f6q$
z<|%&o at YCphCDv5|ZQj&kGw(atcKRqz4-G^Q6?)5n>G68DQU}j8!W#ivjpuR2+yG61
zujuk=xUwB!`uRN(EZC&59%=}!%dW%%CaVtT$5?p9UhuLG%NdQn+^>S8yLur^nJ>XR
zn$deAvET%Z`3Pi}?1XsyC}NM_C7FhFsZvIiC>8p3!orCh;U-i;s;E{mCMN at G`+dY~
z?zE0^P<s{E1;SUTW8E7}U-fF5>G at cb$1(|ZsF1|Vs;c8VKg$VFh3WR1dbXd^sEQvK
z>Sh!Kte-IL6N|nno6wL-(scWJbS+w>(La80T|V4?vv5;UertEYn|ofkdrMgz%dJ&)
zcQukaK$BW*K!aytXs7zEI21{$9Mp5KPan5l;gy0+cej1%I9MDNJQ-43q6(CNR_Q#<
zia&^w9v at g++bqkki$1<ST-$QI98o^2p3G$|5$YXW`Rcm4T&^F6tZ_Rs3phWv6+rB@
z=u3jn8mKQVx!D~%n$uaG;n+J{n0x&(M3q~+Iz89UqNnazL&xzon=PUF{I)V;)QXGZ
z)`qVa<^8v&ozZH*q(6<i$qe%53qu8mk{r<5QmqPAIiMNUeW4y?KVxWQiCIf;hwTDn
zF<L9ssC{LAu>S^V9@{#i4+=nIi;T6b>s9mSA_-2DlkXVN4=RXlbCt5xH!XO#JT0I(
zuo**YpA1R`U&Ot(b<})9n<}Btb?l_7lg}(@nkz at DI{Fl%ZdU^3LOA>+lHSxIPQP?7
zjPq3Gx{{)tGDaduK3>A-7&Yx;XFL_UQbNEZ|GlVN!U$O*CX<+tL{^$aBV60!9wlK#
z&8ch0y2F9$7=qL{aG><M4#<le#X&J at iwRm;Vrm%PM}U1RbwXOs&CY=`k-pNfGK>rC
zD7B~$C$q>GtT4I`NeU7!yR63~d3HW7Q7G7XezAwt10HG?0gYA6qO6-mO3GbLv&W2(
z_sMgQjLDj;BU^)#ukd_TBUm|_nWmdeN08J>^=!qOb`Z@>YP&`b?vtpU5`$2~K0dgq
zpAw$Fb^jL8-u^sIVy-fJ+ntmv01 at vfgg!4$ZQ=_oAGHC~$B}aIcH=d6jo49*+l{xO
zd0g;0ekXW)LRr$OP~Dpt*cf=0VdMF6ui=8PaMQHc18PiI(-G*N;BQ8xYY&TDVt=)Q
z;7X4YV+?)4R|aeCPBHY{ZC?rN!liYVfICHD{#kp78+_Jrr(_bF)nXnnsU&PD0*pyA
zJ4GDtl$g<vPP?)nk{JepxpNA-_jx4W&UT^g at Ie48O3>t`Gww7-ubI00D$5vC(g=2h
zCTH=5F*+rx5gRIxzH{}!M#ymno;6Lmukg__UmQ8Yn~nh~>`vinUJadDE(XY!cRknr
z?iYUa3d=DharD|OUv{tIMUS)}R~{+Y4K0BO?n*n!|F!a9KCC>_B8snQCEkeAn*%^V
zLj&vYY}?9cNl+UxiogY at PsjX_p_1A=(n@)mFhcjmQm=NIJ{0n5`jDu0^NjqwJ|r3k
z3ml#{6YGj>E&<`ax4p^V&<j3OEdbdocJ;2cnoIhfO3OyJ2*cugQ+uxQwQ^`Bhgr4K
zJ3A#1rov3#gH1X{({PwH6<dgoI?2s_Ze)|)@HtYP(;ot=jZz8p>cfh at l;C{x&XRz?
z{!+08E~Fh){~|~I4c|p~ESLCnwG_jV?9&S>i}^Dr at gsaZI;e<DZ|-Nki&^qI#4;`z
z)EykjJTIzi3j9;qwa_p;VTk0vxQSAGhr0T^uYsJNHsT~Uuy-s at _khbbn3OT;$aQ(`
z9+*Q$;uZM4=pR=+ti~aX3PpS!ROy7Be0$ogdzbXVhRMBLk2Wl^=*aA%dp~gu8tSbt
zPYnQc*$@Dge)C34p&pGtx%=$J<1`p}icbrJgMk4a4nJij!67if{+o^ccqIBuesZ(_
zME%kL1AAmF{}Snk;-9SN-$~d%y#Kxd`N^byq+$OOpNHa~cK(Bu{eK1bcnb1MW*>@w
z8vRAd{^!8_LjBoAw1=Vm)5`A@?f<s(NYef#um8=?KPcP(ZRwx=^8Ob~zbM at QtChNc
zvGR-3{ohs|N!`EX at L#O_e-!T@#(rJ}zf;^EN#4JN_Tl2t`$hTwInzIZzn|zoGT?rR
z1l;d at xSzPk_D90~pXdF*aFHkv|B&!--u8I<{}c7o+wc46e~!P#!z1j!&f5O8^7}LK
xanJorK9K)&2mUAW_uKgKnfXhgX#V2~Dk}-~@c0D-Lw<PeKLG;^qJ8}K{{X|<09gP4

diff --git a/acqui/pdfformat/layout2pages.pdf b/acqui/pdfformat/layout2pages.pdf
deleted file mode 100644
index 59d0de84c8c0b0cd62c436a4feb05ea1210ee08f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 25541
zcmagE1CZcQ)TZ4wrfu7{ZQHhO+qP}n)3$Bf?rHAKw;#6Z- at i6hshoRH&P^qG-%4)s
zkjM**(lF36Ly-&?4|Wf>4(35I;?v{X8CpVdbJIzi*qS+;<1_v3QKS>Kuy!_aq!YC^
za5fP(F|so@;pK&La&|N^uz_;VPEj4V-K783b4le+i=Q&60s;dlVU0FM6BB?Nxzkx7
z4#k}I>1(!+x~`xEk^1z+4jpDEehInscqe92az9PRr at _LNp6K~r%G;yV7czKxK5FlS
ziN7{p9uF{@(_8r}Ca=GA{&AWU>X~8E%w^NE=nLoxh~qqT+8rGLRyut9w9F`I_xwV2
zVdbIKn{695Xwi;!gM4gJI5K5{D!Z;<DsM*M^!8>@o^)>zNvY1|@mxM79U6$c^fh-V
zc6=ROiy2kg1hrRhxSXtDmbq at NslnPZb2w^9S)PHaDvdP>nFXPvEHK?%Z at 96B=7ch5
zhOE^I^0~zTGU0~CAZmn;Iy2>y2?Sk+R9WHx!*p6b7^p0(zyG@}5G}n!MZ<DhGba5K
z^=3fRxxL=y21TWGx_2<e=JD3vL<^Ktd#x4>r`EbkFpO at jXz&y&{@YzE?qkSA0zFh~
zs~NS-m33obkfvx|A}Gv6n(J!9qyI+s`U9m8%%^AX5DahW%j-U&57%Da=0M8Ae8MAT
zB*6`?5qz4!dJ<ZHF%RD17*<*;9cPVKq3;?tC1vFs`}lbMoFL6VM-1 at S8?Ms@$Bikn
zvbnlgMujKXLTSlii>`)l%f-EL09v43;vQ_N<pXD_s@??hOLNPi4^!oQ`L4<mun4GQ
zHj$m at oINS8MwvEGEe>{xr`P-*72LEnL)MHDSA%UkB0^mc?_I|5cdT+GkyU=KUIX8Z
zu{FmMKvTalz&gW%S>vcRti*UB_83 at eh%rqzT?6$JAl(g1MGv)5Ex~12;Ks8=c#PeH
z0EF+z2OpfEkz$`6edTEi;I at rg;KfQ*g7z_b^I#>r$=yQrdo}L{X{%%@hU**kf#0n?
z*r&!cEKSK+&y`WtgRVUYMfMjKVoqeT`>;Bgh;d;Oux%PZVRC!)V{IBDazMndb%mkY
zvKOYU`gq-W60ZLK?HNtAoCUv;-5Q{0D|(8GGawYNJLhajcX=RF4z2E@%368cHEwPg
zzA&$qT|JOp5(p?0TjT$9!{6wifuR2R=3l_Z#_%uuAAKzUA9u0-|G4Wv-N%5>z{1GF
z`hR-u*vrd1X*A_*%G*;amAA)cvX%GVr;%o|)p~q{btDh;jes6xeQhXiEftTEl at 3em
zcPR6)3_d(CR-3_i6YTV{YZs&!5pEWVOk4X0(e|{>V!c+T4V%QI>-phMaHx!htu5q1
zF2*>>n(^z+_l=*L`ffId)5+8nhuKUvQ=Yi=Z8Q;ZrU*7voHbVF#!ibbI>8fgaJ`AK
zn&8{@Lpau66a<2=wdG>#!Q5t_NO)IZyk>{RWslK^Dh at qS@drA=`JKDB`P1A&AGH9v
z{V#WF9PlCe3tg6_Spgl)-PE_DuqA;#yf at gTHrpI*jET)<hDdo4vL&lF*suAev}HN+
zeAy4^&9K(tFudH{z;}mW=53`UrU- at Rc)@a6fz7hgL#4i3A3<Oj$dfbx>`=caBLI1k
z%U~sP70VdaGB#rjneKJNmUWz&t8DG3pHVRnh;;?wb$@B|NFKWn`%wir8oO at 452luv
z5xj4`8NnplT;W~*vU!3hrKLOza{&eB09T-sm07p>UBFb|!g918{}bM at YX@hrjYVgM
zCv?vXr?bK{NN1?8X`3S9c~)n<sbji1IR_F?9BC6opKz8lsWX<ncY?hYA5<#C;8Aqo
zQQQ9Bm|OzzIZQ`LO1XJdM0{?}u-swb-yDFK+|EwJlRqenVe?;iTmB>SwEpX2>v!XP
zgx4{<{gpRjR&&7Spc|f2adwBN>^Nt2NIc+-U$ldus94JgwoD!w at t1Kz$CKtr-eL6B
zIoJoP!C79NU7T#r&0?#&Ew(nBnac?)sVAi>RBFLk$Dzm1lNXj&sj6zKAQO|4QBhDm
ziS0v&Gp!jONeohTi<V22C4offDXdX63<MhJQj}1`;>FP`!vy>=+kxREp!_XcvPsB>
z(bDZXj4;VYZt|gv$@^K!>1e4%$0j9$P2|M8=7=Fo?QK0+dqOgXaq-<#doD1l$c>Vy
z%G|hT1k7e}Y>*PzNSR4AT_dNNMl!!|gLT^^wNX}6QVNkcdHg;76Ne9$AhoHDz~T>1
zOvoS>jOPuKvfDh&nK5i`ZEYPrxOq%Us**$-B3KGkqD>TAC at V~<Lm)X_ocY-mI_cf+
zVB$iJd<V<fIi2O)60rh%owOgfwgx4d_|B2C5_@^l8V!!`jVsocvY(V{ZE)B|Ek2yZ
zvz0wP6w*I<0*}MfcKdLclKacMKW`C0wfMW8oM;N?7}2t at IGv1K)sfvDZi4&i*_L4t
zMdxkLTuw&X;Mx;uz`YW^t+DAQsas2mXe?}QFJ%$!qUd=+(BG_(d0J at WI?NJC-#w-w
zKmZQ_GCaAR_rYg^=joLbo36LdJN-j-$Q0Q3ZY2`YZ8X%a8{Fno*N0QHwv7nQn{0$$
zwH5bucqmzeqTyjk%)<I}S(Q}6y%*jRCW&S=rUZ5J!{(vrtCow91Qj(P3<GrATmhsC
zbWYq=8GMszX}k3O1)D_5kpf_k7pYlC8U4COngRmkRWqaC7AtSBWJ9w6AmB}$m%IxJ
z0eC_U^9v(LOM8v^vn4l%QrMm)%9gns3bI_rouxKZNffM!7pXAJZ3~H at r=1!~pODGv
z8hSoZkUJgjg;Vx8Q3O at W%OViDR0DKSSZ7`0VoA0cR>`lL845O!B|^RU`*{rAy2CIr
z#mC$bLLci9l8jZ%+%~})YI at qbSeX)>flbQpSa<tHuUt#k{l`gIbYtdZw6)=XJ^269
z1o)*!8)l|>z5F{3Jb;OsWjSRs#P&)sYKcCkSk63_&E(Adi?vkJQnrdPYD>8p%3D=L
zI~P~(T}f3kUt<gghKE_XJYkr0209nO9%PLkImLvv#iKwgI*R9 at Jsw7^>wKf!Jw2Ie
zK%a5;tn#sSgJuATfdHPFPPLpqiN<%eW<aL3 at qOCzDE4GIYI-1B)OwR%EF%gd6vDKZ
zGol<a%xapp_2b+ZRV!2<X)xCG!{bJnUHbKbeY at 4^;9{P`LFm;{6c+c$cNLd26|`l)
zbtc86WN%6}_t!nqHQB&h0&LHA-Q6!qo`rRvMEyp}*2dFd5S#5f2#64jRC#KVg-Cv?
zWF>HA=IEVgN%R7Zl}ddGRXmO$gh2~b2lSY10t at WEa3X)DVh4lJBD^`p7xppqPq!v|
z$>+zA-1`o7_!fsFfQa9CvW5y^=iv{K(#oO5ve9+Y7sDyYyW;mT7Tu8t%la5=0h5xi
zQ}@#cw at s642{D{@-F4XtwIZs@!L6aI&+cU1#zkgRLdvx<wG3!wE-&n4+1au&E*k3N
z1|=AmE<WV|T+rTQVOXGgYhv<xAvD%Rq*<G&^$x7Z`Q|LJC*<;n$0L*MbGv>Xqx^h7
zO#$DNDJZ~S8St$r@$&Md%PPmh+J?jzlu^+_{Xo_Yo8bsiQWFgQJBba4 at Z9#^N)qFw
znz1RL+uOVC?=5A%uYz{B(0yJP74UjzBx3O22WQ)EcwfW)z-WCN>wlJ`z-0{|rp=$S
zDwf8RDy-<N*Y1E+1J``&*T_0n<ykizB?|_RregAffi;zeE=H2v=}zcZS_z5lkfWhT
z9!H`?Q%25aaHdH1wY%pzO-WQ~vEHeJJ!%L9#aZnlHKjF;mh{6!zzlK<{PX;Hmg3x`
z!S!?c`Tgn}2X^DG4H0y*)-7I at SJR^^d1N!76Ue?M9|rb4M^}}o+-^ruYnV26=^W}x
zTCEzXJ1?o6CMF!&3CgU?S{j=HoSRQZKDO!zLZ?Giya}{<RJ*IvxhwiLr;9Kjs)6tn
z^@D({sKu>a-V^ZJ2H39hp6T8=`tgkX2jot3PwC>?2`^LB&!bN^Y81dJBQM+$sQYr9
zesc<bUMd?&o27kyag_>K-D<;u*;!6Qdm>D!Fp|&gQ=ekeQ-{;i)J&GJoH)*9MShk)
z_2(|_%$=N)2{A1P>wmIrC5!uHJ9=dqK2NfFNwtQ(+}a>m-SJ&}Klhsk>E6~=)9Xyr
zehgA^n7qYA{K+LGlk=^a?*+Ar8`#j|x3g6aMBHx_vw4%CTG4`6j~G-rBiy*kw$^)5
zT8EM`7^+$Al2V{ZHIs@<)ulL=G?*?^t%;apyrQOvb9XpG0C&wVU#&tc<mj&4zS3v4
ztbnd(0sr!~tl)zId&??~yv7i!X~5#Bm!w}S(Jv*&Gn%X320n>Gc^NtX4osms);^8w
z>YQ}-^=W<zGuy<)u9f0Z*woDl>N9*1yOX1-!rNHNUpiB6Ax$Hq`W&{~{+JIN2G-kL
z4#<PG?zX$$_+V|^Ln#uiUq(xwC4%>*$SzSiF88LCEke6 at NvJj6JG4pwCaet<vQ|EN
zi9j2YI#5wyATh+s=LD?Cj|+CsWGR0tlp^M9Cp>V9PB!wf;BvEWu*=L1lw=L2^`IQ+
z<e97tCCiK8COQaimm`Kz_;Xe;7DZUP{SuKaH3WsAhjL#<Sn7>FL5Ik1TL2O!68oGP
z7bmuXYN3a$hca$}@G;CQX at LYe?5%f1E}fR}D`m1a;*EJK0UM=(cmb3QoePD|Fi at B}
z9K}#M8|8Gk*j=HU&=UVM=pwLuY-VD@>Nq~^6(Uz7PVjL2QFz-m8SB_lI<?$&E<8q*
z27(j$?9||P0S9}i-XW;oDM<e<Xz>XctUk!MwCroq!YH4GPZ|9E{H0xDfPP88+R#PD
z#nkWjO4(*VL at Huqlm+~q+$`U%-EK!`HA!7#G~E=El#`3!+u*BGB(S!d$^68$-mYrZ
zYPUn4?5!@t#)I`K8J@?)1h)mB5872wQa$`rJrZ1K+U+9F3PK4S-W+!k0VgbPzPqSE
zGgNmRHmR^k{m3r?T#zcV?y>=-XYD6)bDFFD3m#>(SQIP5S&zG9 at Gu^RU-JrageU#g
z<7YH+?1Yp~%9CA%*+hp!8GQMZTMW}bSFU_;H(l{IP+^>hlW1))ZVxqj+Hd1>J06#K
za;L1(wYo at EF6@>@R;qEVM+a?u?E#8E51Vq|tGA)KndKE3?w00n=QJ)ZTDh{ffP8|L
z*y^{AH_LavA}qbiJ}sH#RoBZqma+;VbSgSEgcForDQ%I9X#1~`wI~TqB6g?=gaSz@
z^Js^!k##6ZO~ZDmNrsUM$Olp(YS0mlbGm0VN65O~<6g^B$+}&um&Z at CpSh2jN!c#F
z=ftuj{Q<j9+D`FJv1~X)0t^>SY~QTat0=<t6V(sp?76x4r!3yVOh&L}37S5=8&|3+
z&*3R&)s9i!Qlz{Xo5t0N_oHdXpRbI(G<iwmkBq$3hv3H9@%Q!7ToeI9w86NM at Fw1}
zz4&^G9Z8J5q=zLBq8>2lI0-3<(Kw8%V{etwyNP}zNluKsgniUWK8!mghqxGO<1&mC
z$qgY1U)N&i`?O<QY-|4T<L;UxMU1f%?j_MA7}d-&P|1Dq_n;VlawCkwiUy}rWJEX*
z_0pMV$o|RG@%61(qu<OA-QJ3%ZH-&$`)RrRNzT4_<68_Fvi at 9zhd#;1XoqU#bSaPt
zG>icupOihi4~!%n)JUB>I*e`Xdt%P2X~qvcq|rpu+RpF4O9Nw#lSneK`VtEyf7=sF
z-#gP{*ZW~5s(A>I7CrF(NuLr~Y_d+|@Ks1WJqNjqV$3y5s!nSg6BchGZHcy$=A}fM
zQ%J8wOhv!pf{E%R)=NQYQucskHBE`ui6%Sq5EuzgD|$%grXn*bkr=^5w#=y<E=OHm
z5lPFcUQeVeu8u+FNZnw;mD3eNjSK8=gd>p?g7gGg6eD+D$1o<lkDU})vkt=0Yc?7!
zw3_gC{iJ%@Gh^Ob8J at lS*21zQdt1$6s`&(ku${8k6qKfikp1=i(STQe&i3Wz1uN7H
zTpP~|9nOOUs)Ew!KI<U%wTKScc2skDmYnH!0^K7N6e87yHSDFN1HRemn3aWfeIitm
z0^ZsAfO%0x6Q+no;NR%Tpi5b=x~vfiqSZe!ZL=CT_bbxb?ri?75m`#jTT{*ADe{sd
z3J~=z!!tNpjuH$1n+FrlxT<TpSTu&FU8qLkRg;FbO2noIyuuxYq5Ntr7HiOzdhK4}
zLxihAK29DS_jlp^4pIn_NJWDcL|8KB46`|bsjL<DX9EhK`7p6*PGh1gm9ELKt`&=L
zl4TI6Y at WQRj{P^i5B$sDc}03e558e9uJ_tc{SWp{*kOpMmTQZ~P at A~q{hr0=`+b3&
zE>}(^hc7lB0U1i)bWQC{kEuep_qBzZON-Qf%hrY5))fo}X&<p2C6{{j&vswEvDFj8
z;9o^>fR=zw)I$IitOcUoEDEH at v2f-Mgw?&@iQw5j>@V_O8HJ5*e<c+0vIqLGW4{Pk
z=RDE8vExCvsfwv%l$)BgFC0g#>86W3l1HG<i4<4!8z75dPyBftm7dL*$=qS4c*(?N
zLNFe{OnN(&%w+Bsl3Q**{~#a)R)AS}bOq<}+ye+)1fTPz;xg;6wiXpUY|P|BjNFf$
z!J!&h%t=YfS=>kA;-nf0?rdFHaA^sY at 2YKXu91~*x3wufDzUoc&h2dB7nyX?$NQD&
z at B?xhAFk^QYGJDllV<)WTo5>^B*Q<#ZuxR|5h-lPYbpvwH|sU~HBn8$EgF|rm(t(b
zPh{wJn3YcV&JgkWfa12=ZD(?RMCpbEK~&k)MOfbUvf8U(CO*pz8X((E&$)`(mVh$T
z(W8gUa;ohV-&m?EBA!FIC>8(lmoo9Mj+a~XDPc;kH#c**gR-(_Jin8ZuHoR!hZPrB
zNhvQi_cA4|8 at t<yq%<|Hmr~Z-wE)=j7?;gdOk=GvPbcUA+Dp4nfqQ~00^o_TFK3SI
z59WSw=h?HdMed!$Oedb}gO~IZX}PTSLMHrv2=#PB3g1p_s>y~@?U;9OgCdTD$B?B~
zT>)_@;X9N4YF^|6A(R4pa!kok<xqJckwI_ZjKI<PP~*WrU?#vQI>fA)kj&n5{L--P
zm at E+dC|2s`^0bFog|Hxi&naNEFn7q#T)XxS0xGr<I4VXhno|+Wn%qH^>0^*Vps1*)
zzwzALaMCX6Hv{k`{Wi{MUl(H_ZG6R1!Om<!qKx<9)wA%jD)u!N^9MEjEl|pivl`@G
z0Ml5P1QR}D-B-~(cfGs(<g9$Vt?$N$QXcaCxS8+xyPhOo?hlE5&o&oPdY6qRZ+V%u
zb$*6#akAgn0bU(^+<bf`HI_I%zqBXUC}*GXevQRRt=PzY$#}+naJkmnV(aPUl+<j{
zZ#%xGu`O4aW2*$m2loDq^}B`r0bh=*8uwhxkEj+43g at if&0a7SnNp^b1B_RJ at hoR+
z#(0O(?&+1;Ej!iL<gS!0hp+0W=d2`!a!JXIM*NjGVm`%KAw5F9m9Si?u*r<sqEK^k
zFICx8$)=JmnZi=h-z_?)?9UbaRp=0+!+^$dF)&5~fbBxlPTQ#r+f8*&*j)wmi(%Dc
z6(tP{ko`Cl{1XU&iMCV8^PQ+#do_i&>QWt}^__}{bf|6Q3Vq$9OaGMFHT6RC3ZaWA
zGl*G(+bk|KUZH01Nwo_~i~~t(T?o}o=Op~O2?x1YHlzYa`5VkdKtTLZD3#Oc%wXsC
zboL(J3Y8gpFAObCfiK(d>uaM~Z^f{+<gP}m3d_#|y>2_BGqP(`(TlBA at inIO<%ZXv
z>fY*&Lro)t>3Q?A&t*V%!0*BSLa4JOIap^(-;++r7sR&=(}#z;266^;9PJAH+Bm}~
z#wgBcra(UQioh;hE4PdF6}ki53FS&~5R#L646N at 6_VFcr)yhVIMG&^O0I`DnPIzS%
zW~EzsP~g2_^;BarnM6TO#XyOGg8J#sTUn#TZUJx6DG>MaSrU9QR^3xLiC9Vp2QC<&
zF7yl#(O>?zT#r4UWEp at 3ytXoqVQU|<cKt;xvp6V6z~8s_a;G2u{M%X+4U?3c{gki!
z#L}*h8(T_>UHZkXr{53!61H~bJypdWAGtRth}9O^=8xwx-4CnqCn#-hplZn{Xvnm;
zIw-g{h&7>XtsG57GRM!oK>cXF;3hZj?)5G-p6uGy*3U%MV(uDv8-X`Mv-ly<&jo7p
zuL*%Gx*&ZeeBe|iD@$vL^GsD0HE~my`}&KI at 8#d+ycK$LRVRS$g{SBS8X}o<@xx-u
z3N%A-3banZ!5QGWFCS%p+!j<pPLp4iw9-F4DNoN7wiX<tG7V-}=bSPQq{zXyacYTL
zFr9=82IxBO0- at PDSGvMy)+R)37_b`Fm%<M at 0uGt82YxMwwv2?U*08NlUx(}LFo*h{
z$(c0}ls4%5{V=;INsi4-8M+V|7cj%OaGc4+Y>(}C83w&><Jo<N`IXn*)w*U;UaD=B
zvL%d8M*4mp&Rlw_RWDVjo>`OXnC9-C`9U_)h>oktqlW*64~UypH6vPQtuFC<QALWw
z at gAQ?jFx;$3`vY4iR>&QQIiyhM9F}K8{mgLk+N?FkxQ9Mol3JO$q<T1csnOJv&~7N
zPjr`vM=gF_5RoWJ=$<z`YJF5(>KxL|S3Yq*<Nbl?z6K~Jpi-w`k$diQgKE{EO6dMO
z%iZ-vWSx-OC&u3P`32q)7d`xaP|X!P7$7Zd(IZk3d{R3!aHIS<-?R^F9)k-vh~~28
z)oI1qC>Q3!QRA7lE4pFr(`shDY7M1X)z)L~wfvGRGrT$A0*jEPwcpwyv8}?E>n60f
z$9o|wsGOe;?%&STIyPaAMm5O2R_qugk$^SLw(eLsGn^%1nK8w@?t(kHSEqMocGA)A
zP{mY${93_%!-R&+g)IVV>LidbsGzOCqVTaD_Z6A98wpxzb)7c?6x_>kDjS${R}R91
zdh$%@?yJ-qfzI&@n<8J=5+nPEybv`TXg_4Zo<g*wsiZiTE{Bd}e*s<jL at KESx&%#X
z8K{ajnbPsOhL5g)O12tPsCWqdnbXmQ)5MF{E;i6+!KHBvvYW#^*XH;6R0`9>>tTQ|
z^Y599=ADc*!?v_3*8CH77@{cgiA`?hJe?+HbBcA$%#VR*;J5<-b#U5`1s!NRWt*=$
zE=p0uo{+bRwSXAikd^$7n<aDKLh at N!DUzC$<>mFlAHVLtk1HXB9+J_aD*_<K^?n~T
z;znd1gcoayA=<KCiD<ZW0qVdV<ngv-jqv`!rYUqPda<}e?-~vuBg+S8DJ_+jrWW^l
z)G#XsfRvh6LQ3$q8FUItO}oL?fdP_lb6s3bOv}{_?7g%rslsqG#saP26RXrtfT6{w
z#COJRVzxRLjbB1|?hbCqG&_zHk)qkLB`T!Us*`J#tb#B?J>cJ6cQ5AaGs+W|P$FPy
zEYGW^Xw*8}Eb0zpXB9LR=r6PtIu3g^;FoMGCp;_6h)2CyJ=Vq7 at 88*tfJzPNIt#59
z9b05*9L(zX?h;P)bgR9Outhv7`S>dj<=M_=L4D&AE%ta$qw|P232O0|Bg0Dh&)Ssf
z)BxD)A?v~9^`Z_ZBY*5WcCZx;tWU7v%zOm^Z+=6x9iy#1JVIl)6VdV2EuYtO<iK6c
z9UTUGPaJ`Xv+?a}<cBZ?y~(rhA_*wQF%xW4IoKf1BzP<444spF-g_;uL~xUQWju8b
z;l$sGLJD;ue?R|3ca!a_5q}m2-=^TEi03tn5W+5SMzj<63GXEOlK2oi_>u0L5qpad
zyh@}ulEFa&ulDtj?oT#<Tq1ffY(J1=sZ;I$&=~A}Dna`BCH&M%>-8zqwMb~k2JZsx
zSSud!p8E?oH$O|9y|q5&3hSobS!|q#Kfy+5(d?HXwn`)lD`)u9ml5rMA<Bw>5H~7d
zCP5_Jg(3Fh>m-g%F1!*yklPF?P>?3%H!BiGZI5dFBrWJk9i<2NB^of0?#n{9iLVjT
zBm^Rs#owuLF4Yk`YI2e#*wHWeAl}4>mRLkoC1#dmLy-{9W0jaY5kK%i;w8yS87GjG
z5J%U>%i<2MwcyQT7_z?cp4U4|AC!`KJ6++Ehs*#NjVNEz#MbwdbSib?KSfBUGXz)U
zq|s+2nwEG_K!!yx5Z9!Ii_$Bj4}i_+j|s{4OAO4EGo2j8C%GZkG!fukJ~osP`Vr*i
zdlU2#=4s`~anM25MUp={IQgpia{Kx90&zWXARMFE&y>d-9c;o at azhlI(K>@o&-^Mz
z+VkC4HzZqOj-f-VbN%G{49fFBJKVkJaARoOTHM;HKb*k at Zc|#sy2?W1<O{|K2s6(Y
zuqS`AXO*kNLWM at XUhv8V#Jsk2*kGBXpA}%r7R`q9(W%~xE$*eRw#KuYq0wv{!o6#^
z`lNYAiQQUSWbl5szbG2L2Wb0~)cX>YbrGRh^65LJvBoWrwqLsUX0MY+94C~~ds!Qn
zJv{gz0ndrr`;-2sIfH!L-R~yv2+?Hb8 at q5mL0d4o(>jPE(DP9^3H=w at aL<8JAtOF(
z<YmD_w!7+QM>%Umkh}-dZ>++~)Itc79q1aUq%*LC9{%^l^1!PSHp^jE8EUG@>gaVa
zoa}i{^VVW`1=rKz8&fb;CJ;}^n=*=nYl%IYG^QvwB<;F(Usrv1Z~a?N0+-deI=`Qe
z!#DV_Z_7?X`ad-sv=}nY605IiE;kZA>6#txMvL_(zCxo(5vZi_a+Wk{!P>urDCfM{
zc at f&#_?7>-=l!YAD4%lA`>xNm_pAmaE7w6}02>sD4r~%o1m|aFN6CiIh1Z3oTm)$2
z4gZ1@(Y1QN9`ks29ZEu at u}=}JiA^kY4M`O{$ENtwC4Mvw7S;TU8l~*|nN?3=c~pEn
zk&!k~08Go12wfNzJL&dugkJgOwLQTSvJD<4q;ja2191&8&sI08xW8 at eJRTYF9%&Oo
zVpQPcHxzT6ysZ9k4fdzEZ;j<~B8bMbr~i6<v9u95!1|`P;ZH9jlizmre6Ng=lH;Mz
zvD;pC{l44aC+b)fsGf!~Q(u^0W|_f<-GHpP)n>AfBx7~9DsTQ#u3E10cT1wu!lDt`
z9Im3TiUcdwE4f4)qEiTKwve|m%Q*p5Si{_!;g-2_xig$jL9A0b^fJiNRGAzGk{wfq
zdmvXdY4~D9%pt_lAe8L9=~yF1BTTzc-BMd63~S0nzA}2W26lgG38{5qSUj9*2`h(;
zuo1h{;naBdax=u`bQKcVmPt4k#8Mx|&A28Gqkc-i0lp@%8KVQ3>@ZQ-k-4KYC;LtS
z3Y_<b!?Hjur+pI9{@N+~mAo>0{n787ScP(IC-QjURToZLKom4rea6e*r~Ays{Y7=m
zf|K^Yk7Ki4_9#ZH56gqFob~$w$B}wol}#K($HMr56rx6gBL?&p7mnsI40UOKLG|}S
zls at iDCwIK9SZDqaxbxi61pEewV*I=s&fq|n{3+R<3JGhnd*(PlFiqtdJ3zYA*n?<M
zUovu-KMh{673*Ml-q7j$bDX(UmGpMi#P at SLqxbn{!3~ys0@(QcZeR=lNc$o2`HplX
zH8p5oj%65?C&;NDqNxDSi|o3y8O^2|tCA=Q7#JmP;&$wQOq3ESNr_IQzm{VjA6hFa
z?pbWekD{QAx_lrSLvfJ*wbhbY9WD=pe6d2(@0e1~uY+)#XfMlKe0ZmRpmQ+oyA~cp
zv%J6cDgO7X8VKW(8iFdnqeydkT@!rRhrJ3O>bpH2&gKGA)YQwqFkbBQ{-V$6JA_cz
zii>FMi^1QyyYkcZCD+O*PEaefPue?j^Vd?OcyP)x?D+zozR4QY=-xD7_?%k8zMAbs
z%+h$(BUPhAt0W8<GKn^Gq8_wE1s7ttz1TB*VceOTND;|rWjPDo<489xza97v#6z0E
zFmr1#NVQ*lE^P+a=2Hp{mz6m_93*&fUfPF-9N$m at su@mR$3zJmg+9-d3Q%iBIkZC1
z=$$ua@*+q{X?9gDg|@UxHj8ZjK7PXETsgDPbJY6s;Ivx&)|y`5)n@$am`JMOXi}Wo
ztuA}}@fg2^YzDOk5Q&H0hvxDe-s=esG>YXe3Ox1wo2I5x*tKEoyaro$>1%&X?^1=0
z&&%(P5|&F!oY=^gqyE#r0u>%}+O;%whadSKayMo73#&>;mD<Ei60+4#=dYe?-W1JA
znfFs at Gu}U{I%|mKl`{z!QjNnSF~v9EJuzRC&`_zbY^-psofUe1-y?j7qXcyMulKV*
zCMk8}s~Nqb at MblZ5%_qwM3Z#Iw_AFpY)BcGuRvp;v<sVWPQB2)wShWAkG%b(IL{<L
z!3pa4Xw3ygph}$@+ugBJf- at 2{{YvQb3{v*(gtO=Lg>0W3v*F$67$q!^xoJ61UyIUN
zT<M$|qSs-<8(w0q=DkI+cx_N6933TrC=*-R&K_D{x!H<w%NG>W;}k_>j1NU}S{g#{
zwSc{yp?p4u#<%$ve{K`FzPip=TR$BS7W2MKHI+FgP7%HoSjO}7^EQ$!McsCZ2i!gf
z)=DakC at 2-bVK0d3@biEQShfg|LE91by7IT-ZJxCuV1;<{x56(9s1F_jdg1=;Sp{{%
zO7eZ(^E}1yXB4FyIOCp4<zI!qoH7}a&g~wOf8QPfwW)GceTuWx=@#}D{t0lE?#gdE
z*PTPVl*3%XTt)xcVV=5W at EdImo!$uX?3XJkBESVbyX`{pY(cbdW`Vcs?r0s!x*TFY
zp8O3`G5-!TRbbgHUdO+F#t)_{=>4q6SP#W9FNL8V^OApSq7R#0u at 6%%BD$3k at Jt`J
zpY=1DkL||*Y*x_o<_^Y6$alYpLDek(LAahCz<@Xw0wW!tpgsK?dt)jArkWpRYXzoS
zczvr0Lp@}oWAX2pwT^vbzcH1o-Kl`B6mkhu0-noNGqM6;&u~q|z-9y~j{PQoi#98`
zbXyoM3L6^Ac`KviNWwri=!=NN)Ek--_xdpN(o|<==VoT(N=i%H(xItZZ&OOkS!2pg
zK`h>9ygk*vng7{{*mv*LS^Jfji+&kyx6$EZ-f80KRcPYqsiX~&ss=F`%rzbigTt(%
znx+CaslT={OSFNWms>D4 at eo-lXMrxE5qgwbi^Mb#AD at nk8Doc)xkD(e$XX<5Os+s#
zy~C>rr?kt=kQ6Ql>}c3Er_x)X9S%owu!%G<_o7hnXgd0AWQ0WI5Q-fkM;7Yu&d31A
zxZdsLX=v(f7#z#0^sQ025g&dV34Ixg81XiB^l~q3XsLl;@AZ1~PylleF_#)AZ43RW
zWfS35c2IPm5h1f_ at O69`VWZV$df?0x;h=s<Lxl@$0L_$S6tOL|=+OC{ku#WeNCZj1
z0NLzdKviwT<&3kzj1y;9M72F`+U at 0SXsq4t=2%A0%!rsL=`T$F=hT7rr;W7h*_4b`
zX(^a=j`WRmuM2#5o*Z$H3*?!=-;f*v!3VSw&>b{WfQY{VXXDTulfG(>I9ch6V~AZ^
z(2ApI8|nw-x6;kw9P6N^1G&Ynj&-qPGwMbd#>wJ0(8h0iBy$)SfM&>R5M3dE3xjJ&
zRaszOxMqPpMZjamw{NelV6L|kFO|SoiXgLJx#!C(-(eg!#xzW96jbZgmApx_W!e)r
zdk^bHvh?c;HpJ at CDc`K3eW3P9Y-U0%Xa+n|fSRyAV(GM{>*&c+f%mdXvh+JT{0#vL
zA{w*oNpv_iTtye3(Fm)9;YM?Q!Q*}jj=}e(s!1o at kazAQvaEwpW$Q4a8hyhp)4#`l
z+EiNtrft!%oNxxo(plzP9aOV`Y{2$*ZC~oJ&23M)6Zf at d@@@G4<XxxnzY6lqY?!5o
z*v+2xW#4asy<Zuo_Lk#OMm6K|X^k3TOrowujsR>-AK~;>{9wfI(~C3C9Eowrn!YJ!
z)?oNp&qi~CI2HC(?4Y`IKB8jWnm%F#lmS>}1ha0K1>dI|CgSvjeE2!f9RFC1+kQnS
z at TO3tMO1%7z59)v2D854RG0S2n#?w-Bi!_()g7|c8SQiKc)^O*?XSb1@)7?y4xjp-
zPpnfJe}M<#bw2^B-2<}v__Lfb`f+%2xO!YX%uiD0ocmbw-x at sf=~cV at a6j3u&I;Z-
z7r5O&oOLzblI|Xx$8UVpitawpo^<Z)W83-)sF$m!Yo_b4_t`t_PXwC2a6Rr4_&s0y
zZ$8<)wncm_y(@XiIW*WAF0yU!63?3%&c^>SYdF_<Z3-~!D9fXC<6G9;^F0tx_&7+Q
z5?h1ssERYr&;t7bx&4|j(j!oUpXO!$`Nh`d=ga3|vAV8fOnTuYXZzaK)|T4tB)G0~
z at oTl@z_uQZMrLs5AazZDjR!*5rw8R`M>TH~v(cHtpb-k6*}=9pL2FjVG0wq^qotHc
zbI&&HcK9rXoT0|84!+vV?Ni7GSHIcRa{3C>)+K5d$D+n1OLMy>V1-S~Z|7a0%Ca7X
z58RK2t|i-Me}JZ!U#h+2_hKTNgA0e?3oWnl1tGf2{;vzDblddsac1)ktHLz4aMC}L
z-e9wNXIp!(Z8-|NXXa9tg+3CW;tO2?yo1+063avqOUs+9K0t?jH|u_9zce#;Q(<h+
zWJeynHWG^ff+^^s0rLC?0#sk7rij&hL%)0h+y;>TxB*$}lg0>t51St4^)oS<n}U5<
zU;zULnSLV6Ff_x5<^nT?^O{%XDJYnml6vj^0B9bDeEwf(!hf9LKZKBho{@p+zj;Eo
z|KSOhJ?u^BMD1*yg-x7{94+jf?f%lbf19!fHYRj}0{<2&X$wOWM+0XIJ6k0aM+;LL
zMH4d at YXe89e^{@X6F&3b;BSSXpq;xG4Fel1J`EE+6FvhyJqtbuJA)3LgtLLQg^_@*
znY9T%JrtdQlaYz7Gd?>90~FoAgZ^vKFfy=0(FqyYi<?-OnLGchgQ8P%HnCB~Xa8IB
zZ}`6?u?ZvoKN3>$FV^^9WF-6loXLN2$ISHq59(MaaoRSB9>)KcTO at Y7AaIVg8d1>F
zB7yx%%*YEMGab$%n0yY{u5ayz)dGADZPb-_IAZc$dDAym at 2eauU1U}3&;Zj;H>mx0
zOIw0;$oaFk-n<@sP1J$>CiNnWkWClEY|$Idl}wY~(1rd8G`H}56x*Jc7fMxJBjn}D
z$rc)nzFC5>2my?9!K~6{?k1pNrRFNB_3Pu`A9#L{w^6_e3!06QxUkZ-%X?a0A>?w2
zf=4PU!ur#FJ<1N_C5w4A at D+^3q!O9P0ZIopA>9NsibpgJ8-%y%Zex)e1ZGppA7kEv
zJ5IAq4*_rDW;h&S2PCI+8f39}3A0!A0=4YAV5yL!^J0yCp2DVnEn=pAAw0+1dW21W
zq8wL!LU`lf7z`g~7>plOhA+F=XNI?I;cC%#duGmpyWQ|cMPY)E0}{`uzPpK7II8on
zumpqUWd9f8as1DX`EQBQDY+Or|I?eYql?LZ^a>g{nf$xC|8J#PI665CnHxC%Q;@X5
zf5wb|MWbe6>}>9&#m2^l&&WcL&&J4z&&0%p&q7a+&&<s9-|@fvf8;ng{v*fA%K9H$
zCUy>dMm9F6zw3Xr|7-iN_TLyREdP7If3^SG|MEKjTao|c82o>RQiP&Ywo|dS_y at V;
z|I?)+)c+w=2KxWGApfaU28Mq-{a?iTKM*e~6FdF?3Gr at wd1+&<W}I=DiP}NJdIDk+
z$Do4&B0>=5;u?*lhrzIpfpPiA06x;cfr1UkHOEM-Mi^nQ+Fq89yLLG^EizkdY07R5
zt-B&^bau4GG52OQyDbvObY)%J+6{7Emv+ctM}6cZ0B}w7`n}e1;ZM8uKKkr(oO11Y
z$1(lN>+}K1n1?ZpXKZ$}e;6{0o5c_I4gA##ixUoArYd_1=#4 at UC`#sbLlfQoG7G^l
zw_ at RX!@<q@#U}QM!1#?MD6%;s3Kqtv^HpUSOo=HVx{QwRN(z6O|0Q958h0Io=Q;Kk
zCzkJnx*_%|4FlWCTib_MAQ>Nk`3i at d$zAb74SdaD4*dc48v6<Qngw3qLnr9T&B1{4
z!@H3nTz<p5!N<YE*l{{AZeX4l^vC8e#f#^e0l2ilYM}lP;YF7*l?qLnY+lEaRa141
z&6<67_W^qU`C7;pmSrxe5L$V9r9pFoJI*IV&~(pgP3=p%MB{z)<ACmYkFi;c^Yz~u
zMUb8&YruIfG+++kjWBgMGPR^We4cxyc;bAz6(Vc6IV>^cqy3E<KUcNj1Jx7$ePaaq
zT68+c)fNlb{xMH<hCO^}8t($;hgUZ`h#w at W3$M4yD~r4is#mt>1kwA7m_4E!M0R2~
z&-#Gv0i7edD?LjG+!M1e@!N)e&};!{L;f at mq6egjzA)#Ez7xECSxV`3pDx~DUyomv
z>YWyUr9dt}NebI<=mI?&frfhDRx9(6o+IG89pH=Py=Y-+v8SWTX>mkd>?8EqrslGc
zW?Cl33TuV at x$07NoXX0ovWikIIYdfIFeCtoLT~EvqY)<~n`O|D5%Y<&Ce%bfrGT`-
zgI^pOhIkE#0h6Y{#^KkmAT|OpM4<dkyAlZqV9E at 8suG~&BD?}+#pDS at l9ON+a}^2k
zzxeJ at R7{~g<g4u!*qd?D8WHh{ihB at L6R71N5NsbFdvNJhgD61&cyOukV?e`tX at F?F
zTfeb3RV at xfYVaIr5hOnne}tgJ0}!otjEX-pYfU$Q{ElFl487vwo;_h}Lsvz@>xY-5
z;3Xo4VbMm&N+luEMhj#Pr6PKnk{DSqbV0}Z2d#toDE}NcH5|O{r7V5WZ>~w^=^0!p
zV=yEUL!-j8*tWkAFHuDN+FCM%Vuejs>WGCFE+QE-A{kVZAAdcz!}qloLy$$Z>cO`^
z`5MecPL2&~$jN%ZdcPDj6PIuRk{Mn4bW at T{z5((jSgjPapG%+|^X_WW9 at xm;#FJqb
zTMNk*R+}qX_!4zAED)IQrHCKw?d+9Cam1I^HUu)@1whXGm-9XuErmHaGa?gKmy!+O
z^<JK^B>P$tK5(;{ZNq3s#>*7-3v~m0czu>l&UO=|swNvXYe1|V45_KBKhJfc7J*|#
z^s9RxyVWGJ<sc7b4M3A78#gU6GiW~QUS|d%bx7lsqb1Q{&yr1U7$6j*jbIIgVR<%b
zg9ZMVmp(NX2n0!iFmw9Gd+kl|0)#(f`c6?Pw28qUI<`Lzrk!#d9ReyD5?q6U1>bpd
z<_K4pN-DF~Km%(4Sm=UwguN0Gj)r+Aj=8i<zyu<jD_;~Lv>Kf<#HSL1a)2i$MS~U1
znu@@p_3NGa0NZc)!6a5n=g05h1z at Z#BG<Slc_Cm}6rGU$&x>%##@4E?8YSz^wN0I*
zT=B}FNTZU{xNwB7KgsCy9l^Q_(A&Xgp8oN`!E-SFYxPjQNSqSzcyP$Ih7}cmpXHql
zai|prm=S~p7R3xQVw-Ic%koZ|SUSn2B{K0%tP>wzpA}Wa!ueX_ at G#h(l}l%aXhZ>I
z0N8*Gf8j>Ptc~tDn%HojgY<ZL!)<39WuD5^#R++r+?}dgEloBG=%wJ#xt_KB32A2V
zKUpbR<_eoq(`RCxt2D0AO`Z)kPN`66i$Dld-a0 at ENUD~M9?$1xvrTK<5bzA#^B0fY
zUIGedP28e*n;H(=chzg_J(4A0 at DCK<aGa^Ie<|MD(8OQtO`*_)y>5q~pu3yvn_tx6
z6^lJO+j5A~D{#zD+GAn8H)f#0$S6|ese~3n`LL80NX$=^JU`WebI}`<l at KjF&X7bX
zWqLyf%+3+T_FIIp0I at Rr$S7iTYb93<a|~~{qz36Xvt(W)rr at 6CF+^zQAifSjQB?w5
z2N%%k=F^Zx><jVq5wOU5a`(>^-KhsIe=*(=DM7a>N0|e>MyVzJXyGvpHUYTg7@>(-
zUYn6cQ*P at KIM@~Q`k-M<RJ_r*Un4Z=Y6jT9-C+W`&jsRf_W&wIg at f+GL4`&F*i6(J
z-y0K%uuRN0J-cYq=QXua4aXYQ8=q|37Ft-|<3GATJlKRTwsC9;+Z&dzox-;1I(D6{
zEC(!irEFI&a_#dRl at vD|rfb}&Twv#^ZmMqFwqUOD$7tHYw~}mC%}9gKgQ(T<+OS)G
zMX at f<<>eTVl9Eo2oPFe=TiBHIB1TN5rKK%$0km%LV&7!Z!Hc!NK0kxL%Gum*_VxMs
z(J!iMX`#))+1*~=X2k`^fyRN-nH`KpGA at OE@Ou6c$<8=_Qd2bpqx=H9a=TcNF|Fjx
z at L-_G<r1rYgWwh2I-S`@?-;x3`SyErxpaT=_u3B2Gbml at sGF^{0k-xV9N3(yOTR4?
zRF24%hePYApFeg at P{pck**C;uU3bT-FwDdlV1y&hGuRTfnKV9 at CJ{){K0cqIN~tbr
zTu_LqbkM5CEV3-&ROON9QSxcgtSSdcB8w!S3Xy0ZPAEgCp6}+iQ|Q`^nP9`Lp|$Di
zKerLXuFMO|8}l}`ao<tJf;+hL)+5F~FQNpx_BVZ*72_v}lKg$Fdr*7{XH0LXOHom+
zE_2~vA`*~Z)?(P;$YQi=LN6OerKqbS^T6uu={5XvR7C4lY at qa~G(yzw at F_^^#@xDM
zM^k%Fexsx0$6iewl2a`ug#~KLZQEt=($<@!i@*}W at p{;XOAU795+|5r$0KXj<74-7
zO4NoiiXisxJtfO%24*?6ir^K?*f+RwJ`Key7Wz_$eKhvjwR%4r+u$h;bw`03%t_f#
z`86{3%-Qy}B!q*+PejD|cMRmI>J|f=(Dg+#*M6>(o`Y3F3n&LWxC6kxQf at bS57j!W
z+S0!DY^x^DH7mMjzdvlGttj-nQ{S0y13a}2uCD_-ItbIHl1&xs7I-A|OW9LvW`aX0
z`q(6XrwP>nT_>CMwuXiZ(Z}X$TYI1TVVT=jfL#2p`$pDeV%+Zdz3<Hkd?OZS<2YUu
z*3z@!&5W!dO_ES=QS<qgy4hqSs5Q*k6pS(BAu9HqQPEBfSt;qZDb62C?%~c&{e2A8
z8d at Q%>A9Lgo^*X2v=#jt(W-qIRBKaeu+A|qX$%G6+r5U=(Q!AAPp9uy?vAm;Fc0r!
zzQH7#PjWwhGfa=GgDUq2pdY7io?O5{AamBo*SolfOtrVRH#d(Hg>Q>*&|HqeLtuZh
z7;iMbDJIQ{mqqYDqkneqZXc;l2*G&6$hdKOPb$iaT0S{*i%t25lW={r{o>7xdt($)
z?~nS`0+P0p5b;j$$>Rb%L_3^bjQ>Ke?hm|iw`JL3%e}Om9O%cZ^hys<aebpk>2x_1
zfG3o>v=QS4fd)ejukN1^ap#gZrx at UQvubl3Mw}~N7lxurQ3_}<kNwUVM|KNJ><WFX
zp8lg;?$Ic`BS@?y`I(f#+6BORC*zQ~au4q4>h2k2;iLJdRouLTd;@(0Oi7<Ga^lf=
zdlEcx2^-7(a(7~HO59QIv2=$RIVcV^W8)mB*=pI<i|4K_r}#64ZmmRAR*hT at tvM}(
zmazzTwv|ZP;CZ6kdK}Nb9~GxTR+K(~aMH}>uGEEXbR0d*jP1c8s`eQNsvKL;{SUr(
zSS|4!FYA^>J{bwpSd}$Ar5RaDJ{RA;%z1!8&s;U=RdGN?PPBZ8X!k?(xZ6%Bb=Q)$
zmESYYdX42~0K1?n=jYX-V5^&KzH)dF-Lx;fJxz5B;6eE(As(e!e|R7K#kQ-O at uoOZ
zh2YX}7!a&_>GJHiENE6(q5qitk^El&6#mxkW##K**VfkC(&JX}E`IaAe;lSm(W7Dw
z??hdr)ZI+Ti({n0(xJ5zn~>OXN9f+~#uU-Fu)m~&e^uxc=P3j)3>cIupLL>rAFiZ!
zU&%>`R1Ey-c+9;{DBf;1EEda+HfC|NrQ-0mwfi&4H$itC(>J#UopFl>=X-odYI{xg
zZe?8xi_sw)<#<{mbo=F7?Ecl;V)a@>S32A4w{P=+@<KaQw3)oY09I$LnV}oXz`%`U
zjD9r0facmUr5$A;8k7*a2$4yJsaiDtY+i#y8nm8ivKy{lpDylmH2mj5I-F&{_lsF}
zK*r at Blk-u!p%GUs8=)*c!||}5_|tjwMsy!3ujlI<O}8BCxaQedxyHibXmuBrplcPx
z_ob-;OHXT2f611Wvs!dnj-|i!ljaDWv{{uxpa(N%-Elb(R4PNHL0a>KIuk<*$X2=!
zR0)~E;^P at +;faZL+4*$R;&Yo%L}>0alF?$EJDU at c)6Ix3cw;sX%eAewbA8i7x at 4I5
zLfbuS8?2WB4Rqdugl#egw)Bvcv1%CXZQ8;CpV(occ&MG^!cG&PR8kR=vcEi-3PBQ`
zL)Eb)I5~x!q#<!Uv56!iu>%q3L0>LPB at V?$+D~Nm%xS|ZXXb at kdC8!~-h-hSFhtZG
zq$B`&%IL>i4^M{9oPK);e0(&LaruPA5)G7DTXdpHGK2FSV2<B^(KSgUk{~#dtx>Wv
zOS0~>*!z<T$%_o4AKlu|?BV-}XGc5;eO+E2ndTg)w)w&Jv4u}o=iQmfj*=Qu<A<Yb
zKM1V}>(1(fcULLihAd5H1dn<|tTpNnAmW at JPt+5%8gg7f6mR;y`$!Xpbg2GGAx1Ui
z($at<Tx>f>Wg0;d$%KQ)9}jmcT+>Hvk7CwbH|AT%9V!oNYWSo^Zj!j62e1c354Fdg
z at x`}?JL4S<^XcP;eQxc9#dIM at c~$6%W5-j+x}(O9T-Q97D5m4qt{e>6QBryt6|-lG
z(_&tw<4UHC3$-tCO^?U?K74K?0f^j$;cnn5e^M+q at Od(ynygMKOYlsnRx+thP0W?L
z-9+m3R at hq;&kmr!PrS8d*TYLoWLP(w*{%jtj(kKA3WoiDQ<y!Dg9%YFt10&l at mll-
zg;CR{^yvZgBGh+!oq2l9nANg3Lte%`u1l#m^gMVnZ>QcWUec?o*PI826>Plfp2bM~
zo<>3$u0v at Jr!Velve&Y!49{N|n0o7cE>RXn%dGktu`q%<5WVe87FZ$Ia^KWl?V`Ud
zBO9Bd&U)Cp+#Dd;J()1a&T_R3WM(aJMG1M!sGE=WQTbNh>UFbfNWeyj_d_lbd&zZD
zA?R}Adx;rTA^S*rs1oG(4<RGY6YHt>$%^fyj$lAHi3cR%B0ir+7hEE^33ZagA<@UR
z5KEtmr7%ki at 9aptH9SQKqp}4coA at 7$&RNd?{<{|S6ebj~sCt6jGf at dxEe55ubb~?(
z4(J7GUL}c<8=#-QcT*~|OF@^wK#vV2k;dv;marl&sp8V4GcZi?R_tRYz)6^q+Ssr{
zOieCznWsYZ)g2J`yl56)D(fLo$MlJSb5|V at Bj(1R7QdY<`Ov at NHgnPHp_xKKh%)R|
zvwr1DC<}7X!eJPm_|r~5YR?1))3GD>zV)P01}7O)alGUqsxOCjX!z?2Es>AKu(a at c
ziDusMN5+A9yQQ!?Z{yRqOI<@JqcwoK3_Tx?09X*(WvDX2`wvrI1v>ZoAygW&@o%TA
zNk<9W%g0$h_rnYF#WiGfjQ0U~j-vSnwO7n)?`{3Z`vxppOY$XBbMGrqzF+(;kw5&j
zya1qi+qmSMdQXb;ErcVhhR$x}FBnv4W4q!y8!>454L2T|aQ1v5Bnx-=G-aO&j%ujJ
zO(ifn2Zm=xo=vOPYs&7kPGOdsaoj6y$Niz^45yRuCt#Y#pVcWv*H*E?me(DwhZ|gZ
zvAfULLM=1VM?c?{9E-&i=O0`4t5>m-GlF^JuH`Yg!5yZAkT`0RaZYdP7)+y2Z at OSj
zV*%lSE%mHnG`l0|)~x_o?3nG?`WJNIx{&bz(;HTog-^A}XkbNZ!0Gw^i0BYgptT^(
z at SydGzdL9m8BDtkjiWViRA+Vt)Uq9S_j)WIWZM*Kd{5e{1aKLNvwf)-Cs+CP^>jZi
z2e>;7S6AVrxw&<9doQaN?fzG1X8~2!w)Js at 3ra~T2$CWoAaIiI?(ROop}Xr40wRK>
zG}6+IbW1nV0us`pv^0DN at AJLueRq7{7~dIVv(KJuuDRA(doCD<@%ztxJ-lLNnvwHV
zbrnd)r<M^-))r>K<GeWp?Rz&&$$dJ&5PRawaau<Khx71r)Gi;kudcSI859gc?|r2Y
ze)3wQM$V48lCfH9R_n2h=iv0H9em(Q(LM4GE$&<AQ1hbfh9en!dd>LF;5TIw2_F<_
zN}B`00>|<5a!u${Q}4W9c!wgU5LeDGiOuNTa+y>{Y94>hLE(=S>D(BOZO!oZj_`{(
zw~u36q+LYTAprEXzicG_<0)#AC|J^1M752XT9x{NFin`SuH-$Td$@X-Q5BJduY>4C
z%tS&)bS2jzA2dVvtG)&qDa+P at a7jNIIZ3p}7KeD$4!H6tS5YZ#Gu%sG<v<_#a6LgN
zJyEM3zuBp}WQpQp?y@<Z{#{<kPuDHJl$mAY_+B!0p>})tV~JLOOGrt5oVvrMtZ$y{
z*5iGDfw?!n9G;CT0|Sla!lk8TH%@C-T2|2pF<pJub at D1Uybk7Dr4glg?uG*7y{2n6
zYvhC>2K#H84%O%+j|#)GTNUBdHJh$muf*?iNo8SJrH^})F%62pBKxqVi(Q7j{Oltu
z#pLD($p~ldMyZB7fx at ytlNFOl916qoJ21Wqdt##xk{E8`4LySiq;B%z#40u{3B^i9
zu~^xro0OaAQp?J1EThjLROlV0bOFTp0`Up)HIgS|4MI%OJr at NcKI-Q*E<LAZ&bm(;
z=o;m>GV~uk&L$5Lyuo{~L6_<25c|SYL;2~1^!C%2xvHm23zEAsD^N at URwb>0_@}%~
z6n+_P48GUb&uTX{=%hb3K3h^9;G}~+$`d&rfJt3#p`3VQ%^k{&LZt*&W4790R8f at C
zsqyn~o%<JGWXHaZ>U}mi`XD4fHRHanVud*xO33+6<!FlYL*5$wTu+zyTmY8zz)9EK
z58Y7x&{;Y0xbk`DYj7GSHHJ(k1DT=T?1l2G!i|wyrS8s-LE|&q8&%FnA%V1u$#o>v
zC$VOe!Z4zcBZ}o0Lf=7dvI6n^bXcP^QcVy`rL1KYj+BEq|2|3eKEuL&g_sleMFY9!
z{Qv~#XaX-I#G2fyk0tu)RDt2k1Qk^c%7GsMqQ#0Y9M_Uz_HN#s<(tj#nA^G_EiGdv
zthSq_e<aUg4_lR(@<o3#mZo{^8Ym@(86H?h8wjP at sfGpMo;Wseemrf&(u|mDFlx{m
zbeBt1GFcl4Oc-<-ve!fCNl at _4=GpT&8kt3S%*m2rF9%6rFR+*l27Ru-Rxl>-uEkuo
zlnf}?F}ktg-|06MYC_;+Y$mN|bnU3%O+8s6nIOu#ZeH~E;5>bjm+QOvVDP at QVICn9
zvvif><9r~i6R^u4Z-Uj7&%fylojhGNbgsGdlLiOK$=WpgyW7nNBa`%o^xUVAhgRge
z?;1Q$ON`xcOH1mO>x`{TbKF*z*se-<p0v at IG#4AGdC8SoyWBL1kfcr|av=^H;scGE
zi^^-6w3Qk&n{VdZD15of`*!SgHZB}SXc33W{?UC~WZ)7Y?6^G6Irb>;nT*6!oA+ at W
zAGEYb<@O%&2Vw>syA#2BFaqXbfQ>gjaQAURoOt3A{@6Qx at 3q5|K$$pC-(tM{R7M&P
zegzD;AUv`84h at IZd6z^zUJG|5W5?x1?K&dPEi6Gf1--XN;g)9{H)#~a5iNB}P>#BD
zUzn7^9*bmI^Icb-glvPBG1O4lDpIn^a$l2gK$m-Eg*D)_X?}3Zku?(-^@rDU_rz3(
zA8ZfLFrLp_*AKWwpHRwEX6KwYXtb#&vQW(rhZUHfDRkhvy&}cWo$jWQPmH4C%bzPe
zUNW`~b1bK+A)x`%=o5q};DjC<wYZCpr;sc>z+}KOO5|irC5G<4nr1prKk<kv_K|9&
zCsfK;$%Gr>oSXUSEoVJ|#a_ at E>f^ht`&$c{;7ewJG~cmiO_flUX at aWI!hJ|$V7tSz
zBoSK{^nZwX&X)_s#^i at QVxd>r5A2Gj9#UQIailAMB$4p0?wDtmn|msv$Q3DuJQP0^
zS(ofKF8%TlQ=a#Pi=JS%X3}f<u|MuuFGI8rv4Z=yYufj at Bf&;4g!mNtzG@~k9$vmy
zAz<q}IW%oC2sh)hUewmiZI_xG>P+h2#96t!H;H137LGEmYpH!G?e|6qLj{8rCq#%a
z=AJHYBhknysyoP at Slj6iJ9+EFd2zP=%sJwfb>#P2W}nHlDb@^KhIP9Wu5Uvra%9WC
z)oZ9?8`t0Jx1YQ`AD^0>IAo|I>Cj!{vr@|IIWHwP+-k!WZw~S`(P#rFV5=XQLA5?T
zS6+TyFInRw>nk~2G+wiXX*{yN5qgA^EE4M8!Cm%gY0v$z$-R)IQopCga(O;$zJFe$
z(Rv^hbDiaoNuPd=VvoL2qiNS2%FmX1lo~Xd5|8UuUbUL!&?Xrf1t!eW9!{RA1Qk`w
z^>=zpi&?VQW~YxkxIcvpUCBWC_<%|(1RB}86W9~@XWt#=UPt6vw%x6v6KJteqB4<j
zZGRJxj(gzk+8(^1>T;*5{>P)0rm8RlEd#xIW%&Y)4 at K0={_S^^iC$sUqYb#XEuku_
z;InM78loy!jXweUUv6E-d7JWX+Y|SW2JDi$QMeM21XbH-&E3h<Yvp0Y#*lFiwN-T!
z>;`xiZxDtESu;K_8nDf;GA{lCXJBp6rCuf{O*Xk~b0NLa?i%hBc-xx=ii@?nA+(7p
z7h;XJg0HEaArf`t_Qyb!@p%1seFMaOnomn(5~=!HqIzrKm$hLnPnVZL*MVUYa9!qQ
z>eb<>-UuJs<tdZP%rO5Q$}^utMVf56d8Qa`?#WIWrAXP;=r5q}F%HSx#S0@!3+Y+S
z)G>Gc?bq0b#MMIZTCLgo?Rr;y&Xmq961kX`(VQ)7Wx8-dC6NyPMb8b at yGU01512tt
zC>uTZt6Bt0qLbkmlb3Oqta>}x2gC3+A#U&nW!y4otmr=8oN-I8YJzek*jei&4?Ou|
z{@$Xm{Hn2{hUF!UG(h`c6)Uk;)yBuJJgwxUw%~&}smA*WWi-NT at h*4yu81BIxTA0v
z+S?|j at 7k&J59<|?Dpev-YPOSQAS0->=WS at mij;@Ae2;ZgSQHKyTniha1(7fyR#RvE
z{0%x;Aq<?=|IAwVWN1##6PrYvJ1nEc5=F}qS>|EOpzpPEaO0J)C%gBU)`0{lKY!KA
zi%Cj)DL{qly}_C$xA~fWu-!zI$bndZ+Fp*V3?fa~YDB<AQTrXq!pwD#)F&IdZw{p+
zbuQGZ4G0_lV{I$41CG0pqzBJzB5k?&3iOQe*31^RK341uJ-l=ri}lFzIFpqsUYc&8
zW?#$nRZQ(!tD&2l{?@f-qpmV7ibKCAqS4r~j_bAEbTv<_Kj^WWtiPv?dRi>CYf-vJ
zVXvf5b;Q3Lw6W2IQKI)IeE!kVFba>0x%y)69NV447aDH3&99hF8%by*-}_x;jeg)J
z`96X5nUm)+Zmm22&X${8?W1^^ZE}EYLiy*SZ4Q9u>~Kzi+0(i1Pa6J+D8StiT?6j$
zc`~Uw1KZtXg?DhFiMk?K(rCE{zSh+QfnUh};A0lNcg8h#Bq>%i+}i5ec+12F3K0=S
z(!{LdLn|cfq;Z`qT~-DPCERz<$7nk)?--#f(8r>`DIA?xnb|Rd4oREEI90~5R4<EE
zd)ag(Xr<JFDxon@$IdzFl33$6o at 4;e<07RR<*9=0iSlR+DwFb;Q3=vHAuy=uli2K#
zvLy22&#;OzVz=<g at 9AthgZ575=^>iobn3~&;y8*WcPjWKw*8C-UUHNZyQ0}S?KR3-
zjVAbi9-6f-Cbr%$i{V|PkmE`aXH=1ozZ>sS)*iD<qu}ndb5<P8wcIA8kQ`h_d0BEd
znO7(RXOJkBAzkI9#xLnmcRv!G8cJEg)2X!tLn)TMo(^c>br at FKFp^XKgW5bmk*0xf
zz_>w;Mt1oi;q7_Yx*p!+L&1k at ZFZg|9<LTdJP0W<lJ3s$FRG*l^RDxSp-N`D(&DYt
zj4WkrzG^blaeg8uwErU5VsAu4x6Z{X^F=Ud&|ThZjaM7puM$P~*qnE(x4$6I(?IF{
z{6hmJi}Cfgo&YCnVu^+?Hj`xuPF!- at aduP2+IjE$AUbj91+OPnB6Ge6%LWo#h33L7
ztE%rU97QwX7Bbqc1YNDpZ7b#pi3tm^z0FnrV*EKjjHD-GaL{2(LLgVcH{f{wGJHY4
za<Rw~O3I$CFOTlLHRy*pZQ5U6m<f*^TA^}qup8yP?qREDSg*H#cIIVzk_5f%7wFfj
z>`J^;s_3gTm79Ene!8}Ya*dS$?$bFHTvj at SQ%+<WFp2Rn-&c?P)Z^d7M__7pYM8K*
z{hSe{(@QeA8UwZZp$-9p&8SilIu8d(un>P{x>zZjqoImY=v{~FHO;Xp^h}w=eN}lw
zdmwTkbC7)S!n#Q6lXBm>T39MO<0nSJ#y`BzA5g7kTyZxQb<}5a>y&bI;0j(XZ%^Tz
zCKmbF`LZ749`4D2H?+41M$wP2^POiB&M*9r8p4w+th~hT2$ncwhS~L2y6Dp*tZ6|P
z6-?Z#L}{h7nx<5B7oiK!u%)*3j=!jJQMr0AKVIn|x$a()>^)!F%1}XMOmypCf6S-}
zPF$FBRd0x)^ElSAYji%zwbP|bSo}Dt*SnkDDD7}z(m%uZn0c_Ppd_TK24Sl^sl1^3
z3g01r{p#xVDRmp3QHo1HX3MAS1S5KoA-9!u!Xu)IW-~FdakGz at V=0>jA(+Wqa=Ef$
z)f98%2bcnU^LVVOyCOcEP?xc`>$4*vpWTDUGL}SYy=nuq&m$~HxId5%G8<s4FSWzF
z`z77(kpx+aYzv10SMEolp`Sd!FK%CbW)HwXetk7cd=mEMQ8M7WHI4V1i5>ChLhM80
z)+~<?tU`>cBou5~KjCUlD^~k=SON=HErYaQj$7vye^C^fo(-I}f2X$3C>kO at 6!%q`
zqasO5PhG+)+xnsYYEAXIc6;$avJd$o-l<e!%S5Tw>xZjd+|Kzeq*6^QL7Z1c23#C?
zbo47YQD at BuS9?!`m$s5K#h#r!;ZWFC at HDulCA55kE+g?}LJMM&JG|RUZ=(C%ao%}a
zTdz;m=-%ozPNVzu>;6JzU&pV`wE&+A*Wvi!z?U<T`x;;04r^3i^wS0<dw-s$37jiM
z9QQs9_Bm}GZ|Bk2gIi%)GYj({$cpG4T!_IW#1vGzRSOfmv#MZnIx1I|jaA=B%G;A)
zS8=0(3A}3!r?%dtZ7 at w*OzJpQf=s{bA=dMrl)Mh&U41VUKSX8mT>9Fjc3 at Wfty)qV
z`p4dlqobqwrag4mYER^UUv+v`;YYad9Zl%wD+nu at DVPs6K;kX420Lb9lr_22?dGqD
zj0nf{pz2~t9=fV|_TlC*n%AQhd->!Mo*I at otk3WeE|c8kB|HWaTMw{FpvkhUN`-g|
zr{SlsO6T%1Yna8rXDP*ciNG{=qC*@OGv(6f8$!TS(c>$Vr#KH&wFm#0h#@;3en+fe
zNvu$ZmY7fUcmxbFygM3vJv5%t68HTN{K$p4BZO(0wS-2~`;1ny0_|@tHcs+t>wOje
z)%L5^3e}J_YjgbPLCgh?nR2N!Z(=8SCLb<;okU9(UK^0b6_+SZ-3hCX6}D(Ltc(+N
zvoR;Pin7jG_*Q8$E9=-{khHrBYG>gg9`5?=v6tZkDJ~jxwyxZ+w)nOev-)L?sG+0Q
zUEJgW0g>l`V3Af6CwL5M=)zf~&TiGZd${D&!eZ<vcElNXREZ<az;o24gcsN6p68Vn
z!geB4PytxvOj;dZ?))QItIzJTAfm9Fpo=Y)r<-z`>7GuF8(gpL3eqd(v)Z+V_;Nfs
zQ~YB)v~Gx~v_cz$fx;}h9dE97NN_o#S4)(*gl;P4$)1es15r1o7aSaZaRy at bp=BBO
zNVv2WQ5aA)l<l}447G}(`Qsz}`7|7>0^cfTbI^h<Cr%-vV-{jT6hc<|vQokJ!?O1k
zZgfLt0?x%9KVjv`9UXs~iked}=XUE4z0U?4jaVBM%F*79&fNJ*W^i7dwHVOgb6hgq
zA?-;=XYM?$*Xh%pb=p$7J1=|Z1W$kZxYIvU>86meDZ~Ie{V}CaWug5(TVwHAqA6dI
zfL~JVXaG7V>yij+Gc5^~J#2SUwcPeO7Rdw&!H0>hJ+4<GV{9|US6n*>{mEh{$)MG@
zm3gu)`JYs$3l3;ki~84`@mZMHR!Q(vdbYXitfmlp9v*rp-)3AYnAtoWW at 8dOc3`rs
z_i=P(>8X4;6E7!GxV#p&@j8s~8hsW*3{ouY1P()q6pRiupa0MVovp<5ZX4|GTyjrR
zAN$&tm47c}*u7S5ahafsWIMj06qvrkGY-9pLE&kVu8}${OInYH5S}_;n~WX!vS#0S
znVlV2S^2L$CDaNeONhx!dMA!lIK`CG3OsCgS0q~GUQ&^>RKi>={y?=c3)S(nBdfdP
z+KOPCBe*zWVnwA&`>{>EyQ}uuGkp;4TG+2paLuw$rn%W3w~I>M?0}E=wQui^k-k~~
zk{RAb>Kf%B&kUY3 at QcE+=hfBA!mg|wUX_n?*4I+vAIX-lnGS~r`l}hf&F%;|e&BA-
zFByoa7Q9rs5kqr$7Ul`N#^%OdG`C}&ulV2tmm+!eEEXb*A8KTgAcVRl-TvG$)17Qm
zu*8KI7g;3;L4&(JLb0(ADU!JVJO_r>*E(S_{fCpe_BmdGGH=35mW_M-u`j`jktQRg
zl^EuOenZLtaa0d>T%v4-(i|8D<BEnwf>>vm0IroH`&it|s=P>2>2~fTR;MSp+c1If
zY-C7yOWaGjJS3b-#-3%fa}2Q-k{YzJ;6$_eWNS;lz(q;bVr-)Mh%yWhD*}5J4xjj#
zw3!iwXs1>AI1`fJ8<O94dfL&f3>!@4`#63&RDSva00r at ZTntTWov%*Aqf}c)xIj?;
z89=$2dq{)msd<gyg#d9K+{7};Nd0Y`+H<13D>^C|SsF1$(CPT%UeA16{+Ev(d1aVu
zR1{&sfi4#>rD2Xd-MP!ODt_b(4A!jQo<B4S*pEUu!0Z>wMyfidf!y5ukjy8+;yGUf
z1bGRl0z7u>5tiPb?%uD$+4asH`ZmHM$R81~<8&?4juBmSeckVkUD|64xGQsatV2Xl
zhZ|DPacOtliKh^b6CoS1J9jsfjUsgSOQnZrU<m_1hE=0QXBH9QY%}E3X<J)9LH+gS
ztlJJ5>1*tL%ybHZAFbR!?rbj(<wr#|Ilr$d1oLyU^F!##Q)~4ek&}@nh6RW}J8Pk@
zJ6cHENu{HA$;l&lll5*dq<#H91XW(pZ<zYS-8-J-{Hu95J_UEQ19Cp$kL;kmCV-$P
zRGFiGkJ&m&XEH|hlu?`E+oMHE?V}24wy1)ly7hSpQWQQY4!)*fGEFoPe8*%;{w5Qn
zb>~i>07b(e{5O;}WgRzExpSFcbK=d_Tc7tUc6Li^uCblDiIZteDY%encx^EK_=v#z
zhA|h&9Uy0MC80KiFSzaJCON?{F(<DktsDC;lUxIChw)lImMO<knWb~$(~o>rJu0x#
z-7rq9OV!-|w;~1B^(TzIL?{vOkDIW+l$5xTJ!4$>I+Fuixyge&7gX}3ht~;pcB_S^
zBaAJr2#W*#2*mGBq$#J at sU0Y4+va0^L+`s`G9agT`Qz1$K(Y2_^U+Xz0qEqTt*v^o
zi-T_-tMbL^z87!7eEwRlS~%x`iQ<>S&Z{&Giti|L;d$p-gbbsOjDx91K07iI-1nR^
z=bRUaPmX>hJ9{g>8^-s>E{nt5$l?_#2$NE)Z0C@=86K)TYAO26M+F|Oke^5>(eL#+
zLL33(D?aYIX)q(~#OJ3k`+K&N`{!RZ0T0E$;{L!Lu=aW9a7M4+b;V}jmFV0Uw%rnp
zSnxXZ3S8^Du^BSA2<H>nyIeUOaAN7?cg74(+w@%<2d}4j9Fh)pxa?dk&fGQm8bC{h
zzlz4Y&tl!Q(I83BYP6t2p}@l1>3yghFnm58)!lQ}y|-dqdkq}mqvloofdW25x&C at p
z*Strv)gs96byBu_X|{);;HRqhTC{aMxAi_B-pkGC{lYpY{}m0pdGi{5;c1w_oiqds
zc5{m44^zFs&qZ)zZ|BtYnD<d at brh#t)RY^gd&g*{yX||yc!-{q8~m(qnxAdUAXJ}S
zEoVh$6N;OJ3~EWT=Kb{@>rdY4f8Fl<@yezWL$&RNEc3GQR^olr7hIj@$M1 at L3~)N+
zK2TW*Obl6 at 6CjFNUJR3UN{^e^*uKQn((z__%F$=%DwdKAE_VTwl-trjvgsoDz-6sh
zMp#(2;MpO4(}NmCN;0`9b9xk1GGtixE!q~Qq9aT)o78$jpDll0Y`r6AzAKkL*re0I
zW_X#H+Mtjsikn(3>S5+))H*g6_XtBUqZJ1wW&H&<^hj2rJ76m)H=xZOzm1_5p>3nk
zZ5OQW%^m)tZPOwagMZ|eu{oM6HzzKBAQ6)ZnL;-s;7v{jmE4#DxqXd_ZC_Fo#m?pp
zDkTv=%|GzYKVjaVq&*M_f&QCM2mYln_P;sk|A52)LG4BU8MPO-vo`r>&YlzWi?iqa
z3EOl0zd(B=rO)xtr2S7|`LC!w at K<Hxzts3<hx`M+{8wOEFS;Me+T)9zcn8IAK0zg-
zd=nT+NcfZ(k!K;`w at 4$#)CDqWTbKebS1XgG8+)5^0`3>Cjc>p(4Ze-*84_Hj#|C-S
z&))BNXd7_f<oWmri;viet+gC}{Y*bM8-Tq&?e&v;3v=_0(`wfDE$csu;5TccyN+;_
zpXIUIBI+I=qSJ1Oi3(|9p*L+Gjwh|V21XWCzj2&xudvnYHCRMIsg1N{)HmtTD=m1+
zikpQLMU at y|*R!IHY%R>Qu0>ldAgU+D-iL}SIWkdncO;6=6RZOrKMqIqFgm?XaiA9(
z3R%8)7UlIl>Lew1!2c}F+ayP}GleD%iQ=2Bk=3oG#u}6EJ2}Vfq!}Z*dd5lV-3UIq
zi`)(RrW at LdlWx1HowOz2$oVwO&jPu;7Ys-Gy9)gC0urV-Ddf`v8P_{$6y)7IX?uQ`
zPwiFR<9x#XHoi~R?~nOs)h&12#ceSgmBlFBIL9Dhtd{?$oP_*`IsbR^{Vx#y|DJ>Y
zNZ^A(zY+Lc|Dxu9((_1i{`P!J<KL3`x1{|~njUGtrRZ<%KmCwYJ(9-9`bFCRI<q4)
z at RvU)()Z`}pT0l)-_rQEF>gtJWGrOC?0+Kje{R6v(EOiy{5zZfm-^b`K<ZoR0usvy
zQ3G$+?|08%dK%;&xYaEn%WVI2VN-OpGgg5+>#!k9<Fl#4-JSJ*ga7|_9~5C`a5hDl
z<E`}N=NN3ta3?z#M`O4XHSo{U-g0mg3)roq=2kZV<$_XkLO^<K5{`B*_Q<hSkP-@*
zt&{z22xAX65f!A8#?`_Yt}G$UCPnRxlvnWcvxy)lh#bL*`u2CwUw87~)8ckIPFVjn
z2Q0RKPXZa>-?O-tKgd{^IO$OT)Gyp#irBf_uEk&F4u6*ziNKI5AUiYUr$&zT=ZD5(
zQ?Q5I3K`!Di*){s#ipsHO>OI9ZT;sD05Y~L%+~CgsUwTHGUIPc`WNMokc+dqog=Tf
zn7BAnbOZnZkf{RTK)zuY0RTYA>z_7c+b`Q~J3ANh5aUNq9{Df=r0VHccMhZ*vd?WZ
z2LyRW_T>N}-H><K#Kjo?%MWrJ?sll#VZ;D{+iQ0Ae;v1>!N>#I212&6-}>IhM0U8H
z4j9>XYX<{<4Ub#_QREX6o{4fJ+qr;1AQ(AAAb^7z0Av6F7#RPuvhI#>Q!D^AkP8bL
z>0d8ub|@4Kr8cGh(*}Zo*^x<n`=Yk}mks$I_}?~8cI3MM<_Cg6Z at 0{EHUNN=^Y4Dh
zIdc3x9uNou{I?$jDF*vJ9uUa+Ut=J<aw7Bcw{byW at a=B+yAAyJaY0}x<nMC^fw_=M
zw7>O*fH?lk4+6g3=D&{tVZZ%z{x=&30GV>XY|f4_q#n)j_IVd77M^hA?O;>3vqSEI
ze<^{aY)$Q`fq$xi*rY_Mb*OoP5MdBhM3 at 7@CCbhz#32p at 0Rcd$I0OiV2y+UHK>4x$
zZ<pK6CTeFaVh%U9a&obuX5$hQ;}8OH3L#USQv at su1c2Eg?8wUhLhKM>WC{!2ZW$+M
Wn4|O0v;jf5pd46qbYcqPSpNgsr_&w)

diff --git a/acqui/pdfformat/layout2pages.pm b/acqui/pdfformat/layout2pages.pm
index c7c1985..768fdec 100755
--- a/acqui/pdfformat/layout2pages.pm
+++ b/acqui/pdfformat/layout2pages.pm
@@ -236,11 +236,8 @@ sub printfooters {
 sub printpdf {
     my ($basketgroup, $bookseller, $baskets, $orders, $GST) = @_;
     # open the default PDF that will be used for base (1st page already filled)
-    use FindBin qw( $Bin );
-    open(my $fh, "$Bin/pdfformat/layout2pages.pdf") or die "$@";
-    my @pdf = <$fh>;
-    close($fh);
-    my $pdf = PDF::API2->openScalar(join('', @pdf));
+    my $pdf_template = C4::Context->config('intrahtdocs') . '/' . C4::Context->preference('template') . '/pdf/layout2pages.pdf';
+    my $pdf = PDF::API2->open($pdf_template);
     $pdf->pageLabel( 0, {
         -style => 'roman',
     } ); # start with roman numbering
diff --git a/acqui/pdfformat/layout3pages.odt b/acqui/pdfformat/layout3pages.odt
deleted file mode 100644
index 8e9145864faa76c53f672c704a1415fdb7a0a741..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12973
zcma)D1z1%}*QUEm1ZhD~y1NAF4k;xLb%=9-LwA=T-6`GOAs{6w9n#%W(gHu|_0#Kr
z at ArI*v(GboX1#0H%<MfgXU&VE3 at jWT)V)wD8uGpFVnus$m%hJ{?k-E9rID?Zm65)c
zl?4!>Zwmy2nCwA at j9`5T5W)zyG6ETb0d|%~AX`RTBS%}szZtv3|3`@KQqRF4W1xwh
z&37{pRwjt8zO5a^K;MSx2M+13%6ljN1G-DxJMt$^9{@12FuF4XwqXL;+1T9I?r3QN
z3#BN7c<(e6%>CD${JT4Zccp)tHMRij+Zz3J<{tm2Gyl{GE3lQF)m;bJ{ndzn!ae$j
z+N^BACN at Tp-<tnV$ba(lzOrAP_P?TR!C;I3jw1U9FM*c&CPok at QJ}4*z7^!Zj1$@&
z*h1e4Y-h^=&<B_r0SxsFX%_){dPs|gdU`?dtltOcsjG4v&YkA{_3vYjdRGbngKYmA
z*FEiN&<r=8TUsfWjvgsOxKZEqE>M|$6pl8$N at V0=zqW`>^ngDl$K$nZU5*82UCy{M
z1I>y at PEtDrTRz&aQeEu6eCQM3+~KMW*TSWLytLaiZt0*!U`%?3Oq^1C^Uc;Wt$JSP
z+fgDS^x;A4#_LB0ITm4T at E+Rf1FPf@1;Cx&=-iQF7=$S0k7&WIRQ;^QBG>}V`_hk<
z2Y>)OSVpsF{3>!W9QINV(34uGJ>PtOFFcylON1)IP=MH!e<Z8Sw}^GZEE*iG(NC)%
zwozQJJltxXGYWM1Yz|?uX}ES at V9DgsXX+L&Pe)jD!N}2Qk>#DUpX at 24P|u?i3T03>
zu;%W_ur>`BjVbEw$+H%heZleWuuGD?1ReIZJopnhbv{*h3_XHqa&@)8-cRHh;!>Fh
zkIm^8*Tv}9i~HDY*VvnJ8!`wf(4t64_b-{*dc at NMffjg$nud~5M%&t4ZH1}C6vmDD
z5+2>^6(SaA>L%*|sxG4F1Z|x>YqC$auKDHuOcEkE<arfTRBjumzA{BkV91bE-pSV~
zZ0=>zH812uF4>Q<NiCh2iZ?{Uy*1@}=HkaC8SoOHWF-oldY^^rCC1pvv$_eTifdpM
z2htkK2P9uXbE6=y4X5kr)rSRH)kJkRrK`++ at LsK9tQdciud}u44W&-OCrn!7wyWfH
z$h$>ZKP8>Y5p_I)?iCBi;LWxJO$*O}dila19XTbf)?FMst|iVZsLF`p;Uvl_5*w7T
z6DlcXjc;J!Q9872IJxt<DbGL;1r4z^tPZT1jda$m-)FvW at YndIxoWNK@7Uu|0u-!m
zwj+~!m5Ru>gB@$iqf8dQF*+ScC5c&cc>sFniZ+U6Kk-jvt5OpL>m_*Sc1)%;xs3Ra
zkHJp#FhVJ at dS9YN5Q-2pyP}qQB+6XvNpqIH9p*NqRt_rbWr)eeQ<%91P4=xkWv-5c
zZXQ%>xt$@<VLBVEUigxnQoQCoyOm<mezLdCK0}&QC5ta6o&ilJ_EDkceTsdqM**_8
z)knWDKRN64e&OyDQ5hR)*B!O)Z*(8v9)?19bGM6^FDt>WQM{Bc^(yqzHvE#1sdUO}
zcOxa#qQE}ifT%-kq`%%20gkvZIkn5}-=ChW94|o;WN<=>G&4a#W`hMJ*DcnB$-iw~
zW7sbA|0ps!Ij=Rq#&=5(U(2*{byd<jI8A_G=iKX&M)LLwjV~F#v%#{x=g at lJ@z~Pm
z%5}!yZ9IOa1h}a^F{RYlBIifaPjvZe<N8&$7Ukn1$#m0XbWdU3=tM-mVQ0m_3(0e*
zc$;kHXn&YY375bnosjCSVT3o!uc(FO@)Ewf+w-N}N;2B7QN}ptNPq1QvPhg54p;Hm
zqK!kFlEmrQ4mfcm>8!*Xnr)n~M40DJ;uOSWgM`MIx&~!aw#~*WHtRW{tl7?^V8tY5
zt>>kFBj`{3G-n2eHAhTbipVSDI3#~9&+W!&Gf}(a<EfY^=R`G>D#AhT(hq;pdqSeh
z)7V!R#JRzsNO9<<AzZmeV_ZXoN*bn at Jq&@s-5S>)tEAh_KlQBeTIHObSiwHs<L^|C
zs-{B@>P_eI3T!tecg(xeFv25vj~}CZVDqk|aT`T=+B?X{*c6vwh>#6)CK<>lmXO3<
zLQVRuOY~DIzXaYyG at TNF?*dJQjXL?WOp>kM$7`pXbUDp+6*>BH1}CT!WVs<uH|$3$
zloO3aKH=wSzLw5>s`xaqu9Q^4>zrZu)M(FjXn5hu4C9xw&gWH7j`{2LM&)-6cUA18
zs*~^q)EqdD7%$EZkCe%(X_fM~l5<4iPDlF5*F|`y%}AHbDBS#>9-YkYXL)DHv9%vN
z)sE%K1tf<YF>C=FNB0u0Ns%g3WNPR51O|NBDr3p)Dosoua3VF7)tTVq081gKns6Bi
z at _a(%G=8lZ{rMNUF%!xL9X`e6gg1G$60z?CYX!fZf#H`)Vf`x$T$Pjq2o)jWEG=8_
za$G5rC7<z82-IYylCn)KF4e7A6xe90d!ak`AXvPcd|%agZtR_InR|@w9H08-M9KTr
zawh{$n1<%Qo9PCeY<x+rWRA*u`NPUSh6FW-j6rF}!OwM;q>>I-!t>$pgbm)e3|aOV
z8Ev{}a0}_NKzGJ*3qg|iyUP4(B46$3BV3iOID{HA>Cf<6#96t*M*F$y>d|4c`3g~<
zmyNpPQ;K4;P0zrANa`z(a*p!LQuoR<y4snnW~X)aYFCxfcRQ&!!f;+AB4R+E6_zIZ
zW_L|xtfh=$^7~A{SKgwd>SOQ07WuUUBd<yWGFH<Eo4+JNN*kBzCyP^ExO4<&Q!vWc
z=M60N_nDRE?5Q6q)K}E5Z7gHZOI!4?1j&NYxU+Q at mW||84%__S?w3;TH_Xf<+3SMf
zTF}=^;&dY<0*h&RB$v9c9A2JHT#uiOUyla}m5>(ggq=;Jv(O6UgQ*dOchq%>8S`(V
zMcmq&^j<SF#it>!;Jt5POpU~>m{z$Ex_R{t^M2=aRjoa5hzJG6!~NeDXOz3e8Di^X
zVFbC~a}8)oh0So{y+3<Ni1L}3VJ1qd8)R%FiB%=+4I}s2T=;Hf7Q=y$Jc`s^IFnS$
zFzm_H#NiHrTAvYoACt9ylJq=Q-d^@8<I#+sU<y2LtOVuy#X9Ht*|CcaZd3i$TD2q&
zX}KDG1}mVRMw(0|hlV`4Fot>_A-n&j_tO$}o`HC+EmLZgSiW~LpPE^7c7v5T)n}Qn
zMiNQBYUr<8_Kci3_W4i8y``QD!+-JmAfG8Uu>1pJOr%)2q#^uxlh1Pa(YG1PvhfBD
zza{sUv at fMOqM#2KHuY%e)d-KqUB&5C+VLeQWF8W!EV=Sxl7PF|N#0;Oxk)-D6em2|
zBP!UEQXL1e at lx3*K~IWlKb6?<*9QfhJtZZZFPw at S$eYLLSf%-fBzC;ejVZ_Y(V~c9
z)w2F+WD{YtT;E<FDur1dtsd%F>#Kfarsr2PEAwea3o<1MU#BuFcd_L%Kd(^kK!^?o
zo-dMH1OT_|s6oz($9A-u6j>!+k5`EC98Hw8gK)KypyfF at h>%c-wBP$<J);ndc+i$*
zX8RiQ3eKS<iUy{^RFvw40YUcmm+E3qXD0&>s==8>*Z>>vuLKvXxKaGbG~vf at xmLCg
zInP50M6ZX9stVh(vLC^J^j~X*dKW>N>GURZk=J{5PN}DS1%AoViv49~8T0~@soAF(
zXOt?3-DlUO{Fr?!4`H|R*!#Y;<6*$pYt at d9>W68H_Ejb3%R~IEset8cN{fz#3t8de
z_R5g>Hf~LIGZ{enlXP7cIgHvi3uk=jLDJ>&=VL>sNV3Q;R7I%bl?<OfzQq^<1{b|a
zs_f_U#ZIXZRSFq*{_r`o(nbd5Y6{X!ZNL45UF|gio~rT+#ez_*?>FCAt#ourbW%2b
zO`w)VKAWCi5p^cBQjCANxkOuy{}d~>kK at yz*R>;_8!YYep1D*WY#3SXNV!OXRkV2P
zJ<Pj_B-UxWIjU&0;Q-apL&+?d_2O9SuUldoV!<AWS;yk<2DGG)<)paEq9rS_f><YU
zMwYIHPEHg2=jGnBBoJ?^zpIrQlS;o;+BK=%vQxV1&UYBw5AdN<^M6GBz$r{Qd6ABf
zyOkuHqgujJjxCtDwr1N*wtU<gX^;l54&*{#L(er3lEwbE%>)76z;n~2X};}a)3aXw
zk!-a(L{`~HQ at kCEHyyUf;szLN37OdO?32eiW}ox5J%y4Yoy6RoB8Z6;gjnH+b7ZpZ
zeQw);W at wW=_7h(r)Rk%G{dSQc80lE0R9ya+26~-jX8i2W_8O^*bn8!7YpbF!qzu8*
z<`m`3%sc5(&r!0g6yrw}IApV?975WqbH!R%)Ug;iWx<C}y{R43^cT_xb`=yASz at f2
zr|5Lfl?(7%eay_vc2pPALb_fnVHWuKUB=2?zFXC(6KprpIIoCz(|mJ2g}C!RHC723
z9Z^SpamuZp8BnXKi&}i>h=J?$K2Nf%+xXFj at uN{&g|O}S>#RdOvJ`ei-F-REq%W_U
zQAoAg^RlE;T$FQ|(1sG;M3XiP%efw at j4Tdg3zE$Z&s;-2-(b1ojw+ at rcoZR8EX+iT
zlUZBUn(Xr87FJq{Ov6Bq1U)9+siY!|Ze2Ei8(WWdU3PI^%edW$i#c>J(amMWiax-+
zOY^KIu!|bsPO{Dc#d(>dS(%yF-J^}=>L6rz<;BAErhp1<Dz%%?%E$I)CsgO%H<I8q
zks7JEjg7}wK659nDGmt0g|0Mab3~GF>1MSOx6xqoR&3KY36^Jv)vAe4B)oGem>U9o
zlxKuKy*zg5;?gD at Fpuae#;Jmf^L)PAAco$)$=zI8Iu~~6mdjPkk8v7`E0({9f7NlY
z5Q}3=s8Ry}c7o;tQ579dfCc?X?+cZ!)JQZQiN%<5RkOW)(88gZs6A=nY{yn=yb*p9
zQAh9~cxPMGy17YFXYwvN?zen-EowcdLtC=ux19LNU9gO^M<NMz057D1e<`V=0W<-p
zEEg|^6xwp-`KfTpJgvonodH{|dJ_(x&Ug8<>oyD6;(bWU)HzbX<?Kd=b9$)g$0J81
z at _oe3u}ldfI5%U2PsFF0UQXB=j7d*A1@~2 at iI}qJhw(!<BG}0i%AYvvN`};|w<EnD
z at suaUmay9JMHfpVrD!O&zAgW_E`q7D at z{{og>;2$y3?YeiqG2D(oRf^KDTsmx11G*
zaZF4S!{wb?nV)Yv@}$UFFqc*H4t-{vJb at 8Ba1*=s_`1!Qyl3;>Jo at W{q*4IBkAa_x
zNi$2*;5t_*_DhK2fZm2bnbUfu6DFqI!MmC;zb?lQ)k`%}dXv<ug{bW(r30h6PCD)^
zY_~ACjgq>;b2&9u?<KCzslGaFGo(H>Q{HEvd at A}vtvItrogpKqlF3)lm`S2JdOr{I
z>b7eAi^u&+syJ(+g>$!(CQ|)eN$(cT at 6iOCfaKu}I4G$5>wA2~$X5S;9px9g`y#hD
zvVq)1SOh3p7?~-_jX(gfArNFDK&htsf`OY-NDze|Y-|h!81eoLx-i^DXY|SMpdbkE
zk0Jp|I~x%1_wWoaNZ-;3!fOlQ{XI^@`@1&p_lkbxI9dQf<^q(awzgKhOiT_A4vY?L
zj9?oRCKetZ9;WZ5lz&xa2>6elm7R^ncP&Ez(_K*JJ`x0BVqs)q`l);G;s5H?z3%TW
zfx+PaRCM2lA5HvT9V;_4JJXMQO7g#Y<+tu*r4;<xSNBE*`M;YsF#`Pv8wo1hSyTAl
zm*1_iF)}}v1%m7x$^TxUdl#iKGXmH$u`x4SvT!^WwF6ohGVri*@$fVKVev-|KoHOt
zsBggluraz1PYEjO+gXq+g6%ByfuO%2f2#Zdeh1u*J%iz03`+2>bvz8rtPCvNsw}L$
zcOQ1nztDfz<2MBG{sOSDFfg;Lvas+n-+kElnSK`jsKLqxco$MJWH500C$D}h{Z0M<
zd&9=d!NSY()0^+8A4)$^MuvCo2bnMcoB($_L_s#zzuf*K|L at 9%e}x1E6;)Z7CE2*-
zSeRA*!2L(%2l7A9|9uD%2(bkM$iEMVt-gVU5d#2h2eK8QWTpI(`8|g9GxP4f`mPB!
zxF6R)bFJ>8T|e`F!made^i6E^txSIwu(1DS!vSn#_%oC3XC}b(P9Ja=NBmjB%Fac}
z^w$Gu2f52PG%^N)j0}JHasQ4AP)dP}!Q?Fen;Pr?rpETasj=Uy{q-X8-uKL}yZ?0Z
z_w0WU*WJe`RZZ<I4M6%p3kZ|#&m^N2$fQ`qL>0HU215XAtC>&)4=;;$M8x at l@ADWU
zF=4Y!^5)th at d!$4Y>{x|cTq!1Vn{fWn`+1$wn&7IsV<YwXEAn@^=HLg9>x={Y?USx
zsrxf7G at VnD0jX~TFrc7 at cDBrJ4jXUapu(X&$6B-lyemfUew<{a<|JxL4o}cqa+@#C
zwlXeNYcE014h at j|4;H9a(^E`HGxRZi@;}Powtf%_pNnborWkDH%Oc at BK1>_q>xb+^
zP^lGYiB|t{ae!a&EkUu_IB<N3hRZ{_XD4xcYJL3*LCgTI_qG1+4ao!<;H|^g!Ib{5
z09(yiOsXD^=PAsSgjk~Qbw=m}Vw_z+`^!Xrp_iihv^s*~Omd4nR-m at h<#VKL$uZ&3
z{>5*K1W=Y67KLeb<icltYdf+q*_X#Lz0hLN6|@nq&ZCZ+WuQ8IJ!x at CL0>h?#OX+(
z$W$E^n>L_d2Nqt*ty3q%H-F9_@@5%iQlBgT0(ks97RK!LA?o-8%C1pHs=1HLE36yj
z&~`SZ#1G*#;^JPwttcd}pAa+91XFnfaO2?Q0z at T4L6J%$FUJ^*aC)!Rsu1UypL`0?
z1PUx>xIF00Cp59O8?2caJ!$^r at ZiK`%uqO8n?Hf>WIQc&TEV`>bY>pWM3!E;Qs1!K
za=1D*;8j!bw6C_Cn_WICT|=`Ymr?gH?vU5*##cJLN>L`=+l!)O^lxY at GfLY7m`+9m
z4Ma8MidycMd4X8M at nRSeJRG&ct4x{1$3V;;T`A=j+C7f29<Th88isvF>O+fCeI}1%
zB)uX{?#!ahoO66s6GoE&OeKwLn=}7%SE*WrPz58Kq&@{c&9}rkEf2R!bct`Bsk2KY
zkF}AKUPU)nL^-?~#+nk at ZWELvy3Td!u3RUdfAk#O4_&mcdvYU`?imduL*s7Lh~Dbt
zf}!`#c$3D1oZfaPdwNMn)$&YAt3N28>_kA2KHT{xp8MG9+6fkogs1m`l>|#80N<0b
z(OrVO(u1)xbA=nLVqs^U4X5qBec<DixOiS%8eEsBdR>B8<y3`xH>v$H+eApFsO&=L
zM+4E9pQpd}cD^;sv%;T60C2}n$vyI2I;tOW7LJe#etJnX(UB#R5VL6fIY9j?iCl*O
z+kz~Jd?C&;x6MqrUcRzHF-nzRQJtNpc7JGzPv}IFmtR;cNsRYKhrDky0)_0FzOCL2
z^_9-CP at npdtUFmr2a&^4uW2b3ylixd_AJ*UO~!pH)f7||zC8w|rG!Sl%n2C1-0i4^
zx}3Ll{fW~-)T-VmQAZX{fkkxq2irO;BZ>fYtj!eTg^u~k6D6xvahkwjlFbJrgC%-R
z(FFnmZSQ)TF%NU`HUr`YG@{BOP-!G-e3dRLH0un at M>@<z{mb<kiNU&|wP%vAcY&=J
zYo|0`j_q&u%^!IkOMPCSg5{AdfkvzdiXA>>=T$&>4U?kfQ$XHW?I^*7&_v>j-*!sV
z`=EWtN4Ft`=~B~=2u2USq#&jmH7Z0cXD7Z#7SeIH5uj`6Hdtds9PO-Zk3Qcz0F6N=
zSJTxop^#8X{Y304!pl<AcXd!eE4L`{1>2VH3Uuk4B7;7%`7wOAc>hZ^QFF7~=x^Kr
z)STju5~||Qs$1e!v>&R&<@#PwKUU_~s{4QwHID4$7Cn+Ais at eO_l?|&ts|xW^?CCV
z6=n4i_vo%eDuU3h^_8B^{^WzNH8j}o<}L!sH{`0J%Yt}p1A+X`W)n-Q1ar<oGYt&~
z)v$!J2`3BtbRQ7f8w*s6g{W1x at d|7neBE&^j-fv2cxJ=5ATT;(D2zIrq+T+LbqHA4
zHt^Qw{q_cU4N%zYh8sA*(4B5`p@;(-O4I9JTPVZ|fmGMXSU9rD at F8d1URjpp)5yO5
z%6#0GxKs}O#!s%-)KSOP1=J!xh8r%(e(T*KUUXaey3b)pCgH;SVV$5p at bUcP@_Dz_
z&x4M6FDd8sdp4(U*Kt!<6b}tlO$q_5YrIu38HXw;x99w1TF>H?LK7K+c!n<57)-nQ
zP{AQWdm<OTq{8iV`fy)5nhN2$1ZT5eCy%i>xyq2x3C9WM_-ODm#64R$PH at CeJA83)
zjFpKIr0ZxJQR%e^^u%RV<^wr#&PRT#JJ0^4#+ppaI;JH;CSzD<?2wXmE!H7Xw!Pam
z*F*kR?Gk#SR~zlU=unoJyIct-pOzK^BBt`V91e0}s<?rqXF$@o^osEHK1x7E`s`ps
zbIn&q%izYm6TNpV#Q9HhF+D2vW}3<h_$*c=kZms7igA<?%hg3Qp1`==V1G)WZ#zAM
z1duYUn4}qP=$X=@pgw1u>&`K$D+p%_T<D8lWZoA4WLS5#h|h^msd?IVzN%>Un26<M
zraGCt at zT?{VCgGo;CXGw%t$}(^BXSuji;Eoo|)^W<tG+-M#w#84g{>uO{YDWuW^oZ
z>jRxA@&IR#@?fv^Ma;6LxjYfO30bh*ll6{;pDl#>SM)9I1{MxX&6Yg)<aShiy%<rm
z4nGBYO)HgEN?(Ufs$?KeXSHS_+GH{_+j at xMqE?qb8j5J!sqX&a#R6q9uYGc<zgF`n
zMt*>YM>aW0+)6#`G5;QY{3S!Bukx~##5+LSs{`jWqXd1y-F{=P(7`XPbk+*}3hBx#
zj46(WU9$9xYp+Zn#j`oE6Fk_vm{NWll<7**+Uo${!ENj24t)c!$Gt^M<V#x_s9$b)
zyx!@VMD#8wSLErws{5%u!a#8`j$5Mg09E@;uo=LdBk&>LixU6bY2=51FK$<(G;jH4
z79>Z*^Hn!c{g!5fhf&VB-d#d_eJMl^Q at w7+5WM;J^=5tC0Oz&^|N8dHT7eyg96}X(
z^)vPGhJ=t70wK3@*U3WG!-CSWk!pIz&UbZ9>9Yt?dy+Nn>LVx1dp4((ZT;{sDB4qz
zct_9<o+*U_9nEzePgE7WC|oGCpd5 at my<Vkfhx0`eH3+w}KK1C3Fp*ye%JFd%Z^yhP
zLtAWYkSy4iGD=nW6w5z~Nl>7S$~1Znf$+-3RJ1EFq<XNcl5hvQ9<5gl*0EQX>776Q
zBn_p|uk>)_3=$zZh4k<i^Ub`<kN{RP2Ah)7ESuAZ=o!`crX<$)Xn8R8Ofp-BbhM*P
zgKW{whqkwuUROMRS4v7sT{23}D-8nuVjrgS8ZVpLPLIe!y?MLXYE98sHoKGXAeb(0
zTqYq=dvY^y{)rvyKEb(w$j-_&EhA{64_=>pOuG}H;=RvFTlyH5spp&W&col3@)Ro4
zDNO9GK)N#qmvV_S2jh9!G%#%shnz@{u2J0}9LmLmScMkoij$IT#&O-vnDz4m$_)>v
zskcP9&=zV%<zV6>{J$thne)60Ali!pVv!&`%yvt0;FLEGseU}6XnFNIkykbOIN*iE
z*I|`(^x#1~4pxSC#qhh+K9;p{Rp*GD05YcRv9=7o(lK8?PLLMo#NigflEzx$KJ}D<
z!{eHT;3p-)2ttvY*-qt6Bj-he3gvC3ebq;m at hq^rQ;{v|V^`nea2JaGm5I$07gm=A
zeHm2?7kLDw0%T6(Bs!ewf*rI=yB*4*8HXYhRhRH+vAQMNpLRjBs)HRs4g5aU3Q@(*
zM_n~C+u?4D(m|#nWl(W~<+_x4wjWbnonzQs%(zRadLw1lIcJo@(B#DyR;zg%1U at V#
zo<8)e<%xJ!vQ|?~a3=56oh`_aN^SluP#I(!Lh{jM>2Pnzo%ACHtuqezqHNbhJNn6F
zI)%$M9!#kF$Qd(Q-oasOA&lZ6NVT3^DuHQE*4iUCs-V~(=;Gyt`mC=(q=GIfS0dv@
z=fo}E$s0r|`DgXMnuU^X<z at 5SDNWeLyks9T2GfOJa>P2Xyp6Y<u`$lMutLz4tY5b1
zjeQZb6Z6rp`TdPp(^w6WNT-hYrihgHiiRDj6x7xki8Zg{Gx&)QM4lTuS1T<evc72_
zwO(MndGNIAtRw1`dYJHG59qUkS{?T+ZJGOW$3>xzwz}L>P0iJVHAQW2^M{+a!k-t)
z`>p5&x7ED4l3;w6;lT0eFC^ZCJ6uu1zJlj4yYa-fTc)RKTRRN9QcKtON-DB({4_OJ
zY7<u{rKu;L($YzRQnsm6{>YMHs!vui#CRkzEce8%xsS)mCH~2-?S|k1-?{I6VudHr
zsE)6j0-`5iGhNh(U+vpd5I)Nk3r*Rmc$qjA8Il at 8K+`YKkoy6L0%?2Ji!Hnm^BV`R
zn)D%(2;Q4$bG03(xlPBFElJ8Eexj4-rt9#;;{ZA6EsQO03cjXUn!(Ozf*SgnedG#T
zwprqWqc*E4b|`!N+vXIz<k1o;Te6n>3(@7bFhHHYNb~U`<WG?L*VKeI8K)0c?2euW
zF@!913yOmZxaedGb at Kew6W7s`ABokgKYb(6ce;`LJOXK>ht(qNhOHA_3QCo(*38Z^
zy>8Ff*kE~Ea*_5R=<NoY$>qha-o$hl;}?5=&a&N4d0aCzlVu9M{Y1yc74|QbUB;BU
z`bZc&>FIJ$wK at m%S~%9WQj4duiag-kmK?X5q0KfNYTJ6a28GrXvmJE at B@4%2>cpnt
z_Y)6{w-1tMvu_C!^ZB<pm_`uaz!)ANE?jR&O%f)@xLx2GO)qMMaFsP&&j`&c3njbD
zESel!G&S+lZ75<tZ#u$Q1q8XsKbckm3f?Yu&kzl<81R!O<nm){b#~Ar=n at VKTZ|Dk
zQ$lZL!wWUc^<Y1=-;N00-rttOvfg5UPcSd4{UOKggn=Nw=2TtJY2d=J6E`q~pL%2I
zbD!Cc!d3^W+5i{gl3;Pta(}&Uh^v~%L%*-)T5o_8<ow<lC(gjZh6BaDOE1-~2OOV=
zEzdlPdRf9Id;r)@DL1*3{yQDGS%O`4#|ehJrCqKBHcqUr-I@`$Bt45MM5Vnv{CJ(=
zw8!eJhr*l2ndrP`SQR6~qAp{uPw7nglinB~nl*QU*Q>~%v7$a`v1?t}WTNk$iqNP%
zX^&6PtR^&!&or!t-7lG3;kE{BS{?-?YnM4UPD`}kreDMmP)T*J)KO7$174^X%Sxny
zl)lpCt7dA|+8`aU3gD#3C`y=KRJp!tN@)!<4#oxBIIUvCy?q6GHa9SFK<DY;%kcVD
zy{kxqE<wb}adBY2D%m%EYH-&G)ofvV(Id(J*rz;p;Tk3(zI(V~naZ~H!mRHYt8FiX
zN28-uPa<+v;UD$IBl0}+E9o-oV;FL_A&$Z_5uY%bx?(#sqh8$0dcPDme0F5^{1W>-
z{e2=;C@`;Z0A3=1mXmB)V~1n`ET<;y!E<5~LJhk32BxguAXjhn?L9JXNBC5#XE*ch
z6`ZdA6SbM-{tU`8=L(ArWQ1GL`-59JhKlDW=evspmyO%-#wC0n7kdYjLpOdKoQ7v}
zu8(;Z9fn6)M~c(}I&Ki}<DL|B4PM)rP*5${KjWVNMCrPx3PFr)@8d*&ogr#Nwz<*V
z7j%c0>;j&rzl at J%qhN?8p!L=6OOjHRwB8Nb!`m#?<q at t8_`pNIn6UR8h$|6kv^Dy~
zZzruXJhjOu9NL5{e;4za9Zdg<d+Q6Xd{A!kd+BTX8 at mBrU06&M!Lwzocxf3$l(>($
zuE{+gmQUrL5)`!tp&5EbU>S-y!IMI33#gwrG=$S?>m&?&%7K&t*%_iVY$@^{vI-tn
zEWL)u7p^q*jau8*r$iz4YSkLoYWN%9R3hB<^kp;XO*BmsI&br%vLkeLqGa%2x@%ar
zI5w-6ol7F3i0&mttr=N<mP1h^n1_vbcV?*Gs at F~1T5{Hg+B%@EZpd86o=1+C#{UGl
zn6+DP44;FaTvW4+v>>6WAv-r~lKQgMIX-@&U$IX?7|KPI(p=ZnG^OC^(x1zCPH3<g
zf=ukCqr$wJ45Oc)fy1(!o7pSvtw23ik2#aog7egYAPqw*8Y3Q)?V#n#4B|@tNzXX&
z0z_JRX`UlZ&FrWmPST4Aw@}mC_j>))(bb!|NZRQ>3wv-rE1@#CbH-z3^i?~`$+=ic
z-dlN0oL9 at zhgMO$I)e>UY}W|M0VL5?q~-ud4A at Mfgkue!<Sq(rg)M*-leHj^mb}NA
zOoC(Zn}HgWVu9k)UQWdWymKS32dB(#?VY7l6?>;RC7evHy>%`OuXF<8l{6A=Wt6Jj
zTBP8%utL`D#rV-pBoMD?GO}z$a1k{Eh5%w+Dn+*C1 at 90paiC6&s4xP^-76DdtH#5f
z?Wof7<T}mq-ym{tGlq;cN%cq1VXwgSdWECZLaU((=M?m3HHM2K^=n~aU{XOVL%K8D
zwU_HSL7pFA$v}3q&@&pzj+*40&k2>j%_yd_OTmfm0DXcdpDnZ4d()*Y&W`RpgYiSw
zrM?<^+@^@f)B{wp at +%8H{EBpJ#~}8hQ<F|ltY0O8L{46D$g^4Id7n-Z#1B9nUjgWR
zKw(BpPx7`pM1^Wz<dB at x|7uc&9%JvSg>9lvZHIF{Am&@sL`rD04tO5JMZH*MU>xic
zwe<03;agQjv-%lTfqlyE9y6EAnYYFDTD?fKl$cw0BG>%xZn{lQ+^J<FsL#WaY5KG-
zG|fTq#w_5XwK%#su0{Z&0hGVom{_b&1jkv9_pYrSR2A^X9Ca^VELk7SDxcKG0W<fz
z<m0=mo2R->q=d-0T(TX)>W||DtCPzPzo^lk2o@#a8h5|mlxQF7v at bnddRbxnQR||C
zEoA~^sacy at +i^3LJ>T4ylv3bl?~3-Uc{W{Wz at vFT;H%|Oc at 73c^(-I%lXc}fNVogi
zmvU{oN|91*k*Q`=J1zT055bePIgHfo6Lvb2>t6gXr|awCBmQ*smg{k}`nW;JxrNEk
z^B#=)5+%U!C9#y?pwIBMrDhj*1?|He@?<Uuf8ib%#%-lO+c|)PB}u1YC9#_uU><+?
zj$<|gy96kKo#H?psGafgurrRMnH{;t@(823(|0e3Ct3!#I9gr#ovY;Lo(*@NR59{X
z#h5V1`5H7N^R9lC at _hCxAhQ8slVxWnO<ddl*scdJ20Ep-yRuf2Q~b>089XDt5wAjE
z46+b!IhLa=Z=RjfSehj%>OS!VJ&iISGwIiul<+EXTu+UBYrV&k?6GR<sH>O#tAsOk
zYv?79aPl=;i^)fGmy%o!5^0DOV}%p?a>Jl#9KS}^vcC^QQwOwN8Gl}ieq)OsCd=<B
zy}?)nNh3)wl{KEh|6;W*xnj8Jv)L+pa#)l`ND96FCg`oy2i%jm*9EYNn-9%7BOj*a
zr)o}o#1f1c3CXnuLm_KlwBxNGDBs#m019h9d|5h|znUF+Iz-9lA`R6EZ((>cVUg`?
z>=w#R522E%HXVkK!{)TjS$)ZlbW5X+p(hc21k70R!X){?pN<f`T3X$^q%RrYqQ4IL
zDC4ubNM?}lJy|bLJdHV4C$AxEDg~7gpZ{b8eonIKc>q&yPFuf-UKgRZ^+UF;N->k>
z2iG|oxNU|ZE!pXz*v6wUk8{gww!$0qY*y=%GegtGntCJ;;w at 8n$@qHD82f_;5^<<~
zT-cry>;^XnA-tekOC4Ya2 at rZNPOV+PYr6_#Qi+VCNC4|{e6+a2d2vW~zx<T4$Onrf
zKtXj;{I}%?|8Dt_6IT^skdlAFWT_7V8XG~r^M|Wr+Cc5(Xu|u~!GSIxCPwi%QmUk`
zyuZNeEN4l=VR5P*pHanpHrD1S)~*+U+n at H2A3xS-?j(f;nh+mq2n50u+Z5NhQO$FK
z*P<L>GpWOB%u!go5#a&TvX85<S*AWi0}B|?BsmH{J5?2{SPS=^Y at D1JYB2?)){P?c
zRWXNjiu)J)M at oc+LhXmDx6;Yi*IL at yszJm%9rdiI1^Uc*u4csn(wI%=zIaDDge5Ak
zQ}%4h+F3ZYqzx7&wUL|-((#C7RUTvoQ^+RdE*m=-VcT{=18C|T1TSsb3}{@f+=P1_
zMpQPZ7k86;5GG;2N*;+HL#0;mf($(@sqpr`o~bImG-Et}g?1YbuJ&VoJxNITYE{|m
z^HOMVK4Nb^i4J@&-Uax2*@W at XH2lk3lJF%^vt{L*_6cv!#~18HO?&(3Enxi!9)Zq{
zk&@NgILB+~`*HEWb}~?dhJxz2I}%ltfri0@`gg+l-QfHtKk4UxqJC3>x+i7-61ltN
zpTzFpdFDTA|9xBXlPrGEH2)=jcga8P{0r~=zd3h*Hu6hm?~;ES{lz-}d&m4jLH*H0
zoV%|4)5`BG^nbT=&qMzu(*I=VZ>;oxxAgaR`Tm2YUo7?i)k?!ZSoy_T|930*y!Bsl
z at DEo0AB+8mv7b-D@2vFu&FL>;xO+H$XSM$v>YvEpDRcL%^<Uz2hXnlMu>T4Cogr|~
zsQV=ZcelUzbw6?U<@f)M at F#!Z7f$bP&wYPTch4sHiTdg0 at B8w<j~p$*zn|UxY329n
v_3z!JLG$+={h!F+CxH9u_m at o4|I1{oC<A{tlS4sa-Tl$tktM*4_jmsXb$(#e

diff --git a/acqui/pdfformat/layout3pages.pdf b/acqui/pdfformat/layout3pages.pdf
deleted file mode 100644
index 1560e781ae6120a6e7190b9e78b6356b1331f0d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26944
zcma&N1CZcQ(C<68ZQHhO+qSXenH}4<c5K_WZQJ(S{qFrxb?>Y9Qk6=d)9I5+=ijNE
z<QGx}5iwduIu<C>fj<MC1I+`uP)r021olQ&P&_>JGNyLsE*1pLe|wbZ#Vl=HOr7Y(
zYz$pYMNEzDO-%XtpqyQtObu<J+_RF^#_Tp25V|g?-RTID2UI~|03~hEM`@$|@gla{
z^Ch5IQa^po_t4f9l_63dA32~y?IkWC7awlLEsO4^$oVx{xziFn-;4RWlzV~)F3v_A
ze6R>s$4cV>MzXuhU&Iv*7SBFTvO_%6O&hswn-+WlJpplD22VPp{K1NcZXTDIgzTT5
zsn4xFw7awHLI*5cv9D2%EDMGwEz#uG42l)Z37ubG4NDX63?ryCxILaqCuKqc at D{&j
z55$kIqN=eXiyNSJYmJtY6wNc%Y_v4lnx+p%jHpV}(bQzHCm=H+bX5eW8f%T#SJ9nO
zXU$Qx+d)1z89~O~&>6*yG0>(beKLTcOOVTp9ATJGDhC2o<P7$DTLRG2+Eg{IrnI8d
zF3_&~wOm?jU9VA9i>JB=l5HPu989%AxpY>m!Emc>DuhDmM+*l|pyIyWwPQa9O(iix
zv^N{kN`A4e&kxWRu1N-ln#yorj(hZ7%Uyk-_JH|x?H+*PFMfI5#rNPjDA?{xTUv~J
zBoD{C!PSFL5!y^Z8!Y6)J08KxNT=bh at +tOQ!6qj!f8!h-t(_63{>~N$M0mw>KIgnP
zLs7BN5Kk}j1e-4|I%v|<)N4Aw6Y)n6uus^9Ew;MnDpu1UM|o~+I`CmGpDW!_T?7^d
zb;=^P_ndVg<I^nB;jPBSDf0B1+ogt^vSG}eHs-FgYehn=>EgRhANr0_i6FMl%h9jn
zpEj}KTm)$7GXYp*oHwr at v4NEwE5I2AYYsM{&7!ZPSp=lNW-aTY5w0e at 2n|?&k_?Ns
zzZZn?9sb~l6Earnv1cehNe0}qRS!5{j*Qni!e|^Q=P<pUuY9lMTPJIlD#rZvO0(~G
z;{f)lIR#5wG}?7(Tyd}G079Adg^iRQk>oz40VZlvkO*v-3Q&;L8ud_}iiF}Hj<BXU
zSY7hWyjdHkH%H3d*S9sTrJg<SH at s5?^kmIIS#}D9>UHaq1?jE;WX7r8Sy*1JfVaxS
z1H&KcwY;MbvO@|1Wol>gzpLS|^{;@S{?*MtgPoo6pZ7odSpSdeV*CG5UA77nQ2h)D
zoj2;2nii9G32gqefq4P!th<7pZ$c`wkv%uf(am8&JZ5fY=3#0<^zM0LwDjm%OsBME
zzh{8$#N2N@>vPD{Nb=^TYhXw^8%OS<;xQH+u{Bq4($D)vj*tIX>MB&9O4+4K9|m(?
z9=BLFv8j8LU=9$W`YQUI+{^<NL#FWe!DtWp1%|t&wD*jya|AwSU~wy^i|u+2Oxv;A
zXY1FaOSl8V0a9z1BiZj#Jprm;{&vHyodW;Kler|<*@LmJ)7r-lJW`$ezohD468`0f
ziGkz4QpNFqq>A(ZB~}0XM#V_L$jZdZ_CIe+M_yjui6hCUlir at vDSTbF6U}^gKJ~N{
z%{F7hY{R*ruY?RBYpa8?t10+QZ1mXLy&)_^vIOwJ*e!-*4X{&3zd9hji19K>Wm{T5
zh_|L}7izULY}q9zew`g`2ZhL5+Sx(w=U|S3teU)Be_#8lYwTokIv-C?a+*(PG3QFi
z+(Z!rXNclJ#oAzJtZz5 at Vh}z82i2OIs0+Pb-G^cCMnWL^+E^_#@6T at Zh=z3p#A&rz
zUUV6MsNpgY|M|cmJiB%Gws at SK@1YT-a6oXU!37^wIM-ucoDtN;+DUmW3|$o5#eaoe
zY_ZG6!5rUMVvJA_C112|f&H3WOkI+v$dmhk-Uw|T3dPUK33zu5V%btoWDZwsj1wxA
z6Wk~%K2Ywt at eu-cg*;9LzzOktGzL%*y$DjKP_>FyD`7Xml<izIYFfjczRc2j{23AV
zfLK!$S^F(x5y5N!;V_~IM{D2d_rcusJdFRXKP{9<mm{(xP%=mOsJxhKX(6b{;{OZi
zczMQcZU->Mx1bcg>-RBV=#`@j*!qGC<0FRWx$|kkDWnV3*OYCc$Q+vs{^Sw;th^(s
zC$5Ysl1~`xsq`u9?mOY`vJV=yQP2nm at Q7VscXSRR_$-zaB$fOe8WI5yS7^=<a4#p|
z1&@pK(8LewLg?Jr?dI>{IlA9#;%m2K{6tsLJALKX;?}dk7NF~%(y{gjCmgt^HORc+
zOkZ>ZplH}jh<3~#>2Vja!bcMp$ljq0mDxD^YC)M^?Hyd~E{)<VJ56 at B8yQRS%PGgj
zs?_R1*he8pPZQ@>)+uW0Y9QkiQjw8RT?ws&2h+{z9*K<7H49dYR7C;A7|Cprw2XwB
z7}8WwLlS?YmWK!hV73CnNI?afHsumgjG|;(vzcI$jNKGM7LxWdlhV*r3Xe>Sgc>MF
zb}W#BnOj at Buy=)Jjbh_ECwE<8)KKcB&{TNvP6=7eW7#1kagZ|-X*-5bGK^(=Z-Vq%
zq;ybMl9LONxp;qj{!SR$Uxd`5F$Rm<KQ<+Ym^Ya-Ow4NWuwcQoy|J@%^5Ee$EviTq
zs|#n%SB)}NYN9GLqX~xOa&-~lP;6&#yM>7jG4>rO<=}FWcT2zy=yuk5*xVeDY~Vjb
z&P?d$O|3UPx-%(TUCeq^uC~QxAF=#!k;qc<^iWLu;0-tmOWo<gWlriV?fkq!1l1Pk
zbatjKm}NrG#O87~{-uH9?sy&4$H2Y>gCsU*cj|gP+yd8{Knw1b;BA9LKS9%6R7h)S
zdvhU&WFN`E2ZHfxjl$bR7u#kYPxkIH1pxxM50LK3<FW at n9W=+FlF)Fqb=LknM3-EV
zWA{cf0mD{P!=}z{E at f>fC3DM|$fChk_(ex)PnVa9EieimhSWT?FNaN8HOzbdHGYD4
zT60oJH!pM!ilJhu5Lrk`6T-+}ujLnjbiVGfyBec!5*=NK!Ed1k(Nbi8*rNp+wh<=3
zj^PG>e+9LSsMm$^n at hQnOaKUYQ<p{W0wMt35Tm?;aI)fV6M-zL^}%HJC&`i}p1S-@
z*D)9Abv05&8<GWTObfdLV(2O7y5dI^3i`UP4^)(P$2*baT`p81)zXr1ByKf-T~xLi
z*Vq`+Eyfj!%SOihjU&krFM&Q at Be%{_EG&spH^h*KTEs*XRdcruu)3<QmJT-Nco$&P
zl3TW&KC#PRMQgvuNLlrwXJvJC;1TYBBWM92sMCd-D_t%1rh at x3)37cjPXyat3Pmn5
zME{Yuh+#K9wfJHyma>woAd1{nX at v4t6V=JVlYduMlgiT^g at NH^Q7MfdBAbTJ0dN3W
zWk5+bWoz=t*N%$h-EWP95$`x#FLh5#V(vF!nmH|hXkMr72Vx|IXQ5XsWk{s;U8(Aq
zZLWWxvO0`8UW%OR&l0oQU=UA_#0-Hj>*fkCg$%WxqHF#*^F`ARF+d)OG5hei7U7V2
zx#!qwcHTdq<8%~$aT0^YJM>+_<4OT-+H0OpHZ9tnRLeoQBfcW<e~pLj+N!xlkm8+R
z^GPtMr)sW02?DX*s)2wA#!OM55uJ|^piWW-S7C|Tev-n-*IX_)fKbEd3`88TM03Q5
z&LXtL=?NqLt^CK)Fr*NFR_U2z6ywvafkEo&Avou*O#{Bk at em-q7hldu5$r7N9#Tdn
z<d0lbjm-H_GRls`U9 at Fq#Qu^2=BodM)XU`E)c#Gw#A<vrmwjhVmSVN2no3Y}$jXyD
zd8bLC`J}K)b#yf&dWq{Z2YFVOT(qmE#+YFd=7p<IDF8RL_h=|KsQ#+Bf_^Zq4KZ2f
z23oBn+fkkcE9^0a!okt-1jp=-pT~#*|4)Pe_e3%(@K-u~GiscI0@;%4k%*2F$vIVI
zlyD!AP2ENqVx;sqW8Zc{-2pt0gSWEe7 at 1Z~^5 at ppPV0M9iSLV${S9=F*LfMd{wb+A
z{P+IpmK*-pP#-XQ&-&WiQY5&X(fyRgV`kanSYnwqz0K+^kXpd1Pwgss+lm6)x|3A?
zz~N+cZV<4R^5FS!qC5RD!*Vkbu{}x@^zg%Qq*(Is=``*n>7GvK9G4lX8XfjKO^`<w
zp^yZdeT0^bmhqxNs3 at 3WcK+{NKi<VyHyLn)>^=d%+WP*T*efGM-OM%17nPN?$Z}q}
zbm(~UuZjEqJ<pL9WooyZVYDjd^&NW0nxbawdYbkNYUlBBCl10Ao06vbMgW(_<Kd6Z
z8p4pNU{!BI9bUE0iZq_GKCP)jtouqJd?kZGAZr>48`t-E{FZ+9%iJgWSI$0s<KO-A
zCpjndv8_ZG$r@)-$Lm#!;8YRk?uax!+0MOOLZ25Z#xmxqUtiqCg4Q=WaA5XUQ_!A>
zld4P<(|a^0SPV2_bhK3yMXbk8vzZZ}rH_3%i`%ouC*;D+OF;&oteZ&^K3Ps)nMO|&
z>|WB%q0cwAh}O6KSKd#3W`TM)HI)pyQ*<8#)SRZT(cy17MC9_mRdd~-*0KHT+5+}=
zDgj7)_2Ra#lGMxE at EYL*s;5NjmsvLY&&q31vWA0ID;?5`lqu%Yu_=0#M^c7UC2CdS
zvrLyXl(FuPhlt?6@=8}KkP0|E%eO8K*sRK+Ygxg+e67m(VZdH9izBWug{$hYIcudD
zR*MXZN$`zlE4P4;BT=7+&%OhasgHC{B0Ab9e);+|K8Bia;NetD^D1uWWe4^cJ&WJU
z(^lZGFXk<tsx*<M5>tN;*>8Q!g$@DhZ!G!e!rFA&U#)+z)$gJfiq$TmC(RJU`%-2V
zsUDSjQ^^&g-?_$Do9rG~#{&~p2MF7!96pDm4@&Q=Dl(E9VdrrHmgU6;xo5DJJ{Cxm
z at V64}J4YoM`&e?j+0 at x*<OE2u1<`p>^|$j*l!uV#hVu~b2erzRz$m_*=8r}a6>mL<
zXGsr2A?l;vRS*?>V~o=y3E1U>go?&IWyHpcucKM&qv)fK86tiR at kv=CLk at ZCA5zGq
z#v>$8RENK^OvdA&){)GEl4EeA(i;Vc(1f8Hsbry^4E=Fe>?E=x_zXM`C>@<1AGbb=
z3w?pe(To*37<&-e`jv!z<Rp_)`fD~UT8tKg3+430 at MaztXRy{Wu+}-y;5BgJ5g4pC
z(6_kcYr)bukCk5q{Qc~?RkEL9(V)`ERo2zauXnj*qYoklsXo#Y{#Jg5|Hgi&t-X at 8
zrap>(5?R{W)$euSML7ak$IWzZd`f>utzxCqF<0(Jk8%Cp=7b#IV|<*)lHUjYGBB|g
z{;?JrE+qA40e2a(2o8Uir;v~fmM_m;Ot2BEGZu$TM6`AoK at bn5g1ob&ANfh=k-~!Z
za_^j11w97UnrO!3HVHhGml0u3F_!4KuX5~^HkN~k%2{Qiqacg;U@)COZ(@^i>gVzo
zKiqXkoGnx+*TDpO3yj-+mA=mFnEbZK1-|?VTU50ka)m30m9e#2EZgCJ3xBJ>($D>d
z{P)UDNKQs+S-QKG#p at ZZtE+a7+zlYVP&tmqjnnngt*<C+w~9|w21Uiy(zcbHVlcg`
zZWYlul~;00!~*)>OGGtle1oVxT0D_pBI+Fa!AnF9YGT8XJzAnsgd)nmbg(*fc>S#2
zDeWPOp7)s7l5~<@$I8XgqugiCLq=kjYxfz6+;E@&j<b$)Ttf^y?w}y!IWzk=TjdI>
zNbPv#eJMvy4#5elcM!8NY)QP9PxtzzTJlp^@@b`0WT!M4ALfQhWy0M^s>$aI6CZ7E
z;@ATdAI$-{NmkrlZ4@`9zc5`8UIe_Uw_G=YenML!6Cc?@(Y=@l3<hp|azYd?liKKO
zdDKpVA8Dd96CY6zO`;FeHt7K#ruvvH6J=6eaQxSm_}L!a=qCH>Z}>5Ht>HqZm~r=_
zC{oNy7FnpIp13<uOh5TyCJ`mW6KQf{-1}OYj8l}~NmFsP&DbN~Eccz>N at Okdn`wKg
zIeUpNzW8ICjOlW}xrq*Zl1$JK)G6qbA>(P8{DVKKy7cauNI7Yc+qZR at S~zyaUDQ%d
z?s>_gh-GwK-g}D!VoVZA)3JLJ@}+tmNM!C@=x}QNuoKih1j!2T`QFkdMHd=u5;%Po
z6Hd-RZX=m;%o8h9TSi4B8pxWWtY!G9kY^Rs%8^nquDM|%+e!43Q5#e|Alb~4qjaOl
zPdx;OgHj9clX$4fO^YOlu~4kC%ZEzQR+dFmGb`5;=>Jqkqj9FJv*O9?iKE2^^wq<W
z$_qn!f-HzrxU6BCkl)2j2(H=$V(K><j}%ysd;j{Re%v)@*<2o)x&7A0wkLmG$!4zl
z1ck7hbkGu#VStcBc>1WrFFj-ba`S=}ZUnB5<AV<4MFv$xt#_Ys6#rVlfNVLex;RbB
za65+X5)KTO?!X at MQq~3EXm`rY#J)NfE=vY)Z@<Snub>T8!Y2G(@5HD_Rjan783Cf*
zH$G*%5<80!;bMO}cUq4kt?sR*ZuuB-!5ImN_L}Y)lq64uP4LZ&1!q#xvGhkQnzmKA
zO7TUDmaRh6whO$>9hI^4ax?~e;1|v6o#KZmcb!740yti8!Q3`-FtKP^oi#*g64o?}
z1)-UoHO^-pD!;`LiCK1i!Y^t)(;+=;R*^)jKv20{1u<QRZw4Ru=fCrcwD2whqi#I!
z)t}lQoa at koU@`4qO`3x(5>j`&mY?r;`SN<)+2x$RIQWF*s6A6v)ze*Oik;q9mg=re
z(sxap=klAEFqmXLB=%I?8kIj=J+&s*kB9?*6~PHw1U6m^0g%5MfPTFom=?>*mD?X$
z^L{IeZ+E}9z;|gJI<oZ at U&zN1;KPCQENGMcNc+lx58a|Bu7O!<X4*P`6uzpLCi*}T
zjy5a$r&7QWMHFZJ?O{Y_CVe_%n}zZ at 1CJTeq#rBs^+YOzrBhgbsqyTCkO){2X8z$9
zIIrg}K)?d{tS>dUd0(ZCn9xCe1~*c~Uc at vmb^k(ka&q><9x68%^>9#o^ZdMPQ-DH8
zbz at _doI<OeZSi4|^#xB(dy|0ZgsTBQLW1KD$Vpt7o-e4SoeoT@#aoyVaAHyV?{NF2
zi=74J&~2~DNL0Pdm#mirbw#%*JUTt9-!^`tgEvEL^m?~ONKgBeH<fPN6LZ7L*QAJI
zDrT-C3U(KjUVXB0nQqVkS#J6+6)bjyR2fblUEEfaEhhvf(jDP(oFauO1P=%*BnWNK
zHyD#5RNSv_7I6C|C5`xg$HyH*K^gbUuD_(Dz0}=Hl(nzzZ^jc-)wQ3C*=|<-Vb7vn
zH&U=nv`0Oiq5bJD>^}wX2rmhN$3wqdII})j`oLXgPDdAbwhuC#d9U`L(~f22Gg}Lo
z3Hl&3(u^p5+i|ET>WX!u- at OeBIrkre7n}72C7?uZP4_DKQ1*pU^BpL#q(W3e6of?w
zyn)jLM&?3H2HwC-fl+ly*svg3yk`YuU|X?RAp}sZH7pe94zLSgK>(kU!RTOaQCzrp
z9O?vB?ZR<YjhnP4!<V#p0?X4zAp=3t&`x^s-CJ-|FBmrb38ehiPw8G3q9JX4CD6c5
z?LZ<;_TV)#@iWWzG#By)G=E#7mK<f)DYycrvMmb5f5f=2pnL9kclgO$`*zygjt(Z@
z=lSul+zNC&N<QBmkocZ%ETDET8Bg5svFPaj4Bg;ny{`ehIQqEx_)2Lma(RB~OsrDP
zJmDjZ#!4^S%74jv#(r at Bs<y+?*Uv7hT4&gDdP!wpDzm^*4T=ls{u%9a3w;A$ime#)
zT*wQr6b}sJs@=(&Hxr#yp_T`XQ-$#?WpBiMhtcWkmfa~i(b3{5mn(&@XshKaCxdcL
z&WJ)n$Q`zrWGa&xrrC^NDp%ZK!D>>hI=+)GZzyM1&5}xHE$izPn^pPE9rRV;7_7^P
z&UxNHN(zAEO4~};t^(UheMZz-0ffM~;<1973I)h<lmY$;M6gKLuI%|vT&c5?OjmKC
zf!X{{O-we}GJJ`#=Fwqr!tyKST<a3CgE%9QMU%%oHX}~4YWGpC14^6|S$a(v&0P05
z?5P14<&Ru&8LrAVn5&?m#DQ=Mm-DIN_RY!69lSLf3-oR%daNRUmfzRcdZYfbQFGC4
zm39TTpCv}kR(g9x$B2>_d$H0>bn){w-*4(W>sL;7&2;9cjf)=Fez|_Xdxvx3_M)U9
z-AMyadSPD>-x4ezUYaV%Y0xqBOYkd`bmM5_SmWt at g^)`^`!MaC4z?HQHgIRuOQ8Ws
zE}BuWo<rD&=dcxPTR~PK*y?<wGKyP~<rSFaPL%<{_xzO;&50yZMR`?2WkO1t$6Id|
z%_94G`~~L#yo)C(@QD}=Pmx3tX<b~nAOiZ3Q$VEO3cd1O4*XIj0G9AND!4|?Jt#W0
z=P at i2pq&1HpV~{Ee+2Sws!cUbldt!ZzwQ!>J3g-Ms3><B7B(My?*%07>`S{U{<MAM
zTpuG<T4q^1oXK|HufQLpwzz?+Cmo}s(B0^w;@Kiqg|IhsHWbPpJ#_>1p?8CuUc0;3
zy3%@b=v3M~5m$=4YvQj5Tno<-1VcaNtIxf}2Q2G>^c3-fQx`2St|HAbSCm!7PG0O8
zEIhoIewXr<>CaXi1GW~NU>ItOX3WM7iK{5m4#FwYIRgi!gXcVdl)SmktAU&(y(nv^
zeR@)zoGNb4J4I#~PP5HAr|(NsfN$Ye6E|Twi{$syx7`Lnv$rpIgiWuGi`p_`*R3sv
z9dP;|uw?ZkEQK@;hpAPuuT5Qr>29-x_ at 2s}*AW)i8TkFMxGGDHPEQ)S5}V|+z&CN8
z%0_RE?sXUizHH&!e}?*%*4$SA%A~qbUoU2lADM{o{XCey at KUc_EK@tRA=5R>***1x
ztfv(lQ&&I>>xK7^ol!F<USq2)@_SZ8j>YvJn?s6{dQAvUh$M|@FC<l$l7K`_hlT4G
zfIOCVXatc at o=llcbs$X_jzfGsBRsXsPG(4OmyARE^Dr+eSrp$nXLQ*7ptRUNsF$a5
z>~hNY1JQW}@Q09EgOXMLsmBef*<doh^Y1Ko#}kQdTzZcLXUhixye&3r=zG7CJ7&ON
zM#Qp9v at Gbjda(am<zcR257r_Y4{iY6b<?ZenyX$u)RnW!Gjm65-NvWc+-AiFN~@x!
z%ff5vIY)MAqu&)4F;jc5xlM9Ql|9Ezcz2iYTuw+OFAe;6D|7ScxD7h>0MF_lr$EVg
z>?!s&r-JFBOi8QsNtQKNyouc!{ZsSfwpPaq=6sZwGM;N at bQEqJQBX5y!T1419fM`X
zkFD6Rh}@kB&~odm++m=gZq5_Afb82+5MH$7Cn9%W<>qh<P6QmvJUuJStRIR3v at D>#
z;CTm1v7&~eKQZ*#^rU<97%IooiAB&w=+a9-6?92dPES?*^nH_Zl~}@m1~HzvoLsp~
zz4+{70&M49>o*}gIW2N*d(S45neSf?{C!z^r_UR=(^HLFQYYE+jx}J2BPGT+cvNzA
z8(1tT*RV1^`k#Pf_W?A(=|1Llq3u;{ziPOt#EiOvU&mMdqxFK9^V+T#Eqn_oX6U3z
ztCE+N)(U?7I(t4Yg%P_*M+Pqmftc3%e9%eiQFsxbZ72unN_Hfp;MN3b0=7}cT9P!w
z`T`mzF{l~DV-LKmIDw3<?p>s{Rht@`+-uQ7tr-E5tD1?Zz+0v<D5<pU2b%l)Nxv=h
z at U*b3R?=~HQ!k|p!pxcSwS$hWQ`!Lr7akMdnYKvSYg{!Egz?=S-B4(^oyH@?vSNx<
z$!OFjR?FFhV1&ECzdLT9E!L)0#;u at 4!BSbDR?N_8bhlVF97j*fXv;93>B at 8+cdNiJ
z*q4uamsyYwyED6N{#?C(XVn8L*QM#sH(R!ClB097XxzC=Iy2C(bU(lr@~Y+$EZ>)A
zxtIs`j7c^*;5(1ZAzjC-$6X8$Dd#=uP^HlT;H(9&1yR(BIUWzcIkau#C>q)v<G`8w
z3IbmDLbM#AuiigE<Fpdf^Vck$)pBOTUCtgJ1bB}hf=RIR?`Y-)GY7sZaO at xpD#fx8
zZc#hhB2CA8D`gL!k$&EJ&9jE{kbb2<wh!XQ-HJg9cc6Sf{X}(=@2Qh~76jcS<0VVv
zHi{C#&U1yglJtmdC-{>3kU090?U|E!OZ2};rqz?fK?1Mzbdl{%G=5wlc`$C>Q($XQ
z at BPpk?tUsm`uWBGRLki1sL(e_>cj-?0BzeS9rB(17HMpJl01EFe#{ZkOTD#RKMQ+=
z4cDgKD?)0POb}5?_hl#{-upt5llUO1SHwz$h`$X*>L$=l7 at e4ZA-Sip9aN+wi_dFR
zB8uD^(fmoA*Oxv_3+hQQWF*^@gKUvlC8CWFKq`s5RpnZ&A#u{;B9FIcnD;@tjteQW
z46jJYD8+#yC7Q!7vT!E3=Y_;il#@1zCoLk0s*aPx8(3|^pTjg_d*wT;b&=UGCiQl{
zB%lbM1~490xuA`y?IUehZYOvQmr7#{D$7n~NKY^;@}PtajhZK^N(~cZP{HU2n>H8~
zmg|%3pDtxSK8#CrL#k>Z#J_l`D<bkE%+2#A>><k4&X(t-hpdU9cyM&~Rrlrb^XmrU
zzUM?dLUoufjWgcgfGy{NC_JTe0h^je_=CLbyQg79zRVI$k6!cZllwC;*8}}v=Z at 2j
zv1M~%bG!Cn8V|Tdc>((}6P=4c2-82*B2UnP;?aRkz6Ki&8trP{D+dtk%F1z_b(Ud9
zkU2{%3(iNkayRBrH%+AtzWp?<R{bE}ZL9Ss?GtLu=HddQ_q)S+;m938%Ufdib71Cq
zxKh!l at 1*7`j{^E$@$RdGZZ1izaC-Meb!gVmz`Z0q7h3mE+FN5f#g at C@b?zaO>GU^F
z!CbtKP*l53AZ38(gGeF<0{KwazHtE)0b9gH{(Y9a+GkrSTX>*?2XZfVL3v661nD+(
z6;$FW*nXG5dqQczWf8m8keVzF^+aXV8W?WY9G6A&A9%%ICqvg}U}(%Bo{-lil>1kb
zyR at myk#5L3HLbqC4BWj9Zny|tS7K}Ye%cOR;X}Wz+KCw6syOK|Wg8_|UQ%7JCA-qJ
z+T4v7YE6BGM-s!)$l&FzXj6l9dIPCuy*c<0TiFFv-rRHFYST+6-E+Tda~wP?0m(~s
zkr=@S1fv2P1eL%ASU6C#;B(;hAgLArTKK}g;6(MT->*hJ-hT}yqSHDgi&w=Y6#NQK
z5kJGB{L&+NFbfjX`idN(>iC(_NM?OddN`JqF;oOh&6Nz99}z$9^l^e-M)2AiXARy0
z4;5BD(9edrf|z5k8ByBXGI1G;@PCi64JI|t_wgHyK1y2BxW58>>+V@)eHag<_3Y}q
z8e1r?2lltQuC9CQMq>8cs+{YVHCA>y at HukZt*qU18~8*UjRe)#G-2)u^~)$R{IKtr
zld#@M@{wYy%u?gaJIqnfQTc94P at Z2fCZEMq@>P{&qkf@~Y(a7kX3G-xHeo#@gbJ;j
zT{YUYP$_kR)6I`@E`?qKIh-t!$3(VgPInLBjv@<N2#-F1I2?eIn=>1&$E=5G6|Pxq
zDTiT89?w(3h|<LAD=s3lDF}^&Gb>`_loc`Na6XtE>s)GtxR|Oy2HP|Z!-iPw!Mq;R
z!euf@?lUCN0ybxI1d|&g4n4GRa^d3G_D6;DUUys)jNx)fB;H#+;kZ;#;ix_A&5ltl
z#c`&H1730Eq60)l|7E~*(R;GT@~5w`hDB(?q4y{z%XOD>r1GFN5ZlF|4{!{*>qW)X
zQEW6+07x-%I4Hc|KxzJP7Sl+N76GcS8>0AOPbR7Db=fB4htQq(me#))Ad>0xawwe>
zMe3($Yce>r!TyQ!Y~L(}cXS{5R&y7kNn_F2aqc8&-cG!Y at o8PR=j|wCu_E#HvVs5S
zWLp38)shD+=NPd5>D|x{{(<g8^79?}P<nE}p%mLFGFOO8BUnojo)6{M_C^%DT8wIf
z6ktH4gsIz+`w?++gcKD9t-)%xMO;X=n1tsaBLP%J6||*&v1rQuysyosjLI+t7?ks6
z(mto;QUP7Wn*;|rzCQ=I8vDBYQ@*QV(X>l at o1YSY->QKyEvh4`2{?&1mew at DhkiJy
z;-kGg;Nx!0BS%g??}^~YJnb#`oV-H_cPzV##XKASox7_%UR`i6kKhJ2L;Iw at qcnak
zMo0uDFTtM8;~SW+LXGTB0fx=0$M31zjYltzRXkAFJ2p$ffT57;uq5b1JC<=Hg*k{n
zaTLU!s*4tqewLTA(mxD$(h1muZ$sRt3J$R}2Z2=j#pTeYb8kE*({fu|5Wqo#2j!-I
zXv*^s=A)V8=C+L&u~QoGKB at vWmz6>*29Df%V<jzs6cuMxR8#86sAjRs<?Ru~Kg^c0
z_&i0fEe%Ym$8E0a_grqot&EDM7>y*xs^92wv>uHLNXn(tXabRX=znM}&Emft(?X+K
z?V!Tb+`VdPDTiJe#ms54cNV|&MRzZj+4?;9t{1UhP~pZzG#&Px^yI7ZTF|YgYB>HV
zbWymexSv~>JE>MDWRQ}te7byfUGXJrO~}5VK%4Wusp+mFm6lJ(pG(&d4M+dE{_cwY
znt+B%d0}URV{0$d_xm2^KNumT&wII>`7uqd8Cyy37K1mhvI-}_zagHW|8ujcU(Al2
ze(?e{`bjsx@#@?S%~u_uJNUrYH-h^_>Jt>NL4e+vPYkNuuDR72BP}#7N!zE4F~=zF
z&`LCO#!$fi$vG3&d4^fU`jC^F{rI&YlgXXNr73n5Dzfe+-fYob7=zyeRm9m=6o5Lu
zndRc4{gsoY6uWdzIW<OEILdTiD6g$4{9X;%-5$d4V`OrZXZdy$&;8YLw$l9Rw7-!1
zU96?TIevoprN}y#mzTSqXeH*hL(=c|*}qy;ZcIs~^bLDXLQjwjl+U_JhyvP*xZ9Dp
z1#kPL0|6_{o3|Nuo=>xX at 81pgwrd^O4lBj~b;tV{Es$QAX6S-<DxG&3 at _fQ<Og6i7
zK=FNZ2-Kp+S at 9{sTBBFcUGV1rOQs{Q;Y at E9{X!mV8EXaOXPag6hS6`NK4fY=*t1W*
zsE`m3^z^0!)w2o7p^+8dzO$`)IP+qV<!GW8q-^dTW-{NZQKCj*?Nk6vP00I6pQ#p#
zb50slBl<b-#?$~dt85RZQdDd+-T#RpbT9K~A`i!p5!gJx>(w2Mjfnql0h78>;e%)`
z&7TozG#ExEE?#G<7iWDk9;Q+Nb#ob}Qe<tj0aGJ*ylvs{nAJ`_qrF%vmG0EQ)`~eq
z$^K8JYU!E&u%~#Y;$YK4lt+FOy<&}uuAP=f3nE5F^4=;KxKc2Xbq1oM(X~cqB;7tN
ze6*DrSveV5cv3PlcJ%0KHd|CO at -|rVlMoAc>93E~uNH6X;d}1wx~mAeIT#mV_Umn~
z7VV}^UInI3p2|89De4dtLEK|OFt{wLYN at JV69%j6GsNo{xjFfx<M$Ee@|GBqnjwcN
z)yT~KadByQSkd;_8QVlMN^FHfCKQTPmD_wuaLPL at jEQ0Lz)nUTv#Q<sI$?06`y0sp
zv(Jk84`w4z#>U9Rjv+YV^5h}E-I*BSnASR-J&nv<jDlj=l)p6#*5kr%BA_oqkiuUl
z51;QujI1;XYQ0{r at AF~qAZAlyW$d6owQa+_O7;uy(!*sp48M*J!fmxX%=TS)!yPpa
zXsPjl4WXG6jl;Ku7aZHa)3XOM4~QWN86g`T4XG=Qxm|GAS#V?R3#qrp%sRcijZAb}
z-JD7oSeTG<rGAT0yq!4G{j`vEJeiTRDK7?*&62&6?RJ0<%~2rja)Ue({x+h3K=c7E
z2XqI`5F{3;!(BhHz+$MFB}r1g<Q(LX5whki+=BW6=~ccym}MKVa-^`_(Y5*G)QGko
zig~>74Yc0NfNTNd3eX671)?YX+tTm~QcVt+53W&gR|)Wl>Gj)dGl=`O$V)Zgg)-0_
zA?Ivq`8$-;)`XUsosxR3vYan*rbK7_diQ><P>x|u(UwF5I{BMTtOwK~k=<OF72S|m
z8c++?M?8(Lcnu>-I^a%DS&m^_SD?;cQB-q=Bat50mb>u$GYWBKAk28yFKEm!-YMv=
zSS|6G2lCc^SdMJ~s$>mDOtWXGX{vYhr$w#Ff65LW+ZlI&JdJg(*-<SM$QEpO$L_fX
z$HMM}Ct*)}I?q<%E%z!_;6;dcdfhxN*nZ};C+lt#?ETUxrMncLDzXueUwgzDa{_HO
zVi;h3>JYc5><2S$k3oWI`cRxx&g at kwqYBf<W+sXY#JQlWY#YtB{Q(X0#_R#pzXZTK
zJ&0}HJm at aXC;_)C_`}a-`sl}U%<d~Ho-dg)HN5g0>fLYnB#7-9x3aiL&UB_h1M#{K
zz2<<u#(0lw+Y45_W^WDtgrDTcY3RiFY<!K{<O at 6yzw;4L{SJ`L=QryqlOLxi=P!@*
z`?(3K>@y!5fg8gIe*H?<AD&0Ml^LNMmwdOo`_qnw8?v1vi at 5cVYO$Sry5sikJsdk<
zL5)(4G_5pUjvfccz3~9EXYPj`Lcgc0-y4s%FD>C8i|@)_@{V=(Mhom)J0x at FMl*45
z=5=S9FAe_YZ6&!>Zv0DHyT1Dp at gMu~)Z(k~Z56R5>DpjFAU9v*#`=WH at Kby&KM3p{
ze!l!3mMd$zCS>Q%@^&vBEiEan&O&Rt=LjoB`*yYHw6X)+`zfmitGo~*K3%BS+iJNR
zSoJQHhV at VcERJ^7@!B)8PO*;WoK3~VTDx|kH$$h%6pU4FHSm?@ZlA)ocm|DTR#TT)
zcCL{#xRzC}nOa*_{>$vze%tSY6;`#V{NR4H^i5f|d;PTC0 at AHTy$cEGj;@?S&vbky
z=R_E;dkE)HX?AI0V=NZy)&;5TVPtPo-e5Dir<=PkE!m1Yrxwyy1wN9W67wDYd;?cq
zl1s#ri%T0TK0pWj*K2;K2wLeoDKK`Ya>Mst>j{MbL6i*80J(ns{%X&YlO!75Az!`#
zZvDt_Za`KBWYHquLuQA$eay at jW?&zd*ua2+W}hgsjE(RiIl#<ed=?eCii#FyWL~>J
z09psZpZ^z{@E<4mk0xYfU}9wcFP at N*;lF`G6%PkfdNF%D7ZFouV<$@o7yG|t^WUbN
zp{*&skl??CTE^1I)XC7r(%w$l)XCC}R>{=d)yB{X>K_7a?o7b)*Z3PDBxLWdP0Ps6
zMnKEVz)Zl%z`#nt$-$^gFX>`vV`(gCXKrIkzyL)r=xl6i=R&~2$p}UN at 1Xx0v`ma_
zQ1rrv4icu8<`yph;-Ki2T}*A&2sr+R{2Tr+b#2N- at DGJl`pY%`Cq>H0_}{1UpO7{S
z!~X}Ot(!1q7svqf`-Vp}W-C8nmaP&=$jUOF<5Jw%3m_v6&N7H%7TCUL^_tBRd=`D=
z7vE6$#JkFdZ;bv|DR!FZiuQpamc3qJYj0CayiD-flehkyK73W=zQP900*tV22jfiP
zEA6FhgZ|*T!7wzB$Xz7+u9p{TMQlCf#qsebI*fsNyoe|vj7$EE@<q-Dpi#Nj3YpEz
z!{1MMevmhj!1421^$~cmGSy4F+FrpF@(DtRs;VLeQ$1ZOj$=g&xmECGOn=BEGf at 1M
z_icka38$3~Y3tUBZqnRFBQy!kCsjU1y at j@&XPEE(UnR_OIYakJPi8gAWANi=E^7s=
zIrP9%AV=oJ>w7#!%>0_f&HRFSkGAxQ8vMjKFMEXX$G$NcKg=<iKB$eJcW_RPZrH=r
zqwIIhU4(Wz;f)JJg&z7PpU`}F60mXA=3Zb42TIBRFVbWDANc%#iHu&^)yU<a;#8bm
zP5+};$k5sJ-{t-P)|#c0vx~5Wq0>JN$r%1`o9VA?)GbY1ES$C3+1Ux0SQ!Y|nV1Ne
znVAV#85jsySeXCI{^$P>A1CL3_}JLk{$tC`!AZcx&JOi={g3v4ZvVyp8-tbgf9>}#
z_Fwy-U-y4$^1o~5uiXDB6N+BNUe(U>-#-Ba{~=8!sQ)R}|Ky<m`;P)fmVaUY7rp*B
z$;-~l!0|sx-mSkRul7*#ZC0DQ{aE|*M1A#By*KSfJ?%(@z9P~NhwtdGeTq6{8}gW|
zS43`l?q*~pi|{icAUHxxY0Ab8Ax)|LKO+8(LAL0dY_<CMNtZ(SC=_RO8}=Wl_7<u2
zNeFM;&ZHZVrnx;gHS+geZpVKaUbE>eFFfY^#X)~UBa($6;``q1 at 4KFl<Fil*LVhw3
z8es4eZ*p~+W1}}D!X%j3n at w#5k1KtMz1nKUt4(M3R`Q<Wc!V#0WTpGtQH7t~l5$^N
z5s4?=(LyH>K(B;QR*jzDPo42y%AtDGrJd*(Ve;1-%xtqeZ_Mw^LRQ6f+s!RMv#*d>
zT{z41Mq4d4emArFP(5Av7dHq6!FP3IWjBeql0wU!6YC at 7A;T|Oyo?eO*{~xmc!t0A
zpBar5r_PfO{ujuLA&Y57xbTnU)tt6TO*?pY_xauw$PxMG|1On7;Ko$0B07HjYKM2r
zFi9kbO!v!NO1U0$eZc?h!3kDt3k3Z<^tdMv10c->pgtoDG>P&Km=rkFvI*<wviTtK
zz}<L>N6ve5uig#yW*`i;1HDN+6upPXk8I85k=}0Wh7a13#v?1i#8C*`!+Yhc3=}-<
z<ER<fXpS`&b=$il(F?upP8GuP#N0{KkF$N$d`IIH&5?+u5A1|}dbJrs<jXdjm0JIa
zI`hB@&bcHB9aH?H##gS2|DAAp{DbPz6n8_Em%b?@N2AmUFNL3#GfCfXr-5 at ozze4~
zO0G|KGXblcoyon<ZX0E9q1{v6RK)rB(~3e*vt6`Khv(AxX+*|(`FMn>>E3+8et<!D
z68h+qS9Y^ZUzQ=$sjF7B){ryD#D0i?aV~xQPU`LhaGeHZ1^7GStRHM1{hqMG!4n6h
zer~{V2cELn<X)`7IHimSA~ML1RDJ!Q)fI$WQoTy}*J<IGVL6)IQh1j)Bxfm)E~Vp#
z<OoP=Uw)-mtSsWEZji?}ETm{~aWky<^Y|UjKwn#ftGMnzX<19ywHCcf1q2MfXi#c_
zN_n8L)YD1 at taWzCS&Os$X<_!4Hl^ra-_;5G$0A~RdX_}is40+7>p^0MXV|8~<Rd=j
zk>=*tT=a3cK7<Db2DN_L<^dPt>zLJsX2%*t%t;h5i{w!Do)h8B_);j~=h#Su!%eOW
zM*LOMx<W#vkbpar_>gks3@^`5ao;Q=w2*!zm8)U<+3A)ruUO{qX74jI@;4B#LA{fj
zg^p&OfTS|}*%Ge4-!-w3;lmy6NJ2Xhl at jvJj>^{k?T*&w0aDT3 at xDR3`nJ9LwC~Iv
zXb$^7ddz}?c^nGGzWkZ5cMnW!{>g)n!_z8T;=jV=kvMVArDpk-nL1{Tb|$ro(Y4UV
zK7d*?s;;t`A@!{AU|8~^VqeIM-SYUZjHD3}kT7q;zk8!d7u1ojl^lFH%8&aL^@WmS
zjRecBAr+J{#-j36n6{;Pk3}vC_!ssoAPKOCO9*FYQ@^=6_C>(D6ZS=DlC<7qrh{~1
zLEHGd#9+-Q`X%OeLZw->YH0L{a4_Uofm|am#zK}D*0;;z{){0tH$l#`#}!KjVV`Tx
zbcdvOzb_(S)btKdn at gB{&#xWv-IYOT%C(<k)*I8FtNISeoa{REZ;-?7XR=*hpnO5L
zL8G@)&vGsfp}>-=xI=b4Q1g<VuE$I-KMPz8Ur(Pu3Mj!w;nM#_k7V<dW$FZzr7cLS
zY7!%K(21ZRZdr{86<UyPAfx{bNelQ>D- at TzQu|~RB!JrBh!xDPFsS4X8$Vs7m8Wr4
zMbkPcH&EScVk3X)elM2%Ni%Ao-(pm<NLMh1mdy%E0Wd^aqaYxYCSUN-H#eY|Ma8%y
zJ#;6}#72%KI%;G<NiSI`KWJZP?H6K1<Y%K-Nn=2cCcM+yBg;s7H)4H`KRymN+lgYE
zUFRD}1D}V1jOpYQOoN(ON-wy7Zg}CGU5%w@?4BF{;Bi(<S?l2G*V{-Jc-WQ6>vAp%
zh(<e1+?TDShqeq}j%iOYVli_y2X+`4ZeZG++unMM`klXki<>R4lxO{M-adV7sC~lB
zCu9ODg_#7XIW$5QwLn&Bf$DvSnI30Zl&lUQ<+IC!09vg38xWI2UYWrVPz-Un#GoF?
z7+;6<1Y#WH$}P}7u4;z7UCivgJuL<qTngle0MLJlBD?pzL11Y(h>t-fl>y`&qcf$?
zTG at d$&{~1H7m##_eF_5BpPx$_#aspmqrt8pV-#}eUY_4HNRk)^tFIU+8OnyI)V&pX
z7eN47fK&j%03 at 5|iU<QwAWj9boQS~$D2l^CIfSxsMAAlX-$kpPTei1M77lsIG+jnh
zD^>b>70avFb@(YOvaqQdmhRlyf9=RMSeL$S+oi00Kx#vpZu=6;IopL%W!Yh^$aSpZ
z+z4GaRp+LaV_6`4;^f>py2Cv>Ua1<q(BLZRj18H!jM=qo8ittFK@&}G!y3GxIc{Bo
zgh^dbZ#qY#cJWc5)x4SqXKj070ePLjuFL%Ad;2S2Mp|~Nyq3AMtE9!84v7zq3#~m4
zGTzkm54b1a`yDs|^Tc&c={StqtLtuy^}MQG0adyO9VUlQM#dflPGR*zNex`~!HeD-
zdtIC6A$)rVe`jW<#V_4-#d9v5 at AkKrHht$EQqVsEJaqVUF2A?;oMzFW7d7%mfxsdy
z@{@Il#XY8nj~uh4YwWOU(yH_R2$gcEI at SfOsH&`%OQ1FmSNv8PQ at tziE<Y=mR<+Wk
zbZGMjfP^;0va3HD=TfF&Ur}B?c8b4`_G}Q|DsJ#v4->FDxy4SOsDzx+wCX2>n0XTE
zkH;e;N`jLz`_TabttSAXcv0ZabYlpFK1`X9II6IuRiT-IKP;a at DAkzKWW~(dIu1)x
zSDV{>%3bgF_PR$5WmRe^^Ip*CD)GJlre$AZSGA=buc5ZxnfGcf)PP%4Pf1?-XuWAy
zgJskIN@$=nyFb#1)N-r7%q?$Hyq<o>?tBLRDP=rg8l#C>@4ry9iP>OA(XH-Zt;zi$
zbWEThTebnWz>Tv7twL1^(9O$w{`};wmo$&Ev|s2f$j6GFaP{?7o7QgTSv~=xYBf>c
z9AfO^I+AKN(?!>{GO{CL>l3pLdrjhIAI_;?*biH~w3TaETQ=*fK5 at -UWL>aI%DoU>
ziR3M{bbbZjQ-D~i6rZcgaDa!RTg*(@u%d%X_cyQuTcWW<>^#-#aWxk;bzR(Pt{!`O
ztKe at tBjb?syRfsSk>>jqN$?(AF~favp7rQsp3S5mwe{vWX<C2gcBmGO%927OJ=;$>
zGigA^ZWWM+_NbMbf`!GB$@*CFie_!s8*ZMqlmXMkDZBuqD<DW5q?)HzrW!B}A~yZU
zII(jq4sjuz4RMi(WCwN6eBWNgQ!Xe}q*b<4{Ezma;a%S7QsgcIwdi}mEAt(1yl{|r
zC0m5}khsVa^}hCg2hmH|EA1U<e1~{YAVkTNQ78w6la<(W;>Xa);7)`el82axt5LIr
z=(5j~@=nB3*c6d$^zXV7-ThMco>9>uwGd5;`44?jDNmLmU#TEN#5i}YZqs8C8Coup
zcXGsQ)1=VkW;iyE%OiFUrS}Mk9b~|f2{EboRwWbV{d!E}OUFZAL_9SAsYAW^hH#I4
zCpI$!pRN)aGY(cv(|!&-gM~c5T)h6f^`^Q&qDuro6Gl2EzM;Gb$RIrvTz!NyN5o-K
z3=t$oDkUPI at wWtsmoWIqny}4Q4q7EF^bZj&Y9Pf7wlL#;#JfME$chLPB67xLLdbQ{
z&zgS`LHm{t9NRS!2Fokk!Ab1OUkWXEX8ntd0n4(C0nQc+X>Zi#%l7;Y-mmEreh48{
zSV~xEy&LG!dRQ1*K}NKVL5{rmd%+4G^y|@BQ8->StnoRM62-xbi#W<t(^PD(e)1V|
z;H6)`n1A0>IbeOvQ#-;9gBiNdkZNqi>u5e at kL8#cs^f1)Xr7f-wsVbasQ>ipL0H86
zg!8_suSE(<9(>}gjQQlY&J|oIZ`e)prO3i##bA|k&SZ*%?j>O at Mt67C^Kjnub&71;
z<Z#i~Q0S;=FKV->x%@emnR6DUN7bd92W63MRVnZk*25cPv323#!B!HxKaaG4Jwc%l
zP#zGM_h=1W6E#EJI)$~t8 at I{v>7!FK+v~84rJ*mnrN0ty5l>JXsL!uHbtkE)^U)sL
zTkx9D|2EVsEBz at N*Xs4@$@`%WWrwu3zpiS=ST;XgmA$7uf$w?=%`b5MSgzh`sSfM<
z_<n0SQ-9SCm#~Yo7UR(9YjW7aG2a!T8+055bOh(X5zCikuL3GSQsG+?MXgafYF#>p
z1<RhxGToBE;YgRTJsfJgmw9B}%lVp=-xp at Qqhh<C6cD8qxkU6LU^X3gl)9~2-g at fJ
z<oDU#M%OE)nby6SF4b8unW*R at 6mqM9{C+GUR_|#pmaEyWY)OBL$hPVgeFGiF0IOG{
zBiy1&o^u%k;ZshRWQ)!;lP$MY2Ex~=fy4;ITI|w_DfQ%xENFK=n*6!WHK4Pw(@bwH
z#rp+I%je at t-@ZPRgXhxJ*!l`QSyFG3+c?uRWiPyuCM<NAl$Ce{l)WbhoUIrL_fwx~
z6C at G9Lgz>qzLrV$7 at nXaB=tK9g0vfn4vW4`Luf+kFu{GyeJqePJYfw9)-kYStP)fc
zdqr>2Y5lSpr=yED62*=oGiZ}TF<*dqGLT6;;=InUx+F9heKOtdrf=6+GriyeX(7`4
zn2z{JvuKm*8Hhm~z_M$M2Gk}0F}gCLJY+tSpAP?Pe07^q3Q*z2jqFAi?@8nwDE{d!
zxGv$k530d}RnOON|FZ;3R9H~5?oB_-6~FVeGH~VDr<r=kvIrgK{RI7!c&Cq7-utj7
zmvH?pvR<2f at Os9b<{%x0ZonMH2(uG#XmJpl&A%OlEETYek_ at 8Fqpg+|{Z&Vst}1=J
zi}pq6n!3%K2i-!mI!pSX&8IDVQ at ZWuu)MR4A?Jf&+06OPfsSUTdZu`dq$2zfg0q1W
z-T4*AEpsJ{6vJs<=NYEM7P-8bs9`<HQE9u(X(&zRk?I!-Z6{}vKEzHP0 at uu_(5Amt
zZ$Pwl_G#jFiflG1s}JnkMj|P$tn0<Htz?SL2AEfy9pR4o%i@()*SqUbWC(ZjiJor5
zp#o)JTv|jaGgl*y^1Yb0w2q&YJpH*~&0aRottNm##_EKN;!v3iUd?5+mu2pYpnd;@
zM_1hKv?u-FQ*2rGnx9B-=;C<!#oTv0E~8?b#alGh<V=&ZnLBT8CYWaFZTd6lS`Hgw
zx65LSnUs#e(ZXzrIeaAly{M^j^`MH*l^uMkd3dRp1~ga=N{prL%shRjxg<;iP;&HE
ztYdK>I1a7Vq%7;2B^dBVjg*y0C!vxQBdwpr(EwsEc_Z~`R>?!>h>Ijb>aO$NEOKKw
zq!xakAX~uy7Vjcj055$)VkIE-o&o}s`%5A)3iVSi0D7JpNjDEhvX^)~_Rq?n9m!4J
z`2i$YN$sM{_!M;vy_93jiY-b72<~^HeZ6=UJxGVN!kc2x9V*9!O?C`u>0YXiWWfrO
zwnAn#YCu+Ly)t#I#25*464xnHNRqaE&R>cFCnN;($|WS_omZ~;^Q+R81K^|_M1r|2
zv|R(m*F$xY0c)nuERN{F2oQ%JK(@Zzj`q7cX4*Pz(0YV44*iXA49g#mv5{RDlLC}{
zO<9;T5Y=Y^`Y`$5Mz<yIlSwVvt<&1qJ;SlZnJLLnOxZj3uqrC5e_RPB at F181<NT|G
zF^xneyIo$kCO+g{IQvQ8FkkV!8gLROJ~y3T^t)Ilm)Jo<!T8t}rps79i at LZPTFZOx
zrsFH%iYa8s)BG;QxDiNL>wgU3a0Y{BtYFb{D80*Wod{2C=R4R&mn|C*CO1Z9)|b#7
z>Z>_Z;2`+>D4AXeXoElFoy5_^8j5hR_X92t+Oz+k-p)EIs_uLEVu7U64L%?xF~kfE
z-QC?iGz{G#Ac9g7(jlFKbc2B8fONOg(kcC3{C at pCKCyo9TJIn4taTXfKKtx_?mqk6
zfm!#nuk|>bf$MxLV>6B_^2DaDg;|~2{ZJU%8fT$D{${BfEb+#=7^;3Xt<wy4`CfxH
zHpw1+vsTn88(5gV#vVw<&ckpY$BT9b#OaCMl_W*&n5XNRcc&}t6WK@`8R_0<@%#vm
zef;ES18qc%ag-E|Ozuy+$MjK}v9pEnt0s!yl;!EFK7ONzdiR+Sbdn$iLm$1693_DC
zWeSZJ#e~7A(|Iw5S!;`bKNqZd$g^TGl_ at Lws?Sy<g;!kituNEah(?BqLDHpFFJGO_
z!~|vpABVPn^Y@|{__f{vIIFZiyLK4hsGf()6#9s}Zx5d7jCa at YI<0r+2|T^oIK4`r
zQc|z}#(u at a&!ef&|6{6SR#$8gj!ON97spIx99yUjQ4O!fl4Z>k*(S3ulcBGXw at 26|
zdg4OPq^qS{giY=y$qF#P1h?hbqWT;^>%Lr$=S!|XEagb|P4SKKn{ZiCeMMXz-Jp_4
z-#ZiJI}!|0q!e35bKFxTCp~Vp)$cxd*o4c}wN3g~cW?#rM07vOflW>ozwLe_y557Q
z9odAEWr|zR#R;^%%M#-75FPtp_rD^C;&fDW5I2<c=-!VHT at AH(lGQs3`}`)1Bmgsy
zVF#aWrdTw}SF|U6&_B-Lo8ZWShBBSlS1Y+(<b+Rn$W|)W!_7iksh5;ZUm4)c{kyIg
z5CYZem$n*_?~&9BNQ;uR?`EAI;ZMkVn-uOw*0k>i at 7iFQn(6E1j;TlZ`d?^|CoNB8
zN3qF7%qg<J<Ko!obSputci^+>5#O=h;drFjveg3#9JzmXF3s0Jp|-h>k(5eYIBY1Z
zTzVHTH))|wwt~FrA%c6tcnaw;)#Bg_ at hlqcOr>_3V^7mJ{9^G at sY2`=C=bYxm{=dt
z6mm*&Yg88vb`U`|T&sx_Dp$i-3G;Kj3zWDSnkWlMr5!>!!p0;X?~zF5iGLcP-dSN9
zZrUn{L49^k+d(Nnb at hVCl#6kWerOJxLq at L;HBi1cj;{Jf&{Hk*4W0%l!6he1Iee7S
z;g9x!VBhCgQkkVvdkLT29SmX(HMv9dvgEF}npinTN~O_*yp#fB2e{~wTq}jj`i!LN
zYy}U!vHK5YhG9}XOYf|P3 at M_>-=@XP$8yMYct|nzh<szk&*{O|0QaNUDts}<W0dSO
z6QJvtjvsWi2ES2rt3 at -W`^>8_3+rdK92+znJWM%Dx=OE;WxQ*JJu at V@Jv|>I?dM5Q
zo|I#1e$y7*dZO at BBubJipjyk_$V<V)41)#|B{{(Q6c?KrrK_ at HLof3&A~iNrTFQ#U
zcoT`<ny5I$GzYgD)i=5^3)7eHy7TaYQaPP>sc434_^k?^RK&ZCFhSR)!h^RX{oxrs
zu6jP{oBNg*_BJDWJR0vK3a;%#TQx^Vb^N*O2o@$t$GEYdMfN`Mp2W{Z$WSVyR~swh
z1tRWpqdB8B-0$_^W3!6vs<3HLdhL#p$ZCum7E2snw6&yGRRk$+b4$jxp>_S}MkEnl
z*=$(2SRLSo=5FGzGIBxxg8s$B7Yyiu3?KaGNg5Yj4(R5|oda#YI3<{z&?Q?(?S=M6
zD8Ushfd6bgpLC2g)P|agJ++rb!9&Q5C6LhbGds0*WnieWi1M{Ir9N|oHiKuYOXnM`
zEY2s71`8K%4$Cu|zgz;}r at eOfx!Ft^3#=h;aItqemKz|~Vdtx(B53~MWS%jAt?AQ#
z at XmHDqkOE%4L!w2+yu9>XE*H>?=|dL>|NQ47{bbHcYR at hrR<$}GUD@>E~SXAWzInA
zm9a7Le8`IfZJ8w0YPHy$jOcn{Iq)VUcsm<(H~59)`yjd4tnV(`$?|z)IKewl$i`CB
zTaHv8qQ*->&ALMz2o*QE<U7oDyWgLqFNL<%1WnwJAUJsGX{1;yr?|h-)}Aj5f0R_X
zqS^cjWP_4sOehUXqd at 5_LHYF2BK<{)?B1jD#{}--(xuOIla*lONHC~mw)&8}B7~iQ
z6B>k;U#-<kLpzh)8}|O198J&AE2Sw^su}a{L?QEO>M~hy3 at 4k~)m2e`;cOh%?#e5?
zs!Q|DHrjLaBb7^&^}Mjp3Td&sie5_zXp)%gj`fcoQQsxFH%fwnY;~{6p9*O#@l!Gq
z!+mf6@=xxIs)EPzclwZ6s`&{Pi}X=-F$Z5XN=LkV at O6?ue3^lz9p(8b%hP>tL8pg9
ztM^ESn8T1uhfJMys(ffva_a}izb~>CHzjT?D^2x_=5?R&oa7m^J$r1 at W7?YzGQbXy
z?TBQAVWauJoJmw^sBjUvsLvQHS#F2x+j=i@%<ZjP*N6+74EVm1`F#4}SoccY{>t=V
ze>pCQY+kKFp$c9PFJx_!nDD<=HHOApK3yy4H}mQ2)zbO`TX`_}NUm|tERXp at _zSEC
z`7q!k7{z-K|8t7WBWwLf2M%F|y`X>$2XtfXR+(0}00#Ku&Oj_<TS#|s;Kx~&-3;>R
z5z)&4zj42zfeWV@>Sz;!OI!Vhv9u<soSWTMT{@J0zZAFBdwmK`AIS9l;=D2jR_56W
z at ClM`=I+Z*)gpaOy;-=F_C|J6486|eejX=QM8=A|JsM$wWm$(ejnA~=JZ)o}5%;Y^
z3tPdRWZf20LpyL!hwqaY=(;fRV0N``(W9fii%;- at LZZZpy@NtJ?NZ&cM_1N?r{U}&
z at CPfO_vF3RT*SEt-!o4kg=1-cxCNpYqyu4kc1Zt(erPfCh4Rc&RP4iJ=G7ycF40F~
zq*0Dy%(B8q4Kh%AQl-y#IqhV8T}J|V*YVBg#z>TikD%sr!3uQcpLF$n(7(+Se_<&t
zVt_N`sUec$hK3fGC_i9!2BZqvaopJRfA|u);<oA}R3L2?U2CYXrmsTIndHJ1YGyff
z62^_mlOOo58l}BWs84T at yXTNw#U|8D(@C-2LEGiillS$4Dndd*6$PEBRz>a7WaAdT
zxaC=fA#KPSnS04}yf{}vvHaLU`QB#+CLfdr#n7_AN;_lg>6u5uxXpM$L+eZHS4wth
zRE%K|i8=~VKa!k<h&B_YAI7*lVQu|Ngb~7WxWZxlJkowYX6PF6g9x%-SV&}@iqo42
z>tyL<RlYiQ+3`k)vNt=s;d*8c7NUQzDW2feEM*bhxC-IAipT22jW}JhU=dw-GwhWW
zDcXX!Vi(#b1mRc at 5!S<vlXxn?FmR6|$Y}^|NF#Gr=yMiN?8&7Ctdg~NDP`eJGlJ$q
z_{dyo#}~q8LmnnCRwth0l}&zjul?>Tp<Sa9?!qw5aK|i^8=`MmbS0`cfl7j9%VO~o
z1tL+ar})!T-n*(V)hU8{D>VzF+7~2{%(C|Ek91?nBZVobN+VqvF?Rn*rlZc>bI0wR
zO4xJ=nSHJ#F7|C`f8Ckm$%=KBU?!nT9Js7KQ_EFTRf(Qwrm!FO04c93Q_fLz3z}R>
zli}{b{_2Vz({zaUV{N`0D}%J{!O8X6{2th=hvIcMO&tG>ijXoYdD0KMYwV7%;uU+`
z^LQc=tprZ$8P<O=t?&k|y!W$vKT3?HYjD#oKZNnjR)yT)V!Zil(zf+s!kD&7d<`^T
zIp at u==SKZpRuXtzG40S3Ck|G{f)igD(N`2M<0UPP*#$(3HTW{-vQ}j_&fXvKpwre&
zWKz)OVWkKG-{|*8URHcfX;kE6L<7m>mD>E3I^WV%$j5jrGI{lFe7*$E4>=LZHGC!G
zbFfJlcQhO9lN`u55dP{Bxym-5-}WO68RZ~)=#tgWD*Rsk7(XpnYWBd>H%1brCVj0?
zQY)`?yFL{0tXz#Q|N3|Zo&m{P2}22gzNn8c{B;$kBlUNsf(&eT6J at qxM&otVM)<?~
zb?aJJYEKwdu97v9$+`OB3p*91mUDxZZQg`Qje2_e^=w)n7ojof>EGPR*T*KB({w$E
zSMr{{yr4S29~FT(WRM8TYAu^;E!x66d3a&QV_+I2634 at +nywXF_eaIEm<cqoHq;EU
z#bfPNP<>USeueNz=EnG5G^*XQP=}Q6gNaZ33=Bi4(}Esq)zcR23GOk^b!@B3+SRG}
zZ5WEN^%o1KzE&xc<yxcIAk=3-L=~TC=0BGbFhP_m^D!8xuyw>jb2{$Ra0)O7SXg&I
zT+KnBBD14&3hYl^%Z+UCTfR<BZs@{z>Q<C|VCO!8 at zAZCtYg#R^xI_q*@FPHIfA((
z@>3}1TxzE7&gx^v$eV5qvK{(U+sV%)glP9aqQYcd8|oz7p3Byr=kODq at a?$GdC!Jx
zC6LTJ8 at Q^Z^X$miLW{}0yD(_yuxbZtp+x?wmNa&)a%HXkZBMKxswXv316zIUO1|_*
z)H(vC5YA at 9ET(;W`M#?oG~FMg#m_R-lpmI}<?_a>F(^#wXc8aR``135F)pvt(i6wS
z3TU at eJTy+m*UXHQ9%0n#Rl-B$fn?_*qflhV at m&$Iz;)KU|EXGi at yo_2f|Gc(Qj^SA
zM2{Nu=@f$MyHW~52!<m2zo7Q!q>kn8<~L2G?dxdarl{rIZ?7L+QdP|2bzTfQ72myF
zb$vS%vn!(HrYvy2$5KOU&hwt at 4B7593H%iy(63+7nRaPZKHO|3H$LXkh&G69Aml<*
zcSw;xE8WN#O?>dY&VKEHBz|P6yR~}=rH0+xB*7}1kv^oytL&8x#zUam6}Bt0F)J(U
zd?9<MY;HbuGyGK+Nv1?5ZI*dv(zFHKnb8y4%kEz2NPRANl(U{Zbe7-D9fSa-t59mI
z!z5{+>|qaEsyK(es<N(Bg3dn~(X8j|5T;lanAcZJPe*JXAFYCBK*4^D0VPKGPg50l
z(<Ot$3l^}l2e?aKmwZ4RmMu%>eX`d}`LJ)lVViuXhQ->$>*$BMhAm?S=G^reJQh#p
zJ84zwyD190ADx`*`vX^{?NQM#fok_?z20b0c%3-~&yz1-D~{-|NXIRY+cljJZ>QIL
zzP=k25U1C(n_VoeG~+%p%}4S)?7TOktcugyjHA%3y6(l}O~sQ7ua!?%xI4(*^>)Dq
z at V6Ka_qN%2EhGuK?!`2FO&ugm+<DYqycF$^Mq-6Qi;+@~(LXwjDKImS#k93+;?2eC
z(BFBTcqHz7I{f<C$m`x^=^a~r>apxZ8ycsB3E_A4wOe1<rnS(6I=~(M9VyL|YO+|X
z6#aQt$?b9QZ_eHjgKnpwJIr_P33}n+74?e~EYX*t;9FU0r)!A7D!{Iee4oby;XYHI
z#HC2eRHHwvxU`#^bIp9fEAYL!J4Jov8o7>)2Zr>q^&wN;*5!~&(O&g7>6W^V8Em_y
z`6H3pg|$4UYy6hnr}_yv3-6__%&1+uLw(OX(j1L2Rb<16{&3=3x!9M({FY}P at GPS(
zw2c%YFy*u%K`kqGKu}X(RGxs4-(AR%7tNS8YB8&*DvT|<<GgZ>t~qHFbkIAhAio7c
z{uBfDYUWrhDxx31;RY=otM6V9E4I><;@C7BPgooHI8J3y%yRAzet{WJC3z#tjahu^
z?bHq~f{bPkN?u{$F!?W&Fu7Q3lUQlAkB=L4V!;`dt(|8z*E25lia6(Im9mvSu&<fI
zWEaZL<BXsm+4Q%VSumg+*OER)2k<snT3lQ4a3iCsd at wC7?deVj$>!81 at CEEHC@wM@
z-i;^n+z^4fs4=O&3}CIk at h#m08*|KVQOPPwJm=IU6^_}_kT;5&lxWqOLP)R6D)$O(
zY7SzHTrg#^nu_|0C>uBX80w`Vk65!>70KDXjQYGj%QUUHs at 2Ldr+mR-v^}WYkBuVE
z)8dZdE;l6Uu)ukD*ds~E&igF+5j_vMcOVtt)e7IWE-<lxj3ky_-TuLF^7YARZcEaK
z`+p2BygQnmGpNqW8dr^nGneRYw-`CO!Y<yFH;>zQR4Z_R)AEZB6H(*T%({qY!6eTM
zT{#GZln||Q9i4r$cyDL=?99c#qZ(MI4Hz at O-qtn{7^c=jZ&@&R)J7i)Y2g^4GJTco
z%D5GN=wu;sWvZ;7Y&l~#W}~9BpS&`)is5`e_wMO^F6f<DTXsb!bxu<=?(;rK@>HMs
z at mZ7p`mqk%xqDl+i6zTGl=H`S^1Bs=1tGzSocKRbTa5oeqmngLl4oMP&oyi8{Y}G0
zmr0b%Z}G_TdQm+c{{1APICKyZkg}{%QZhfGWnD65)l~lYJMT3^=_;jV11;2jVeC1n
z`n<xI$J~C<x(NJCz4GYCbz&zTjsd0{bi-;W^}=+O;3!J!00Naf((?B>#;t~|JfG5-
z>Qseg2nS=Lh}er7849g9V*)UqI@#&UH`t##S9klCd_EF_M(GaT&Bfv4+u~CG!HTw4
z!n3}o$b4nRY-h at F#?0i5ujVz97s1cMUsdEbN5--dxBPbA%mw$%HuBTL!LEL&{{WW$
z<ndXvans2Jj&@*edCO~_#G;gT%r7k;&I_!_z6eMXuMCqM8c7F;@Ym8KV{(700KY5#
zj at BMj6%=a&o at s<wsT at BnUY)n`-Pkj0z06gG!WbEbX~BgnalMU_(A|%dwyOQej)w>I
z)Q&vzThlHY5_Wc7dJV3r>)mo`Gbhyck^J|MbPX2jOb;@GqkG^dL&&?HSIzF1%@e!a
z*9foa>7BEceOiBh;z)rcS^hKAgWidmnHEfj=xG9#rZ?P4atA%Oju%UfJcsKRkR#K3
z>9&Ym*0qqBq-}kk?Q)?QjPh;Bg_?PF|3;rHw~enx%@le>KzTsugV9JMuj=rlv#Z9^
z$c}Ya^x;%SY4fKl(*zY){G;kiXR$YOw!1zDZD6JTbU55nQ#Y%jQ$nSEqbQhyOAhXH
zM6sh8rPAO;hVI8b6_<h(Uh1%L-oW2vw5!eeK^~vw{+8N3_U$ShA0{m+A)DMWdkyb3
z>9w)+3*r;H8)u<|RRL8DI&;l4)8xi;O$e!@u>bbkaPsQ5Z6bSi<Oig)qOE0PGK+H6
zIEXLrxP(zT=H~C*Kkyv$In#YVF}Y at d!b{1Uu}spNc=mNx*-3JnQ3TquC{C!F$d-<m
z>h5e1%1(%0ha72#N^MSlckImH1xpXA;)KYUYh6g;mutDqNncQRS}CPlG3 at VCsFQ3r
z(DzwgTE>|pl+RY^PS}3*wLYyAs at 3zd(KYYEtK#=%W?F&jJNfv|+8>QQ-;Zg6r|m+=
z%*w2oh}E#3p45^tFc}UVo92hqX~;08FlS8^vNE(N!UTriFfu+>nX3!gn=|p2ytCpf
zREFqd%Y&G+mtI}b at A)}k&U5)Jwy(XTNNbB+&pR`yPfFI)I5_LYk|FSOI|q~Uc-091
zuzS$c at 7N_zKw92z#Ds3W^zk94!^fDwcHCF=2{ka&A2odO7s|~2Ow>UjeUv3(dpo%)
z9P8aCGtl?5g&#|6zO{2$;n#t_n{KC>vQ}%c?RQ)m-|~y#`F6<PFF8IdoNZLjmuw1*
zVEhjDy4l)Gm>NWnKof|&tU0{8QV85Bi at BLD-T6{*br3fsL8DPZdQ+5oLGk?1RxKEF
z*0;uX21ldW8?$m at ozD4L`jtLi<7SDU`!ah=ZG$Cj>3h#eVp=h}7?#_hUnWZdgdUP3
z^kqz|oGA!j-qxA$Fg!)tdO})TUZTSC>B`-_<EgxNb6$Z$Ax{Qy%w}*H%rx}P&7+-4
zvuTa5))hEPpm)s7%p|nBuE7VQUF9$`oP(q*GMJ*$AfZD8Rrmw30$LXRnXvWu$Lf$^
zRFil72C!n#sP2Z^5eCau;SP(plUu3B3dL*AV?UFD-Rr!lpc`A^$TH;$spGfNEF&C`
zH#n|M+lT!Gb8gV=H)2Xlgi>&*KjA2MrBbS0QomlTi1JPSK}7OJj`;C-ga+P+r_WG0
zD_lRrRcwXorM|Y6W2AfSOa1UuHGI<8xLHco;-~6v{e+WX1MQ>kYhDd@?epU^#N^HU
zO}NyZQr^Y at cMQiT<sw9Lr-p>S9ot{^*AV*+!F~!Zs>c!M_vCaBaXzSfmF`4eLx4)S
zMm8MRTvSF8Xnv_4GOG^|G2^!56w}%^3X_N}gO4q{367UOo~vi3Xzb75Kv1Y<>m7U#
ziSgPrtubx1Vj~;ro(sxC^>Sa*?mH)n;EY8vAAXk49fskpI=kf}tc<DBW#YlhGzXeM
zRVfHcHiA1ENo}JXscZ1#kMyLR!F1;2?k8M{%;s+&_Zw2Jx at abgC+7AFdLJb^Ct@@C
zfPumhvVN(|huI;Ac?gED%i1F_F#Y1gVHk!-JWm?4wL??Ht<82nCOybotLux6 at +g~c
zrP&CYXw|v5fK{f={^Kkji9B&QG4T<`iNf&(`Qf|xcWP(jvY6=GB&11uAIOpkDU#RI
ziOFU(Hgzh at BjLu*Yu%&SaAONci?54=h8y)mWFiHw1{Z^$*X`#f(^|zgu@@wgeTuJ4
z{B>T@&=8qwSxy~1yPwmvOeLBX)9kx2DtfaxIDh?muDQ%;friwt*spMMq7nWc7r6!~
z;cI1a*FWpRJ6UE%#%KS!Aj3zc`PwJ2IYO)rqrE-ro(QVFp at nfFMO0U=xczJcrfirz
zW(4NPc^Vl3dBSZK5#(U+?-zNwuV}hX!e!;cOHqR1jr*O$KnbQhU*j;twlQubY*m80
zf*%IcNVx5^_ryoYZqHSCIEM6_TisuC?+**^vfqm_X;<MqQ9v&{Qy`x#v$ino<pjT~
z6=~+<iu943ZgDcUuwY5vK!Sbdj0nRF`+*rrws(w$jvlU%Axe1O(p7gPK)jVE_6ICG
zJ1s0a)m?7M1&8R5z#sJ((Z0o}CL64cy;4NJMIS3)$wni6o(d)uF}?fLx`&Xz>z!9i
zn+dv(4Bjl?kK?B)`xLF!QaO;93gTXh8%43j?I&cYrmyEErt!Mzh-h3;rUDcE=G`9Y
z-w;*7qpn*b>csrzn7=Z%E5${vP#}z6H!llpSgIxp#B9V4x0#g at q~n-!wsponv5`gy
z<SOEu6cAY=<9e|5Y^&DF(l at FkWTEc%hYXb%cHl|V<k08T_ at JtHbsg0rd69~H(u_Ro
zLki;5xxigxWsJ;TX$mD(T;+b95N2m&7c+V2r^Y`0Zir0vT(|U79&WgyEtRxwO0i(@
z6B<s21?A6mX@`PI at B-!O(1aV6dU{8~?;_F{*_k=O9SjDAd$XZMby`E?LB~erk{`Zx
zmF|B$FpW-ErOUOazUtLxD!!rawMUkAl#HVI#uc}Uus_M3Ffpi~@Fm5`GW%ZrF&DWc
zYCpW!{o&qDdtI0jNfwc!d)V`6vc^{zer|m^HzqwhX9;O>riDM8S7NrFEznXNM#XPj
zFDVC|_IHyc`{8-`I8Bl4bLK8cHnz4P&8|*BgWa}Z>po`(2<LW$;sxKH?{5FD629>D
zSn>QQp<l^v-TqpwdGedaW!{(RJ3i;jBj#zohn8cLczeF~XZN^ITBES?FOkB0aQfC7
z*VZSYd;C>P1!sA+wDJ=k{gLDzv1uN-ofJXS5<;~DZU$36vp;<H&b*u&mj=dsBYe+K
zgmx1fmP#=6S?Zd0T|GBlxsD0;=!;R2y^+^d7aHBl-R5~Bt|FJJN-gJ;$sFv)MQi)5
z?B)@j9yD6SmML>c@#h((Zgn*TmQ56|1iTkTcKU(^s{<SL%&mCKx0kDts~vP2MCR=|
z-|jTqc@|!z+HGz>wEkSK6_mLcm6v$vST+05E{vzAplX}R7fw1AUPWffGu8P4j_R(H
z<gM?7zMRlHI~j71jngC9LSA-uD`b+>Jiw#kF)KV*5F+x at 1~YlBf7E6NOu<?~;q-)i
z`wm`8u!=d)v`EJIVbYo0hevYW)^~R#CAYVj;al?gyOMAF=X7`m?#|A+T)f7~{xX+D
z2j7)Fs%y~33DkV6Wkie?a8VpM>LMpE9~6rv`$|~lX at G{sMYeK!3ipeuf*yKoR5^JD
zE_Wjs>c at z|o<Zuk!Bh}U3<%nR8e at t*(?i{m``Gn`61(!6>uBB$TG(ABlYhepZf}hL
ziLS6hxuAdY9>0|h{~xO0&)e|-L{~)q9bFNI+nD}4x5CBti(BFP39oSeKY=R%^}_k@
z<O=K0hX?#l1N<uW{U;3opa}nh0{njSzh1N)fUZ0iKTT;vI6v_xyBGfQEjBha{*{s?
zmY|_z)SEKW^2L+mzCrcPKZe-T&fF()@W%?++DV)13qBa(Um0>E*KF))KPITfq<Jgt
zEW%Uz{2boZ`7mSmL;MW73GAF65wO?4J7-oC(w~vcy!ZGeOUXUXgrZ4r+$w_!H|rL|
z`|P1~-A+S7yH07u7qelHl_#n<FHb-$ItvFHd(E1U-;77AO&0_v+iKf~*9pHBQ(`VJ
z at 4E+@YiZK!Wr}aUvPofi*Ua(ei2k%V1m|@ll{{Yg>YBuI0#sbSR-7vDGlQ`2av$G8
z+V_IhPu}AEY$|fCDU|5|+G4(nUANrVRuT3CS}%2?z$#Jh7uMu>+$Gy{&060xcJsvJ
zxC<V&mA(k=9!vL}63Fp9nK+ssOZQg4!A-nUaWwRkJKIVp<$ZoK at k8&;l}VrKR_T5*
z?u9k)^Nwp`cDxG;s`}Yu{QV>cOutTvO1HJk^}&zBeT$Xo4}I6B<nbHUPch(vt>6AF
zSvmitkp3qt{}<Nfe^1VT1zp&IwE7Knf&Ldx`3b22fXXk><raXs1zLVWD}ekKR=I^?
ze!(mN^n&^eX!-RH0oava`donS&tm{|xdmi?!7#TrZ;t_6Ko$T0fHb#2%&*1{KsEmY
z#oX at Jzd|uTi~RouiutX&y*N;~{uUbofEYGP*4v=|m7n>AvjIEimKmaC{fUF2vM4&j
zO;ljcIxN6LJXlm=?#_CD@$k3BQ8Y4#u_zij-hyX8eXuCQoZv2wCNL*T)>{|KEOIbY
zOQTz!?Uw2RL&20>9Bg_l5{_^ed%(8}fG-)@IoaQuF!5j!Q2{tMS4$I^vV<^;6s0qO
zHu3YbhyW7=JUCJQJfYwA{jUofVCZMA{C}R#&n5Y7I)6{y+vzx={v#x)f5rp|$^Qi9
zcF|=lO`UWoZ$Ug|%AYvXtxyE+0)&_CH%DxLrw&Do05A}44lD)W at jokp%A#NovlBA8
zWes)yW06HuOPkWp#m448KR|$OStC1hIx|Nmab^17*O~1%7Es8=*#hp!D=sE34seJd
z5C}+W5I|CaAR-_T8*uzn2K4=s-S$JEKojE!CJ#Kz1ppy`4d(>ZfHAk-oE*SAFqV at I
zPy^D=)Wrn$OONB$+^wryH)0^r?J)%M-*#)79cVxw8_);2)xEU|47i;RJJ5G4X9xXq
z4 at 5u|c)$#uC^yg#Wn~3%0F9NE<2i_x76hWD|1GlajxaM+08C>;1uXsdMF|0e*};@%
zl>d>j0UI3n0J?oq+Wl7s{C=D6f0J=RfH3|=#s=mD0o(R3G7yN1>+gEN>>$7z|3!}t
z%*F8!AFQlgf7b&}j1$<*e;Lcl3IyvPGERUk{hJ;e>+Of at U&pesbN$^O8wUpj$j`s%
z0WvON2mDP2tn}YyVAg+}2OF3J0_>*0js*j>-alke at IU-QK;Ylv=j><%;H{3gj~Y_3
z^n?LR$)XI01N#S<$L$4F%FYZ<`7^(74 at 4<-D0xBRBH}`#!opB4b`V5Vh at DG_OI#cZ
z1wq+F*>97cANBvPa=TGQ;U*#$FcWJh7h6ge5ixcMtGE~&NL*BegN>DwgOim5#Lg-T
h5)u>R5ET`@-EL0KMvl%uQ;zL6qfwtd6H^dJ{Xg76qObq}

diff --git a/acqui/pdfformat/layout3pages.pm b/acqui/pdfformat/layout3pages.pm
index 2d82b8a..f081b56 100755
--- a/acqui/pdfformat/layout3pages.pm
+++ b/acqui/pdfformat/layout3pages.pm
@@ -373,11 +373,8 @@ sub printfooters {
 sub printpdf {
     my ($basketgroup, $bookseller, $baskets, $orders, $GST) = @_;
     # open the default PDF that will be used for base (1st page already filled)
-    use FindBin qw( $Bin );
-    open(my $fh, "$Bin/pdfformat/layout3pages.pdf") or die "$@";
-    my @pdf = <$fh>;
-    close($fh);
-    my $pdf = PDF::API2->openScalar(join('', @pdf));
+    my $pdf_template = C4::Context->config('intrahtdocs') . '/' . C4::Context->preference('template') . '/pdf/layout3pages.pdf';
+    my $pdf = PDF::API2->open($pdf_template);
     $pdf->pageLabel( 0, {
         -style => 'roman',
     } ); # start with roman numbering
diff --git a/koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.odt b/koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.odt
new file mode 100644
index 0000000000000000000000000000000000000000..e07288329a985e27c838f90b055eb51659aef505
GIT binary patch
literal 12688
zcma)j1zeQN_dXzvbV`RHAl(hp2uL>qOE0k?9ny_-NOz}nhqQEuba%JpAM|?l`oH)0
z`JQF>GdpvhbI#1X?>n<+9%Ln-Kw^MB3bwd8w^k?9(-#lr$2aW5+Z<?aVB=_M0I;+)
z1L^^6fEFNnJCHt|1;83;O=n?g0MfV6vo$vW+0fY-IM~Sk!`K7<Z^3;i30Z&)fkw7g
z-_2Mv(OcU9Y;3J{0ao-saIg<9AA|TC^iX&V<WC$xPtU;2;K7WA6}_IVmDQtn2XnJ0
zV6u`hk3oY$JbpaLe}{wf(E6uYLo*A2jls`g9`Sz$^KYH7w6L_bd>8=RzdG at 6IQ)O{
zW@%+%WMyFeTlfDB`EPMPI{P(f|0~MI!ouwTMiKo>lt6QUk%2Y6AkfAfU}^n-%oD-`
zSkD4v^VeMLsn3MWu%WmdsKCMx`9Va`IMP=o*oK*_6MqKb>5QgZfYZvcp$95T^qj93
zTp`|;A?1BA=sxd>F;66QoDyzhUX5F_<VfuARq6Fsx2Ac%wA*<;muwEeI`%Kw3ckI*
z)=u=eHMyCSB<y<Lp5gDO<{4)tIDm0u?!gwB@&2 at P021%r^8kFtC>>7uCI6h*X!Q&(
zC;f>Ya(Uj7fo*8bNo9w;I%?D1c)EBS?XT`T)8PUiihFPo-V_ydH544n%fDD(JbNw@
z$f8O^1xNwy#>sDeIl=niQ@>fSDaGr?f$wBkL5i<j!-77Rnm*KqvD1;cQQxGZi(V+J
z;)<)0(_W_UDPlB9?4w>!y)im~%9sLrC(R+0Zf%Bhcy)fBu|G2tx?Kk+Ury`Hbhr-~
zx~XZ_=<pP;E6yr4Ery4Z;7*9k*ttqP3Cvgif}ER%cj|<#b at x_?-mVqflaj{d(DDV3
zFiRoNK&14WCy58(tu59B*-DG1Vqa+CJz|hmbe@?fT at 7B>`&s&;S3pGOv>*ZGNve*6
zh7wA~M<ityqY#uhDfW{Y0M(u*(UhX&Ozu&|aV^7vhDBFTllkJ3l^x|oa9b*#?gZ+W
z@@ZwOq7?a4?k3uChUzk4utnu$OhfKCN<Ht*Ff4?q8!CD$?!ilEk-}q at r2?m0<CBQv
zGZkPdzIJJlEJ9rx?Pf~Beoo*K1xe+}yaP_zQ3d6g(N5vbH$SzI5!FkS at LAJD!!*(q
z$|&#|7;yuX42p(Orm#;K*t$51i|Le>y_J9Wn^~|)k9bWKs?fA^Xg6Uu{d(Xy!&^$;
z*FKRs9F8+=wP6`j9+Q}G1k5s(*XtYcPzPsGlqUt42>a`N)snm?Yndp~s+67v;96ng
zMppMdJ~J$k6ONeflyQRZDa55n5OJC+*HYG(o94ej?=!}e7rvs#uByd6_FS&yKD{kD
zF8DmA26O6+-L`}bW7){dIhi(t_teg+arf*K($baF2^%*_c7+6{ux&acQ5I#7<U;Zc
zo|dU6aiS$EU`ZDLCG!wMYkNdu#22SwX18sISJ}*;83!!i7CKD7a%_zrv0pS?1n0i!
zn>SWh!@18)((c6j<i#8koL#~){{?yKn^DzSZW4cKkyn2<e3P*%e1x6hYgpzd%!vso
zHP|ZHI>+Egl|En8x+c5j`<e0XX~6BNSNw89KF=?@!_K~6ZI<#u=MnNLPp>I5tEp?)
z)!x@;gB(<0OQi0Eu$L6%XXvDxT_QoXW3%7H=Dj#jAC4gP$cD%&w*rH#lQZE<j7R2&
zY((Z?n^UMg#@5RB&FL#Qk~5p|9yQ);j6&u(JQOp#E&&C~HPC>~6`7hJ_0-81M6ej+
zNd}Ig>fZJ&kabQQp%`*2ypR_8P;>+X_p-IaKB;^kB2-rp_$*#DmDbDh)j$x!aomoU
zM4KPttfmZhu`FBwsradZdS7gYp{J3;7k@@<2l#u#=p%$wTfIqvHG%m`+f#=?vYct%
zyl$?j=fcrLfnYr60K^t_mwEM!uvB*Z;P~j5wk}ufVDZd2{KmdW0LFd>gwnRSWIxJL
z#$|Q1)<LPwC#rj>KC{)tChM!sbpEK(c(0``Os&&!Vh=Y<uZ9$Ywc{74#BWsIWE;y@
z_<Tea5zfZo<>FC at Vt8seSm_g1+h<9rVL{cO*>lYkzakgeNRLO|)t at f2TpHQX?FOSe
z+cakiES4WkM20Vg4S)^#2nXgN6rF*BK%$O+7Q1Yh_}-T|;B<H&)AK5E9ZaRmgjOyA
zk|RYqdbo1t<T`s74B+T-1-ieg!=USrwpxl=2t&k2xwPz>%2J!&4s_Y_sPGz|SMjGJ
zmW6fDxC3IAM#-QFia?;>XIlUzFT9Gh at 4wYU!O?-YscAI9=ULn2=H>JcrdNT^$*q9}
z%0qgl+ai_qPmq<Wt3UOaD?n|xcjC)-?`e){SMH<guPyTkB8_&r)W at WT;4Y9I!M)ru
zhx{7<8G~Y{h;7vLcq;Vko=4wwWqft`hw4#_Yi=fv*>HP((l7^}q#dNyvSHhMGJbv?
zMwku at S64&+=7d*1W@{o_j$GFbw-*TNuGTYmpn9LlXQ?z8A`p^}$#gfkEgOw{{4e~6
zPG)z7 at T)(}rm89OtxdF`#u%`DgB?s7<vbUlGw%wq;Jkkh;B>HzT~FPogp=$q5lM(1
zQ+e-c$7y{@1l`&*V}ygS5&2w(2-&t<t<l+w;9y>7(B5Lm^<v-A8B&Z_S9(F$NQda1
z?33!XkQ^z_uV>7zFwC#bx}Ql%gMv7-H0_UiGV?BtW!f%+zLagnl2&<?Hcwm~O>mXZ
ztB+RQnB2WMKWcv5Y+y*dB3Xe31B0Ufx!L%)Jq-NA+GuU#Xl7vjxJ~I-mk6C<!)Urt
z!GWK~qn(MA=mHs9iKA2qctS`|n+ixq^$VjxMI1+HFI<SrrR#TRsG)KAfvwN*HAQEx
zpCt%=d}Aj?O?Nz_!<Phw{!xr{{o6X*<;97!6?#MM^;)Gk8eyptO*)faEyZghg=`Aq
z#DZw at dFZS@6;JA7WzPOs^(|v^_>bIa(Swal*}H*qY|66?*CX)+r>cNe^X`!|hhE>W
zF(Kr0p_rmthk5kL{-v!j(GkL7;`&hI4PMJ($2T+PCF6CfK1;66Df^$Y1wpOftZJVk
zRzl;CzZaoWXu}jEk$i@$u=Jh_nZTlxh2R6Sql>s>Tu~hU9&Y}YgyJ}enTyOW0en(e
zgIa9E7Xb3Rpe7`mFPMty&z(nVU!}N#6+T($LYAicVpd4IYF<kn(SXw^-MiO|Kw^?h
zse>@~`E8#ez0mc{%6y8!f at E>r=~PDfE~<3K^a|;YHSS@*&?2#!A8@;d9ONW>VoRw;
zl3DEWd<74~!AMRc09`!+{0%EBE-XB*Mw2hfOA_I5?3PRu8!hX%koLuq6cBaBf at Gq)
zSXtZql|}AOj=FAS12c<H{H#1rvA(UMNAkc?gq?)2uWTK$T?S(b-VPg76trY!;X{4#
zUHc4{7EYSs_#tDF%X4*3uDf&vYRSQpMJ1yId;!+jWH8zZzQTU@<?SaP<ldEMPquPd
zdiUEfkf3VSt4Buxp=yG?74dm*tbN{*0ZZ59799!}GQ+~`<gH^{IMkF)B=t&Pq-rxt
zBUQJUIbnhi5H6PrjSZc{O2LULz9Ng2(|`H=9%%>|Sok5KypP)(HK|NcE@<4TbvmQm
zN)rBh%DR!<Zu<p`k`@+*qWlWU0{=(v8}E<msfgl;gv<anpt at NevyM(7c?N at Av~QTH
zSWA`f6cehK19gB_^@#fhW7`||95Od%q|7$h99aJfN{sbxhTV9AcPYEsice?5^b~`S
z#4{n*i$0Q{ZV9Uj2fD#zo`|INtG_;xmS8W55-&#yV46f5S-RyvJCF07mu_N=!`oC&
ztCk#-NWGWaH7eh-mAmfBvmZO~^CDC7#V5yh43$q at q~hlIOpwJ|DP}Is9Eew4wQV9*
zI{prJfC8fi<V;gV!`>g1$r93H1dXWczG>7j-}0s5We?9tmQoE2lNA0GSNq~!yA7O(
zF49_D25KzJ<Vm*4be at Jge?o+#u&ZM at 9<B^O6V!0FWR{)ReGAa!>14Ov#HlrTd5USD
zZ3GD7^+&m6be`rq8qGuo%&ciU)nr+!b?VjXil}cA`WCNENlF<Qc2XmS;Ik at ZV@G6I
zr81}NgW6u_2sbk-qtLQRSsYP&k~^dT7E=3nWn^U;qu()1QE6Vv=VN^KGBGjPQCvs~
z>eP}$&iC at U`Y3&swyIjg*Jh-8Sr+S}_Th30W~V9nqZ}L}jHdG9luIpxUbUJwLeY@}
z61rnku6SpcA^wIT{-}*i=yuaO(-5Z=i7jqdZ?+Sm%5 at _=p?X_xrbLpnd^Y{lp|}rG
zgpC5y?~fHm7Kc&!h~|c8Zoz~$7_T`Zi>UJP!v%{3=n2s>sw+MxI*Z;vc`ZStsw+)^
z7#-_aToy{TE|s^9szbRhwK%VC*k-`a5WE-f;=E!><7e8bc2VWuNsehNUSkjMw9MKl
z&%ovC*1~vw7&N>hy6|<ASAjB_+=YMTOWU#|g46B?af_5!RT4298_%!3=FUDR*+T;t
zI#U=-VF+$gO{&H2qb!I&qZ+q}F}^&iRE&Qi=9xpnQ0M0*Kf^z$a^l>{u7T5U8s1ri
zRsk8~F0@)FjM%ox(OCXzF7(JHhrOBy={y)+IByU0y8UqBBbp74LX{q{12pH4AZvdH
z%<qG3Dv-BSB2dK_jy7hmWDdb at W|fWCm^5>;W&UKi5q1_{gM}Tqvn}|pu|ZaI@}W5H
zvwU?c_-;;<vUtsBIeyTUuY|2zECHb(BdCmLDWR+mGyy3u9V-kQ+<fgmSg>T8(rnK{
zi>g$)35iMNy*&MXo6*9oDJW^`64vi(b|c*>HCXV=u>&me0nFxDh8QlSiy`zN-g$<H
zBdRK0!ix^R1I5?4^qDlnn86$2EJSgoFPyZ+gR0isV4FtV-w>jTS#EeE3MUYf)D^wE
zFa5Iq3Rz*}xjv;c;R^fL4zs!n?swkiw!-Q(IiCi0OPL_(#)QR at oYRy_e7xJ>CSP3y
zvRgLp&}78C!7_jXZlYG7+_o4JcW<W6BWfKceA2`8()Cd=YGh0pSZ5DLRk7CZ*V*tT
za$GNWL`IfAOsfj@>2zqVT&j}LnIu;%KxjMr)IXZzsOiecd=GJ7FRm>xmtAGqBzApC
zc51&(n at nvYf50+HEhwr~lu at Njo1R@x at 6BgOFV+}!kc)hMU$MUL_PCPD&Kjws!GM9q
zll@#tfBvv-!$6}<hXezAe1A_#7}x+F*HIq+hYw;q11sx?qy#T1BOL=Nu>nZWLLUe+
z;w4p56s6 at L<>!Ovu`o0Q>KSnT%u~=lBs2iT4^WUb*N-M%Qd=t!*Y}JD7YJZ(V9jNt
z$Mt(^gX?!~uJ4Y1)Hs*{L8iQ<#x^#VT=ewz_V#r4%ybr3M)ZuFoSgLETS@<NrLXt5
zo~5mo*>^2{J^F_{#$)otnx2u4k^ZOdV}$=}P>;I5hh$-4 at wcPLKK$t7cXvz-3 at r3N
zzLOIFH7dUi9}_9x&#`(m%E$BFw2=YmN2Y~O=E0iG_p$tLjhT+&xfBp&>p=X^2JMH$
zhKYfm4LvghgE=GXb3t36nLaHiGdm{_{T~*8cmRTcHb8(Gt)7*^V at 8Kh7GP^eENfwF
z1^|Nog8ZrS1Na^AF!!|j4`~~|hu(40GBD9Hawsw~aXtL8u>FPpryh^K9 at j4bBO@&%
zvmzq{7Xt$q3o8%(&&D4fEUkbK84Z0}UB`cm>bKV4)c^lzn7LRPxfp*&^Bwg==?BU{
z|DpdNBU(L2y at wqlA2ZWmVgFJ8Pi6hTvS@s=55bEwvr98FDExu at TjdAx@9Y0D>jt#8
z0qPNdpAH*<u9*R?o`o&QhL at Cy^hf3Qw9n7Vhx_WgriJd~y#85h`H&#`S;zR7rX|1%
zU}OcbH2%AR`L7mx3oHGfl}sFeRq7c(=<7YC-u`Z3WG1Em>jJd3eyG<sFa&}O^nb+h
zc#rauN`MS4h#CJkHKzYf?SFL2@@Va^8;R?2WPW}7dyv0Z|94jNF|DU)Y-_Fy0szgd
z>1}=%=`2A;MXE-M=si_PyeM0ZIIl1;GAT!1IbnMXMdJz!m~0X^Ru74Ulaiyp3NuWL
z9Fh};MHAmtf at 8IT#c at b>o^-m1ww<iKC}MXroOsV%ZZwg6Fyl<oF(vMo9O8!r1~#;_
zWpZ~^e+LN`2JSxAtl{TbHu~`6Bt1DhUQK*>g2tS~baD1G-BP8-68P*;Ke6vXzG5W}
z$;4~gUiv}b<Gk&6*uhXa$VMNEEG)el#k|LdDWko8;JmQP)&0$%)_z&+=iv*%Dl!=d
zjt^0=yUBO&#BWcnuU|t8>q7Qu0e0^QCW!Px>`w=h`cCz1)IK7Ub+Za3F-+p12sUYs
zQ1M1Py`T1#jM%4<pcq^ofp;Rfha1aRTIuvUmN#deuy5P<nIh0D$q9`_wmf#`es^y(
zvM|}3%ldVpS+_G_BTSi786i_wark!9?23e at VwRrGfkc+RGT>uMKcL1!U?rzUnF!NV
zh$ra7GRUYl=Zz at vMCc=giPjOqI5uhLC>`0{m*o|v4PtOxt50~(AXQ^xL?KsX;@8jc
zXek28JoV6HAf^2T#e+c+aw95ZbcJX=w at MW-^9(Nr{nUWGi|NkT9eFrLHnsy*6QgI1
zgZ9{GMq~N{sTw?SRA=KU!Cz(UnvG}XVT`0`<jVp2UFO4;$$oDe0>64|xVYHnAyCyd
zI<Omb4Wkcv+;5yxVU!EfKm3F*JVCs9x-uiT-H+^O&|imJMJ%iCdX?*sA`mN#6wb+7
zEwD<Tfp-E#?$(x&Z>HR14ej>GE3TqFpd&vr`vjnOJAu_HRO84f%*ejPL@=T=@<WzW
zy|udVEqyOh4IM0FV3p7-!>tyAm)-nqt5_TF-ibV`So}l-HsNhleOaXa+hLTcSKBRo
z(zv%d&Ryl}#Pj$<7JcA_2ij+M{Hg9y5Rw$G2K9)a9i5SMZVWdm+=yvxcCx-MX)2mu
zNT~M(<Pn|m^3jAj-Nka8Sl&85c}l?9gKa6sSg(iaPFL?L#!>D@*O9Tpfl{`xv(Ajx
z(q!lVJSirY3!MVpnOdil52ci>VDB!uPjVX<));|>|MIv$>T3GyX-`LpNv<X4EVLfS
z$0=!i at 1^6~5hsCgi9qTr+==$gS8>schSPq^*9pX$Sg2-10mKV24mm9*0<~|->trJp
zd1RGYD5?*Jmbm%P#JP9`gcF3h?lg&eH^bqHZfRO-O%UE{p78f7A4|Cs6}RKsFZCFI
zLV=QsD%O}~$5*2}AX7|2fal($m0OCd=gydb(8<}3T&T$osp*UV8bGe-c@}wW*5F at A
zg?YHGxiTWFhlsM7WVp~iUw$TMxhg{8A4sr?Ju*<N(-4)<%iEIH-H3dYgR$us)2|v?
zY7Le`kiuQ=tU$3&yL_z4fZMlRn;svi9bA1OuC)vN{B7-=!o#8M!+|Nj$BD%B`qUFn
zsbX-LvVf1n=PX<@&{_~l>R$Q8^_31{^w13i?=f4>DSEKmcD%IflIXA0d~hLjpo;UO
zD-j}tl(KhXyQQq#FE;$N^<4(44Dh0y<n0jWKlg(p5lL5dwok~!m6N{^z7F>=SMy#S
z;8o8l^cQ8`(p~}o^r29<muP+r(<RpTN=eYv<UZ<#Lk}UlsJ)o1Xj*Ygq=K at wGEBNx
zl>E6ok9tijTI4vKqf69Cf*`VMt<MdyC3AaHt=47ZF&Sy)F~{hxeKIuv{kv-&&4Wqo
z(<%zow7GBo#2eC;;3WZ^HvT{!CzFXKMXWiefSJ0w!^$T(QgLSs2UM-lZT0zzMf~K7
z+Zg#)*rz-1i=xR7+h1C7FYu1e=nEjsCMXw=q8#ZhZ0mYzaNT?W-s;KhbwTzYB58kZ
zaVCiY>c6JZzBQBi$PZFnBVuIDBEq!3;PA*aC;kfO?JLjCVUA8_&tv%Fc1;;!T$xuX
z;!BwRg49jV4&I{6%IN{CEs>ZrSL- at ft^f1+=cV&5tJ4DxxhkadfbPw&_v`4%E3!wr
zibe%`Olw>f5a~w>@b{NIMCvbN<bvaA12~7S)@Y5pxDhOZ`1f9Y>md|qqXIzgw>K0(
zvGdJlY9)>_I=+`Apc07T%l1;`p^bUDa1!T$nQ|n0c!H9F6rk;39A56R2y{nhlII3F
zvdu>f)?8){DlsKeGL5OfB9hdvF|<$0ycKR2E7{)doa-hIQMv+O=+SuEBsi2Q>?&Q1
z%&o2t4TCH{E{z6PkSwAr?(UaxlUf$G-b<=imO497*I0E*XC7Fed#01dh?n;w2idJ$
zXQrVfpWAFj49 at CXOA(qpOsTS9`U?o>JJi8AnwIkmYd=ET6{8e`4IN`jcmyH3xvp%Z
zn*1<&|ApSDMTTvWLH(NRMNBqCQnmAz%T-yE=eUe#GnI+N^;hnO`Aes4{+HG5Gb4TI
zLU-&m8`Q`-?iuUGrDtZj25{Xb_E=0#4d>m+T4*OZwf>GIxq27)xle8ZuS~LDv%AA|
z;V`1OChD9Byj%$NE$dy{^)Kk3nk~j2bU7}%T at 0^UhnfOuQA%WfqNzb8l+zWVvRpG0
zY%rRc{d|PvtW=XX8VqC8q3qf!x<FdQWtaHLSG{qNjz`bUEsK~SW~G+tglCT?_KLRL
zTYgzWEKRTF?V(eOK^%Z at x6hD0cwnE2>YYrVOsf0}U6O--rxeZN+FN7%SY~?`EbP5+
zQ}Q7J8ShCx_t-<VbJ)1Jg5N>uaBNZHdQ+DB14{Kz);ru2aMJ>EUQr(?x}MuX_ZJnR
zxx~x&leNtRn&_Fb`ak0qE%wd%3inKJ-{pFgB7}QpL3}hUPjLgmXK6NY82*Ai?F!su
zzW^>&@wO3(@9yUGZhc%A?Y<fF_Ws3MzAch8bOmDNOXaY-xS(b%ewWhslLbsi`Jcu{
zDrx9C(rOw~XQ3na#H-qrN6wb_tj<YW`k+Kf+LB?pMxGwNlnVwrm})zmDav?|IFqP@
z*&DcfyiLst<Bq_s6KG?ic54?idb19c=H|fLjt(Jux>#Q)p1&<&kSsI!k!KVcD_<Ug
ze)QJbnoBymtWAbC*^Nb!fW!a&@p{=n4NG~6&L#EWYcQEUxo0C6*5Tq)u+Q$1Kg=r(
z at uDOmG0Vx#GCQ_L%_zn;Brr8S&4s9?m)z2)q8z0kV2)}$vbn$VxaRb^mXnj~l$3K?
zspIVvZvC2Df7Q@(eoPeX$<@hRZH&0G*_D7{jqL2gZWI)`Cp`n{8{fX}6_}$J(NVsp
zZUBzk>M`AI+!Y5F>v>7o+)KMmKHrdg8TNsYvp|+gW at 2x}x+{HPDF-iOAeM_+71`!!
z$dT~)7Qw}uRlaBdrN9hPc2b<#Fs7>!xpux^zV6vq@~v0wPZz2Mr6FR%efMP}O*zy2
zaQ7mCC<M^YvRsnv+1?liRX(4PHNV!1=Tb~O at e>t09acz13>?s5Wuk494TD=7W?UOr
zbPCV*Bcjh5Yf0DnH0I6C22y96INHKmQe7)JAfMv3e_pi^_ at X!vnm=MQ%dxa!<g$=Y
zrnKc#Z{=}$EaQ{isfcFfvFn={^o1f{c|6njh1F#~Z#u<-MNU2mKgshLv34h_Kzof(
zUG}BmbVCvGic1)jC|zQ0)Sci=$`<yZIv%e|naCoi<IXC{?J$?c*8#>sC15dprP`#q
zHeZt8J4G`)n{X79^+ZUnv(3nbK7Av+uv*Dg$J at FXfBwv;nlt=m at mf_S*2Npgt}H&<
zWOCD&{_-H3Ac8MOOGkS{u7qEZD4ozOzLo46X+*u4OeJx?#efKQ9l2n5ntOQkxd1|T
z0Hjz;ED=XPC-u%PCo;dt7wGKaf$*}o?o}C8LXKFvXvf4o#@PoLi8n86z10fDT}n&l
zIg%Psi at 1nd(+5)dRaiedt%Ssy&sZ5|f3t+v7O!14>-i`ey%YV#r?KfyxM8dc_f?0c
z$mS~v&lOc$LJ6>~3xaoCvM-?~T5;VsG_O~hN2I({zNm{LeZZ!!xM+`js~jqD)D4=J
zQL5pXr7Uq>ZvR%Gsi7>rR8 at 72y(X*SY5HvQUSN8mw9k@;Z(GTeJpsaN8PXyaQB>?h
znEf^BlebW;CU@?rw#zhREo(=i*Gj1XkAy-ihry}2PgXHC5^6dkNzEN3 at Fkm?rTFHw
zQ at v8ML53sop*d$RjlG<X&ap3cZ8rE0xi7uv<ICKE1~uGWB-T2-R$mM2F)O{h^TTH8
zKZ29i%U;D#MFb at WVNvw)*5$OKk-%=xdN79-Am6ZZDZM^|eTDHM%2a8`ac<LLWlNm2
zkO%in$aozJZ(L6rd<$udgM_<bmSUjeC7&uFqnB7_%O+EVZ`5iv$rgT(XWNuympDpH
zVN1&VU?HmX9s;P at 8(}(L2sdb5t3{4um41%BVtY&-KpV8s#U}#FXQz at Z(9HEwj$cPi
z#22nrrvAX&d%lq)6b`%5&14pO$J~J^0j5Y*ZDQ+?TC?YEsJpx^zDRi(5VG;q=<3_9
z&cxSFx_vtywvye!T=p4?$r72KKHL+-GCNUu=P|j?UIJQo8mgRg^^Sg>X4bW><f5s}
zLN}<EC5Np>aFY%D>XvTy0sb}FEC=lY at q%#`&5uc#eR%!jZ3DzvEL(hd+`i5B#^HE(
z5c-EO3%45*lQ at adF5fT=zAmZ;v6s}{&hXF6^C!AWE*hPfH8k*0ZOEbuH5?<Y>IFEz
zdGS>N$alZkHG at 0EsLMkbm&1dq-qB72t&KA*U^a%^ND97{1;t-C*NytjZaX}1`(RrF
z<=qxb6V|+-Mr*dq87)?9)w!~cWB)h(4s`z at 9`cQ)>0Xl^nXPsNrG9ppCBCAB<-S_&
zp!Z5{&wNfz)jt3yh<QBI&zyh*b%(NhS00L;*sRmT<`-^-J&d6fUV5kvNq0GuzB}#c
znS7l!Cvp0_pE}=TSvfMj?@|l5A?RLA!u{04$%D}mMtP#VdL*!En1RS;f>JgzEa*J;
zo|?*-C*gzPkx65x#d-ztOC|*DX4}sToAfkYQ{k%BXKk@@YLz(pu^IZ6PY#MFS2*73
zZJHnZC2Ev7)qfRhyHEWVjYTHWu~I`u&Y>r&TqGry0+KtW%2UixueO3cWa33jl9UxQ
z{#Nn+Z9~%MP{TlU3oFM}RLGFGpqF#~6Ngmp_TIEwZ)@MbiqpmlKRYS%&r>A20gzjC
zj*!h3v=!ou_kE=1v<*`=3i94V56zIbsTE*KqpP&J3LK4!R6GmMQG~+pjfLTS=~LWk
z&`UeyWQ7-rVk9zQG<D5<VM4yRm)W!wGkkGuB6Nj%nc5Uj77WZS=!X*Xqhuo*R^1_3
zu#i>~aN|5P3L*!6yRjgx+#pu2_wG41Y=a*Bq+>gC^A=JY at Iq-Ou`ivp#Hq||0}lEg
z)O2_cNn0j#cDcKVbydF&WmwGZ_HFNQa_G)ygH8Wp?)`JlMf>4VrjbG=zxF$r$Gj&A
zRh`E+G8kAh>d(CAznvgHeLO)luzAcA{dI<@p|C8D;kuv=II8PFv9$4#&lbcGuJuhg
zo_G%9Z&Rl*M*wkm#Y^zn7R3;USZT-0c!cw!*Zxh-ZRz1w2fp_yN4=y$^Rqkz9VB~R
zwpz)vy0ug3ZLy<I8hnJ#NEn*?-h2$vA5$?1!?7<pB7Mg9>J=$fJ<zwhA;|c?cv`{p
zfK at pb9)7bSF|4X9OC?O0%gTNY<s(HAm~Jt=#!g2OXU3N@*ly1*MljGhzbdO-Fq)$F
zZh#+W3r4xMz0b<`h`0QT-?kL%I1*@;x7>+ at clM#$6uKa^BIomDRjsP_MEYD-m;qq_
z)hVEIta!uKH9K at e8a%VtYivD49onHwk6Nh at cd|O}6AMy~hF9sd$P`EL?q}<98|=B>
zorHvfQDc5j_PBivF6Y}pezEBc=CyD{I#C=|g;omUYMdaB90Aq*Tw&O*qujEH#c*#f
zdjQcHW7 at IKF)#%Z7+PBbc2Q7d=cjV>l)_h)(C{d~o;+U>LXTZ(EIg5WKJprZ-r0Qh
z4Qv>%V?=#J11Fb4CVRT&xo|*UGJla?*?H5`;VpYdv at JB1!0UQmdu!`VR^P<yx0w|L
zCJJ<K3Pf1TR at 2Hj5M8R0hBwl+mfzb|MctXiFulXTt~VIO6??56O^~`sY1s=wk56(H
z@*zdCw`pd_r1Bc<yrYeKYg>@gzqRS+1?{-a92RP(Bttwm_&Xa`Zs#HkK)52C at f6q$
z<|%&o at YCphCDv5|ZQj&kGw(atcKRqz4-G^Q6?)5n>G68DQU}j8!W#ivjpuR2+yG61
zujuk=xUwB!`uRN(EZC&59%=}!%dW%%CaVtT$5?p9UhuLG%NdQn+^>S8yLur^nJ>XR
zn$deAvET%Z`3Pi}?1XsyC}NM_C7FhFsZvIiC>8p3!orCh;U-i;s;E{mCMN at G`+dY~
z?zE0^P<s{E1;SUTW8E7}U-fF5>G at cb$1(|ZsF1|Vs;c8VKg$VFh3WR1dbXd^sEQvK
z>Sh!Kte-IL6N|nno6wL-(scWJbS+w>(La80T|V4?vv5;UertEYn|ofkdrMgz%dJ&)
zcQukaK$BW*K!aytXs7zEI21{$9Mp5KPan5l;gy0+cej1%I9MDNJQ-43q6(CNR_Q#<
zia&^w9v at g++bqkki$1<ST-$QI98o^2p3G$|5$YXW`Rcm4T&^F6tZ_Rs3phWv6+rB@
z=u3jn8mKQVx!D~%n$uaG;n+J{n0x&(M3q~+Iz89UqNnazL&xzon=PUF{I)V;)QXGZ
z)`qVa<^8v&ozZH*q(6<i$qe%53qu8mk{r<5QmqPAIiMNUeW4y?KVxWQiCIf;hwTDn
zF<L9ssC{LAu>S^V9@{#i4+=nIi;T6b>s9mSA_-2DlkXVN4=RXlbCt5xH!XO#JT0I(
zuo**YpA1R`U&Ot(b<})9n<}Btb?l_7lg}(@nkz at DI{Fl%ZdU^3LOA>+lHSxIPQP?7
zjPq3Gx{{)tGDaduK3>A-7&Yx;XFL_UQbNEZ|GlVN!U$O*CX<+tL{^$aBV60!9wlK#
z&8ch0y2F9$7=qL{aG><M4#<le#X&J at iwRm;Vrm%PM}U1RbwXOs&CY=`k-pNfGK>rC
zD7B~$C$q>GtT4I`NeU7!yR63~d3HW7Q7G7XezAwt10HG?0gYA6qO6-mO3GbLv&W2(
z_sMgQjLDj;BU^)#ukd_TBUm|_nWmdeN08J>^=!qOb`Z@>YP&`b?vtpU5`$2~K0dgq
zpAw$Fb^jL8-u^sIVy-fJ+ntmv01 at vfgg!4$ZQ=_oAGHC~$B}aIcH=d6jo49*+l{xO
zd0g;0ekXW)LRr$OP~Dpt*cf=0VdMF6ui=8PaMQHc18PiI(-G*N;BQ8xYY&TDVt=)Q
z;7X4YV+?)4R|aeCPBHY{ZC?rN!liYVfICHD{#kp78+_Jrr(_bF)nXnnsU&PD0*pyA
zJ4GDtl$g<vPP?)nk{JepxpNA-_jx4W&UT^g at Ie48O3>t`Gww7-ubI00D$5vC(g=2h
zCTH=5F*+rx5gRIxzH{}!M#ymno;6Lmukg__UmQ8Yn~nh~>`vinUJadDE(XY!cRknr
z?iYUa3d=DharD|OUv{tIMUS)}R~{+Y4K0BO?n*n!|F!a9KCC>_B8snQCEkeAn*%^V
zLj&vYY}?9cNl+UxiogY at PsjX_p_1A=(n@)mFhcjmQm=NIJ{0n5`jDu0^NjqwJ|r3k
z3ml#{6YGj>E&<`ax4p^V&<j3OEdbdocJ;2cnoIhfO3OyJ2*cugQ+uxQwQ^`Bhgr4K
zJ3A#1rov3#gH1X{({PwH6<dgoI?2s_Ze)|)@HtYP(;ot=jZz8p>cfh at l;C{x&XRz?
z{!+08E~Fh){~|~I4c|p~ESLCnwG_jV?9&S>i}^Dr at gsaZI;e<DZ|-Nki&^qI#4;`z
z)EykjJTIzi3j9;qwa_p;VTk0vxQSAGhr0T^uYsJNHsT~Uuy-s at _khbbn3OT;$aQ(`
z9+*Q$;uZM4=pR=+ti~aX3PpS!ROy7Be0$ogdzbXVhRMBLk2Wl^=*aA%dp~gu8tSbt
zPYnQc*$@Dge)C34p&pGtx%=$J<1`p}icbrJgMk4a4nJij!67if{+o^ccqIBuesZ(_
zME%kL1AAmF{}Snk;-9SN-$~d%y#Kxd`N^byq+$OOpNHa~cK(Bu{eK1bcnb1MW*>@w
z8vRAd{^!8_LjBoAw1=Vm)5`A@?f<s(NYef#um8=?KPcP(ZRwx=^8Ob~zbM at QtChNc
zvGR-3{ohs|N!`EX at L#O_e-!T@#(rJ}zf;^EN#4JN_Tl2t`$hTwInzIZzn|zoGT?rR
z1l;d at xSzPk_D90~pXdF*aFHkv|B&!--u8I<{}c7o+wc46e~!P#!z1j!&f5O8^7}LK
xanJorK9K)&2mUAW_uKgKnfXhgX#V2~Dk}-~@c0D-Lw<PeKLG;^qJ8}K{{X|<09gP4

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.pdf b/koha-tmpl/intranet-tmpl/prog/pdf/layout2pages.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..59d0de84c8c0b0cd62c436a4feb05ea1210ee08f
GIT binary patch
literal 25541
zcmagE1CZcQ)TZ4wrfu7{ZQHhO+qP}n)3$Bf?rHAKw;#6Z- at i6hshoRH&P^qG-%4)s
zkjM**(lF36Ly-&?4|Wf>4(35I;?v{X8CpVdbJIzi*qS+;<1_v3QKS>Kuy!_aq!YC^
za5fP(F|so@;pK&La&|N^uz_;VPEj4V-K783b4le+i=Q&60s;dlVU0FM6BB?Nxzkx7
z4#k}I>1(!+x~`xEk^1z+4jpDEehInscqe92az9PRr at _LNp6K~r%G;yV7czKxK5FlS
ziN7{p9uF{@(_8r}Ca=GA{&AWU>X~8E%w^NE=nLoxh~qqT+8rGLRyut9w9F`I_xwV2
zVdbIKn{695Xwi;!gM4gJI5K5{D!Z;<DsM*M^!8>@o^)>zNvY1|@mxM79U6$c^fh-V
zc6=ROiy2kg1hrRhxSXtDmbq at NslnPZb2w^9S)PHaDvdP>nFXPvEHK?%Z at 96B=7ch5
zhOE^I^0~zTGU0~CAZmn;Iy2>y2?Sk+R9WHx!*p6b7^p0(zyG@}5G}n!MZ<DhGba5K
z^=3fRxxL=y21TWGx_2<e=JD3vL<^Ktd#x4>r`EbkFpO at jXz&y&{@YzE?qkSA0zFh~
zs~NS-m33obkfvx|A}Gv6n(J!9qyI+s`U9m8%%^AX5DahW%j-U&57%Da=0M8Ae8MAT
zB*6`?5qz4!dJ<ZHF%RD17*<*;9cPVKq3;?tC1vFs`}lbMoFL6VM-1 at S8?Ms@$Bikn
zvbnlgMujKXLTSlii>`)l%f-EL09v43;vQ_N<pXD_s@??hOLNPi4^!oQ`L4<mun4GQ
zHj$m at oINS8MwvEGEe>{xr`P-*72LEnL)MHDSA%UkB0^mc?_I|5cdT+GkyU=KUIX8Z
zu{FmMKvTalz&gW%S>vcRti*UB_83 at eh%rqzT?6$JAl(g1MGv)5Ex~12;Ks8=c#PeH
z0EF+z2OpfEkz$`6edTEi;I at rg;KfQ*g7z_b^I#>r$=yQrdo}L{X{%%@hU**kf#0n?
z*r&!cEKSK+&y`WtgRVUYMfMjKVoqeT`>;Bgh;d;Oux%PZVRC!)V{IBDazMndb%mkY
zvKOYU`gq-W60ZLK?HNtAoCUv;-5Q{0D|(8GGawYNJLhajcX=RF4z2E@%368cHEwPg
zzA&$qT|JOp5(p?0TjT$9!{6wifuR2R=3l_Z#_%uuAAKzUA9u0-|G4Wv-N%5>z{1GF
z`hR-u*vrd1X*A_*%G*;amAA)cvX%GVr;%o|)p~q{btDh;jes6xeQhXiEftTEl at 3em
zcPR6)3_d(CR-3_i6YTV{YZs&!5pEWVOk4X0(e|{>V!c+T4V%QI>-phMaHx!htu5q1
zF2*>>n(^z+_l=*L`ffId)5+8nhuKUvQ=Yi=Z8Q;ZrU*7voHbVF#!ibbI>8fgaJ`AK
zn&8{@Lpau66a<2=wdG>#!Q5t_NO)IZyk>{RWslK^Dh at qS@drA=`JKDB`P1A&AGH9v
z{V#WF9PlCe3tg6_Spgl)-PE_DuqA;#yf at gTHrpI*jET)<hDdo4vL&lF*suAev}HN+
zeAy4^&9K(tFudH{z;}mW=53`UrU- at Rc)@a6fz7hgL#4i3A3<Oj$dfbx>`=caBLI1k
z%U~sP70VdaGB#rjneKJNmUWz&t8DG3pHVRnh;;?wb$@B|NFKWn`%wir8oO at 452luv
z5xj4`8NnplT;W~*vU!3hrKLOza{&eB09T-sm07p>UBFb|!g918{}bM at YX@hrjYVgM
zCv?vXr?bK{NN1?8X`3S9c~)n<sbji1IR_F?9BC6opKz8lsWX<ncY?hYA5<#C;8Aqo
zQQQ9Bm|OzzIZQ`LO1XJdM0{?}u-swb-yDFK+|EwJlRqenVe?;iTmB>SwEpX2>v!XP
zgx4{<{gpRjR&&7Spc|f2adwBN>^Nt2NIc+-U$ldus94JgwoD!w at t1Kz$CKtr-eL6B
zIoJoP!C79NU7T#r&0?#&Ew(nBnac?)sVAi>RBFLk$Dzm1lNXj&sj6zKAQO|4QBhDm
ziS0v&Gp!jONeohTi<V22C4offDXdX63<MhJQj}1`;>FP`!vy>=+kxREp!_XcvPsB>
z(bDZXj4;VYZt|gv$@^K!>1e4%$0j9$P2|M8=7=Fo?QK0+dqOgXaq-<#doD1l$c>Vy
z%G|hT1k7e}Y>*PzNSR4AT_dNNMl!!|gLT^^wNX}6QVNkcdHg;76Ne9$AhoHDz~T>1
zOvoS>jOPuKvfDh&nK5i`ZEYPrxOq%Us**$-B3KGkqD>TAC at V~<Lm)X_ocY-mI_cf+
zVB$iJd<V<fIi2O)60rh%owOgfwgx4d_|B2C5_@^l8V!!`jVsocvY(V{ZE)B|Ek2yZ
zvz0wP6w*I<0*}MfcKdLclKacMKW`C0wfMW8oM;N?7}2t at IGv1K)sfvDZi4&i*_L4t
zMdxkLTuw&X;Mx;uz`YW^t+DAQsas2mXe?}QFJ%$!qUd=+(BG_(d0J at WI?NJC-#w-w
zKmZQ_GCaAR_rYg^=joLbo36LdJN-j-$Q0Q3ZY2`YZ8X%a8{Fno*N0QHwv7nQn{0$$
zwH5bucqmzeqTyjk%)<I}S(Q}6y%*jRCW&S=rUZ5J!{(vrtCow91Qj(P3<GrATmhsC
zbWYq=8GMszX}k3O1)D_5kpf_k7pYlC8U4COngRmkRWqaC7AtSBWJ9w6AmB}$m%IxJ
z0eC_U^9v(LOM8v^vn4l%QrMm)%9gns3bI_rouxKZNffM!7pXAJZ3~H at r=1!~pODGv
z8hSoZkUJgjg;Vx8Q3O at W%OViDR0DKSSZ7`0VoA0cR>`lL845O!B|^RU`*{rAy2CIr
z#mC$bLLci9l8jZ%+%~})YI at qbSeX)>flbQpSa<tHuUt#k{l`gIbYtdZw6)=XJ^269
z1o)*!8)l|>z5F{3Jb;OsWjSRs#P&)sYKcCkSk63_&E(Adi?vkJQnrdPYD>8p%3D=L
zI~P~(T}f3kUt<gghKE_XJYkr0209nO9%PLkImLvv#iKwgI*R9 at Jsw7^>wKf!Jw2Ie
zK%a5;tn#sSgJuATfdHPFPPLpqiN<%eW<aL3 at qOCzDE4GIYI-1B)OwR%EF%gd6vDKZ
zGol<a%xapp_2b+ZRV!2<X)xCG!{bJnUHbKbeY at 4^;9{P`LFm;{6c+c$cNLd26|`l)
zbtc86WN%6}_t!nqHQB&h0&LHA-Q6!qo`rRvMEyp}*2dFd5S#5f2#64jRC#KVg-Cv?
zWF>HA=IEVgN%R7Zl}ddGRXmO$gh2~b2lSY10t at WEa3X)DVh4lJBD^`p7xppqPq!v|
z$>+zA-1`o7_!fsFfQa9CvW5y^=iv{K(#oO5ve9+Y7sDyYyW;mT7Tu8t%la5=0h5xi
zQ}@#cw at s642{D{@-F4XtwIZs@!L6aI&+cU1#zkgRLdvx<wG3!wE-&n4+1au&E*k3N
z1|=AmE<WV|T+rTQVOXGgYhv<xAvD%Rq*<G&^$x7Z`Q|LJC*<;n$0L*MbGv>Xqx^h7
zO#$DNDJZ~S8St$r@$&Md%PPmh+J?jzlu^+_{Xo_Yo8bsiQWFgQJBba4 at Z9#^N)qFw
znz1RL+uOVC?=5A%uYz{B(0yJP74UjzBx3O22WQ)EcwfW)z-WCN>wlJ`z-0{|rp=$S
zDwf8RDy-<N*Y1E+1J``&*T_0n<ykizB?|_RregAffi;zeE=H2v=}zcZS_z5lkfWhT
z9!H`?Q%25aaHdH1wY%pzO-WQ~vEHeJJ!%L9#aZnlHKjF;mh{6!zzlK<{PX;Hmg3x`
z!S!?c`Tgn}2X^DG4H0y*)-7I at SJR^^d1N!76Ue?M9|rb4M^}}o+-^ruYnV26=^W}x
zTCEzXJ1?o6CMF!&3CgU?S{j=HoSRQZKDO!zLZ?Giya}{<RJ*IvxhwiLr;9Kjs)6tn
z^@D({sKu>a-V^ZJ2H39hp6T8=`tgkX2jot3PwC>?2`^LB&!bN^Y81dJBQM+$sQYr9
zesc<bUMd?&o27kyag_>K-D<;u*;!6Qdm>D!Fp|&gQ=ekeQ-{;i)J&GJoH)*9MShk)
z_2(|_%$=N)2{A1P>wmIrC5!uHJ9=dqK2NfFNwtQ(+}a>m-SJ&}Klhsk>E6~=)9Xyr
zehgA^n7qYA{K+LGlk=^a?*+Ar8`#j|x3g6aMBHx_vw4%CTG4`6j~G-rBiy*kw$^)5
zT8EM`7^+$Al2V{ZHIs@<)ulL=G?*?^t%;apyrQOvb9XpG0C&wVU#&tc<mj&4zS3v4
ztbnd(0sr!~tl)zId&??~yv7i!X~5#Bm!w}S(Jv*&Gn%X320n>Gc^NtX4osms);^8w
z>YQ}-^=W<zGuy<)u9f0Z*woDl>N9*1yOX1-!rNHNUpiB6Ax$Hq`W&{~{+JIN2G-kL
z4#<PG?zX$$_+V|^Ln#uiUq(xwC4%>*$SzSiF88LCEke6 at NvJj6JG4pwCaet<vQ|EN
zi9j2YI#5wyATh+s=LD?Cj|+CsWGR0tlp^M9Cp>V9PB!wf;BvEWu*=L1lw=L2^`IQ+
z<e97tCCiK8COQaimm`Kz_;Xe;7DZUP{SuKaH3WsAhjL#<Sn7>FL5Ik1TL2O!68oGP
z7bmuXYN3a$hca$}@G;CQX at LYe?5%f1E}fR}D`m1a;*EJK0UM=(cmb3QoePD|Fi at B}
z9K}#M8|8Gk*j=HU&=UVM=pwLuY-VD@>Nq~^6(Uz7PVjL2QFz-m8SB_lI<?$&E<8q*
z27(j$?9||P0S9}i-XW;oDM<e<Xz>XctUk!MwCroq!YH4GPZ|9E{H0xDfPP88+R#PD
z#nkWjO4(*VL at Huqlm+~q+$`U%-EK!`HA!7#G~E=El#`3!+u*BGB(S!d$^68$-mYrZ
zYPUn4?5!@t#)I`K8J@?)1h)mB5872wQa$`rJrZ1K+U+9F3PK4S-W+!k0VgbPzPqSE
zGgNmRHmR^k{m3r?T#zcV?y>=-XYD6)bDFFD3m#>(SQIP5S&zG9 at Gu^RU-JrageU#g
z<7YH+?1Yp~%9CA%*+hp!8GQMZTMW}bSFU_;H(l{IP+^>hlW1))ZVxqj+Hd1>J06#K
za;L1(wYo at EF6@>@R;qEVM+a?u?E#8E51Vq|tGA)KndKE3?w00n=QJ)ZTDh{ffP8|L
z*y^{AH_LavA}qbiJ}sH#RoBZqma+;VbSgSEgcForDQ%I9X#1~`wI~TqB6g?=gaSz@
z^Js^!k##6ZO~ZDmNrsUM$Olp(YS0mlbGm0VN65O~<6g^B$+}&um&Z at CpSh2jN!c#F
z=ftuj{Q<j9+D`FJv1~X)0t^>SY~QTat0=<t6V(sp?76x4r!3yVOh&L}37S5=8&|3+
z&*3R&)s9i!Qlz{Xo5t0N_oHdXpRbI(G<iwmkBq$3hv3H9@%Q!7ToeI9w86NM at Fw1}
zz4&^G9Z8J5q=zLBq8>2lI0-3<(Kw8%V{etwyNP}zNluKsgniUWK8!mghqxGO<1&mC
z$qgY1U)N&i`?O<QY-|4T<L;UxMU1f%?j_MA7}d-&P|1Dq_n;VlawCkwiUy}rWJEX*
z_0pMV$o|RG@%61(qu<OA-QJ3%ZH-&$`)RrRNzT4_<68_Fvi at 9zhd#;1XoqU#bSaPt
zG>icupOihi4~!%n)JUB>I*e`Xdt%P2X~qvcq|rpu+RpF4O9Nw#lSneK`VtEyf7=sF
z-#gP{*ZW~5s(A>I7CrF(NuLr~Y_d+|@Ks1WJqNjqV$3y5s!nSg6BchGZHcy$=A}fM
zQ%J8wOhv!pf{E%R)=NQYQucskHBE`ui6%Sq5EuzgD|$%grXn*bkr=^5w#=y<E=OHm
z5lPFcUQeVeu8u+FNZnw;mD3eNjSK8=gd>p?g7gGg6eD+D$1o<lkDU})vkt=0Yc?7!
zw3_gC{iJ%@Gh^Ob8J at lS*21zQdt1$6s`&(ku${8k6qKfikp1=i(STQe&i3Wz1uN7H
zTpP~|9nOOUs)Ew!KI<U%wTKScc2skDmYnH!0^K7N6e87yHSDFN1HRemn3aWfeIitm
z0^ZsAfO%0x6Q+no;NR%Tpi5b=x~vfiqSZe!ZL=CT_bbxb?ri?75m`#jTT{*ADe{sd
z3J~=z!!tNpjuH$1n+FrlxT<TpSTu&FU8qLkRg;FbO2noIyuuxYq5Ntr7HiOzdhK4}
zLxihAK29DS_jlp^4pIn_NJWDcL|8KB46`|bsjL<DX9EhK`7p6*PGh1gm9ELKt`&=L
zl4TI6Y at WQRj{P^i5B$sDc}03e558e9uJ_tc{SWp{*kOpMmTQZ~P at A~q{hr0=`+b3&
zE>}(^hc7lB0U1i)bWQC{kEuep_qBzZON-Qf%hrY5))fo}X&<p2C6{{j&vswEvDFj8
z;9o^>fR=zw)I$IitOcUoEDEH at v2f-Mgw?&@iQw5j>@V_O8HJ5*e<c+0vIqLGW4{Pk
z=RDE8vExCvsfwv%l$)BgFC0g#>86W3l1HG<i4<4!8z75dPyBftm7dL*$=qS4c*(?N
zLNFe{OnN(&%w+Bsl3Q**{~#a)R)AS}bOq<}+ye+)1fTPz;xg;6wiXpUY|P|BjNFf$
z!J!&h%t=YfS=>kA;-nf0?rdFHaA^sY at 2YKXu91~*x3wufDzUoc&h2dB7nyX?$NQD&
z at B?xhAFk^QYGJDllV<)WTo5>^B*Q<#ZuxR|5h-lPYbpvwH|sU~HBn8$EgF|rm(t(b
zPh{wJn3YcV&JgkWfa12=ZD(?RMCpbEK~&k)MOfbUvf8U(CO*pz8X((E&$)`(mVh$T
z(W8gUa;ohV-&m?EBA!FIC>8(lmoo9Mj+a~XDPc;kH#c**gR-(_Jin8ZuHoR!hZPrB
zNhvQi_cA4|8 at t<yq%<|Hmr~Z-wE)=j7?;gdOk=GvPbcUA+Dp4nfqQ~00^o_TFK3SI
z59WSw=h?HdMed!$Oedb}gO~IZX}PTSLMHrv2=#PB3g1p_s>y~@?U;9OgCdTD$B?B~
zT>)_@;X9N4YF^|6A(R4pa!kok<xqJckwI_ZjKI<PP~*WrU?#vQI>fA)kj&n5{L--P
zm at E+dC|2s`^0bFog|Hxi&naNEFn7q#T)XxS0xGr<I4VXhno|+Wn%qH^>0^*Vps1*)
zzwzALaMCX6Hv{k`{Wi{MUl(H_ZG6R1!Om<!qKx<9)wA%jD)u!N^9MEjEl|pivl`@G
z0Ml5P1QR}D-B-~(cfGs(<g9$Vt?$N$QXcaCxS8+xyPhOo?hlE5&o&oPdY6qRZ+V%u
zb$*6#akAgn0bU(^+<bf`HI_I%zqBXUC}*GXevQRRt=PzY$#}+naJkmnV(aPUl+<j{
zZ#%xGu`O4aW2*$m2loDq^}B`r0bh=*8uwhxkEj+43g at if&0a7SnNp^b1B_RJ at hoR+
z#(0O(?&+1;Ej!iL<gS!0hp+0W=d2`!a!JXIM*NjGVm`%KAw5F9m9Si?u*r<sqEK^k
zFICx8$)=JmnZi=h-z_?)?9UbaRp=0+!+^$dF)&5~fbBxlPTQ#r+f8*&*j)wmi(%Dc
z6(tP{ko`Cl{1XU&iMCV8^PQ+#do_i&>QWt}^__}{bf|6Q3Vq$9OaGMFHT6RC3ZaWA
zGl*G(+bk|KUZH01Nwo_~i~~t(T?o}o=Op~O2?x1YHlzYa`5VkdKtTLZD3#Oc%wXsC
zboL(J3Y8gpFAObCfiK(d>uaM~Z^f{+<gP}m3d_#|y>2_BGqP(`(TlBA at inIO<%ZXv
z>fY*&Lro)t>3Q?A&t*V%!0*BSLa4JOIap^(-;++r7sR&=(}#z;266^;9PJAH+Bm}~
z#wgBcra(UQioh;hE4PdF6}ki53FS&~5R#L646N at 6_VFcr)yhVIMG&^O0I`DnPIzS%
zW~EzsP~g2_^;BarnM6TO#XyOGg8J#sTUn#TZUJx6DG>MaSrU9QR^3xLiC9Vp2QC<&
zF7yl#(O>?zT#r4UWEp at 3ytXoqVQU|<cKt;xvp6V6z~8s_a;G2u{M%X+4U?3c{gki!
z#L}*h8(T_>UHZkXr{53!61H~bJypdWAGtRth}9O^=8xwx-4CnqCn#-hplZn{Xvnm;
zIw-g{h&7>XtsG57GRM!oK>cXF;3hZj?)5G-p6uGy*3U%MV(uDv8-X`Mv-ly<&jo7p
zuL*%Gx*&ZeeBe|iD@$vL^GsD0HE~my`}&KI at 8#d+ycK$LRVRS$g{SBS8X}o<@xx-u
z3N%A-3banZ!5QGWFCS%p+!j<pPLp4iw9-F4DNoN7wiX<tG7V-}=bSPQq{zXyacYTL
zFr9=82IxBO0- at PDSGvMy)+R)37_b`Fm%<M at 0uGt82YxMwwv2?U*08NlUx(}LFo*h{
z$(c0}ls4%5{V=;INsi4-8M+V|7cj%OaGc4+Y>(}C83w&><Jo<N`IXn*)w*U;UaD=B
zvL%d8M*4mp&Rlw_RWDVjo>`OXnC9-C`9U_)h>oktqlW*64~UypH6vPQtuFC<QALWw
z at gAQ?jFx;$3`vY4iR>&QQIiyhM9F}K8{mgLk+N?FkxQ9Mol3JO$q<T1csnOJv&~7N
zPjr`vM=gF_5RoWJ=$<z`YJF5(>KxL|S3Yq*<Nbl?z6K~Jpi-w`k$diQgKE{EO6dMO
z%iZ-vWSx-OC&u3P`32q)7d`xaP|X!P7$7Zd(IZk3d{R3!aHIS<-?R^F9)k-vh~~28
z)oI1qC>Q3!QRA7lE4pFr(`shDY7M1X)z)L~wfvGRGrT$A0*jEPwcpwyv8}?E>n60f
z$9o|wsGOe;?%&STIyPaAMm5O2R_qugk$^SLw(eLsGn^%1nK8w@?t(kHSEqMocGA)A
zP{mY${93_%!-R&+g)IVV>LidbsGzOCqVTaD_Z6A98wpxzb)7c?6x_>kDjS${R}R91
zdh$%@?yJ-qfzI&@n<8J=5+nPEybv`TXg_4Zo<g*wsiZiTE{Bd}e*s<jL at KESx&%#X
z8K{ajnbPsOhL5g)O12tPsCWqdnbXmQ)5MF{E;i6+!KHBvvYW#^*XH;6R0`9>>tTQ|
z^Y599=ADc*!?v_3*8CH77@{cgiA`?hJe?+HbBcA$%#VR*;J5<-b#U5`1s!NRWt*=$
zE=p0uo{+bRwSXAikd^$7n<aDKLh at N!DUzC$<>mFlAHVLtk1HXB9+J_aD*_<K^?n~T
z;znd1gcoayA=<KCiD<ZW0qVdV<ngv-jqv`!rYUqPda<}e?-~vuBg+S8DJ_+jrWW^l
z)G#XsfRvh6LQ3$q8FUItO}oL?fdP_lb6s3bOv}{_?7g%rslsqG#saP26RXrtfT6{w
z#COJRVzxRLjbB1|?hbCqG&_zHk)qkLB`T!Us*`J#tb#B?J>cJ6cQ5AaGs+W|P$FPy
zEYGW^Xw*8}Eb0zpXB9LR=r6PtIu3g^;FoMGCp;_6h)2CyJ=Vq7 at 88*tfJzPNIt#59
z9b05*9L(zX?h;P)bgR9Outhv7`S>dj<=M_=L4D&AE%ta$qw|P232O0|Bg0Dh&)Ssf
z)BxD)A?v~9^`Z_ZBY*5WcCZx;tWU7v%zOm^Z+=6x9iy#1JVIl)6VdV2EuYtO<iK6c
z9UTUGPaJ`Xv+?a}<cBZ?y~(rhA_*wQF%xW4IoKf1BzP<444spF-g_;uL~xUQWju8b
z;l$sGLJD;ue?R|3ca!a_5q}m2-=^TEi03tn5W+5SMzj<63GXEOlK2oi_>u0L5qpad
zyh@}ulEFa&ulDtj?oT#<Tq1ffY(J1=sZ;I$&=~A}Dna`BCH&M%>-8zqwMb~k2JZsx
zSSud!p8E?oH$O|9y|q5&3hSobS!|q#Kfy+5(d?HXwn`)lD`)u9ml5rMA<Bw>5H~7d
zCP5_Jg(3Fh>m-g%F1!*yklPF?P>?3%H!BiGZI5dFBrWJk9i<2NB^of0?#n{9iLVjT
zBm^Rs#owuLF4Yk`YI2e#*wHWeAl}4>mRLkoC1#dmLy-{9W0jaY5kK%i;w8yS87GjG
z5J%U>%i<2MwcyQT7_z?cp4U4|AC!`KJ6++Ehs*#NjVNEz#MbwdbSib?KSfBUGXz)U
zq|s+2nwEG_K!!yx5Z9!Ii_$Bj4}i_+j|s{4OAO4EGo2j8C%GZkG!fukJ~osP`Vr*i
zdlU2#=4s`~anM25MUp={IQgpia{Kx90&zWXARMFE&y>d-9c;o at azhlI(K>@o&-^Mz
z+VkC4HzZqOj-f-VbN%G{49fFBJKVkJaARoOTHM;HKb*k at Zc|#sy2?W1<O{|K2s6(Y
zuqS`AXO*kNLWM at XUhv8V#Jsk2*kGBXpA}%r7R`q9(W%~xE$*eRw#KuYq0wv{!o6#^
z`lNYAiQQUSWbl5szbG2L2Wb0~)cX>YbrGRh^65LJvBoWrwqLsUX0MY+94C~~ds!Qn
zJv{gz0ndrr`;-2sIfH!L-R~yv2+?Hb8 at q5mL0d4o(>jPE(DP9^3H=w at aL<8JAtOF(
z<YmD_w!7+QM>%Umkh}-dZ>++~)Itc79q1aUq%*LC9{%^l^1!PSHp^jE8EUG@>gaVa
zoa}i{^VVW`1=rKz8&fb;CJ;}^n=*=nYl%IYG^QvwB<;F(Usrv1Z~a?N0+-deI=`Qe
z!#DV_Z_7?X`ad-sv=}nY605IiE;kZA>6#txMvL_(zCxo(5vZi_a+Wk{!P>urDCfM{
zc at f&#_?7>-=l!YAD4%lA`>xNm_pAmaE7w6}02>sD4r~%o1m|aFN6CiIh1Z3oTm)$2
z4gZ1@(Y1QN9`ks29ZEu at u}=}JiA^kY4M`O{$ENtwC4Mvw7S;TU8l~*|nN?3=c~pEn
zk&!k~08Go12wfNzJL&dugkJgOwLQTSvJD<4q;ja2191&8&sI08xW8 at eJRTYF9%&Oo
zVpQPcHxzT6ysZ9k4fdzEZ;j<~B8bMbr~i6<v9u95!1|`P;ZH9jlizmre6Ng=lH;Mz
zvD;pC{l44aC+b)fsGf!~Q(u^0W|_f<-GHpP)n>AfBx7~9DsTQ#u3E10cT1wu!lDt`
z9Im3TiUcdwE4f4)qEiTKwve|m%Q*p5Si{_!;g-2_xig$jL9A0b^fJiNRGAzGk{wfq
zdmvXdY4~D9%pt_lAe8L9=~yF1BTTzc-BMd63~S0nzA}2W26lgG38{5qSUj9*2`h(;
zuo1h{;naBdax=u`bQKcVmPt4k#8Mx|&A28Gqkc-i0lp@%8KVQ3>@ZQ-k-4KYC;LtS
z3Y_<b!?Hjur+pI9{@N+~mAo>0{n787ScP(IC-QjURToZLKom4rea6e*r~Ays{Y7=m
zf|K^Yk7Ki4_9#ZH56gqFob~$w$B}wol}#K($HMr56rx6gBL?&p7mnsI40UOKLG|}S
zls at iDCwIK9SZDqaxbxi61pEewV*I=s&fq|n{3+R<3JGhnd*(PlFiqtdJ3zYA*n?<M
zUovu-KMh{673*Ml-q7j$bDX(UmGpMi#P at SLqxbn{!3~ys0@(QcZeR=lNc$o2`HplX
zH8p5oj%65?C&;NDqNxDSi|o3y8O^2|tCA=Q7#JmP;&$wQOq3ESNr_IQzm{VjA6hFa
z?pbWekD{QAx_lrSLvfJ*wbhbY9WD=pe6d2(@0e1~uY+)#XfMlKe0ZmRpmQ+oyA~cp
zv%J6cDgO7X8VKW(8iFdnqeydkT@!rRhrJ3O>bpH2&gKGA)YQwqFkbBQ{-V$6JA_cz
zii>FMi^1QyyYkcZCD+O*PEaefPue?j^Vd?OcyP)x?D+zozR4QY=-xD7_?%k8zMAbs
z%+h$(BUPhAt0W8<GKn^Gq8_wE1s7ttz1TB*VceOTND;|rWjPDo<489xza97v#6z0E
zFmr1#NVQ*lE^P+a=2Hp{mz6m_93*&fUfPF-9N$m at su@mR$3zJmg+9-d3Q%iBIkZC1
z=$$ua@*+q{X?9gDg|@UxHj8ZjK7PXETsgDPbJY6s;Ivx&)|y`5)n@$am`JMOXi}Wo
ztuA}}@fg2^YzDOk5Q&H0hvxDe-s=esG>YXe3Ox1wo2I5x*tKEoyaro$>1%&X?^1=0
z&&%(P5|&F!oY=^gqyE#r0u>%}+O;%whadSKayMo73#&>;mD<Ei60+4#=dYe?-W1JA
znfFs at Gu}U{I%|mKl`{z!QjNnSF~v9EJuzRC&`_zbY^-psofUe1-y?j7qXcyMulKV*
zCMk8}s~Nqb at MblZ5%_qwM3Z#Iw_AFpY)BcGuRvp;v<sVWPQB2)wShWAkG%b(IL{<L
z!3pa4Xw3ygph}$@+ugBJf- at 2{{YvQb3{v*(gtO=Lg>0W3v*F$67$q!^xoJ61UyIUN
zT<M$|qSs-<8(w0q=DkI+cx_N6933TrC=*-R&K_D{x!H<w%NG>W;}k_>j1NU}S{g#{
zwSc{yp?p4u#<%$ve{K`FzPip=TR$BS7W2MKHI+FgP7%HoSjO}7^EQ$!McsCZ2i!gf
z)=DakC at 2-bVK0d3@biEQShfg|LE91by7IT-ZJxCuV1;<{x56(9s1F_jdg1=;Sp{{%
zO7eZ(^E}1yXB4FyIOCp4<zI!qoH7}a&g~wOf8QPfwW)GceTuWx=@#}D{t0lE?#gdE
z*PTPVl*3%XTt)xcVV=5W at EdImo!$uX?3XJkBESVbyX`{pY(cbdW`Vcs?r0s!x*TFY
zp8O3`G5-!TRbbgHUdO+F#t)_{=>4q6SP#W9FNL8V^OApSq7R#0u at 6%%BD$3k at Jt`J
zpY=1DkL||*Y*x_o<_^Y6$alYpLDek(LAahCz<@Xw0wW!tpgsK?dt)jArkWpRYXzoS
zczvr0Lp@}oWAX2pwT^vbzcH1o-Kl`B6mkhu0-noNGqM6;&u~q|z-9y~j{PQoi#98`
zbXyoM3L6^Ac`KviNWwri=!=NN)Ek--_xdpN(o|<==VoT(N=i%H(xItZZ&OOkS!2pg
zK`h>9ygk*vng7{{*mv*LS^Jfji+&kyx6$EZ-f80KRcPYqsiX~&ss=F`%rzbigTt(%
znx+CaslT={OSFNWms>D4 at eo-lXMrxE5qgwbi^Mb#AD at nk8Doc)xkD(e$XX<5Os+s#
zy~C>rr?kt=kQ6Ql>}c3Er_x)X9S%owu!%G<_o7hnXgd0AWQ0WI5Q-fkM;7Yu&d31A
zxZdsLX=v(f7#z#0^sQ025g&dV34Ixg81XiB^l~q3XsLl;@AZ1~PylleF_#)AZ43RW
zWfS35c2IPm5h1f_ at O69`VWZV$df?0x;h=s<Lxl@$0L_$S6tOL|=+OC{ku#WeNCZj1
z0NLzdKviwT<&3kzj1y;9M72F`+U at 0SXsq4t=2%A0%!rsL=`T$F=hT7rr;W7h*_4b`
zX(^a=j`WRmuM2#5o*Z$H3*?!=-;f*v!3VSw&>b{WfQY{VXXDTulfG(>I9ch6V~AZ^
z(2ApI8|nw-x6;kw9P6N^1G&Ynj&-qPGwMbd#>wJ0(8h0iBy$)SfM&>R5M3dE3xjJ&
zRaszOxMqPpMZjamw{NelV6L|kFO|SoiXgLJx#!C(-(eg!#xzW96jbZgmApx_W!e)r
zdk^bHvh?c;HpJ at CDc`K3eW3P9Y-U0%Xa+n|fSRyAV(GM{>*&c+f%mdXvh+JT{0#vL
zA{w*oNpv_iTtye3(Fm)9;YM?Q!Q*}jj=}e(s!1o at kazAQvaEwpW$Q4a8hyhp)4#`l
z+EiNtrft!%oNxxo(plzP9aOV`Y{2$*ZC~oJ&23M)6Zf at d@@@G4<XxxnzY6lqY?!5o
z*v+2xW#4asy<Zuo_Lk#OMm6K|X^k3TOrowujsR>-AK~;>{9wfI(~C3C9Eowrn!YJ!
z)?oNp&qi~CI2HC(?4Y`IKB8jWnm%F#lmS>}1ha0K1>dI|CgSvjeE2!f9RFC1+kQnS
z at TO3tMO1%7z59)v2D854RG0S2n#?w-Bi!_()g7|c8SQiKc)^O*?XSb1@)7?y4xjp-
zPpnfJe}M<#bw2^B-2<}v__Lfb`f+%2xO!YX%uiD0ocmbw-x at sf=~cV at a6j3u&I;Z-
z7r5O&oOLzblI|Xx$8UVpitawpo^<Z)W83-)sF$m!Yo_b4_t`t_PXwC2a6Rr4_&s0y
zZ$8<)wncm_y(@XiIW*WAF0yU!63?3%&c^>SYdF_<Z3-~!D9fXC<6G9;^F0tx_&7+Q
z5?h1ssERYr&;t7bx&4|j(j!oUpXO!$`Nh`d=ga3|vAV8fOnTuYXZzaK)|T4tB)G0~
z at oTl@z_uQZMrLs5AazZDjR!*5rw8R`M>TH~v(cHtpb-k6*}=9pL2FjVG0wq^qotHc
zbI&&HcK9rXoT0|84!+vV?Ni7GSHIcRa{3C>)+K5d$D+n1OLMy>V1-S~Z|7a0%Ca7X
z58RK2t|i-Me}JZ!U#h+2_hKTNgA0e?3oWnl1tGf2{;vzDblddsac1)ktHLz4aMC}L
z-e9wNXIp!(Z8-|NXXa9tg+3CW;tO2?yo1+063avqOUs+9K0t?jH|u_9zce#;Q(<h+
zWJeynHWG^ff+^^s0rLC?0#sk7rij&hL%)0h+y;>TxB*$}lg0>t51St4^)oS<n}U5<
zU;zULnSLV6Ff_x5<^nT?^O{%XDJYnml6vj^0B9bDeEwf(!hf9LKZKBho{@p+zj;Eo
z|KSOhJ?u^BMD1*yg-x7{94+jf?f%lbf19!fHYRj}0{<2&X$wOWM+0XIJ6k0aM+;LL
zMH4d at YXe89e^{@X6F&3b;BSSXpq;xG4Fel1J`EE+6FvhyJqtbuJA)3LgtLLQg^_@*
znY9T%JrtdQlaYz7Gd?>90~FoAgZ^vKFfy=0(FqyYi<?-OnLGchgQ8P%HnCB~Xa8IB
zZ}`6?u?ZvoKN3>$FV^^9WF-6loXLN2$ISHq59(MaaoRSB9>)KcTO at Y7AaIVg8d1>F
zB7yx%%*YEMGab$%n0yY{u5ayz)dGADZPb-_IAZc$dDAym at 2eauU1U}3&;Zj;H>mx0
zOIw0;$oaFk-n<@sP1J$>CiNnWkWClEY|$Idl}wY~(1rd8G`H}56x*Jc7fMxJBjn}D
z$rc)nzFC5>2my?9!K~6{?k1pNrRFNB_3Pu`A9#L{w^6_e3!06QxUkZ-%X?a0A>?w2
zf=4PU!ur#FJ<1N_C5w4A at D+^3q!O9P0ZIopA>9NsibpgJ8-%y%Zex)e1ZGppA7kEv
zJ5IAq4*_rDW;h&S2PCI+8f39}3A0!A0=4YAV5yL!^J0yCp2DVnEn=pAAw0+1dW21W
zq8wL!LU`lf7z`g~7>plOhA+F=XNI?I;cC%#duGmpyWQ|cMPY)E0}{`uzPpK7II8on
zumpqUWd9f8as1DX`EQBQDY+Or|I?eYql?LZ^a>g{nf$xC|8J#PI665CnHxC%Q;@X5
zf5wb|MWbe6>}>9&#m2^l&&WcL&&J4z&&0%p&q7a+&&<s9-|@fvf8;ng{v*fA%K9H$
zCUy>dMm9F6zw3Xr|7-iN_TLyREdP7If3^SG|MEKjTao|c82o>RQiP&Ywo|dS_y at V;
z|I?)+)c+w=2KxWGApfaU28Mq-{a?iTKM*e~6FdF?3Gr at wd1+&<W}I=DiP}NJdIDk+
z$Do4&B0>=5;u?*lhrzIpfpPiA06x;cfr1UkHOEM-Mi^nQ+Fq89yLLG^EizkdY07R5
zt-B&^bau4GG52OQyDbvObY)%J+6{7Emv+ctM}6cZ0B}w7`n}e1;ZM8uKKkr(oO11Y
z$1(lN>+}K1n1?ZpXKZ$}e;6{0o5c_I4gA##ixUoArYd_1=#4 at UC`#sbLlfQoG7G^l
zw_ at RX!@<q@#U}QM!1#?MD6%;s3Kqtv^HpUSOo=HVx{QwRN(z6O|0Q958h0Io=Q;Kk
zCzkJnx*_%|4FlWCTib_MAQ>Nk`3i at d$zAb74SdaD4*dc48v6<Qngw3qLnr9T&B1{4
z!@H3nTz<p5!N<YE*l{{AZeX4l^vC8e#f#^e0l2ilYM}lP;YF7*l?qLnY+lEaRa141
z&6<67_W^qU`C7;pmSrxe5L$V9r9pFoJI*IV&~(pgP3=p%MB{z)<ACmYkFi;c^Yz~u
zMUb8&YruIfG+++kjWBgMGPR^We4cxyc;bAz6(Vc6IV>^cqy3E<KUcNj1Jx7$ePaaq
zT68+c)fNlb{xMH<hCO^}8t($;hgUZ`h#w at W3$M4yD~r4is#mt>1kwA7m_4E!M0R2~
z&-#Gv0i7edD?LjG+!M1e@!N)e&};!{L;f at mq6egjzA)#Ez7xECSxV`3pDx~DUyomv
z>YWyUr9dt}NebI<=mI?&frfhDRx9(6o+IG89pH=Py=Y-+v8SWTX>mkd>?8EqrslGc
zW?Cl33TuV at x$07NoXX0ovWikIIYdfIFeCtoLT~EvqY)<~n`O|D5%Y<&Ce%bfrGT`-
zgI^pOhIkE#0h6Y{#^KkmAT|OpM4<dkyAlZqV9E at 8suG~&BD?}+#pDS at l9ON+a}^2k
zzxeJ at R7{~g<g4u!*qd?D8WHh{ihB at L6R71N5NsbFdvNJhgD61&cyOukV?e`tX at F?F
zTfeb3RV at xfYVaIr5hOnne}tgJ0}!otjEX-pYfU$Q{ElFl487vwo;_h}Lsvz@>xY-5
z;3Xo4VbMm&N+luEMhj#Pr6PKnk{DSqbV0}Z2d#toDE}NcH5|O{r7V5WZ>~w^=^0!p
zV=yEUL!-j8*tWkAFHuDN+FCM%Vuejs>WGCFE+QE-A{kVZAAdcz!}qloLy$$Z>cO`^
z`5MecPL2&~$jN%ZdcPDj6PIuRk{Mn4bW at T{z5((jSgjPapG%+|^X_WW9 at xm;#FJqb
zTMNk*R+}qX_!4zAED)IQrHCKw?d+9Cam1I^HUu)@1whXGm-9XuErmHaGa?gKmy!+O
z^<JK^B>P$tK5(;{ZNq3s#>*7-3v~m0czu>l&UO=|swNvXYe1|V45_KBKhJfc7J*|#
z^s9RxyVWGJ<sc7b4M3A78#gU6GiW~QUS|d%bx7lsqb1Q{&yr1U7$6j*jbIIgVR<%b
zg9ZMVmp(NX2n0!iFmw9Gd+kl|0)#(f`c6?Pw28qUI<`Lzrk!#d9ReyD5?q6U1>bpd
z<_K4pN-DF~Km%(4Sm=UwguN0Gj)r+Aj=8i<zyu<jD_;~Lv>Kf<#HSL1a)2i$MS~U1
znu@@p_3NGa0NZc)!6a5n=g05h1z at Z#BG<Slc_Cm}6rGU$&x>%##@4E?8YSz^wN0I*
zT=B}FNTZU{xNwB7KgsCy9l^Q_(A&Xgp8oN`!E-SFYxPjQNSqSzcyP$Ih7}cmpXHql
zai|prm=S~p7R3xQVw-Ic%koZ|SUSn2B{K0%tP>wzpA}Wa!ueX_ at G#h(l}l%aXhZ>I
z0N8*Gf8j>Ptc~tDn%HojgY<ZL!)<39WuD5^#R++r+?}dgEloBG=%wJ#xt_KB32A2V
zKUpbR<_eoq(`RCxt2D0AO`Z)kPN`66i$Dld-a0 at ENUD~M9?$1xvrTK<5bzA#^B0fY
zUIGedP28e*n;H(=chzg_J(4A0 at DCK<aGa^Ie<|MD(8OQtO`*_)y>5q~pu3yvn_tx6
z6^lJO+j5A~D{#zD+GAn8H)f#0$S6|ese~3n`LL80NX$=^JU`WebI}`<l at KjF&X7bX
zWqLyf%+3+T_FIIp0I at Rr$S7iTYb93<a|~~{qz36Xvt(W)rr at 6CF+^zQAifSjQB?w5
z2N%%k=F^Zx><jVq5wOU5a`(>^-KhsIe=*(=DM7a>N0|e>MyVzJXyGvpHUYTg7@>(-
zUYn6cQ*P at KIM@~Q`k-M<RJ_r*Un4Z=Y6jT9-C+W`&jsRf_W&wIg at f+GL4`&F*i6(J
z-y0K%uuRN0J-cYq=QXua4aXYQ8=q|37Ft-|<3GATJlKRTwsC9;+Z&dzox-;1I(D6{
zEC(!irEFI&a_#dRl at vD|rfb}&Twv#^ZmMqFwqUOD$7tHYw~}mC%}9gKgQ(T<+OS)G
zMX at f<<>eTVl9Eo2oPFe=TiBHIB1TN5rKK%$0km%LV&7!Z!Hc!NK0kxL%Gum*_VxMs
z(J!iMX`#))+1*~=X2k`^fyRN-nH`KpGA at OE@Ou6c$<8=_Qd2bpqx=H9a=TcNF|Fjx
z at L-_G<r1rYgWwh2I-S`@?-;x3`SyErxpaT=_u3B2Gbml at sGF^{0k-xV9N3(yOTR4?
zRF24%hePYApFeg at P{pck**C;uU3bT-FwDdlV1y&hGuRTfnKV9 at CJ{){K0cqIN~tbr
zTu_LqbkM5CEV3-&ROON9QSxcgtSSdcB8w!S3Xy0ZPAEgCp6}+iQ|Q`^nP9`Lp|$Di
zKerLXuFMO|8}l}`ao<tJf;+hL)+5F~FQNpx_BVZ*72_v}lKg$Fdr*7{XH0LXOHom+
zE_2~vA`*~Z)?(P;$YQi=LN6OerKqbS^T6uu={5XvR7C4lY at qa~G(yzw at F_^^#@xDM
zM^k%Fexsx0$6iewl2a`ug#~KLZQEt=($<@!i@*}W at p{;XOAU795+|5r$0KXj<74-7
zO4NoiiXisxJtfO%24*?6ir^K?*f+RwJ`Key7Wz_$eKhvjwR%4r+u$h;bw`03%t_f#
z`86{3%-Qy}B!q*+PejD|cMRmI>J|f=(Dg+#*M6>(o`Y3F3n&LWxC6kxQf at bS57j!W
z+S0!DY^x^DH7mMjzdvlGttj-nQ{S0y13a}2uCD_-ItbIHl1&xs7I-A|OW9LvW`aX0
z`q(6XrwP>nT_>CMwuXiZ(Z}X$TYI1TVVT=jfL#2p`$pDeV%+Zdz3<Hkd?OZS<2YUu
z*3z@!&5W!dO_ES=QS<qgy4hqSs5Q*k6pS(BAu9HqQPEBfSt;qZDb62C?%~c&{e2A8
z8d at Q%>A9Lgo^*X2v=#jt(W-qIRBKaeu+A|qX$%G6+r5U=(Q!AAPp9uy?vAm;Fc0r!
zzQH7#PjWwhGfa=GgDUq2pdY7io?O5{AamBo*SolfOtrVRH#d(Hg>Q>*&|HqeLtuZh
z7;iMbDJIQ{mqqYDqkneqZXc;l2*G&6$hdKOPb$iaT0S{*i%t25lW={r{o>7xdt($)
z?~nS`0+P0p5b;j$$>Rb%L_3^bjQ>Ke?hm|iw`JL3%e}Om9O%cZ^hys<aebpk>2x_1
zfG3o>v=QS4fd)ejukN1^ap#gZrx at UQvubl3Mw}~N7lxurQ3_}<kNwUVM|KNJ><WFX
zp8lg;?$Ic`BS@?y`I(f#+6BORC*zQ~au4q4>h2k2;iLJdRouLTd;@(0Oi7<Ga^lf=
zdlEcx2^-7(a(7~HO59QIv2=$RIVcV^W8)mB*=pI<i|4K_r}#64ZmmRAR*hT at tvM}(
zmazzTwv|ZP;CZ6kdK}Nb9~GxTR+K(~aMH}>uGEEXbR0d*jP1c8s`eQNsvKL;{SUr(
zSS|4!FYA^>J{bwpSd}$Ar5RaDJ{RA;%z1!8&s;U=RdGN?PPBZ8X!k?(xZ6%Bb=Q)$
zmESYYdX42~0K1?n=jYX-V5^&KzH)dF-Lx;fJxz5B;6eE(As(e!e|R7K#kQ-O at uoOZ
zh2YX}7!a&_>GJHiENE6(q5qitk^El&6#mxkW##K**VfkC(&JX}E`IaAe;lSm(W7Dw
z??hdr)ZI+Ti({n0(xJ5zn~>OXN9f+~#uU-Fu)m~&e^uxc=P3j)3>cIupLL>rAFiZ!
zU&%>`R1Ey-c+9;{DBf;1EEda+HfC|NrQ-0mwfi&4H$itC(>J#UopFl>=X-odYI{xg
zZe?8xi_sw)<#<{mbo=F7?Ecl;V)a@>S32A4w{P=+@<KaQw3)oY09I$LnV}oXz`%`U
zjD9r0facmUr5$A;8k7*a2$4yJsaiDtY+i#y8nm8ivKy{lpDylmH2mj5I-F&{_lsF}
zK*r at Blk-u!p%GUs8=)*c!||}5_|tjwMsy!3ujlI<O}8BCxaQedxyHibXmuBrplcPx
z_ob-;OHXT2f611Wvs!dnj-|i!ljaDWv{{uxpa(N%-Elb(R4PNHL0a>KIuk<*$X2=!
zR0)~E;^P at +;faZL+4*$R;&Yo%L}>0alF?$EJDU at c)6Ix3cw;sX%eAewbA8i7x at 4I5
zLfbuS8?2WB4Rqdugl#egw)Bvcv1%CXZQ8;CpV(occ&MG^!cG&PR8kR=vcEi-3PBQ`
zL)Eb)I5~x!q#<!Uv56!iu>%q3L0>LPB at V?$+D~Nm%xS|ZXXb at kdC8!~-h-hSFhtZG
zq$B`&%IL>i4^M{9oPK);e0(&LaruPA5)G7DTXdpHGK2FSV2<B^(KSgUk{~#dtx>Wv
zOS0~>*!z<T$%_o4AKlu|?BV-}XGc5;eO+E2ndTg)w)w&Jv4u}o=iQmfj*=Qu<A<Yb
zKM1V}>(1(fcULLihAd5H1dn<|tTpNnAmW at JPt+5%8gg7f6mR;y`$!Xpbg2GGAx1Ui
z($at<Tx>f>Wg0;d$%KQ)9}jmcT+>Hvk7CwbH|AT%9V!oNYWSo^Zj!j62e1c354Fdg
z at x`}?JL4S<^XcP;eQxc9#dIM at c~$6%W5-j+x}(O9T-Q97D5m4qt{e>6QBryt6|-lG
z(_&tw<4UHC3$-tCO^?U?K74K?0f^j$;cnn5e^M+q at Od(ynygMKOYlsnRx+thP0W?L
z-9+m3R at hq;&kmr!PrS8d*TYLoWLP(w*{%jtj(kKA3WoiDQ<y!Dg9%YFt10&l at mll-
zg;CR{^yvZgBGh+!oq2l9nANg3Lte%`u1l#m^gMVnZ>QcWUec?o*PI826>Plfp2bM~
zo<>3$u0v at Jr!Velve&Y!49{N|n0o7cE>RXn%dGktu`q%<5WVe87FZ$Ia^KWl?V`Ud
zBO9Bd&U)Cp+#Dd;J()1a&T_R3WM(aJMG1M!sGE=WQTbNh>UFbfNWeyj_d_lbd&zZD
zA?R}Adx;rTA^S*rs1oG(4<RGY6YHt>$%^fyj$lAHi3cR%B0ir+7hEE^33ZagA<@UR
z5KEtmr7%ki at 9aptH9SQKqp}4coA at 7$&RNd?{<{|S6ebj~sCt6jGf at dxEe55ubb~?(
z4(J7GUL}c<8=#-QcT*~|OF@^wK#vV2k;dv;marl&sp8V4GcZi?R_tRYz)6^q+Ssr{
zOieCznWsYZ)g2J`yl56)D(fLo$MlJSb5|V at Bj(1R7QdY<`Ov at NHgnPHp_xKKh%)R|
zvwr1DC<}7X!eJPm_|r~5YR?1))3GD>zV)P01}7O)alGUqsxOCjX!z?2Es>AKu(a at c
ziDusMN5+A9yQQ!?Z{yRqOI<@JqcwoK3_Tx?09X*(WvDX2`wvrI1v>ZoAygW&@o%TA
zNk<9W%g0$h_rnYF#WiGfjQ0U~j-vSnwO7n)?`{3Z`vxppOY$XBbMGrqzF+(;kw5&j
zya1qi+qmSMdQXb;ErcVhhR$x}FBnv4W4q!y8!>454L2T|aQ1v5Bnx-=G-aO&j%ujJ
zO(ifn2Zm=xo=vOPYs&7kPGOdsaoj6y$Niz^45yRuCt#Y#pVcWv*H*E?me(DwhZ|gZ
zvAfULLM=1VM?c?{9E-&i=O0`4t5>m-GlF^JuH`Yg!5yZAkT`0RaZYdP7)+y2Z at OSj
zV*%lSE%mHnG`l0|)~x_o?3nG?`WJNIx{&bz(;HTog-^A}XkbNZ!0Gw^i0BYgptT^(
z at SydGzdL9m8BDtkjiWViRA+Vt)Uq9S_j)WIWZM*Kd{5e{1aKLNvwf)-Cs+CP^>jZi
z2e>;7S6AVrxw&<9doQaN?fzG1X8~2!w)Js at 3ra~T2$CWoAaIiI?(ROop}Xr40wRK>
zG}6+IbW1nV0us`pv^0DN at AJLueRq7{7~dIVv(KJuuDRA(doCD<@%ztxJ-lLNnvwHV
zbrnd)r<M^-))r>K<GeWp?Rz&&$$dJ&5PRawaau<Khx71r)Gi;kudcSI859gc?|r2Y
ze)3wQM$V48lCfH9R_n2h=iv0H9em(Q(LM4GE$&<AQ1hbfh9en!dd>LF;5TIw2_F<_
zN}B`00>|<5a!u${Q}4W9c!wgU5LeDGiOuNTa+y>{Y94>hLE(=S>D(BOZO!oZj_`{(
zw~u36q+LYTAprEXzicG_<0)#AC|J^1M752XT9x{NFin`SuH-$Td$@X-Q5BJduY>4C
z%tS&)bS2jzA2dVvtG)&qDa+P at a7jNIIZ3p}7KeD$4!H6tS5YZ#Gu%sG<v<_#a6LgN
zJyEM3zuBp}WQpQp?y@<Z{#{<kPuDHJl$mAY_+B!0p>})tV~JLOOGrt5oVvrMtZ$y{
z*5iGDfw?!n9G;CT0|Sla!lk8TH%@C-T2|2pF<pJub at D1Uybk7Dr4glg?uG*7y{2n6
zYvhC>2K#H84%O%+j|#)GTNUBdHJh$muf*?iNo8SJrH^})F%62pBKxqVi(Q7j{Oltu
z#pLD($p~ldMyZB7fx at ytlNFOl916qoJ21Wqdt##xk{E8`4LySiq;B%z#40u{3B^i9
zu~^xro0OaAQp?J1EThjLROlV0bOFTp0`Up)HIgS|4MI%OJr at NcKI-Q*E<LAZ&bm(;
z=o;m>GV~uk&L$5Lyuo{~L6_<25c|SYL;2~1^!C%2xvHm23zEAsD^N at URwb>0_@}%~
z6n+_P48GUb&uTX{=%hb3K3h^9;G}~+$`d&rfJt3#p`3VQ%^k{&LZt*&W4790R8f at C
zsqyn~o%<JGWXHaZ>U}mi`XD4fHRHanVud*xO33+6<!FlYL*5$wTu+zyTmY8zz)9EK
z58Y7x&{;Y0xbk`DYj7GSHHJ(k1DT=T?1l2G!i|wyrS8s-LE|&q8&%FnA%V1u$#o>v
zC$VOe!Z4zcBZ}o0Lf=7dvI6n^bXcP^QcVy`rL1KYj+BEq|2|3eKEuL&g_sleMFY9!
z{Qv~#XaX-I#G2fyk0tu)RDt2k1Qk^c%7GsMqQ#0Y9M_Uz_HN#s<(tj#nA^G_EiGdv
zthSq_e<aUg4_lR(@<o3#mZo{^8Ym@(86H?h8wjP at sfGpMo;Wseemrf&(u|mDFlx{m
zbeBt1GFcl4Oc-<-ve!fCNl at _4=GpT&8kt3S%*m2rF9%6rFR+*l27Ru-Rxl>-uEkuo
zlnf}?F}ktg-|06MYC_;+Y$mN|bnU3%O+8s6nIOu#ZeH~E;5>bjm+QOvVDP at QVICn9
zvvif><9r~i6R^u4Z-Uj7&%fylojhGNbgsGdlLiOK$=WpgyW7nNBa`%o^xUVAhgRge
z?;1Q$ON`xcOH1mO>x`{TbKF*z*se-<p0v at IG#4AGdC8SoyWBL1kfcr|av=^H;scGE
zi^^-6w3Qk&n{VdZD15of`*!SgHZB}SXc33W{?UC~WZ)7Y?6^G6Irb>;nT*6!oA+ at W
zAGEYb<@O%&2Vw>syA#2BFaqXbfQ>gjaQAURoOt3A{@6Qx at 3q5|K$$pC-(tM{R7M&P
zegzD;AUv`84h at IZd6z^zUJG|5W5?x1?K&dPEi6Gf1--XN;g)9{H)#~a5iNB}P>#BD
zUzn7^9*bmI^Icb-glvPBG1O4lDpIn^a$l2gK$m-Eg*D)_X?}3Zku?(-^@rDU_rz3(
zA8ZfLFrLp_*AKWwpHRwEX6KwYXtb#&vQW(rhZUHfDRkhvy&}cWo$jWQPmH4C%bzPe
zUNW`~b1bK+A)x`%=o5q};DjC<wYZCpr;sc>z+}KOO5|irC5G<4nr1prKk<kv_K|9&
zCsfK;$%Gr>oSXUSEoVJ|#a_ at E>f^ht`&$c{;7ewJG~cmiO_flUX at aWI!hJ|$V7tSz
zBoSK{^nZwX&X)_s#^i at QVxd>r5A2Gj9#UQIailAMB$4p0?wDtmn|msv$Q3DuJQP0^
zS(ofKF8%TlQ=a#Pi=JS%X3}f<u|MuuFGI8rv4Z=yYufj at Bf&;4g!mNtzG@~k9$vmy
zAz<q}IW%oC2sh)hUewmiZI_xG>P+h2#96t!H;H137LGEmYpH!G?e|6qLj{8rCq#%a
z=AJHYBhknysyoP at Slj6iJ9+EFd2zP=%sJwfb>#P2W}nHlDb@^KhIP9Wu5Uvra%9WC
z)oZ9?8`t0Jx1YQ`AD^0>IAo|I>Cj!{vr@|IIWHwP+-k!WZw~S`(P#rFV5=XQLA5?T
zS6+TyFInRw>nk~2G+wiXX*{yN5qgA^EE4M8!Cm%gY0v$z$-R)IQopCga(O;$zJFe$
z(Rv^hbDiaoNuPd=VvoL2qiNS2%FmX1lo~Xd5|8UuUbUL!&?Xrf1t!eW9!{RA1Qk`w
z^>=zpi&?VQW~YxkxIcvpUCBWC_<%|(1RB}86W9~@XWt#=UPt6vw%x6v6KJteqB4<j
zZGRJxj(gzk+8(^1>T;*5{>P)0rm8RlEd#xIW%&Y)4 at K0={_S^^iC$sUqYb#XEuku_
z;InM78loy!jXweUUv6E-d7JWX+Y|SW2JDi$QMeM21XbH-&E3h<Yvp0Y#*lFiwN-T!
z>;`xiZxDtESu;K_8nDf;GA{lCXJBp6rCuf{O*Xk~b0NLa?i%hBc-xx=ii@?nA+(7p
z7h;XJg0HEaArf`t_Qyb!@p%1seFMaOnomn(5~=!HqIzrKm$hLnPnVZL*MVUYa9!qQ
z>eb<>-UuJs<tdZP%rO5Q$}^utMVf56d8Qa`?#WIWrAXP;=r5q}F%HSx#S0@!3+Y+S
z)G>Gc?bq0b#MMIZTCLgo?Rr;y&Xmq961kX`(VQ)7Wx8-dC6NyPMb8b at yGU01512tt
zC>uTZt6Bt0qLbkmlb3Oqta>}x2gC3+A#U&nW!y4otmr=8oN-I8YJzek*jei&4?Ou|
z{@$Xm{Hn2{hUF!UG(h`c6)Uk;)yBuJJgwxUw%~&}smA*WWi-NT at h*4yu81BIxTA0v
z+S?|j at 7k&J59<|?Dpev-YPOSQAS0->=WS at mij;@Ae2;ZgSQHKyTniha1(7fyR#RvE
z{0%x;Aq<?=|IAwVWN1##6PrYvJ1nEc5=F}qS>|EOpzpPEaO0J)C%gBU)`0{lKY!KA
zi%Cj)DL{qly}_C$xA~fWu-!zI$bndZ+Fp*V3?fa~YDB<AQTrXq!pwD#)F&IdZw{p+
zbuQGZ4G0_lV{I$41CG0pqzBJzB5k?&3iOQe*31^RK341uJ-l=ri}lFzIFpqsUYc&8
zW?#$nRZQ(!tD&2l{?@f-qpmV7ibKCAqS4r~j_bAEbTv<_Kj^WWtiPv?dRi>CYf-vJ
zVXvf5b;Q3Lw6W2IQKI)IeE!kVFba>0x%y)69NV447aDH3&99hF8%by*-}_x;jeg)J
z`96X5nUm)+Zmm22&X${8?W1^^ZE}EYLiy*SZ4Q9u>~Kzi+0(i1Pa6J+D8StiT?6j$
zc`~Uw1KZtXg?DhFiMk?K(rCE{zSh+QfnUh};A0lNcg8h#Bq>%i+}i5ec+12F3K0=S
z(!{LdLn|cfq;Z`qT~-DPCERz<$7nk)?--#f(8r>`DIA?xnb|Rd4oREEI90~5R4<EE
zd)ag(Xr<JFDxon@$IdzFl33$6o at 4;e<07RR<*9=0iSlR+DwFb;Q3=vHAuy=uli2K#
zvLy22&#;OzVz=<g at 9AthgZ575=^>iobn3~&;y8*WcPjWKw*8C-UUHNZyQ0}S?KR3-
zjVAbi9-6f-Cbr%$i{V|PkmE`aXH=1ozZ>sS)*iD<qu}ndb5<P8wcIA8kQ`h_d0BEd
znO7(RXOJkBAzkI9#xLnmcRv!G8cJEg)2X!tLn)TMo(^c>br at FKFp^XKgW5bmk*0xf
zz_>w;Mt1oi;q7_Yx*p!+L&1k at ZFZg|9<LTdJP0W<lJ3s$FRG*l^RDxSp-N`D(&DYt
zj4WkrzG^blaeg8uwErU5VsAu4x6Z{X^F=Ud&|ThZjaM7puM$P~*qnE(x4$6I(?IF{
z{6hmJi}Cfgo&YCnVu^+?Hj`xuPF!- at aduP2+IjE$AUbj91+OPnB6Ge6%LWo#h33L7
ztE%rU97QwX7Bbqc1YNDpZ7b#pi3tm^z0FnrV*EKjjHD-GaL{2(LLgVcH{f{wGJHY4
za<Rw~O3I$CFOTlLHRy*pZQ5U6m<f*^TA^}qup8yP?qREDSg*H#cIIVzk_5f%7wFfj
z>`J^;s_3gTm79Ene!8}Ya*dS$?$bFHTvj at SQ%+<WFp2Rn-&c?P)Z^d7M__7pYM8K*
z{hSe{(@QeA8UwZZp$-9p&8SilIu8d(un>P{x>zZjqoImY=v{~FHO;Xp^h}w=eN}lw
zdmwTkbC7)S!n#Q6lXBm>T39MO<0nSJ#y`BzA5g7kTyZxQb<}5a>y&bI;0j(XZ%^Tz
zCKmbF`LZ749`4D2H?+41M$wP2^POiB&M*9r8p4w+th~hT2$ncwhS~L2y6Dp*tZ6|P
z6-?Z#L}{h7nx<5B7oiK!u%)*3j=!jJQMr0AKVIn|x$a()>^)!F%1}XMOmypCf6S-}
zPF$FBRd0x)^ElSAYji%zwbP|bSo}Dt*SnkDDD7}z(m%uZn0c_Ppd_TK24Sl^sl1^3
z3g01r{p#xVDRmp3QHo1HX3MAS1S5KoA-9!u!Xu)IW-~FdakGz at V=0>jA(+Wqa=Ef$
z)f98%2bcnU^LVVOyCOcEP?xc`>$4*vpWTDUGL}SYy=nuq&m$~HxId5%G8<s4FSWzF
z`z77(kpx+aYzv10SMEolp`Sd!FK%CbW)HwXetk7cd=mEMQ8M7WHI4V1i5>ChLhM80
z)+~<?tU`>cBou5~KjCUlD^~k=SON=HErYaQj$7vye^C^fo(-I}f2X$3C>kO at 6!%q`
zqasO5PhG+)+xnsYYEAXIc6;$avJd$o-l<e!%S5Tw>xZjd+|Kzeq*6^QL7Z1c23#C?
zbo47YQD at BuS9?!`m$s5K#h#r!;ZWFC at HDulCA55kE+g?}LJMM&JG|RUZ=(C%ao%}a
zTdz;m=-%ozPNVzu>;6JzU&pV`wE&+A*Wvi!z?U<T`x;;04r^3i^wS0<dw-s$37jiM
z9QQs9_Bm}GZ|Bk2gIi%)GYj({$cpG4T!_IW#1vGzRSOfmv#MZnIx1I|jaA=B%G;A)
zS8=0(3A}3!r?%dtZ7 at w*OzJpQf=s{bA=dMrl)Mh&U41VUKSX8mT>9Fjc3 at Wfty)qV
z`p4dlqobqwrag4mYER^UUv+v`;YYad9Zl%wD+nu at DVPs6K;kX420Lb9lr_22?dGqD
zj0nf{pz2~t9=fV|_TlC*n%AQhd->!Mo*I at otk3WeE|c8kB|HWaTMw{FpvkhUN`-g|
zr{SlsO6T%1Yna8rXDP*ciNG{=qC*@OGv(6f8$!TS(c>$Vr#KH&wFm#0h#@;3en+fe
zNvu$ZmY7fUcmxbFygM3vJv5%t68HTN{K$p4BZO(0wS-2~`;1ny0_|@tHcs+t>wOje
z)%L5^3e}J_YjgbPLCgh?nR2N!Z(=8SCLb<;okU9(UK^0b6_+SZ-3hCX6}D(Ltc(+N
zvoR;Pin7jG_*Q8$E9=-{khHrBYG>gg9`5?=v6tZkDJ~jxwyxZ+w)nOev-)L?sG+0Q
zUEJgW0g>l`V3Af6CwL5M=)zf~&TiGZd${D&!eZ<vcElNXREZ<az;o24gcsN6p68Vn
z!geB4PytxvOj;dZ?))QItIzJTAfm9Fpo=Y)r<-z`>7GuF8(gpL3eqd(v)Z+V_;Nfs
zQ~YB)v~Gx~v_cz$fx;}h9dE97NN_o#S4)(*gl;P4$)1es15r1o7aSaZaRy at bp=BBO
zNVv2WQ5aA)l<l}447G}(`Qsz}`7|7>0^cfTbI^h<Cr%-vV-{jT6hc<|vQokJ!?O1k
zZgfLt0?x%9KVjv`9UXs~iked}=XUE4z0U?4jaVBM%F*79&fNJ*W^i7dwHVOgb6hgq
zA?-;=XYM?$*Xh%pb=p$7J1=|Z1W$kZxYIvU>86meDZ~Ie{V}CaWug5(TVwHAqA6dI
zfL~JVXaG7V>yij+Gc5^~J#2SUwcPeO7Rdw&!H0>hJ+4<GV{9|US6n*>{mEh{$)MG@
zm3gu)`JYs$3l3;ki~84`@mZMHR!Q(vdbYXitfmlp9v*rp-)3AYnAtoWW at 8dOc3`rs
z_i=P(>8X4;6E7!GxV#p&@j8s~8hsW*3{ouY1P()q6pRiupa0MVovp<5ZX4|GTyjrR
zAN$&tm47c}*u7S5ahafsWIMj06qvrkGY-9pLE&kVu8}${OInYH5S}_;n~WX!vS#0S
znVlV2S^2L$CDaNeONhx!dMA!lIK`CG3OsCgS0q~GUQ&^>RKi>={y?=c3)S(nBdfdP
z+KOPCBe*zWVnwA&`>{>EyQ}uuGkp;4TG+2paLuw$rn%W3w~I>M?0}E=wQui^k-k~~
zk{RAb>Kf%B&kUY3 at QcE+=hfBA!mg|wUX_n?*4I+vAIX-lnGS~r`l}hf&F%;|e&BA-
zFByoa7Q9rs5kqr$7Ul`N#^%OdG`C}&ulV2tmm+!eEEXb*A8KTgAcVRl-TvG$)17Qm
zu*8KI7g;3;L4&(JLb0(ADU!JVJO_r>*E(S_{fCpe_BmdGGH=35mW_M-u`j`jktQRg
zl^EuOenZLtaa0d>T%v4-(i|8D<BEnwf>>vm0IroH`&it|s=P>2>2~fTR;MSp+c1If
zY-C7yOWaGjJS3b-#-3%fa}2Q-k{YzJ;6$_eWNS;lz(q;bVr-)Mh%yWhD*}5J4xjj#
zw3!iwXs1>AI1`fJ8<O94dfL&f3>!@4`#63&RDSva00r at ZTntTWov%*Aqf}c)xIj?;
z89=$2dq{)msd<gyg#d9K+{7};Nd0Y`+H<13D>^C|SsF1$(CPT%UeA16{+Ev(d1aVu
zR1{&sfi4#>rD2Xd-MP!ODt_b(4A!jQo<B4S*pEUu!0Z>wMyfidf!y5ukjy8+;yGUf
z1bGRl0z7u>5tiPb?%uD$+4asH`ZmHM$R81~<8&?4juBmSeckVkUD|64xGQsatV2Xl
zhZ|DPacOtliKh^b6CoS1J9jsfjUsgSOQnZrU<m_1hE=0QXBH9QY%}E3X<J)9LH+gS
ztlJJ5>1*tL%ybHZAFbR!?rbj(<wr#|Ilr$d1oLyU^F!##Q)~4ek&}@nh6RW}J8Pk@
zJ6cHENu{HA$;l&lll5*dq<#H91XW(pZ<zYS-8-J-{Hu95J_UEQ19Cp$kL;kmCV-$P
zRGFiGkJ&m&XEH|hlu?`E+oMHE?V}24wy1)ly7hSpQWQQY4!)*fGEFoPe8*%;{w5Qn
zb>~i>07b(e{5O;}WgRzExpSFcbK=d_Tc7tUc6Li^uCblDiIZteDY%encx^EK_=v#z
zhA|h&9Uy0MC80KiFSzaJCON?{F(<DktsDC;lUxIChw)lImMO<knWb~$(~o>rJu0x#
z-7rq9OV!-|w;~1B^(TzIL?{vOkDIW+l$5xTJ!4$>I+Fuixyge&7gX}3ht~;pcB_S^
zBaAJr2#W*#2*mGBq$#J at sU0Y4+va0^L+`s`G9agT`Qz1$K(Y2_^U+Xz0qEqTt*v^o
zi-T_-tMbL^z87!7eEwRlS~%x`iQ<>S&Z{&Giti|L;d$p-gbbsOjDx91K07iI-1nR^
z=bRUaPmX>hJ9{g>8^-s>E{nt5$l?_#2$NE)Z0C@=86K)TYAO26M+F|Oke^5>(eL#+
zLL33(D?aYIX)q(~#OJ3k`+K&N`{!RZ0T0E$;{L!Lu=aW9a7M4+b;V}jmFV0Uw%rnp
zSnxXZ3S8^Du^BSA2<H>nyIeUOaAN7?cg74(+w@%<2d}4j9Fh)pxa?dk&fGQm8bC{h
zzlz4Y&tl!Q(I83BYP6t2p}@l1>3yghFnm58)!lQ}y|-dqdkq}mqvloofdW25x&C at p
z*Strv)gs96byBu_X|{);;HRqhTC{aMxAi_B-pkGC{lYpY{}m0pdGi{5;c1w_oiqds
zc5{m44^zFs&qZ)zZ|BtYnD<d at brh#t)RY^gd&g*{yX||yc!-{q8~m(qnxAdUAXJ}S
zEoVh$6N;OJ3~EWT=Kb{@>rdY4f8Fl<@yezWL$&RNEc3GQR^olr7hIj@$M1 at L3~)N+
zK2TW*Obl6 at 6CjFNUJR3UN{^e^*uKQn((z__%F$=%DwdKAE_VTwl-trjvgsoDz-6sh
zMp#(2;MpO4(}NmCN;0`9b9xk1GGtixE!q~Qq9aT)o78$jpDll0Y`r6AzAKkL*re0I
zW_X#H+Mtjsikn(3>S5+))H*g6_XtBUqZJ1wW&H&<^hj2rJ76m)H=xZOzm1_5p>3nk
zZ5OQW%^m)tZPOwagMZ|eu{oM6HzzKBAQ6)ZnL;-s;7v{jmE4#DxqXd_ZC_Fo#m?pp
zDkTv=%|GzYKVjaVq&*M_f&QCM2mYln_P;sk|A52)LG4BU8MPO-vo`r>&YlzWi?iqa
z3EOl0zd(B=rO)xtr2S7|`LC!w at K<Hxzts3<hx`M+{8wOEFS;Me+T)9zcn8IAK0zg-
zd=nT+NcfZ(k!K;`w at 4$#)CDqWTbKebS1XgG8+)5^0`3>Cjc>p(4Ze-*84_Hj#|C-S
z&))BNXd7_f<oWmri;viet+gC}{Y*bM8-Tq&?e&v;3v=_0(`wfDE$csu;5TccyN+;_
zpXIUIBI+I=qSJ1Oi3(|9p*L+Gjwh|V21XWCzj2&xudvnYHCRMIsg1N{)HmtTD=m1+
zikpQLMU at y|*R!IHY%R>Qu0>ldAgU+D-iL}SIWkdncO;6=6RZOrKMqIqFgm?XaiA9(
z3R%8)7UlIl>Lew1!2c}F+ayP}GleD%iQ=2Bk=3oG#u}6EJ2}Vfq!}Z*dd5lV-3UIq
zi`)(RrW at LdlWx1HowOz2$oVwO&jPu;7Ys-Gy9)gC0urV-Ddf`v8P_{$6y)7IX?uQ`
zPwiFR<9x#XHoi~R?~nOs)h&12#ceSgmBlFBIL9Dhtd{?$oP_*`IsbR^{Vx#y|DJ>Y
zNZ^A(zY+Lc|Dxu9((_1i{`P!J<KL3`x1{|~njUGtrRZ<%KmCwYJ(9-9`bFCRI<q4)
z at RvU)()Z`}pT0l)-_rQEF>gtJWGrOC?0+Kje{R6v(EOiy{5zZfm-^b`K<ZoR0usvy
zQ3G$+?|08%dK%;&xYaEn%WVI2VN-OpGgg5+>#!k9<Fl#4-JSJ*ga7|_9~5C`a5hDl
z<E`}N=NN3ta3?z#M`O4XHSo{U-g0mg3)roq=2kZV<$_XkLO^<K5{`B*_Q<hSkP-@*
zt&{z22xAX65f!A8#?`_Yt}G$UCPnRxlvnWcvxy)lh#bL*`u2CwUw87~)8ckIPFVjn
z2Q0RKPXZa>-?O-tKgd{^IO$OT)Gyp#irBf_uEk&F4u6*ziNKI5AUiYUr$&zT=ZD5(
zQ?Q5I3K`!Di*){s#ipsHO>OI9ZT;sD05Y~L%+~CgsUwTHGUIPc`WNMokc+dqog=Tf
zn7BAnbOZnZkf{RTK)zuY0RTYA>z_7c+b`Q~J3ANh5aUNq9{Df=r0VHccMhZ*vd?WZ
z2LyRW_T>N}-H><K#Kjo?%MWrJ?sll#VZ;D{+iQ0Ae;v1>!N>#I212&6-}>IhM0U8H
z4j9>XYX<{<4Ub#_QREX6o{4fJ+qr;1AQ(AAAb^7z0Av6F7#RPuvhI#>Q!D^AkP8bL
z>0d8ub|@4Kr8cGh(*}Zo*^x<n`=Yk}mks$I_}?~8cI3MM<_Cg6Z at 0{EHUNN=^Y4Dh
zIdc3x9uNou{I?$jDF*vJ9uUa+Ut=J<aw7Bcw{byW at a=B+yAAyJaY0}x<nMC^fw_=M
zw7>O*fH?lk4+6g3=D&{tVZZ%z{x=&30GV>XY|f4_q#n)j_IVd77M^hA?O;>3vqSEI
ze<^{aY)$Q`fq$xi*rY_Mb*OoP5MdBhM3 at 7@CCbhz#32p at 0Rcd$I0OiV2y+UHK>4x$
zZ<pK6CTeFaVh%U9a&obuX5$hQ;}8OH3L#USQv at su1c2Eg?8wUhLhKM>WC{!2ZW$+M
Wn4|O0v;jf5pd46qbYcqPSpNgsr_&w)

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.odt b/koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.odt
new file mode 100644
index 0000000000000000000000000000000000000000..8e9145864faa76c53f672c704a1415fdb7a0a741
GIT binary patch
literal 12973
zcma)D1z1%}*QUEm1ZhD~y1NAF4k;xLb%=9-LwA=T-6`GOAs{6w9n#%W(gHu|_0#Kr
z at ArI*v(GboX1#0H%<MfgXU&VE3 at jWT)V)wD8uGpFVnus$m%hJ{?k-E9rID?Zm65)c
zl?4!>Zwmy2nCwA at j9`5T5W)zyG6ETb0d|%~AX`RTBS%}szZtv3|3`@KQqRF4W1xwh
z&37{pRwjt8zO5a^K;MSx2M+13%6ljN1G-DxJMt$^9{@12FuF4XwqXL;+1T9I?r3QN
z3#BN7c<(e6%>CD${JT4Zccp)tHMRij+Zz3J<{tm2Gyl{GE3lQF)m;bJ{ndzn!ae$j
z+N^BACN at Tp-<tnV$ba(lzOrAP_P?TR!C;I3jw1U9FM*c&CPok at QJ}4*z7^!Zj1$@&
z*h1e4Y-h^=&<B_r0SxsFX%_){dPs|gdU`?dtltOcsjG4v&YkA{_3vYjdRGbngKYmA
z*FEiN&<r=8TUsfWjvgsOxKZEqE>M|$6pl8$N at V0=zqW`>^ngDl$K$nZU5*82UCy{M
z1I>y at PEtDrTRz&aQeEu6eCQM3+~KMW*TSWLytLaiZt0*!U`%?3Oq^1C^Uc;Wt$JSP
z+fgDS^x;A4#_LB0ITm4T at E+Rf1FPf@1;Cx&=-iQF7=$S0k7&WIRQ;^QBG>}V`_hk<
z2Y>)OSVpsF{3>!W9QINV(34uGJ>PtOFFcylON1)IP=MH!e<Z8Sw}^GZEE*iG(NC)%
zwozQJJltxXGYWM1Yz|?uX}ES at V9DgsXX+L&Pe)jD!N}2Qk>#DUpX at 24P|u?i3T03>
zu;%W_ur>`BjVbEw$+H%heZleWuuGD?1ReIZJopnhbv{*h3_XHqa&@)8-cRHh;!>Fh
zkIm^8*Tv}9i~HDY*VvnJ8!`wf(4t64_b-{*dc at NMffjg$nud~5M%&t4ZH1}C6vmDD
z5+2>^6(SaA>L%*|sxG4F1Z|x>YqC$auKDHuOcEkE<arfTRBjumzA{BkV91bE-pSV~
zZ0=>zH812uF4>Q<NiCh2iZ?{Uy*1@}=HkaC8SoOHWF-oldY^^rCC1pvv$_eTifdpM
z2htkK2P9uXbE6=y4X5kr)rSRH)kJkRrK`++ at LsK9tQdciud}u44W&-OCrn!7wyWfH
z$h$>ZKP8>Y5p_I)?iCBi;LWxJO$*O}dila19XTbf)?FMst|iVZsLF`p;Uvl_5*w7T
z6DlcXjc;J!Q9872IJxt<DbGL;1r4z^tPZT1jda$m-)FvW at YndIxoWNK@7Uu|0u-!m
zwj+~!m5Ru>gB@$iqf8dQF*+ScC5c&cc>sFniZ+U6Kk-jvt5OpL>m_*Sc1)%;xs3Ra
zkHJp#FhVJ at dS9YN5Q-2pyP}qQB+6XvNpqIH9p*NqRt_rbWr)eeQ<%91P4=xkWv-5c
zZXQ%>xt$@<VLBVEUigxnQoQCoyOm<mezLdCK0}&QC5ta6o&ilJ_EDkceTsdqM**_8
z)knWDKRN64e&OyDQ5hR)*B!O)Z*(8v9)?19bGM6^FDt>WQM{Bc^(yqzHvE#1sdUO}
zcOxa#qQE}ifT%-kq`%%20gkvZIkn5}-=ChW94|o;WN<=>G&4a#W`hMJ*DcnB$-iw~
zW7sbA|0ps!Ij=Rq#&=5(U(2*{byd<jI8A_G=iKX&M)LLwjV~F#v%#{x=g at lJ@z~Pm
z%5}!yZ9IOa1h}a^F{RYlBIifaPjvZe<N8&$7Ukn1$#m0XbWdU3=tM-mVQ0m_3(0e*
zc$;kHXn&YY375bnosjCSVT3o!uc(FO@)Ewf+w-N}N;2B7QN}ptNPq1QvPhg54p;Hm
zqK!kFlEmrQ4mfcm>8!*Xnr)n~M40DJ;uOSWgM`MIx&~!aw#~*WHtRW{tl7?^V8tY5
zt>>kFBj`{3G-n2eHAhTbipVSDI3#~9&+W!&Gf}(a<EfY^=R`G>D#AhT(hq;pdqSeh
z)7V!R#JRzsNO9<<AzZmeV_ZXoN*bn at Jq&@s-5S>)tEAh_KlQBeTIHObSiwHs<L^|C
zs-{B@>P_eI3T!tecg(xeFv25vj~}CZVDqk|aT`T=+B?X{*c6vwh>#6)CK<>lmXO3<
zLQVRuOY~DIzXaYyG at TNF?*dJQjXL?WOp>kM$7`pXbUDp+6*>BH1}CT!WVs<uH|$3$
zloO3aKH=wSzLw5>s`xaqu9Q^4>zrZu)M(FjXn5hu4C9xw&gWH7j`{2LM&)-6cUA18
zs*~^q)EqdD7%$EZkCe%(X_fM~l5<4iPDlF5*F|`y%}AHbDBS#>9-YkYXL)DHv9%vN
z)sE%K1tf<YF>C=FNB0u0Ns%g3WNPR51O|NBDr3p)Dosoua3VF7)tTVq081gKns6Bi
z at _a(%G=8lZ{rMNUF%!xL9X`e6gg1G$60z?CYX!fZf#H`)Vf`x$T$Pjq2o)jWEG=8_
za$G5rC7<z82-IYylCn)KF4e7A6xe90d!ak`AXvPcd|%agZtR_InR|@w9H08-M9KTr
zawh{$n1<%Qo9PCeY<x+rWRA*u`NPUSh6FW-j6rF}!OwM;q>>I-!t>$pgbm)e3|aOV
z8Ev{}a0}_NKzGJ*3qg|iyUP4(B46$3BV3iOID{HA>Cf<6#96t*M*F$y>d|4c`3g~<
zmyNpPQ;K4;P0zrANa`z(a*p!LQuoR<y4snnW~X)aYFCxfcRQ&!!f;+AB4R+E6_zIZ
zW_L|xtfh=$^7~A{SKgwd>SOQ07WuUUBd<yWGFH<Eo4+JNN*kBzCyP^ExO4<&Q!vWc
z=M60N_nDRE?5Q6q)K}E5Z7gHZOI!4?1j&NYxU+Q at mW||84%__S?w3;TH_Xf<+3SMf
zTF}=^;&dY<0*h&RB$v9c9A2JHT#uiOUyla}m5>(ggq=;Jv(O6UgQ*dOchq%>8S`(V
zMcmq&^j<SF#it>!;Jt5POpU~>m{z$Ex_R{t^M2=aRjoa5hzJG6!~NeDXOz3e8Di^X
zVFbC~a}8)oh0So{y+3<Ni1L}3VJ1qd8)R%FiB%=+4I}s2T=;Hf7Q=y$Jc`s^IFnS$
zFzm_H#NiHrTAvYoACt9ylJq=Q-d^@8<I#+sU<y2LtOVuy#X9Ht*|CcaZd3i$TD2q&
zX}KDG1}mVRMw(0|hlV`4Fot>_A-n&j_tO$}o`HC+EmLZgSiW~LpPE^7c7v5T)n}Qn
zMiNQBYUr<8_Kci3_W4i8y``QD!+-JmAfG8Uu>1pJOr%)2q#^uxlh1Pa(YG1PvhfBD
zza{sUv at fMOqM#2KHuY%e)d-KqUB&5C+VLeQWF8W!EV=Sxl7PF|N#0;Oxk)-D6em2|
zBP!UEQXL1e at lx3*K~IWlKb6?<*9QfhJtZZZFPw at S$eYLLSf%-fBzC;ejVZ_Y(V~c9
z)w2F+WD{YtT;E<FDur1dtsd%F>#Kfarsr2PEAwea3o<1MU#BuFcd_L%Kd(^kK!^?o
zo-dMH1OT_|s6oz($9A-u6j>!+k5`EC98Hw8gK)KypyfF at h>%c-wBP$<J);ndc+i$*
zX8RiQ3eKS<iUy{^RFvw40YUcmm+E3qXD0&>s==8>*Z>>vuLKvXxKaGbG~vf at xmLCg
zInP50M6ZX9stVh(vLC^J^j~X*dKW>N>GURZk=J{5PN}DS1%AoViv49~8T0~@soAF(
zXOt?3-DlUO{Fr?!4`H|R*!#Y;<6*$pYt at d9>W68H_Ejb3%R~IEset8cN{fz#3t8de
z_R5g>Hf~LIGZ{enlXP7cIgHvi3uk=jLDJ>&=VL>sNV3Q;R7I%bl?<OfzQq^<1{b|a
zs_f_U#ZIXZRSFq*{_r`o(nbd5Y6{X!ZNL45UF|gio~rT+#ez_*?>FCAt#ourbW%2b
zO`w)VKAWCi5p^cBQjCANxkOuy{}d~>kK at yz*R>;_8!YYep1D*WY#3SXNV!OXRkV2P
zJ<Pj_B-UxWIjU&0;Q-apL&+?d_2O9SuUldoV!<AWS;yk<2DGG)<)paEq9rS_f><YU
zMwYIHPEHg2=jGnBBoJ?^zpIrQlS;o;+BK=%vQxV1&UYBw5AdN<^M6GBz$r{Qd6ABf
zyOkuHqgujJjxCtDwr1N*wtU<gX^;l54&*{#L(er3lEwbE%>)76z;n~2X};}a)3aXw
zk!-a(L{`~HQ at kCEHyyUf;szLN37OdO?32eiW}ox5J%y4Yoy6RoB8Z6;gjnH+b7ZpZ
zeQw);W at wW=_7h(r)Rk%G{dSQc80lE0R9ya+26~-jX8i2W_8O^*bn8!7YpbF!qzu8*
z<`m`3%sc5(&r!0g6yrw}IApV?975WqbH!R%)Ug;iWx<C}y{R43^cT_xb`=yASz at f2
zr|5Lfl?(7%eay_vc2pPALb_fnVHWuKUB=2?zFXC(6KprpIIoCz(|mJ2g}C!RHC723
z9Z^SpamuZp8BnXKi&}i>h=J?$K2Nf%+xXFj at uN{&g|O}S>#RdOvJ`ei-F-REq%W_U
zQAoAg^RlE;T$FQ|(1sG;M3XiP%efw at j4Tdg3zE$Z&s;-2-(b1ojw+ at rcoZR8EX+iT
zlUZBUn(Xr87FJq{Ov6Bq1U)9+siY!|Ze2Ei8(WWdU3PI^%edW$i#c>J(amMWiax-+
zOY^KIu!|bsPO{Dc#d(>dS(%yF-J^}=>L6rz<;BAErhp1<Dz%%?%E$I)CsgO%H<I8q
zks7JEjg7}wK659nDGmt0g|0Mab3~GF>1MSOx6xqoR&3KY36^Jv)vAe4B)oGem>U9o
zlxKuKy*zg5;?gD at Fpuae#;Jmf^L)PAAco$)$=zI8Iu~~6mdjPkk8v7`E0({9f7NlY
z5Q}3=s8Ry}c7o;tQ579dfCc?X?+cZ!)JQZQiN%<5RkOW)(88gZs6A=nY{yn=yb*p9
zQAh9~cxPMGy17YFXYwvN?zen-EowcdLtC=ux19LNU9gO^M<NMz057D1e<`V=0W<-p
zEEg|^6xwp-`KfTpJgvonodH{|dJ_(x&Ug8<>oyD6;(bWU)HzbX<?Kd=b9$)g$0J81
z at _oe3u}ldfI5%U2PsFF0UQXB=j7d*A1@~2 at iI}qJhw(!<BG}0i%AYvvN`};|w<EnD
z at suaUmay9JMHfpVrD!O&zAgW_E`q7D at z{{og>;2$y3?YeiqG2D(oRf^KDTsmx11G*
zaZF4S!{wb?nV)Yv@}$UFFqc*H4t-{vJb at 8Ba1*=s_`1!Qyl3;>Jo at W{q*4IBkAa_x
zNi$2*;5t_*_DhK2fZm2bnbUfu6DFqI!MmC;zb?lQ)k`%}dXv<ug{bW(r30h6PCD)^
zY_~ACjgq>;b2&9u?<KCzslGaFGo(H>Q{HEvd at A}vtvItrogpKqlF3)lm`S2JdOr{I
z>b7eAi^u&+syJ(+g>$!(CQ|)eN$(cT at 6iOCfaKu}I4G$5>wA2~$X5S;9px9g`y#hD
zvVq)1SOh3p7?~-_jX(gfArNFDK&htsf`OY-NDze|Y-|h!81eoLx-i^DXY|SMpdbkE
zk0Jp|I~x%1_wWoaNZ-;3!fOlQ{XI^@`@1&p_lkbxI9dQf<^q(awzgKhOiT_A4vY?L
zj9?oRCKetZ9;WZ5lz&xa2>6elm7R^ncP&Ez(_K*JJ`x0BVqs)q`l);G;s5H?z3%TW
zfx+PaRCM2lA5HvT9V;_4JJXMQO7g#Y<+tu*r4;<xSNBE*`M;YsF#`Pv8wo1hSyTAl
zm*1_iF)}}v1%m7x$^TxUdl#iKGXmH$u`x4SvT!^WwF6ohGVri*@$fVKVev-|KoHOt
zsBggluraz1PYEjO+gXq+g6%ByfuO%2f2#Zdeh1u*J%iz03`+2>bvz8rtPCvNsw}L$
zcOQ1nztDfz<2MBG{sOSDFfg;Lvas+n-+kElnSK`jsKLqxco$MJWH500C$D}h{Z0M<
zd&9=d!NSY()0^+8A4)$^MuvCo2bnMcoB($_L_s#zzuf*K|L at 9%e}x1E6;)Z7CE2*-
zSeRA*!2L(%2l7A9|9uD%2(bkM$iEMVt-gVU5d#2h2eK8QWTpI(`8|g9GxP4f`mPB!
zxF6R)bFJ>8T|e`F!made^i6E^txSIwu(1DS!vSn#_%oC3XC}b(P9Ja=NBmjB%Fac}
z^w$Gu2f52PG%^N)j0}JHasQ4AP)dP}!Q?Fen;Pr?rpETasj=Uy{q-X8-uKL}yZ?0Z
z_w0WU*WJe`RZZ<I4M6%p3kZ|#&m^N2$fQ`qL>0HU215XAtC>&)4=;;$M8x at l@ADWU
zF=4Y!^5)th at d!$4Y>{x|cTq!1Vn{fWn`+1$wn&7IsV<YwXEAn@^=HLg9>x={Y?USx
zsrxf7G at VnD0jX~TFrc7 at cDBrJ4jXUapu(X&$6B-lyemfUew<{a<|JxL4o}cqa+@#C
zwlXeNYcE014h at j|4;H9a(^E`HGxRZi@;}Powtf%_pNnborWkDH%Oc at BK1>_q>xb+^
zP^lGYiB|t{ae!a&EkUu_IB<N3hRZ{_XD4xcYJL3*LCgTI_qG1+4ao!<;H|^g!Ib{5
z09(yiOsXD^=PAsSgjk~Qbw=m}Vw_z+`^!Xrp_iihv^s*~Omd4nR-m at h<#VKL$uZ&3
z{>5*K1W=Y67KLeb<icltYdf+q*_X#Lz0hLN6|@nq&ZCZ+WuQ8IJ!x at CL0>h?#OX+(
z$W$E^n>L_d2Nqt*ty3q%H-F9_@@5%iQlBgT0(ks97RK!LA?o-8%C1pHs=1HLE36yj
z&~`SZ#1G*#;^JPwttcd}pAa+91XFnfaO2?Q0z at T4L6J%$FUJ^*aC)!Rsu1UypL`0?
z1PUx>xIF00Cp59O8?2caJ!$^r at ZiK`%uqO8n?Hf>WIQc&TEV`>bY>pWM3!E;Qs1!K
za=1D*;8j!bw6C_Cn_WICT|=`Ymr?gH?vU5*##cJLN>L`=+l!)O^lxY at GfLY7m`+9m
z4Ma8MidycMd4X8M at nRSeJRG&ct4x{1$3V;;T`A=j+C7f29<Th88isvF>O+fCeI}1%
zB)uX{?#!ahoO66s6GoE&OeKwLn=}7%SE*WrPz58Kq&@{c&9}rkEf2R!bct`Bsk2KY
zkF}AKUPU)nL^-?~#+nk at ZWELvy3Td!u3RUdfAk#O4_&mcdvYU`?imduL*s7Lh~Dbt
zf}!`#c$3D1oZfaPdwNMn)$&YAt3N28>_kA2KHT{xp8MG9+6fkogs1m`l>|#80N<0b
z(OrVO(u1)xbA=nLVqs^U4X5qBec<DixOiS%8eEsBdR>B8<y3`xH>v$H+eApFsO&=L
zM+4E9pQpd}cD^;sv%;T60C2}n$vyI2I;tOW7LJe#etJnX(UB#R5VL6fIY9j?iCl*O
z+kz~Jd?C&;x6MqrUcRzHF-nzRQJtNpc7JGzPv}IFmtR;cNsRYKhrDky0)_0FzOCL2
z^_9-CP at npdtUFmr2a&^4uW2b3ylixd_AJ*UO~!pH)f7||zC8w|rG!Sl%n2C1-0i4^
zx}3Ll{fW~-)T-VmQAZX{fkkxq2irO;BZ>fYtj!eTg^u~k6D6xvahkwjlFbJrgC%-R
z(FFnmZSQ)TF%NU`HUr`YG@{BOP-!G-e3dRLH0un at M>@<z{mb<kiNU&|wP%vAcY&=J
zYo|0`j_q&u%^!IkOMPCSg5{AdfkvzdiXA>>=T$&>4U?kfQ$XHW?I^*7&_v>j-*!sV
z`=EWtN4Ft`=~B~=2u2USq#&jmH7Z0cXD7Z#7SeIH5uj`6Hdtds9PO-Zk3Qcz0F6N=
zSJTxop^#8X{Y304!pl<AcXd!eE4L`{1>2VH3Uuk4B7;7%`7wOAc>hZ^QFF7~=x^Kr
z)STju5~||Qs$1e!v>&R&<@#PwKUU_~s{4QwHID4$7Cn+Ais at eO_l?|&ts|xW^?CCV
z6=n4i_vo%eDuU3h^_8B^{^WzNH8j}o<}L!sH{`0J%Yt}p1A+X`W)n-Q1ar<oGYt&~
z)v$!J2`3BtbRQ7f8w*s6g{W1x at d|7neBE&^j-fv2cxJ=5ATT;(D2zIrq+T+LbqHA4
zHt^Qw{q_cU4N%zYh8sA*(4B5`p@;(-O4I9JTPVZ|fmGMXSU9rD at F8d1URjpp)5yO5
z%6#0GxKs}O#!s%-)KSOP1=J!xh8r%(e(T*KUUXaey3b)pCgH;SVV$5p at bUcP@_Dz_
z&x4M6FDd8sdp4(U*Kt!<6b}tlO$q_5YrIu38HXw;x99w1TF>H?LK7K+c!n<57)-nQ
zP{AQWdm<OTq{8iV`fy)5nhN2$1ZT5eCy%i>xyq2x3C9WM_-ODm#64R$PH at CeJA83)
zjFpKIr0ZxJQR%e^^u%RV<^wr#&PRT#JJ0^4#+ppaI;JH;CSzD<?2wXmE!H7Xw!Pam
z*F*kR?Gk#SR~zlU=unoJyIct-pOzK^BBt`V91e0}s<?rqXF$@o^osEHK1x7E`s`ps
zbIn&q%izYm6TNpV#Q9HhF+D2vW}3<h_$*c=kZms7igA<?%hg3Qp1`==V1G)WZ#zAM
z1duYUn4}qP=$X=@pgw1u>&`K$D+p%_T<D8lWZoA4WLS5#h|h^msd?IVzN%>Un26<M
zraGCt at zT?{VCgGo;CXGw%t$}(^BXSuji;Eoo|)^W<tG+-M#w#84g{>uO{YDWuW^oZ
z>jRxA@&IR#@?fv^Ma;6LxjYfO30bh*ll6{;pDl#>SM)9I1{MxX&6Yg)<aShiy%<rm
z4nGBYO)HgEN?(Ufs$?KeXSHS_+GH{_+j at xMqE?qb8j5J!sqX&a#R6q9uYGc<zgF`n
zMt*>YM>aW0+)6#`G5;QY{3S!Bukx~##5+LSs{`jWqXd1y-F{=P(7`XPbk+*}3hBx#
zj46(WU9$9xYp+Zn#j`oE6Fk_vm{NWll<7**+Uo${!ENj24t)c!$Gt^M<V#x_s9$b)
zyx!@VMD#8wSLErws{5%u!a#8`j$5Mg09E@;uo=LdBk&>LixU6bY2=51FK$<(G;jH4
z79>Z*^Hn!c{g!5fhf&VB-d#d_eJMl^Q at w7+5WM;J^=5tC0Oz&^|N8dHT7eyg96}X(
z^)vPGhJ=t70wK3@*U3WG!-CSWk!pIz&UbZ9>9Yt?dy+Nn>LVx1dp4((ZT;{sDB4qz
zct_9<o+*U_9nEzePgE7WC|oGCpd5 at my<Vkfhx0`eH3+w}KK1C3Fp*ye%JFd%Z^yhP
zLtAWYkSy4iGD=nW6w5z~Nl>7S$~1Znf$+-3RJ1EFq<XNcl5hvQ9<5gl*0EQX>776Q
zBn_p|uk>)_3=$zZh4k<i^Ub`<kN{RP2Ah)7ESuAZ=o!`crX<$)Xn8R8Ofp-BbhM*P
zgKW{whqkwuUROMRS4v7sT{23}D-8nuVjrgS8ZVpLPLIe!y?MLXYE98sHoKGXAeb(0
zTqYq=dvY^y{)rvyKEb(w$j-_&EhA{64_=>pOuG}H;=RvFTlyH5spp&W&col3@)Ro4
zDNO9GK)N#qmvV_S2jh9!G%#%shnz@{u2J0}9LmLmScMkoij$IT#&O-vnDz4m$_)>v
zskcP9&=zV%<zV6>{J$thne)60Ali!pVv!&`%yvt0;FLEGseU}6XnFNIkykbOIN*iE
z*I|`(^x#1~4pxSC#qhh+K9;p{Rp*GD05YcRv9=7o(lK8?PLLMo#NigflEzx$KJ}D<
z!{eHT;3p-)2ttvY*-qt6Bj-he3gvC3ebq;m at hq^rQ;{v|V^`nea2JaGm5I$07gm=A
zeHm2?7kLDw0%T6(Bs!ewf*rI=yB*4*8HXYhRhRH+vAQMNpLRjBs)HRs4g5aU3Q@(*
zM_n~C+u?4D(m|#nWl(W~<+_x4wjWbnonzQs%(zRadLw1lIcJo@(B#DyR;zg%1U at V#
zo<8)e<%xJ!vQ|?~a3=56oh`_aN^SluP#I(!Lh{jM>2Pnzo%ACHtuqezqHNbhJNn6F
zI)%$M9!#kF$Qd(Q-oasOA&lZ6NVT3^DuHQE*4iUCs-V~(=;Gyt`mC=(q=GIfS0dv@
z=fo}E$s0r|`DgXMnuU^X<z at 5SDNWeLyks9T2GfOJa>P2Xyp6Y<u`$lMutLz4tY5b1
zjeQZb6Z6rp`TdPp(^w6WNT-hYrihgHiiRDj6x7xki8Zg{Gx&)QM4lTuS1T<evc72_
zwO(MndGNIAtRw1`dYJHG59qUkS{?T+ZJGOW$3>xzwz}L>P0iJVHAQW2^M{+a!k-t)
z`>p5&x7ED4l3;w6;lT0eFC^ZCJ6uu1zJlj4yYa-fTc)RKTRRN9QcKtON-DB({4_OJ
zY7<u{rKu;L($YzRQnsm6{>YMHs!vui#CRkzEce8%xsS)mCH~2-?S|k1-?{I6VudHr
zsE)6j0-`5iGhNh(U+vpd5I)Nk3r*Rmc$qjA8Il at 8K+`YKkoy6L0%?2Ji!Hnm^BV`R
zn)D%(2;Q4$bG03(xlPBFElJ8Eexj4-rt9#;;{ZA6EsQO03cjXUn!(Ozf*SgnedG#T
zwprqWqc*E4b|`!N+vXIz<k1o;Te6n>3(@7bFhHHYNb~U`<WG?L*VKeI8K)0c?2euW
zF@!913yOmZxaedGb at Kew6W7s`ABokgKYb(6ce;`LJOXK>ht(qNhOHA_3QCo(*38Z^
zy>8Ff*kE~Ea*_5R=<NoY$>qha-o$hl;}?5=&a&N4d0aCzlVu9M{Y1yc74|QbUB;BU
z`bZc&>FIJ$wK at m%S~%9WQj4duiag-kmK?X5q0KfNYTJ6a28GrXvmJE at B@4%2>cpnt
z_Y)6{w-1tMvu_C!^ZB<pm_`uaz!)ANE?jR&O%f)@xLx2GO)qMMaFsP&&j`&c3njbD
zESel!G&S+lZ75<tZ#u$Q1q8XsKbckm3f?Yu&kzl<81R!O<nm){b#~Ar=n at VKTZ|Dk
zQ$lZL!wWUc^<Y1=-;N00-rttOvfg5UPcSd4{UOKggn=Nw=2TtJY2d=J6E`q~pL%2I
zbD!Cc!d3^W+5i{gl3;Pta(}&Uh^v~%L%*-)T5o_8<ow<lC(gjZh6BaDOE1-~2OOV=
zEzdlPdRf9Id;r)@DL1*3{yQDGS%O`4#|ehJrCqKBHcqUr-I@`$Bt45MM5Vnv{CJ(=
zw8!eJhr*l2ndrP`SQR6~qAp{uPw7nglinB~nl*QU*Q>~%v7$a`v1?t}WTNk$iqNP%
zX^&6PtR^&!&or!t-7lG3;kE{BS{?-?YnM4UPD`}kreDMmP)T*J)KO7$174^X%Sxny
zl)lpCt7dA|+8`aU3gD#3C`y=KRJp!tN@)!<4#oxBIIUvCy?q6GHa9SFK<DY;%kcVD
zy{kxqE<wb}adBY2D%m%EYH-&G)ofvV(Id(J*rz;p;Tk3(zI(V~naZ~H!mRHYt8FiX
zN28-uPa<+v;UD$IBl0}+E9o-oV;FL_A&$Z_5uY%bx?(#sqh8$0dcPDme0F5^{1W>-
z{e2=;C@`;Z0A3=1mXmB)V~1n`ET<;y!E<5~LJhk32BxguAXjhn?L9JXNBC5#XE*ch
z6`ZdA6SbM-{tU`8=L(ArWQ1GL`-59JhKlDW=evspmyO%-#wC0n7kdYjLpOdKoQ7v}
zu8(;Z9fn6)M~c(}I&Ki}<DL|B4PM)rP*5${KjWVNMCrPx3PFr)@8d*&ogr#Nwz<*V
z7j%c0>;j&rzl at J%qhN?8p!L=6OOjHRwB8Nb!`m#?<q at t8_`pNIn6UR8h$|6kv^Dy~
zZzruXJhjOu9NL5{e;4za9Zdg<d+Q6Xd{A!kd+BTX8 at mBrU06&M!Lwzocxf3$l(>($
zuE{+gmQUrL5)`!tp&5EbU>S-y!IMI33#gwrG=$S?>m&?&%7K&t*%_iVY$@^{vI-tn
zEWL)u7p^q*jau8*r$iz4YSkLoYWN%9R3hB<^kp;XO*BmsI&br%vLkeLqGa%2x@%ar
zI5w-6ol7F3i0&mttr=N<mP1h^n1_vbcV?*Gs at F~1T5{Hg+B%@EZpd86o=1+C#{UGl
zn6+DP44;FaTvW4+v>>6WAv-r~lKQgMIX-@&U$IX?7|KPI(p=ZnG^OC^(x1zCPH3<g
zf=ukCqr$wJ45Oc)fy1(!o7pSvtw23ik2#aog7egYAPqw*8Y3Q)?V#n#4B|@tNzXX&
z0z_JRX`UlZ&FrWmPST4Aw@}mC_j>))(bb!|NZRQ>3wv-rE1@#CbH-z3^i?~`$+=ic
z-dlN0oL9 at zhgMO$I)e>UY}W|M0VL5?q~-ud4A at Mfgkue!<Sq(rg)M*-leHj^mb}NA
zOoC(Zn}HgWVu9k)UQWdWymKS32dB(#?VY7l6?>;RC7evHy>%`OuXF<8l{6A=Wt6Jj
zTBP8%utL`D#rV-pBoMD?GO}z$a1k{Eh5%w+Dn+*C1 at 90paiC6&s4xP^-76DdtH#5f
z?Wof7<T}mq-ym{tGlq;cN%cq1VXwgSdWECZLaU((=M?m3HHM2K^=n~aU{XOVL%K8D
zwU_HSL7pFA$v}3q&@&pzj+*40&k2>j%_yd_OTmfm0DXcdpDnZ4d()*Y&W`RpgYiSw
zrM?<^+@^@f)B{wp at +%8H{EBpJ#~}8hQ<F|ltY0O8L{46D$g^4Id7n-Z#1B9nUjgWR
zKw(BpPx7`pM1^Wz<dB at x|7uc&9%JvSg>9lvZHIF{Am&@sL`rD04tO5JMZH*MU>xic
zwe<03;agQjv-%lTfqlyE9y6EAnYYFDTD?fKl$cw0BG>%xZn{lQ+^J<FsL#WaY5KG-
zG|fTq#w_5XwK%#su0{Z&0hGVom{_b&1jkv9_pYrSR2A^X9Ca^VELk7SDxcKG0W<fz
z<m0=mo2R->q=d-0T(TX)>W||DtCPzPzo^lk2o@#a8h5|mlxQF7v at bnddRbxnQR||C
zEoA~^sacy at +i^3LJ>T4ylv3bl?~3-Uc{W{Wz at vFT;H%|Oc at 73c^(-I%lXc}fNVogi
zmvU{oN|91*k*Q`=J1zT055bePIgHfo6Lvb2>t6gXr|awCBmQ*smg{k}`nW;JxrNEk
z^B#=)5+%U!C9#y?pwIBMrDhj*1?|He@?<Uuf8ib%#%-lO+c|)PB}u1YC9#_uU><+?
zj$<|gy96kKo#H?psGafgurrRMnH{;t@(823(|0e3Ct3!#I9gr#ovY;Lo(*@NR59{X
z#h5V1`5H7N^R9lC at _hCxAhQ8slVxWnO<ddl*scdJ20Ep-yRuf2Q~b>089XDt5wAjE
z46+b!IhLa=Z=RjfSehj%>OS!VJ&iISGwIiul<+EXTu+UBYrV&k?6GR<sH>O#tAsOk
zYv?79aPl=;i^)fGmy%o!5^0DOV}%p?a>Jl#9KS}^vcC^QQwOwN8Gl}ieq)OsCd=<B
zy}?)nNh3)wl{KEh|6;W*xnj8Jv)L+pa#)l`ND96FCg`oy2i%jm*9EYNn-9%7BOj*a
zr)o}o#1f1c3CXnuLm_KlwBxNGDBs#m019h9d|5h|znUF+Iz-9lA`R6EZ((>cVUg`?
z>=w#R522E%HXVkK!{)TjS$)ZlbW5X+p(hc21k70R!X){?pN<f`T3X$^q%RrYqQ4IL
zDC4ubNM?}lJy|bLJdHV4C$AxEDg~7gpZ{b8eonIKc>q&yPFuf-UKgRZ^+UF;N->k>
z2iG|oxNU|ZE!pXz*v6wUk8{gww!$0qY*y=%GegtGntCJ;;w at 8n$@qHD82f_;5^<<~
zT-cry>;^XnA-tekOC4Ya2 at rZNPOV+PYr6_#Qi+VCNC4|{e6+a2d2vW~zx<T4$Onrf
zKtXj;{I}%?|8Dt_6IT^skdlAFWT_7V8XG~r^M|Wr+Cc5(Xu|u~!GSIxCPwi%QmUk`
zyuZNeEN4l=VR5P*pHanpHrD1S)~*+U+n at H2A3xS-?j(f;nh+mq2n50u+Z5NhQO$FK
z*P<L>GpWOB%u!go5#a&TvX85<S*AWi0}B|?BsmH{J5?2{SPS=^Y at D1JYB2?)){P?c
zRWXNjiu)J)M at oc+LhXmDx6;Yi*IL at yszJm%9rdiI1^Uc*u4csn(wI%=zIaDDge5Ak
zQ}%4h+F3ZYqzx7&wUL|-((#C7RUTvoQ^+RdE*m=-VcT{=18C|T1TSsb3}{@f+=P1_
zMpQPZ7k86;5GG;2N*;+HL#0;mf($(@sqpr`o~bImG-Et}g?1YbuJ&VoJxNITYE{|m
z^HOMVK4Nb^i4J@&-Uax2*@W at XH2lk3lJF%^vt{L*_6cv!#~18HO?&(3Enxi!9)Zq{
zk&@NgILB+~`*HEWb}~?dhJxz2I}%ltfri0@`gg+l-QfHtKk4UxqJC3>x+i7-61ltN
zpTzFpdFDTA|9xBXlPrGEH2)=jcga8P{0r~=zd3h*Hu6hm?~;ES{lz-}d&m4jLH*H0
zoV%|4)5`BG^nbT=&qMzu(*I=VZ>;oxxAgaR`Tm2YUo7?i)k?!ZSoy_T|930*y!Bsl
z at DEo0AB+8mv7b-D@2vFu&FL>;xO+H$XSM$v>YvEpDRcL%^<Uz2hXnlMu>T4Cogr|~
zsQV=ZcelUzbw6?U<@f)M at F#!Z7f$bP&wYPTch4sHiTdg0 at B8w<j~p$*zn|UxY329n
v_3z!JLG$+={h!F+CxH9u_m at o4|I1{oC<A{tlS4sa-Tl$tktM*4_jmsXb$(#e

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.pdf b/koha-tmpl/intranet-tmpl/prog/pdf/layout3pages.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..1560e781ae6120a6e7190b9e78b6356b1331f0d9
GIT binary patch
literal 26944
zcma&N1CZcQ(C<68ZQHhO+qSXenH}4<c5K_WZQJ(S{qFrxb?>Y9Qk6=d)9I5+=ijNE
z<QGx}5iwduIu<C>fj<MC1I+`uP)r021olQ&P&_>JGNyLsE*1pLe|wbZ#Vl=HOr7Y(
zYz$pYMNEzDO-%XtpqyQtObu<J+_RF^#_Tp25V|g?-RTID2UI~|03~hEM`@$|@gla{
z^Ch5IQa^po_t4f9l_63dA32~y?IkWC7awlLEsO4^$oVx{xziFn-;4RWlzV~)F3v_A
ze6R>s$4cV>MzXuhU&Iv*7SBFTvO_%6O&hswn-+WlJpplD22VPp{K1NcZXTDIgzTT5
zsn4xFw7awHLI*5cv9D2%EDMGwEz#uG42l)Z37ubG4NDX63?ryCxILaqCuKqc at D{&j
z55$kIqN=eXiyNSJYmJtY6wNc%Y_v4lnx+p%jHpV}(bQzHCm=H+bX5eW8f%T#SJ9nO
zXU$Qx+d)1z89~O~&>6*yG0>(beKLTcOOVTp9ATJGDhC2o<P7$DTLRG2+Eg{IrnI8d
zF3_&~wOm?jU9VA9i>JB=l5HPu989%AxpY>m!Emc>DuhDmM+*l|pyIyWwPQa9O(iix
zv^N{kN`A4e&kxWRu1N-ln#yorj(hZ7%Uyk-_JH|x?H+*PFMfI5#rNPjDA?{xTUv~J
zBoD{C!PSFL5!y^Z8!Y6)J08KxNT=bh at +tOQ!6qj!f8!h-t(_63{>~N$M0mw>KIgnP
zLs7BN5Kk}j1e-4|I%v|<)N4Aw6Y)n6uus^9Ew;MnDpu1UM|o~+I`CmGpDW!_T?7^d
zb;=^P_ndVg<I^nB;jPBSDf0B1+ogt^vSG}eHs-FgYehn=>EgRhANr0_i6FMl%h9jn
zpEj}KTm)$7GXYp*oHwr at v4NEwE5I2AYYsM{&7!ZPSp=lNW-aTY5w0e at 2n|?&k_?Ns
zzZZn?9sb~l6Earnv1cehNe0}qRS!5{j*Qni!e|^Q=P<pUuY9lMTPJIlD#rZvO0(~G
z;{f)lIR#5wG}?7(Tyd}G079Adg^iRQk>oz40VZlvkO*v-3Q&;L8ud_}iiF}Hj<BXU
zSY7hWyjdHkH%H3d*S9sTrJg<SH at s5?^kmIIS#}D9>UHaq1?jE;WX7r8Sy*1JfVaxS
z1H&KcwY;MbvO@|1Wol>gzpLS|^{;@S{?*MtgPoo6pZ7odSpSdeV*CG5UA77nQ2h)D
zoj2;2nii9G32gqefq4P!th<7pZ$c`wkv%uf(am8&JZ5fY=3#0<^zM0LwDjm%OsBME
zzh{8$#N2N@>vPD{Nb=^TYhXw^8%OS<;xQH+u{Bq4($D)vj*tIX>MB&9O4+4K9|m(?
z9=BLFv8j8LU=9$W`YQUI+{^<NL#FWe!DtWp1%|t&wD*jya|AwSU~wy^i|u+2Oxv;A
zXY1FaOSl8V0a9z1BiZj#Jprm;{&vHyodW;Kler|<*@LmJ)7r-lJW`$ezohD468`0f
ziGkz4QpNFqq>A(ZB~}0XM#V_L$jZdZ_CIe+M_yjui6hCUlir at vDSTbF6U}^gKJ~N{
z%{F7hY{R*ruY?RBYpa8?t10+QZ1mXLy&)_^vIOwJ*e!-*4X{&3zd9hji19K>Wm{T5
zh_|L}7izULY}q9zew`g`2ZhL5+Sx(w=U|S3teU)Be_#8lYwTokIv-C?a+*(PG3QFi
z+(Z!rXNclJ#oAzJtZz5 at Vh}z82i2OIs0+Pb-G^cCMnWL^+E^_#@6T at Zh=z3p#A&rz
zUUV6MsNpgY|M|cmJiB%Gws at SK@1YT-a6oXU!37^wIM-ucoDtN;+DUmW3|$o5#eaoe
zY_ZG6!5rUMVvJA_C112|f&H3WOkI+v$dmhk-Uw|T3dPUK33zu5V%btoWDZwsj1wxA
z6Wk~%K2Ywt at eu-cg*;9LzzOktGzL%*y$DjKP_>FyD`7Xml<izIYFfjczRc2j{23AV
zfLK!$S^F(x5y5N!;V_~IM{D2d_rcusJdFRXKP{9<mm{(xP%=mOsJxhKX(6b{;{OZi
zczMQcZU->Mx1bcg>-RBV=#`@j*!qGC<0FRWx$|kkDWnV3*OYCc$Q+vs{^Sw;th^(s
zC$5Ysl1~`xsq`u9?mOY`vJV=yQP2nm at Q7VscXSRR_$-zaB$fOe8WI5yS7^=<a4#p|
z1&@pK(8LewLg?Jr?dI>{IlA9#;%m2K{6tsLJALKX;?}dk7NF~%(y{gjCmgt^HORc+
zOkZ>ZplH}jh<3~#>2Vja!bcMp$ljq0mDxD^YC)M^?Hyd~E{)<VJ56 at B8yQRS%PGgj
zs?_R1*he8pPZQ@>)+uW0Y9QkiQjw8RT?ws&2h+{z9*K<7H49dYR7C;A7|Cprw2XwB
z7}8WwLlS?YmWK!hV73CnNI?afHsumgjG|;(vzcI$jNKGM7LxWdlhV*r3Xe>Sgc>MF
zb}W#BnOj at Buy=)Jjbh_ECwE<8)KKcB&{TNvP6=7eW7#1kagZ|-X*-5bGK^(=Z-Vq%
zq;ybMl9LONxp;qj{!SR$Uxd`5F$Rm<KQ<+Ym^Ya-Ow4NWuwcQoy|J@%^5Ee$EviTq
zs|#n%SB)}NYN9GLqX~xOa&-~lP;6&#yM>7jG4>rO<=}FWcT2zy=yuk5*xVeDY~Vjb
z&P?d$O|3UPx-%(TUCeq^uC~QxAF=#!k;qc<^iWLu;0-tmOWo<gWlriV?fkq!1l1Pk
zbatjKm}NrG#O87~{-uH9?sy&4$H2Y>gCsU*cj|gP+yd8{Knw1b;BA9LKS9%6R7h)S
zdvhU&WFN`E2ZHfxjl$bR7u#kYPxkIH1pxxM50LK3<FW at n9W=+FlF)Fqb=LknM3-EV
zWA{cf0mD{P!=}z{E at f>fC3DM|$fChk_(ex)PnVa9EieimhSWT?FNaN8HOzbdHGYD4
zT60oJH!pM!ilJhu5Lrk`6T-+}ujLnjbiVGfyBec!5*=NK!Ed1k(Nbi8*rNp+wh<=3
zj^PG>e+9LSsMm$^n at hQnOaKUYQ<p{W0wMt35Tm?;aI)fV6M-zL^}%HJC&`i}p1S-@
z*D)9Abv05&8<GWTObfdLV(2O7y5dI^3i`UP4^)(P$2*baT`p81)zXr1ByKf-T~xLi
z*Vq`+Eyfj!%SOihjU&krFM&Q at Be%{_EG&spH^h*KTEs*XRdcruu)3<QmJT-Nco$&P
zl3TW&KC#PRMQgvuNLlrwXJvJC;1TYBBWM92sMCd-D_t%1rh at x3)37cjPXyat3Pmn5
zME{Yuh+#K9wfJHyma>woAd1{nX at v4t6V=JVlYduMlgiT^g at NH^Q7MfdBAbTJ0dN3W
zWk5+bWoz=t*N%$h-EWP95$`x#FLh5#V(vF!nmH|hXkMr72Vx|IXQ5XsWk{s;U8(Aq
zZLWWxvO0`8UW%OR&l0oQU=UA_#0-Hj>*fkCg$%WxqHF#*^F`ARF+d)OG5hei7U7V2
zx#!qwcHTdq<8%~$aT0^YJM>+_<4OT-+H0OpHZ9tnRLeoQBfcW<e~pLj+N!xlkm8+R
z^GPtMr)sW02?DX*s)2wA#!OM55uJ|^piWW-S7C|Tev-n-*IX_)fKbEd3`88TM03Q5
z&LXtL=?NqLt^CK)Fr*NFR_U2z6ywvafkEo&Avou*O#{Bk at em-q7hldu5$r7N9#Tdn
z<d0lbjm-H_GRls`U9 at Fq#Qu^2=BodM)XU`E)c#Gw#A<vrmwjhVmSVN2no3Y}$jXyD
zd8bLC`J}K)b#yf&dWq{Z2YFVOT(qmE#+YFd=7p<IDF8RL_h=|KsQ#+Bf_^Zq4KZ2f
z23oBn+fkkcE9^0a!okt-1jp=-pT~#*|4)Pe_e3%(@K-u~GiscI0@;%4k%*2F$vIVI
zlyD!AP2ENqVx;sqW8Zc{-2pt0gSWEe7 at 1Z~^5 at ppPV0M9iSLV${S9=F*LfMd{wb+A
z{P+IpmK*-pP#-XQ&-&WiQY5&X(fyRgV`kanSYnwqz0K+^kXpd1Pwgss+lm6)x|3A?
zz~N+cZV<4R^5FS!qC5RD!*Vkbu{}x@^zg%Qq*(Is=``*n>7GvK9G4lX8XfjKO^`<w
zp^yZdeT0^bmhqxNs3 at 3WcK+{NKi<VyHyLn)>^=d%+WP*T*efGM-OM%17nPN?$Z}q}
zbm(~UuZjEqJ<pL9WooyZVYDjd^&NW0nxbawdYbkNYUlBBCl10Ao06vbMgW(_<Kd6Z
z8p4pNU{!BI9bUE0iZq_GKCP)jtouqJd?kZGAZr>48`t-E{FZ+9%iJgWSI$0s<KO-A
zCpjndv8_ZG$r@)-$Lm#!;8YRk?uax!+0MOOLZ25Z#xmxqUtiqCg4Q=WaA5XUQ_!A>
zld4P<(|a^0SPV2_bhK3yMXbk8vzZZ}rH_3%i`%ouC*;D+OF;&oteZ&^K3Ps)nMO|&
z>|WB%q0cwAh}O6KSKd#3W`TM)HI)pyQ*<8#)SRZT(cy17MC9_mRdd~-*0KHT+5+}=
zDgj7)_2Ra#lGMxE at EYL*s;5NjmsvLY&&q31vWA0ID;?5`lqu%Yu_=0#M^c7UC2CdS
zvrLyXl(FuPhlt?6@=8}KkP0|E%eO8K*sRK+Ygxg+e67m(VZdH9izBWug{$hYIcudD
zR*MXZN$`zlE4P4;BT=7+&%OhasgHC{B0Ab9e);+|K8Bia;NetD^D1uWWe4^cJ&WJU
z(^lZGFXk<tsx*<M5>tN;*>8Q!g$@DhZ!G!e!rFA&U#)+z)$gJfiq$TmC(RJU`%-2V
zsUDSjQ^^&g-?_$Do9rG~#{&~p2MF7!96pDm4@&Q=Dl(E9VdrrHmgU6;xo5DJJ{Cxm
z at V64}J4YoM`&e?j+0 at x*<OE2u1<`p>^|$j*l!uV#hVu~b2erzRz$m_*=8r}a6>mL<
zXGsr2A?l;vRS*?>V~o=y3E1U>go?&IWyHpcucKM&qv)fK86tiR at kv=CLk at ZCA5zGq
z#v>$8RENK^OvdA&){)GEl4EeA(i;Vc(1f8Hsbry^4E=Fe>?E=x_zXM`C>@<1AGbb=
z3w?pe(To*37<&-e`jv!z<Rp_)`fD~UT8tKg3+430 at MaztXRy{Wu+}-y;5BgJ5g4pC
z(6_kcYr)bukCk5q{Qc~?RkEL9(V)`ERo2zauXnj*qYoklsXo#Y{#Jg5|Hgi&t-X at 8
zrap>(5?R{W)$euSML7ak$IWzZd`f>utzxCqF<0(Jk8%Cp=7b#IV|<*)lHUjYGBB|g
z{;?JrE+qA40e2a(2o8Uir;v~fmM_m;Ot2BEGZu$TM6`AoK at bn5g1ob&ANfh=k-~!Z
za_^j11w97UnrO!3HVHhGml0u3F_!4KuX5~^HkN~k%2{Qiqacg;U@)COZ(@^i>gVzo
zKiqXkoGnx+*TDpO3yj-+mA=mFnEbZK1-|?VTU50ka)m30m9e#2EZgCJ3xBJ>($D>d
z{P)UDNKQs+S-QKG#p at ZZtE+a7+zlYVP&tmqjnnngt*<C+w~9|w21Uiy(zcbHVlcg`
zZWYlul~;00!~*)>OGGtle1oVxT0D_pBI+Fa!AnF9YGT8XJzAnsgd)nmbg(*fc>S#2
zDeWPOp7)s7l5~<@$I8XgqugiCLq=kjYxfz6+;E@&j<b$)Ttf^y?w}y!IWzk=TjdI>
zNbPv#eJMvy4#5elcM!8NY)QP9PxtzzTJlp^@@b`0WT!M4ALfQhWy0M^s>$aI6CZ7E
z;@ATdAI$-{NmkrlZ4@`9zc5`8UIe_Uw_G=YenML!6Cc?@(Y=@l3<hp|azYd?liKKO
zdDKpVA8Dd96CY6zO`;FeHt7K#ruvvH6J=6eaQxSm_}L!a=qCH>Z}>5Ht>HqZm~r=_
zC{oNy7FnpIp13<uOh5TyCJ`mW6KQf{-1}OYj8l}~NmFsP&DbN~Eccz>N at Okdn`wKg
zIeUpNzW8ICjOlW}xrq*Zl1$JK)G6qbA>(P8{DVKKy7cauNI7Yc+qZR at S~zyaUDQ%d
z?s>_gh-GwK-g}D!VoVZA)3JLJ@}+tmNM!C@=x}QNuoKih1j!2T`QFkdMHd=u5;%Po
z6Hd-RZX=m;%o8h9TSi4B8pxWWtY!G9kY^Rs%8^nquDM|%+e!43Q5#e|Alb~4qjaOl
zPdx;OgHj9clX$4fO^YOlu~4kC%ZEzQR+dFmGb`5;=>Jqkqj9FJv*O9?iKE2^^wq<W
z$_qn!f-HzrxU6BCkl)2j2(H=$V(K><j}%ysd;j{Re%v)@*<2o)x&7A0wkLmG$!4zl
z1ck7hbkGu#VStcBc>1WrFFj-ba`S=}ZUnB5<AV<4MFv$xt#_Ys6#rVlfNVLex;RbB
za65+X5)KTO?!X at MQq~3EXm`rY#J)NfE=vY)Z@<Snub>T8!Y2G(@5HD_Rjan783Cf*
zH$G*%5<80!;bMO}cUq4kt?sR*ZuuB-!5ImN_L}Y)lq64uP4LZ&1!q#xvGhkQnzmKA
zO7TUDmaRh6whO$>9hI^4ax?~e;1|v6o#KZmcb!740yti8!Q3`-FtKP^oi#*g64o?}
z1)-UoHO^-pD!;`LiCK1i!Y^t)(;+=;R*^)jKv20{1u<QRZw4Ru=fCrcwD2whqi#I!
z)t}lQoa at koU@`4qO`3x(5>j`&mY?r;`SN<)+2x$RIQWF*s6A6v)ze*Oik;q9mg=re
z(sxap=klAEFqmXLB=%I?8kIj=J+&s*kB9?*6~PHw1U6m^0g%5MfPTFom=?>*mD?X$
z^L{IeZ+E}9z;|gJI<oZ at U&zN1;KPCQENGMcNc+lx58a|Bu7O!<X4*P`6uzpLCi*}T
zjy5a$r&7QWMHFZJ?O{Y_CVe_%n}zZ at 1CJTeq#rBs^+YOzrBhgbsqyTCkO){2X8z$9
zIIrg}K)?d{tS>dUd0(ZCn9xCe1~*c~Uc at vmb^k(ka&q><9x68%^>9#o^ZdMPQ-DH8
zbz at _doI<OeZSi4|^#xB(dy|0ZgsTBQLW1KD$Vpt7o-e4SoeoT@#aoyVaAHyV?{NF2
zi=74J&~2~DNL0Pdm#mirbw#%*JUTt9-!^`tgEvEL^m?~ONKgBeH<fPN6LZ7L*QAJI
zDrT-C3U(KjUVXB0nQqVkS#J6+6)bjyR2fblUEEfaEhhvf(jDP(oFauO1P=%*BnWNK
zHyD#5RNSv_7I6C|C5`xg$HyH*K^gbUuD_(Dz0}=Hl(nzzZ^jc-)wQ3C*=|<-Vb7vn
zH&U=nv`0Oiq5bJD>^}wX2rmhN$3wqdII})j`oLXgPDdAbwhuC#d9U`L(~f22Gg}Lo
z3Hl&3(u^p5+i|ET>WX!u- at OeBIrkre7n}72C7?uZP4_DKQ1*pU^BpL#q(W3e6of?w
zyn)jLM&?3H2HwC-fl+ly*svg3yk`YuU|X?RAp}sZH7pe94zLSgK>(kU!RTOaQCzrp
z9O?vB?ZR<YjhnP4!<V#p0?X4zAp=3t&`x^s-CJ-|FBmrb38ehiPw8G3q9JX4CD6c5
z?LZ<;_TV)#@iWWzG#By)G=E#7mK<f)DYycrvMmb5f5f=2pnL9kclgO$`*zygjt(Z@
z=lSul+zNC&N<QBmkocZ%ETDET8Bg5svFPaj4Bg;ny{`ehIQqEx_)2Lma(RB~OsrDP
zJmDjZ#!4^S%74jv#(r at Bs<y+?*Uv7hT4&gDdP!wpDzm^*4T=ls{u%9a3w;A$ime#)
zT*wQr6b}sJs@=(&Hxr#yp_T`XQ-$#?WpBiMhtcWkmfa~i(b3{5mn(&@XshKaCxdcL
z&WJ)n$Q`zrWGa&xrrC^NDp%ZK!D>>hI=+)GZzyM1&5}xHE$izPn^pPE9rRV;7_7^P
z&UxNHN(zAEO4~};t^(UheMZz-0ffM~;<1973I)h<lmY$;M6gKLuI%|vT&c5?OjmKC
zf!X{{O-we}GJJ`#=Fwqr!tyKST<a3CgE%9QMU%%oHX}~4YWGpC14^6|S$a(v&0P05
z?5P14<&Ru&8LrAVn5&?m#DQ=Mm-DIN_RY!69lSLf3-oR%daNRUmfzRcdZYfbQFGC4
zm39TTpCv}kR(g9x$B2>_d$H0>bn){w-*4(W>sL;7&2;9cjf)=Fez|_Xdxvx3_M)U9
z-AMyadSPD>-x4ezUYaV%Y0xqBOYkd`bmM5_SmWt at g^)`^`!MaC4z?HQHgIRuOQ8Ws
zE}BuWo<rD&=dcxPTR~PK*y?<wGKyP~<rSFaPL%<{_xzO;&50yZMR`?2WkO1t$6Id|
z%_94G`~~L#yo)C(@QD}=Pmx3tX<b~nAOiZ3Q$VEO3cd1O4*XIj0G9AND!4|?Jt#W0
z=P at i2pq&1HpV~{Ee+2Sws!cUbldt!ZzwQ!>J3g-Ms3><B7B(My?*%07>`S{U{<MAM
zTpuG<T4q^1oXK|HufQLpwzz?+Cmo}s(B0^w;@Kiqg|IhsHWbPpJ#_>1p?8CuUc0;3
zy3%@b=v3M~5m$=4YvQj5Tno<-1VcaNtIxf}2Q2G>^c3-fQx`2St|HAbSCm!7PG0O8
zEIhoIewXr<>CaXi1GW~NU>ItOX3WM7iK{5m4#FwYIRgi!gXcVdl)SmktAU&(y(nv^
zeR@)zoGNb4J4I#~PP5HAr|(NsfN$Ye6E|Twi{$syx7`Lnv$rpIgiWuGi`p_`*R3sv
z9dP;|uw?ZkEQK@;hpAPuuT5Qr>29-x_ at 2s}*AW)i8TkFMxGGDHPEQ)S5}V|+z&CN8
z%0_RE?sXUizHH&!e}?*%*4$SA%A~qbUoU2lADM{o{XCey at KUc_EK@tRA=5R>***1x
ztfv(lQ&&I>>xK7^ol!F<USq2)@_SZ8j>YvJn?s6{dQAvUh$M|@FC<l$l7K`_hlT4G
zfIOCVXatc at o=llcbs$X_jzfGsBRsXsPG(4OmyARE^Dr+eSrp$nXLQ*7ptRUNsF$a5
z>~hNY1JQW}@Q09EgOXMLsmBef*<doh^Y1Ko#}kQdTzZcLXUhixye&3r=zG7CJ7&ON
zM#Qp9v at Gbjda(am<zcR257r_Y4{iY6b<?ZenyX$u)RnW!Gjm65-NvWc+-AiFN~@x!
z%ff5vIY)MAqu&)4F;jc5xlM9Ql|9Ezcz2iYTuw+OFAe;6D|7ScxD7h>0MF_lr$EVg
z>?!s&r-JFBOi8QsNtQKNyouc!{ZsSfwpPaq=6sZwGM;N at bQEqJQBX5y!T1419fM`X
zkFD6Rh}@kB&~odm++m=gZq5_Afb82+5MH$7Cn9%W<>qh<P6QmvJUuJStRIR3v at D>#
z;CTm1v7&~eKQZ*#^rU<97%IooiAB&w=+a9-6?92dPES?*^nH_Zl~}@m1~HzvoLsp~
zz4+{70&M49>o*}gIW2N*d(S45neSf?{C!z^r_UR=(^HLFQYYE+jx}J2BPGT+cvNzA
z8(1tT*RV1^`k#Pf_W?A(=|1Llq3u;{ziPOt#EiOvU&mMdqxFK9^V+T#Eqn_oX6U3z
ztCE+N)(U?7I(t4Yg%P_*M+Pqmftc3%e9%eiQFsxbZ72unN_Hfp;MN3b0=7}cT9P!w
z`T`mzF{l~DV-LKmIDw3<?p>s{Rht@`+-uQ7tr-E5tD1?Zz+0v<D5<pU2b%l)Nxv=h
z at U*b3R?=~HQ!k|p!pxcSwS$hWQ`!Lr7akMdnYKvSYg{!Egz?=S-B4(^oyH@?vSNx<
z$!OFjR?FFhV1&ECzdLT9E!L)0#;u at 4!BSbDR?N_8bhlVF97j*fXv;93>B at 8+cdNiJ
z*q4uamsyYwyED6N{#?C(XVn8L*QM#sH(R!ClB097XxzC=Iy2C(bU(lr@~Y+$EZ>)A
zxtIs`j7c^*;5(1ZAzjC-$6X8$Dd#=uP^HlT;H(9&1yR(BIUWzcIkau#C>q)v<G`8w
z3IbmDLbM#AuiigE<Fpdf^Vck$)pBOTUCtgJ1bB}hf=RIR?`Y-)GY7sZaO at xpD#fx8
zZc#hhB2CA8D`gL!k$&EJ&9jE{kbb2<wh!XQ-HJg9cc6Sf{X}(=@2Qh~76jcS<0VVv
zHi{C#&U1yglJtmdC-{>3kU090?U|E!OZ2};rqz?fK?1Mzbdl{%G=5wlc`$C>Q($XQ
z at BPpk?tUsm`uWBGRLki1sL(e_>cj-?0BzeS9rB(17HMpJl01EFe#{ZkOTD#RKMQ+=
z4cDgKD?)0POb}5?_hl#{-upt5llUO1SHwz$h`$X*>L$=l7 at e4ZA-Sip9aN+wi_dFR
zB8uD^(fmoA*Oxv_3+hQQWF*^@gKUvlC8CWFKq`s5RpnZ&A#u{;B9FIcnD;@tjteQW
z46jJYD8+#yC7Q!7vT!E3=Y_;il#@1zCoLk0s*aPx8(3|^pTjg_d*wT;b&=UGCiQl{
zB%lbM1~490xuA`y?IUehZYOvQmr7#{D$7n~NKY^;@}PtajhZK^N(~cZP{HU2n>H8~
zmg|%3pDtxSK8#CrL#k>Z#J_l`D<bkE%+2#A>><k4&X(t-hpdU9cyM&~Rrlrb^XmrU
zzUM?dLUoufjWgcgfGy{NC_JTe0h^je_=CLbyQg79zRVI$k6!cZllwC;*8}}v=Z at 2j
zv1M~%bG!Cn8V|Tdc>((}6P=4c2-82*B2UnP;?aRkz6Ki&8trP{D+dtk%F1z_b(Ud9
zkU2{%3(iNkayRBrH%+AtzWp?<R{bE}ZL9Ss?GtLu=HddQ_q)S+;m938%Ufdib71Cq
zxKh!l at 1*7`j{^E$@$RdGZZ1izaC-Meb!gVmz`Z0q7h3mE+FN5f#g at C@b?zaO>GU^F
z!CbtKP*l53AZ38(gGeF<0{KwazHtE)0b9gH{(Y9a+GkrSTX>*?2XZfVL3v661nD+(
z6;$FW*nXG5dqQczWf8m8keVzF^+aXV8W?WY9G6A&A9%%ICqvg}U}(%Bo{-lil>1kb
zyR at myk#5L3HLbqC4BWj9Zny|tS7K}Ye%cOR;X}Wz+KCw6syOK|Wg8_|UQ%7JCA-qJ
z+T4v7YE6BGM-s!)$l&FzXj6l9dIPCuy*c<0TiFFv-rRHFYST+6-E+Tda~wP?0m(~s
zkr=@S1fv2P1eL%ASU6C#;B(;hAgLArTKK}g;6(MT->*hJ-hT}yqSHDgi&w=Y6#NQK
z5kJGB{L&+NFbfjX`idN(>iC(_NM?OddN`JqF;oOh&6Nz99}z$9^l^e-M)2AiXARy0
z4;5BD(9edrf|z5k8ByBXGI1G;@PCi64JI|t_wgHyK1y2BxW58>>+V@)eHag<_3Y}q
z8e1r?2lltQuC9CQMq>8cs+{YVHCA>y at HukZt*qU18~8*UjRe)#G-2)u^~)$R{IKtr
zld#@M@{wYy%u?gaJIqnfQTc94P at Z2fCZEMq@>P{&qkf@~Y(a7kX3G-xHeo#@gbJ;j
zT{YUYP$_kR)6I`@E`?qKIh-t!$3(VgPInLBjv@<N2#-F1I2?eIn=>1&$E=5G6|Pxq
zDTiT89?w(3h|<LAD=s3lDF}^&Gb>`_loc`Na6XtE>s)GtxR|Oy2HP|Z!-iPw!Mq;R
z!euf@?lUCN0ybxI1d|&g4n4GRa^d3G_D6;DUUys)jNx)fB;H#+;kZ;#;ix_A&5ltl
z#c`&H1730Eq60)l|7E~*(R;GT@~5w`hDB(?q4y{z%XOD>r1GFN5ZlF|4{!{*>qW)X
zQEW6+07x-%I4Hc|KxzJP7Sl+N76GcS8>0AOPbR7Db=fB4htQq(me#))Ad>0xawwe>
zMe3($Yce>r!TyQ!Y~L(}cXS{5R&y7kNn_F2aqc8&-cG!Y at o8PR=j|wCu_E#HvVs5S
zWLp38)shD+=NPd5>D|x{{(<g8^79?}P<nE}p%mLFGFOO8BUnojo)6{M_C^%DT8wIf
z6ktH4gsIz+`w?++gcKD9t-)%xMO;X=n1tsaBLP%J6||*&v1rQuysyosjLI+t7?ks6
z(mto;QUP7Wn*;|rzCQ=I8vDBYQ@*QV(X>l at o1YSY->QKyEvh4`2{?&1mew at DhkiJy
z;-kGg;Nx!0BS%g??}^~YJnb#`oV-H_cPzV##XKASox7_%UR`i6kKhJ2L;Iw at qcnak
zMo0uDFTtM8;~SW+LXGTB0fx=0$M31zjYltzRXkAFJ2p$ffT57;uq5b1JC<=Hg*k{n
zaTLU!s*4tqewLTA(mxD$(h1muZ$sRt3J$R}2Z2=j#pTeYb8kE*({fu|5Wqo#2j!-I
zXv*^s=A)V8=C+L&u~QoGKB at vWmz6>*29Df%V<jzs6cuMxR8#86sAjRs<?Ru~Kg^c0
z_&i0fEe%Ym$8E0a_grqot&EDM7>y*xs^92wv>uHLNXn(tXabRX=znM}&Emft(?X+K
z?V!Tb+`VdPDTiJe#ms54cNV|&MRzZj+4?;9t{1UhP~pZzG#&Px^yI7ZTF|YgYB>HV
zbWymexSv~>JE>MDWRQ}te7byfUGXJrO~}5VK%4Wusp+mFm6lJ(pG(&d4M+dE{_cwY
znt+B%d0}URV{0$d_xm2^KNumT&wII>`7uqd8Cyy37K1mhvI-}_zagHW|8ujcU(Al2
ze(?e{`bjsx@#@?S%~u_uJNUrYH-h^_>Jt>NL4e+vPYkNuuDR72BP}#7N!zE4F~=zF
z&`LCO#!$fi$vG3&d4^fU`jC^F{rI&YlgXXNr73n5Dzfe+-fYob7=zyeRm9m=6o5Lu
zndRc4{gsoY6uWdzIW<OEILdTiD6g$4{9X;%-5$d4V`OrZXZdy$&;8YLw$l9Rw7-!1
zU96?TIevoprN}y#mzTSqXeH*hL(=c|*}qy;ZcIs~^bLDXLQjwjl+U_JhyvP*xZ9Dp
z1#kPL0|6_{o3|Nuo=>xX at 81pgwrd^O4lBj~b;tV{Es$QAX6S-<DxG&3 at _fQ<Og6i7
zK=FNZ2-Kp+S at 9{sTBBFcUGV1rOQs{Q;Y at E9{X!mV8EXaOXPag6hS6`NK4fY=*t1W*
zsE`m3^z^0!)w2o7p^+8dzO$`)IP+qV<!GW8q-^dTW-{NZQKCj*?Nk6vP00I6pQ#p#
zb50slBl<b-#?$~dt85RZQdDd+-T#RpbT9K~A`i!p5!gJx>(w2Mjfnql0h78>;e%)`
z&7TozG#ExEE?#G<7iWDk9;Q+Nb#ob}Qe<tj0aGJ*ylvs{nAJ`_qrF%vmG0EQ)`~eq
z$^K8JYU!E&u%~#Y;$YK4lt+FOy<&}uuAP=f3nE5F^4=;KxKc2Xbq1oM(X~cqB;7tN
ze6*DrSveV5cv3PlcJ%0KHd|CO at -|rVlMoAc>93E~uNH6X;d}1wx~mAeIT#mV_Umn~
z7VV}^UInI3p2|89De4dtLEK|OFt{wLYN at JV69%j6GsNo{xjFfx<M$Ee@|GBqnjwcN
z)yT~KadByQSkd;_8QVlMN^FHfCKQTPmD_wuaLPL at jEQ0Lz)nUTv#Q<sI$?06`y0sp
zv(Jk84`w4z#>U9Rjv+YV^5h}E-I*BSnASR-J&nv<jDlj=l)p6#*5kr%BA_oqkiuUl
z51;QujI1;XYQ0{r at AF~qAZAlyW$d6owQa+_O7;uy(!*sp48M*J!fmxX%=TS)!yPpa
zXsPjl4WXG6jl;Ku7aZHa)3XOM4~QWN86g`T4XG=Qxm|GAS#V?R3#qrp%sRcijZAb}
z-JD7oSeTG<rGAT0yq!4G{j`vEJeiTRDK7?*&62&6?RJ0<%~2rja)Ue({x+h3K=c7E
z2XqI`5F{3;!(BhHz+$MFB}r1g<Q(LX5whki+=BW6=~ccym}MKVa-^`_(Y5*G)QGko
zig~>74Yc0NfNTNd3eX671)?YX+tTm~QcVt+53W&gR|)Wl>Gj)dGl=`O$V)Zgg)-0_
zA?Ivq`8$-;)`XUsosxR3vYan*rbK7_diQ><P>x|u(UwF5I{BMTtOwK~k=<OF72S|m
z8c++?M?8(Lcnu>-I^a%DS&m^_SD?;cQB-q=Bat50mb>u$GYWBKAk28yFKEm!-YMv=
zSS|6G2lCc^SdMJ~s$>mDOtWXGX{vYhr$w#Ff65LW+ZlI&JdJg(*-<SM$QEpO$L_fX
z$HMM}Ct*)}I?q<%E%z!_;6;dcdfhxN*nZ};C+lt#?ETUxrMncLDzXueUwgzDa{_HO
zVi;h3>JYc5><2S$k3oWI`cRxx&g at kwqYBf<W+sXY#JQlWY#YtB{Q(X0#_R#pzXZTK
zJ&0}HJm at aXC;_)C_`}a-`sl}U%<d~Ho-dg)HN5g0>fLYnB#7-9x3aiL&UB_h1M#{K
zz2<<u#(0lw+Y45_W^WDtgrDTcY3RiFY<!K{<O at 6yzw;4L{SJ`L=QryqlOLxi=P!@*
z`?(3K>@y!5fg8gIe*H?<AD&0Ml^LNMmwdOo`_qnw8?v1vi at 5cVYO$Sry5sikJsdk<
zL5)(4G_5pUjvfccz3~9EXYPj`Lcgc0-y4s%FD>C8i|@)_@{V=(Mhom)J0x at FMl*45
z=5=S9FAe_YZ6&!>Zv0DHyT1Dp at gMu~)Z(k~Z56R5>DpjFAU9v*#`=WH at Kby&KM3p{
ze!l!3mMd$zCS>Q%@^&vBEiEan&O&Rt=LjoB`*yYHw6X)+`zfmitGo~*K3%BS+iJNR
zSoJQHhV at VcERJ^7@!B)8PO*;WoK3~VTDx|kH$$h%6pU4FHSm?@ZlA)ocm|DTR#TT)
zcCL{#xRzC}nOa*_{>$vze%tSY6;`#V{NR4H^i5f|d;PTC0 at AHTy$cEGj;@?S&vbky
z=R_E;dkE)HX?AI0V=NZy)&;5TVPtPo-e5Dir<=PkE!m1Yrxwyy1wN9W67wDYd;?cq
zl1s#ri%T0TK0pWj*K2;K2wLeoDKK`Ya>Mst>j{MbL6i*80J(ns{%X&YlO!75Az!`#
zZvDt_Za`KBWYHquLuQA$eay at jW?&zd*ua2+W}hgsjE(RiIl#<ed=?eCii#FyWL~>J
z09psZpZ^z{@E<4mk0xYfU}9wcFP at N*;lF`G6%PkfdNF%D7ZFouV<$@o7yG|t^WUbN
zp{*&skl??CTE^1I)XC7r(%w$l)XCC}R>{=d)yB{X>K_7a?o7b)*Z3PDBxLWdP0Ps6
zMnKEVz)Zl%z`#nt$-$^gFX>`vV`(gCXKrIkzyL)r=xl6i=R&~2$p}UN at 1Xx0v`ma_
zQ1rrv4icu8<`yph;-Ki2T}*A&2sr+R{2Tr+b#2N- at DGJl`pY%`Cq>H0_}{1UpO7{S
z!~X}Ot(!1q7svqf`-Vp}W-C8nmaP&=$jUOF<5Jw%3m_v6&N7H%7TCUL^_tBRd=`D=
z7vE6$#JkFdZ;bv|DR!FZiuQpamc3qJYj0CayiD-flehkyK73W=zQP900*tV22jfiP
zEA6FhgZ|*T!7wzB$Xz7+u9p{TMQlCf#qsebI*fsNyoe|vj7$EE@<q-Dpi#Nj3YpEz
z!{1MMevmhj!1421^$~cmGSy4F+FrpF@(DtRs;VLeQ$1ZOj$=g&xmECGOn=BEGf at 1M
z_icka38$3~Y3tUBZqnRFBQy!kCsjU1y at j@&XPEE(UnR_OIYakJPi8gAWANi=E^7s=
zIrP9%AV=oJ>w7#!%>0_f&HRFSkGAxQ8vMjKFMEXX$G$NcKg=<iKB$eJcW_RPZrH=r
zqwIIhU4(Wz;f)JJg&z7PpU`}F60mXA=3Zb42TIBRFVbWDANc%#iHu&^)yU<a;#8bm
zP5+};$k5sJ-{t-P)|#c0vx~5Wq0>JN$r%1`o9VA?)GbY1ES$C3+1Ux0SQ!Y|nV1Ne
znVAV#85jsySeXCI{^$P>A1CL3_}JLk{$tC`!AZcx&JOi={g3v4ZvVyp8-tbgf9>}#
z_Fwy-U-y4$^1o~5uiXDB6N+BNUe(U>-#-Ba{~=8!sQ)R}|Ky<m`;P)fmVaUY7rp*B
z$;-~l!0|sx-mSkRul7*#ZC0DQ{aE|*M1A#By*KSfJ?%(@z9P~NhwtdGeTq6{8}gW|
zS43`l?q*~pi|{icAUHxxY0Ab8Ax)|LKO+8(LAL0dY_<CMNtZ(SC=_RO8}=Wl_7<u2
zNeFM;&ZHZVrnx;gHS+geZpVKaUbE>eFFfY^#X)~UBa($6;``q1 at 4KFl<Fil*LVhw3
z8es4eZ*p~+W1}}D!X%j3n at w#5k1KtMz1nKUt4(M3R`Q<Wc!V#0WTpGtQH7t~l5$^N
z5s4?=(LyH>K(B;QR*jzDPo42y%AtDGrJd*(Ve;1-%xtqeZ_Mw^LRQ6f+s!RMv#*d>
zT{z41Mq4d4emArFP(5Av7dHq6!FP3IWjBeql0wU!6YC at 7A;T|Oyo?eO*{~xmc!t0A
zpBar5r_PfO{ujuLA&Y57xbTnU)tt6TO*?pY_xauw$PxMG|1On7;Ko$0B07HjYKM2r
zFi9kbO!v!NO1U0$eZc?h!3kDt3k3Z<^tdMv10c->pgtoDG>P&Km=rkFvI*<wviTtK
zz}<L>N6ve5uig#yW*`i;1HDN+6upPXk8I85k=}0Wh7a13#v?1i#8C*`!+Yhc3=}-<
z<ER<fXpS`&b=$il(F?upP8GuP#N0{KkF$N$d`IIH&5?+u5A1|}dbJrs<jXdjm0JIa
zI`hB@&bcHB9aH?H##gS2|DAAp{DbPz6n8_Em%b?@N2AmUFNL3#GfCfXr-5 at ozze4~
zO0G|KGXblcoyon<ZX0E9q1{v6RK)rB(~3e*vt6`Khv(AxX+*|(`FMn>>E3+8et<!D
z68h+qS9Y^ZUzQ=$sjF7B){ryD#D0i?aV~xQPU`LhaGeHZ1^7GStRHM1{hqMG!4n6h
zer~{V2cELn<X)`7IHimSA~ML1RDJ!Q)fI$WQoTy}*J<IGVL6)IQh1j)Bxfm)E~Vp#
z<OoP=Uw)-mtSsWEZji?}ETm{~aWky<^Y|UjKwn#ftGMnzX<19ywHCcf1q2MfXi#c_
zN_n8L)YD1 at taWzCS&Os$X<_!4Hl^ra-_;5G$0A~RdX_}is40+7>p^0MXV|8~<Rd=j
zk>=*tT=a3cK7<Db2DN_L<^dPt>zLJsX2%*t%t;h5i{w!Do)h8B_);j~=h#Su!%eOW
zM*LOMx<W#vkbpar_>gks3@^`5ao;Q=w2*!zm8)U<+3A)ruUO{qX74jI@;4B#LA{fj
zg^p&OfTS|}*%Ge4-!-w3;lmy6NJ2Xhl at jvJj>^{k?T*&w0aDT3 at xDR3`nJ9LwC~Iv
zXb$^7ddz}?c^nGGzWkZ5cMnW!{>g)n!_z8T;=jV=kvMVArDpk-nL1{Tb|$ro(Y4UV
zK7d*?s;;t`A@!{AU|8~^VqeIM-SYUZjHD3}kT7q;zk8!d7u1ojl^lFH%8&aL^@WmS
zjRecBAr+J{#-j36n6{;Pk3}vC_!ssoAPKOCO9*FYQ@^=6_C>(D6ZS=DlC<7qrh{~1
zLEHGd#9+-Q`X%OeLZw->YH0L{a4_Uofm|am#zK}D*0;;z{){0tH$l#`#}!KjVV`Tx
zbcdvOzb_(S)btKdn at gB{&#xWv-IYOT%C(<k)*I8FtNISeoa{REZ;-?7XR=*hpnO5L
zL8G@)&vGsfp}>-=xI=b4Q1g<VuE$I-KMPz8Ur(Pu3Mj!w;nM#_k7V<dW$FZzr7cLS
zY7!%K(21ZRZdr{86<UyPAfx{bNelQ>D- at TzQu|~RB!JrBh!xDPFsS4X8$Vs7m8Wr4
zMbkPcH&EScVk3X)elM2%Ni%Ao-(pm<NLMh1mdy%E0Wd^aqaYxYCSUN-H#eY|Ma8%y
zJ#;6}#72%KI%;G<NiSI`KWJZP?H6K1<Y%K-Nn=2cCcM+yBg;s7H)4H`KRymN+lgYE
zUFRD}1D}V1jOpYQOoN(ON-wy7Zg}CGU5%w@?4BF{;Bi(<S?l2G*V{-Jc-WQ6>vAp%
zh(<e1+?TDShqeq}j%iOYVli_y2X+`4ZeZG++unMM`klXki<>R4lxO{M-adV7sC~lB
zCu9ODg_#7XIW$5QwLn&Bf$DvSnI30Zl&lUQ<+IC!09vg38xWI2UYWrVPz-Un#GoF?
z7+;6<1Y#WH$}P}7u4;z7UCivgJuL<qTngle0MLJlBD?pzL11Y(h>t-fl>y`&qcf$?
zTG at d$&{~1H7m##_eF_5BpPx$_#aspmqrt8pV-#}eUY_4HNRk)^tFIU+8OnyI)V&pX
z7eN47fK&j%03 at 5|iU<QwAWj9boQS~$D2l^CIfSxsMAAlX-$kpPTei1M77lsIG+jnh
zD^>b>70avFb@(YOvaqQdmhRlyf9=RMSeL$S+oi00Kx#vpZu=6;IopL%W!Yh^$aSpZ
z+z4GaRp+LaV_6`4;^f>py2Cv>Ua1<q(BLZRj18H!jM=qo8ittFK@&}G!y3GxIc{Bo
zgh^dbZ#qY#cJWc5)x4SqXKj070ePLjuFL%Ad;2S2Mp|~Nyq3AMtE9!84v7zq3#~m4
zGTzkm54b1a`yDs|^Tc&c={StqtLtuy^}MQG0adyO9VUlQM#dflPGR*zNex`~!HeD-
zdtIC6A$)rVe`jW<#V_4-#d9v5 at AkKrHht$EQqVsEJaqVUF2A?;oMzFW7d7%mfxsdy
z@{@Il#XY8nj~uh4YwWOU(yH_R2$gcEI at SfOsH&`%OQ1FmSNv8PQ at tziE<Y=mR<+Wk
zbZGMjfP^;0va3HD=TfF&Ur}B?c8b4`_G}Q|DsJ#v4->FDxy4SOsDzx+wCX2>n0XTE
zkH;e;N`jLz`_TabttSAXcv0ZabYlpFK1`X9II6IuRiT-IKP;a at DAkzKWW~(dIu1)x
zSDV{>%3bgF_PR$5WmRe^^Ip*CD)GJlre$AZSGA=buc5ZxnfGcf)PP%4Pf1?-XuWAy
zgJskIN@$=nyFb#1)N-r7%q?$Hyq<o>?tBLRDP=rg8l#C>@4ry9iP>OA(XH-Zt;zi$
zbWEThTebnWz>Tv7twL1^(9O$w{`};wmo$&Ev|s2f$j6GFaP{?7o7QgTSv~=xYBf>c
z9AfO^I+AKN(?!>{GO{CL>l3pLdrjhIAI_;?*biH~w3TaETQ=*fK5 at -UWL>aI%DoU>
ziR3M{bbbZjQ-D~i6rZcgaDa!RTg*(@u%d%X_cyQuTcWW<>^#-#aWxk;bzR(Pt{!`O
ztKe at tBjb?syRfsSk>>jqN$?(AF~favp7rQsp3S5mwe{vWX<C2gcBmGO%927OJ=;$>
zGigA^ZWWM+_NbMbf`!GB$@*CFie_!s8*ZMqlmXMkDZBuqD<DW5q?)HzrW!B}A~yZU
zII(jq4sjuz4RMi(WCwN6eBWNgQ!Xe}q*b<4{Ezma;a%S7QsgcIwdi}mEAt(1yl{|r
zC0m5}khsVa^}hCg2hmH|EA1U<e1~{YAVkTNQ78w6la<(W;>Xa);7)`el82axt5LIr
z=(5j~@=nB3*c6d$^zXV7-ThMco>9>uwGd5;`44?jDNmLmU#TEN#5i}YZqs8C8Coup
zcXGsQ)1=VkW;iyE%OiFUrS}Mk9b~|f2{EboRwWbV{d!E}OUFZAL_9SAsYAW^hH#I4
zCpI$!pRN)aGY(cv(|!&-gM~c5T)h6f^`^Q&qDuro6Gl2EzM;Gb$RIrvTz!NyN5o-K
z3=t$oDkUPI at wWtsmoWIqny}4Q4q7EF^bZj&Y9Pf7wlL#;#JfME$chLPB67xLLdbQ{
z&zgS`LHm{t9NRS!2Fokk!Ab1OUkWXEX8ntd0n4(C0nQc+X>Zi#%l7;Y-mmEreh48{
zSV~xEy&LG!dRQ1*K}NKVL5{rmd%+4G^y|@BQ8->StnoRM62-xbi#W<t(^PD(e)1V|
z;H6)`n1A0>IbeOvQ#-;9gBiNdkZNqi>u5e at kL8#cs^f1)Xr7f-wsVbasQ>ipL0H86
zg!8_suSE(<9(>}gjQQlY&J|oIZ`e)prO3i##bA|k&SZ*%?j>O at Mt67C^Kjnub&71;
z<Z#i~Q0S;=FKV->x%@emnR6DUN7bd92W63MRVnZk*25cPv323#!B!HxKaaG4Jwc%l
zP#zGM_h=1W6E#EJI)$~t8 at I{v>7!FK+v~84rJ*mnrN0ty5l>JXsL!uHbtkE)^U)sL
zTkx9D|2EVsEBz at N*Xs4@$@`%WWrwu3zpiS=ST;XgmA$7uf$w?=%`b5MSgzh`sSfM<
z_<n0SQ-9SCm#~Yo7UR(9YjW7aG2a!T8+055bOh(X5zCikuL3GSQsG+?MXgafYF#>p
z1<RhxGToBE;YgRTJsfJgmw9B}%lVp=-xp at Qqhh<C6cD8qxkU6LU^X3gl)9~2-g at fJ
z<oDU#M%OE)nby6SF4b8unW*R at 6mqM9{C+GUR_|#pmaEyWY)OBL$hPVgeFGiF0IOG{
zBiy1&o^u%k;ZshRWQ)!;lP$MY2Ex~=fy4;ITI|w_DfQ%xENFK=n*6!WHK4Pw(@bwH
z#rp+I%je at t-@ZPRgXhxJ*!l`QSyFG3+c?uRWiPyuCM<NAl$Ce{l)WbhoUIrL_fwx~
z6C at G9Lgz>qzLrV$7 at nXaB=tK9g0vfn4vW4`Luf+kFu{GyeJqePJYfw9)-kYStP)fc
zdqr>2Y5lSpr=yED62*=oGiZ}TF<*dqGLT6;;=InUx+F9heKOtdrf=6+GriyeX(7`4
zn2z{JvuKm*8Hhm~z_M$M2Gk}0F}gCLJY+tSpAP?Pe07^q3Q*z2jqFAi?@8nwDE{d!
zxGv$k530d}RnOON|FZ;3R9H~5?oB_-6~FVeGH~VDr<r=kvIrgK{RI7!c&Cq7-utj7
zmvH?pvR<2f at Os9b<{%x0ZonMH2(uG#XmJpl&A%OlEETYek_ at 8Fqpg+|{Z&Vst}1=J
zi}pq6n!3%K2i-!mI!pSX&8IDVQ at ZWuu)MR4A?Jf&+06OPfsSUTdZu`dq$2zfg0q1W
z-T4*AEpsJ{6vJs<=NYEM7P-8bs9`<HQE9u(X(&zRk?I!-Z6{}vKEzHP0 at uu_(5Amt
zZ$Pwl_G#jFiflG1s}JnkMj|P$tn0<Htz?SL2AEfy9pR4o%i@()*SqUbWC(ZjiJor5
zp#o)JTv|jaGgl*y^1Yb0w2q&YJpH*~&0aRottNm##_EKN;!v3iUd?5+mu2pYpnd;@
zM_1hKv?u-FQ*2rGnx9B-=;C<!#oTv0E~8?b#alGh<V=&ZnLBT8CYWaFZTd6lS`Hgw
zx65LSnUs#e(ZXzrIeaAly{M^j^`MH*l^uMkd3dRp1~ga=N{prL%shRjxg<;iP;&HE
ztYdK>I1a7Vq%7;2B^dBVjg*y0C!vxQBdwpr(EwsEc_Z~`R>?!>h>Ijb>aO$NEOKKw
zq!xakAX~uy7Vjcj055$)VkIE-o&o}s`%5A)3iVSi0D7JpNjDEhvX^)~_Rq?n9m!4J
z`2i$YN$sM{_!M;vy_93jiY-b72<~^HeZ6=UJxGVN!kc2x9V*9!O?C`u>0YXiWWfrO
zwnAn#YCu+Ly)t#I#25*464xnHNRqaE&R>cFCnN;($|WS_omZ~;^Q+R81K^|_M1r|2
zv|R(m*F$xY0c)nuERN{F2oQ%JK(@Zzj`q7cX4*Pz(0YV44*iXA49g#mv5{RDlLC}{
zO<9;T5Y=Y^`Y`$5Mz<yIlSwVvt<&1qJ;SlZnJLLnOxZj3uqrC5e_RPB at F181<NT|G
zF^xneyIo$kCO+g{IQvQ8FkkV!8gLROJ~y3T^t)Ilm)Jo<!T8t}rps79i at LZPTFZOx
zrsFH%iYa8s)BG;QxDiNL>wgU3a0Y{BtYFb{D80*Wod{2C=R4R&mn|C*CO1Z9)|b#7
z>Z>_Z;2`+>D4AXeXoElFoy5_^8j5hR_X92t+Oz+k-p)EIs_uLEVu7U64L%?xF~kfE
z-QC?iGz{G#Ac9g7(jlFKbc2B8fONOg(kcC3{C at pCKCyo9TJIn4taTXfKKtx_?mqk6
zfm!#nuk|>bf$MxLV>6B_^2DaDg;|~2{ZJU%8fT$D{${BfEb+#=7^;3Xt<wy4`CfxH
zHpw1+vsTn88(5gV#vVw<&ckpY$BT9b#OaCMl_W*&n5XNRcc&}t6WK@`8R_0<@%#vm
zef;ES18qc%ag-E|Ozuy+$MjK}v9pEnt0s!yl;!EFK7ONzdiR+Sbdn$iLm$1693_DC
zWeSZJ#e~7A(|Iw5S!;`bKNqZd$g^TGl_ at Lws?Sy<g;!kituNEah(?BqLDHpFFJGO_
z!~|vpABVPn^Y@|{__f{vIIFZiyLK4hsGf()6#9s}Zx5d7jCa at YI<0r+2|T^oIK4`r
zQc|z}#(u at a&!ef&|6{6SR#$8gj!ON97spIx99yUjQ4O!fl4Z>k*(S3ulcBGXw at 26|
zdg4OPq^qS{giY=y$qF#P1h?hbqWT;^>%Lr$=S!|XEagb|P4SKKn{ZiCeMMXz-Jp_4
z-#ZiJI}!|0q!e35bKFxTCp~Vp)$cxd*o4c}wN3g~cW?#rM07vOflW>ozwLe_y557Q
z9odAEWr|zR#R;^%%M#-75FPtp_rD^C;&fDW5I2<c=-!VHT at AH(lGQs3`}`)1Bmgsy
zVF#aWrdTw}SF|U6&_B-Lo8ZWShBBSlS1Y+(<b+Rn$W|)W!_7iksh5;ZUm4)c{kyIg
z5CYZem$n*_?~&9BNQ;uR?`EAI;ZMkVn-uOw*0k>i at 7iFQn(6E1j;TlZ`d?^|CoNB8
zN3qF7%qg<J<Ko!obSputci^+>5#O=h;drFjveg3#9JzmXF3s0Jp|-h>k(5eYIBY1Z
zTzVHTH))|wwt~FrA%c6tcnaw;)#Bg_ at hlqcOr>_3V^7mJ{9^G at sY2`=C=bYxm{=dt
z6mm*&Yg88vb`U`|T&sx_Dp$i-3G;Kj3zWDSnkWlMr5!>!!p0;X?~zF5iGLcP-dSN9
zZrUn{L49^k+d(Nnb at hVCl#6kWerOJxLq at L;HBi1cj;{Jf&{Hk*4W0%l!6he1Iee7S
z;g9x!VBhCgQkkVvdkLT29SmX(HMv9dvgEF}npinTN~O_*yp#fB2e{~wTq}jj`i!LN
zYy}U!vHK5YhG9}XOYf|P3 at M_>-=@XP$8yMYct|nzh<szk&*{O|0QaNUDts}<W0dSO
z6QJvtjvsWi2ES2rt3 at -W`^>8_3+rdK92+znJWM%Dx=OE;WxQ*JJu at V@Jv|>I?dM5Q
zo|I#1e$y7*dZO at BBubJipjyk_$V<V)41)#|B{{(Q6c?KrrK_ at HLof3&A~iNrTFQ#U
zcoT`<ny5I$GzYgD)i=5^3)7eHy7TaYQaPP>sc434_^k?^RK&ZCFhSR)!h^RX{oxrs
zu6jP{oBNg*_BJDWJR0vK3a;%#TQx^Vb^N*O2o@$t$GEYdMfN`Mp2W{Z$WSVyR~swh
z1tRWpqdB8B-0$_^W3!6vs<3HLdhL#p$ZCum7E2snw6&yGRRk$+b4$jxp>_S}MkEnl
z*=$(2SRLSo=5FGzGIBxxg8s$B7Yyiu3?KaGNg5Yj4(R5|oda#YI3<{z&?Q?(?S=M6
zD8Ushfd6bgpLC2g)P|agJ++rb!9&Q5C6LhbGds0*WnieWi1M{Ir9N|oHiKuYOXnM`
zEY2s71`8K%4$Cu|zgz;}r at eOfx!Ft^3#=h;aItqemKz|~Vdtx(B53~MWS%jAt?AQ#
z at XmHDqkOE%4L!w2+yu9>XE*H>?=|dL>|NQ47{bbHcYR at hrR<$}GUD@>E~SXAWzInA
zm9a7Le8`IfZJ8w0YPHy$jOcn{Iq)VUcsm<(H~59)`yjd4tnV(`$?|z)IKewl$i`CB
zTaHv8qQ*->&ALMz2o*QE<U7oDyWgLqFNL<%1WnwJAUJsGX{1;yr?|h-)}Aj5f0R_X
zqS^cjWP_4sOehUXqd at 5_LHYF2BK<{)?B1jD#{}--(xuOIla*lONHC~mw)&8}B7~iQ
z6B>k;U#-<kLpzh)8}|O198J&AE2Sw^su}a{L?QEO>M~hy3 at 4k~)m2e`;cOh%?#e5?
zs!Q|DHrjLaBb7^&^}Mjp3Td&sie5_zXp)%gj`fcoQQsxFH%fwnY;~{6p9*O#@l!Gq
z!+mf6@=xxIs)EPzclwZ6s`&{Pi}X=-F$Z5XN=LkV at O6?ue3^lz9p(8b%hP>tL8pg9
ztM^ESn8T1uhfJMys(ffva_a}izb~>CHzjT?D^2x_=5?R&oa7m^J$r1 at W7?YzGQbXy
z?TBQAVWauJoJmw^sBjUvsLvQHS#F2x+j=i@%<ZjP*N6+74EVm1`F#4}SoccY{>t=V
ze>pCQY+kKFp$c9PFJx_!nDD<=HHOApK3yy4H}mQ2)zbO`TX`_}NUm|tERXp at _zSEC
z`7q!k7{z-K|8t7WBWwLf2M%F|y`X>$2XtfXR+(0}00#Ku&Oj_<TS#|s;Kx~&-3;>R
z5z)&4zj42zfeWV@>Sz;!OI!Vhv9u<soSWTMT{@J0zZAFBdwmK`AIS9l;=D2jR_56W
z at ClM`=I+Z*)gpaOy;-=F_C|J6486|eejX=QM8=A|JsM$wWm$(ejnA~=JZ)o}5%;Y^
z3tPdRWZf20LpyL!hwqaY=(;fRV0N``(W9fii%;- at LZZZpy@NtJ?NZ&cM_1N?r{U}&
z at CPfO_vF3RT*SEt-!o4kg=1-cxCNpYqyu4kc1Zt(erPfCh4Rc&RP4iJ=G7ycF40F~
zq*0Dy%(B8q4Kh%AQl-y#IqhV8T}J|V*YVBg#z>TikD%sr!3uQcpLF$n(7(+Se_<&t
zVt_N`sUec$hK3fGC_i9!2BZqvaopJRfA|u);<oA}R3L2?U2CYXrmsTIndHJ1YGyff
z62^_mlOOo58l}BWs84T at yXTNw#U|8D(@C-2LEGiillS$4Dndd*6$PEBRz>a7WaAdT
zxaC=fA#KPSnS04}yf{}vvHaLU`QB#+CLfdr#n7_AN;_lg>6u5uxXpM$L+eZHS4wth
zRE%K|i8=~VKa!k<h&B_YAI7*lVQu|Ngb~7WxWZxlJkowYX6PF6g9x%-SV&}@iqo42
z>tyL<RlYiQ+3`k)vNt=s;d*8c7NUQzDW2feEM*bhxC-IAipT22jW}JhU=dw-GwhWW
zDcXX!Vi(#b1mRc at 5!S<vlXxn?FmR6|$Y}^|NF#Gr=yMiN?8&7Ctdg~NDP`eJGlJ$q
z_{dyo#}~q8LmnnCRwth0l}&zjul?>Tp<Sa9?!qw5aK|i^8=`MmbS0`cfl7j9%VO~o
z1tL+ar})!T-n*(V)hU8{D>VzF+7~2{%(C|Ek91?nBZVobN+VqvF?Rn*rlZc>bI0wR
zO4xJ=nSHJ#F7|C`f8Ckm$%=KBU?!nT9Js7KQ_EFTRf(Qwrm!FO04c93Q_fLz3z}R>
zli}{b{_2Vz({zaUV{N`0D}%J{!O8X6{2th=hvIcMO&tG>ijXoYdD0KMYwV7%;uU+`
z^LQc=tprZ$8P<O=t?&k|y!W$vKT3?HYjD#oKZNnjR)yT)V!Zil(zf+s!kD&7d<`^T
zIp at u==SKZpRuXtzG40S3Ck|G{f)igD(N`2M<0UPP*#$(3HTW{-vQ}j_&fXvKpwre&
zWKz)OVWkKG-{|*8URHcfX;kE6L<7m>mD>E3I^WV%$j5jrGI{lFe7*$E4>=LZHGC!G
zbFfJlcQhO9lN`u55dP{Bxym-5-}WO68RZ~)=#tgWD*Rsk7(XpnYWBd>H%1brCVj0?
zQY)`?yFL{0tXz#Q|N3|Zo&m{P2}22gzNn8c{B;$kBlUNsf(&eT6J at qxM&otVM)<?~
zb?aJJYEKwdu97v9$+`OB3p*91mUDxZZQg`Qje2_e^=w)n7ojof>EGPR*T*KB({w$E
zSMr{{yr4S29~FT(WRM8TYAu^;E!x66d3a&QV_+I2634 at +nywXF_eaIEm<cqoHq;EU
z#bfPNP<>USeueNz=EnG5G^*XQP=}Q6gNaZ33=Bi4(}Esq)zcR23GOk^b!@B3+SRG}
zZ5WEN^%o1KzE&xc<yxcIAk=3-L=~TC=0BGbFhP_m^D!8xuyw>jb2{$Ra0)O7SXg&I
zT+KnBBD14&3hYl^%Z+UCTfR<BZs@{z>Q<C|VCO!8 at zAZCtYg#R^xI_q*@FPHIfA((
z@>3}1TxzE7&gx^v$eV5qvK{(U+sV%)glP9aqQYcd8|oz7p3Byr=kODq at a?$GdC!Jx
zC6LTJ8 at Q^Z^X$miLW{}0yD(_yuxbZtp+x?wmNa&)a%HXkZBMKxswXv316zIUO1|_*
z)H(vC5YA at 9ET(;W`M#?oG~FMg#m_R-lpmI}<?_a>F(^#wXc8aR``135F)pvt(i6wS
z3TU at eJTy+m*UXHQ9%0n#Rl-B$fn?_*qflhV at m&$Iz;)KU|EXGi at yo_2f|Gc(Qj^SA
zM2{Nu=@f$MyHW~52!<m2zo7Q!q>kn8<~L2G?dxdarl{rIZ?7L+QdP|2bzTfQ72myF
zb$vS%vn!(HrYvy2$5KOU&hwt at 4B7593H%iy(63+7nRaPZKHO|3H$LXkh&G69Aml<*
zcSw;xE8WN#O?>dY&VKEHBz|P6yR~}=rH0+xB*7}1kv^oytL&8x#zUam6}Bt0F)J(U
zd?9<MY;HbuGyGK+Nv1?5ZI*dv(zFHKnb8y4%kEz2NPRANl(U{Zbe7-D9fSa-t59mI
z!z5{+>|qaEsyK(es<N(Bg3dn~(X8j|5T;lanAcZJPe*JXAFYCBK*4^D0VPKGPg50l
z(<Ot$3l^}l2e?aKmwZ4RmMu%>eX`d}`LJ)lVViuXhQ->$>*$BMhAm?S=G^reJQh#p
zJ84zwyD190ADx`*`vX^{?NQM#fok_?z20b0c%3-~&yz1-D~{-|NXIRY+cljJZ>QIL
zzP=k25U1C(n_VoeG~+%p%}4S)?7TOktcugyjHA%3y6(l}O~sQ7ua!?%xI4(*^>)Dq
z at V6Ka_qN%2EhGuK?!`2FO&ugm+<DYqycF$^Mq-6Qi;+@~(LXwjDKImS#k93+;?2eC
z(BFBTcqHz7I{f<C$m`x^=^a~r>apxZ8ycsB3E_A4wOe1<rnS(6I=~(M9VyL|YO+|X
z6#aQt$?b9QZ_eHjgKnpwJIr_P33}n+74?e~EYX*t;9FU0r)!A7D!{Iee4oby;XYHI
z#HC2eRHHwvxU`#^bIp9fEAYL!J4Jov8o7>)2Zr>q^&wN;*5!~&(O&g7>6W^V8Em_y
z`6H3pg|$4UYy6hnr}_yv3-6__%&1+uLw(OX(j1L2Rb<16{&3=3x!9M({FY}P at GPS(
zw2c%YFy*u%K`kqGKu}X(RGxs4-(AR%7tNS8YB8&*DvT|<<GgZ>t~qHFbkIAhAio7c
z{uBfDYUWrhDxx31;RY=otM6V9E4I><;@C7BPgooHI8J3y%yRAzet{WJC3z#tjahu^
z?bHq~f{bPkN?u{$F!?W&Fu7Q3lUQlAkB=L4V!;`dt(|8z*E25lia6(Im9mvSu&<fI
zWEaZL<BXsm+4Q%VSumg+*OER)2k<snT3lQ4a3iCsd at wC7?deVj$>!81 at CEEHC@wM@
z-i;^n+z^4fs4=O&3}CIk at h#m08*|KVQOPPwJm=IU6^_}_kT;5&lxWqOLP)R6D)$O(
zY7SzHTrg#^nu_|0C>uBX80w`Vk65!>70KDXjQYGj%QUUHs at 2Ldr+mR-v^}WYkBuVE
z)8dZdE;l6Uu)ukD*ds~E&igF+5j_vMcOVtt)e7IWE-<lxj3ky_-TuLF^7YARZcEaK
z`+p2BygQnmGpNqW8dr^nGneRYw-`CO!Y<yFH;>zQR4Z_R)AEZB6H(*T%({qY!6eTM
zT{#GZln||Q9i4r$cyDL=?99c#qZ(MI4Hz at O-qtn{7^c=jZ&@&R)J7i)Y2g^4GJTco
z%D5GN=wu;sWvZ;7Y&l~#W}~9BpS&`)is5`e_wMO^F6f<DTXsb!bxu<=?(;rK@>HMs
z at mZ7p`mqk%xqDl+i6zTGl=H`S^1Bs=1tGzSocKRbTa5oeqmngLl4oMP&oyi8{Y}G0
zmr0b%Z}G_TdQm+c{{1APICKyZkg}{%QZhfGWnD65)l~lYJMT3^=_;jV11;2jVeC1n
z`n<xI$J~C<x(NJCz4GYCbz&zTjsd0{bi-;W^}=+O;3!J!00Naf((?B>#;t~|JfG5-
z>Qseg2nS=Lh}er7849g9V*)UqI@#&UH`t##S9klCd_EF_M(GaT&Bfv4+u~CG!HTw4
z!n3}o$b4nRY-h at F#?0i5ujVz97s1cMUsdEbN5--dxBPbA%mw$%HuBTL!LEL&{{WW$
z<ndXvans2Jj&@*edCO~_#G;gT%r7k;&I_!_z6eMXuMCqM8c7F;@Ym8KV{(700KY5#
zj at BMj6%=a&o at s<wsT at BnUY)n`-Pkj0z06gG!WbEbX~BgnalMU_(A|%dwyOQej)w>I
z)Q&vzThlHY5_Wc7dJV3r>)mo`Gbhyck^J|MbPX2jOb;@GqkG^dL&&?HSIzF1%@e!a
z*9foa>7BEceOiBh;z)rcS^hKAgWidmnHEfj=xG9#rZ?P4atA%Oju%UfJcsKRkR#K3
z>9&Ym*0qqBq-}kk?Q)?QjPh;Bg_?PF|3;rHw~enx%@le>KzTsugV9JMuj=rlv#Z9^
z$c}Ya^x;%SY4fKl(*zY){G;kiXR$YOw!1zDZD6JTbU55nQ#Y%jQ$nSEqbQhyOAhXH
zM6sh8rPAO;hVI8b6_<h(Uh1%L-oW2vw5!eeK^~vw{+8N3_U$ShA0{m+A)DMWdkyb3
z>9w)+3*r;H8)u<|RRL8DI&;l4)8xi;O$e!@u>bbkaPsQ5Z6bSi<Oig)qOE0PGK+H6
zIEXLrxP(zT=H~C*Kkyv$In#YVF}Y at d!b{1Uu}spNc=mNx*-3JnQ3TquC{C!F$d-<m
z>h5e1%1(%0ha72#N^MSlckImH1xpXA;)KYUYh6g;mutDqNncQRS}CPlG3 at VCsFQ3r
z(DzwgTE>|pl+RY^PS}3*wLYyAs at 3zd(KYYEtK#=%W?F&jJNfv|+8>QQ-;Zg6r|m+=
z%*w2oh}E#3p45^tFc}UVo92hqX~;08FlS8^vNE(N!UTriFfu+>nX3!gn=|p2ytCpf
zREFqd%Y&G+mtI}b at A)}k&U5)Jwy(XTNNbB+&pR`yPfFI)I5_LYk|FSOI|q~Uc-091
zuzS$c at 7N_zKw92z#Ds3W^zk94!^fDwcHCF=2{ka&A2odO7s|~2Ow>UjeUv3(dpo%)
z9P8aCGtl?5g&#|6zO{2$;n#t_n{KC>vQ}%c?RQ)m-|~y#`F6<PFF8IdoNZLjmuw1*
zVEhjDy4l)Gm>NWnKof|&tU0{8QV85Bi at BLD-T6{*br3fsL8DPZdQ+5oLGk?1RxKEF
z*0;uX21ldW8?$m at ozD4L`jtLi<7SDU`!ah=ZG$Cj>3h#eVp=h}7?#_hUnWZdgdUP3
z^kqz|oGA!j-qxA$Fg!)tdO})TUZTSC>B`-_<EgxNb6$Z$Ax{Qy%w}*H%rx}P&7+-4
zvuTa5))hEPpm)s7%p|nBuE7VQUF9$`oP(q*GMJ*$AfZD8Rrmw30$LXRnXvWu$Lf$^
zRFil72C!n#sP2Z^5eCau;SP(plUu3B3dL*AV?UFD-Rr!lpc`A^$TH;$spGfNEF&C`
zH#n|M+lT!Gb8gV=H)2Xlgi>&*KjA2MrBbS0QomlTi1JPSK}7OJj`;C-ga+P+r_WG0
zD_lRrRcwXorM|Y6W2AfSOa1UuHGI<8xLHco;-~6v{e+WX1MQ>kYhDd@?epU^#N^HU
zO}NyZQr^Y at cMQiT<sw9Lr-p>S9ot{^*AV*+!F~!Zs>c!M_vCaBaXzSfmF`4eLx4)S
zMm8MRTvSF8Xnv_4GOG^|G2^!56w}%^3X_N}gO4q{367UOo~vi3Xzb75Kv1Y<>m7U#
ziSgPrtubx1Vj~;ro(sxC^>Sa*?mH)n;EY8vAAXk49fskpI=kf}tc<DBW#YlhGzXeM
zRVfHcHiA1ENo}JXscZ1#kMyLR!F1;2?k8M{%;s+&_Zw2Jx at abgC+7AFdLJb^Ct@@C
zfPumhvVN(|huI;Ac?gED%i1F_F#Y1gVHk!-JWm?4wL??Ht<82nCOybotLux6 at +g~c
zrP&CYXw|v5fK{f={^Kkji9B&QG4T<`iNf&(`Qf|xcWP(jvY6=GB&11uAIOpkDU#RI
ziOFU(Hgzh at BjLu*Yu%&SaAONci?54=h8y)mWFiHw1{Z^$*X`#f(^|zgu@@wgeTuJ4
z{B>T@&=8qwSxy~1yPwmvOeLBX)9kx2DtfaxIDh?muDQ%;friwt*spMMq7nWc7r6!~
z;cI1a*FWpRJ6UE%#%KS!Aj3zc`PwJ2IYO)rqrE-ro(QVFp at nfFMO0U=xczJcrfirz
zW(4NPc^Vl3dBSZK5#(U+?-zNwuV}hX!e!;cOHqR1jr*O$KnbQhU*j;twlQubY*m80
zf*%IcNVx5^_ryoYZqHSCIEM6_TisuC?+**^vfqm_X;<MqQ9v&{Qy`x#v$ino<pjT~
z6=~+<iu943ZgDcUuwY5vK!Sbdj0nRF`+*rrws(w$jvlU%Axe1O(p7gPK)jVE_6ICG
zJ1s0a)m?7M1&8R5z#sJ((Z0o}CL64cy;4NJMIS3)$wni6o(d)uF}?fLx`&Xz>z!9i
zn+dv(4Bjl?kK?B)`xLF!QaO;93gTXh8%43j?I&cYrmyEErt!Mzh-h3;rUDcE=G`9Y
z-w;*7qpn*b>csrzn7=Z%E5${vP#}z6H!llpSgIxp#B9V4x0#g at q~n-!wsponv5`gy
z<SOEu6cAY=<9e|5Y^&DF(l at FkWTEc%hYXb%cHl|V<k08T_ at JtHbsg0rd69~H(u_Ro
zLki;5xxigxWsJ;TX$mD(T;+b95N2m&7c+V2r^Y`0Zir0vT(|U79&WgyEtRxwO0i(@
z6B<s21?A6mX@`PI at B-!O(1aV6dU{8~?;_F{*_k=O9SjDAd$XZMby`E?LB~erk{`Zx
zmF|B$FpW-ErOUOazUtLxD!!rawMUkAl#HVI#uc}Uus_M3Ffpi~@Fm5`GW%ZrF&DWc
zYCpW!{o&qDdtI0jNfwc!d)V`6vc^{zer|m^HzqwhX9;O>riDM8S7NrFEznXNM#XPj
zFDVC|_IHyc`{8-`I8Bl4bLK8cHnz4P&8|*BgWa}Z>po`(2<LW$;sxKH?{5FD629>D
zSn>QQp<l^v-TqpwdGedaW!{(RJ3i;jBj#zohn8cLczeF~XZN^ITBES?FOkB0aQfC7
z*VZSYd;C>P1!sA+wDJ=k{gLDzv1uN-ofJXS5<;~DZU$36vp;<H&b*u&mj=dsBYe+K
zgmx1fmP#=6S?Zd0T|GBlxsD0;=!;R2y^+^d7aHBl-R5~Bt|FJJN-gJ;$sFv)MQi)5
z?B)@j9yD6SmML>c@#h((Zgn*TmQ56|1iTkTcKU(^s{<SL%&mCKx0kDts~vP2MCR=|
z-|jTqc@|!z+HGz>wEkSK6_mLcm6v$vST+05E{vzAplX}R7fw1AUPWffGu8P4j_R(H
z<gM?7zMRlHI~j71jngC9LSA-uD`b+>Jiw#kF)KV*5F+x at 1~YlBf7E6NOu<?~;q-)i
z`wm`8u!=d)v`EJIVbYo0hevYW)^~R#CAYVj;al?gyOMAF=X7`m?#|A+T)f7~{xX+D
z2j7)Fs%y~33DkV6Wkie?a8VpM>LMpE9~6rv`$|~lX at G{sMYeK!3ipeuf*yKoR5^JD
zE_Wjs>c at z|o<Zuk!Bh}U3<%nR8e at t*(?i{m``Gn`61(!6>uBB$TG(ABlYhepZf}hL
ziLS6hxuAdY9>0|h{~xO0&)e|-L{~)q9bFNI+nD}4x5CBti(BFP39oSeKY=R%^}_k@
z<O=K0hX?#l1N<uW{U;3opa}nh0{njSzh1N)fUZ0iKTT;vI6v_xyBGfQEjBha{*{s?
zmY|_z)SEKW^2L+mzCrcPKZe-T&fF()@W%?++DV)13qBa(Um0>E*KF))KPITfq<Jgt
zEW%Uz{2boZ`7mSmL;MW73GAF65wO?4J7-oC(w~vcy!ZGeOUXUXgrZ4r+$w_!H|rL|
z`|P1~-A+S7yH07u7qelHl_#n<FHb-$ItvFHd(E1U-;77AO&0_v+iKf~*9pHBQ(`VJ
z at 4E+@YiZK!Wr}aUvPofi*Ua(ei2k%V1m|@ll{{Yg>YBuI0#sbSR-7vDGlQ`2av$G8
z+V_IhPu}AEY$|fCDU|5|+G4(nUANrVRuT3CS}%2?z$#Jh7uMu>+$Gy{&060xcJsvJ
zxC<V&mA(k=9!vL}63Fp9nK+ssOZQg4!A-nUaWwRkJKIVp<$ZoK at k8&;l}VrKR_T5*
z?u9k)^Nwp`cDxG;s`}Yu{QV>cOutTvO1HJk^}&zBeT$Xo4}I6B<nbHUPch(vt>6AF
zSvmitkp3qt{}<Nfe^1VT1zp&IwE7Knf&Ldx`3b22fXXk><raXs1zLVWD}ekKR=I^?
ze!(mN^n&^eX!-RH0oava`donS&tm{|xdmi?!7#TrZ;t_6Ko$T0fHb#2%&*1{KsEmY
z#oX at Jzd|uTi~RouiutX&y*N;~{uUbofEYGP*4v=|m7n>AvjIEimKmaC{fUF2vM4&j
zO;ljcIxN6LJXlm=?#_CD@$k3BQ8Y4#u_zij-hyX8eXuCQoZv2wCNL*T)>{|KEOIbY
zOQTz!?Uw2RL&20>9Bg_l5{_^ed%(8}fG-)@IoaQuF!5j!Q2{tMS4$I^vV<^;6s0qO
zHu3YbhyW7=JUCJQJfYwA{jUofVCZMA{C}R#&n5Y7I)6{y+vzx={v#x)f5rp|$^Qi9
zcF|=lO`UWoZ$Ug|%AYvXtxyE+0)&_CH%DxLrw&Do05A}44lD)W at jokp%A#NovlBA8
zWes)yW06HuOPkWp#m448KR|$OStC1hIx|Nmab^17*O~1%7Es8=*#hp!D=sE34seJd
z5C}+W5I|CaAR-_T8*uzn2K4=s-S$JEKojE!CJ#Kz1ppy`4d(>ZfHAk-oE*SAFqV at I
zPy^D=)Wrn$OONB$+^wryH)0^r?J)%M-*#)79cVxw8_);2)xEU|47i;RJJ5G4X9xXq
z4 at 5u|c)$#uC^yg#Wn~3%0F9NE<2i_x76hWD|1GlajxaM+08C>;1uXsdMF|0e*};@%
zl>d>j0UI3n0J?oq+Wl7s{C=D6f0J=RfH3|=#s=mD0o(R3G7yN1>+gEN>>$7z|3!}t
z%*F8!AFQlgf7b&}j1$<*e;Lcl3IyvPGERUk{hJ;e>+Of at U&pesbN$^O8wUpj$j`s%
z0WvON2mDP2tn}YyVAg+}2OF3J0_>*0js*j>-alke at IU-QK;Ylv=j><%;H{3gj~Y_3
z^n?LR$)XI01N#S<$L$4F%FYZ<`7^(74 at 4<-D0xBRBH}`#!opB4b`V5Vh at DG_OI#cZ
z1wq+F*>97cANBvPa=TGQ;U*#$FcWJh7h6ge5ixcMtGE~&NL*BegN>DwgOim5#Lg-T
h5)u>R5ET`@-EL0KMvl%uQ;zL6qfwtd6H^dJ{Xg76qObq}

literal 0
HcmV?d00001

-- 
1.7.0


From gmcharlt at gmail.com  Fri Jul  2 14:48:15 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri,  2 Jul 2010 08:48:15 -0400
Subject: [Koha-patches] [PATCH 4/4] bug 4188: add note about hiding the
	OrderPdfTemplate syspref
In-Reply-To: <1278074895-7443-3-git-send-email-gmcharlt@gmail.com>
References: <1278074895-7443-1-git-send-email-gmcharlt@gmail.com>
	<1278074895-7443-2-git-send-email-gmcharlt@gmail.com>
	<1278074895-7443-3-git-send-email-gmcharlt@gmail.com>
Message-ID: <1278074895-7443-4-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../en/modules/admin/preferences/acquisitions.pref |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
index a1ea02d..9b10600 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref
@@ -1,5 +1,5 @@
 # Broken, omitted: acquisitions, emailPurchaseSuggestions
-# Unsure how to format the OrderPdfTemplate field as a browse option
+# hiding OrderPdfTemplate for now - see bug 4188
 Acquisitions:
     Policy:
     -
@@ -24,4 +24,4 @@ Acquisitions:
     -
         - Use   
         - pref: OrderPdfFormat
-        - when printing basket groups. 
\ No newline at end of file
+        - when printing basket groups. 
-- 
1.7.0


From paul.poulain at biblibre.com  Fri Jul  2 15:24:29 2010
From: paul.poulain at biblibre.com (Paul Poulain)
Date: Fri, 02 Jul 2010 15:24:29 +0200
Subject: [Koha-patches] [PATCH 3/4] bug 4188: move PDF templates for
 printed purchase orders
In-Reply-To: <1278074895-7443-3-git-send-email-gmcharlt@gmail.com>
References: <1278074895-7443-1-git-send-email-gmcharlt@gmail.com>	<1278074895-7443-2-git-send-email-gmcharlt@gmail.com>
	<1278074895-7443-3-git-send-email-gmcharlt@gmail.com>
Message-ID: <4C2DE88D.7060207@biblibre.com>

Le 02/07/2010 14:48, Galen Charlton a ?crit :
> The PDF templates for purchase orders now live in the
> directory koha-tmpl/intranet-tmpl/prog/pdf to separate
> them from code.  As no automatic translation system for
> PDF files is currently implemented, I'm keeping them out
> of the language subdirectories for now.
>
> At present, there are two choices of templates for printing
> purchase orders (AKA basket groups), controlled by setting
> the OrderPdfFormat syspref:
>
> pdfformat::layout2pages (two-page layout)
> pdfformat::layout3pages (three-page layout)
>
> To customize a template or to add a new one requires two steps:
>
> * modifying the PDF; note that OpenOffice source files
>   are included as a way of generating the PDF
> * modifying the code in acqui/pdfformat/layout*.pm to
>   position the order text onto the template
>   
in git.biblibre.com version, the syspref now let you upload the layout
(.pdf)

May be tricky to add it now (as there's also a change in syspref
system), but I think it's the way to go : the layout is language & koha
independant, it's provided by the library (the .odt being still in koha
repo to have an example)

HTH

-- 
Paul POULAIN
http://www.biblibre.com
Expert en Logiciels Libres pour l'info-doc
Tel : (33) 4 91 81 35 08


From nahuel.angelinetti at biblibre.com  Fri Jul  2 15:32:21 2010
From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI)
Date: Fri,  2 Jul 2010 15:32:21 +0200
Subject: [Koha-patches] [PATCH] (bug #4931) add the ability to choose home
	or holding branch in stocktaking
Message-ID: <1278077541-21128-1-git-send-email-nahuel.angelinetti@biblibre.com>

This add radio box in stocktaking to base it on home or holdingbranch
---
 C4/Items.pm                                        |   12 ++++++++----
 .../prog/en/modules/tools/inventory.tmpl           |    4 ++++
 tools/inventory.pl                                 |    3 ++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index ffdf6dd..077b728 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -1029,7 +1029,7 @@ $statushash requires a hashref that has the authorized values fieldname (intems.
 =cut
 
 sub GetItemsForInventory {
-    my ( $minlocation, $maxlocation, $location, $itemtype, $ignoreissued, $datelastseen, $branch, $offset, $size, $statushash ) = @_;
+    my ( $minlocation, $maxlocation, $location, $itemtype, $ignoreissued, $datelastseen, $branchcode, $branch, $offset, $size, $statushash ) = @_;
     my $dbh = C4::Context->dbh;
     my ( @bind_params, @where_strings );
 
@@ -1069,9 +1069,13 @@ END_SQL
         push @bind_params,   $location;
     }
 
-    if ($branch) {
-        push @where_strings, 'items.homebranch = ?';
-        push @bind_params,   $branch;
+    if ( $branchcode ) {
+        if($branch eq "homebranch"){
+            push @where_strings, 'items.homebranch = ?';
+        }else{
+            push @where_strings, 'items.holdingbranch = ?';
+        }
+        push @bind_params, $branchcode;
     }
 
     if ($itemtype) {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
index 0b35000..36e8cc4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
@@ -76,6 +76,10 @@ $(document).ready(function(){
         <fieldset class="rows">
         <legend>Select items you want to check</legend>
         <ol><li>
+        <label for="branch">Branch</label>
+            <input type="radio" name="branch" value="homebranch">Home Branch</input>
+            <input type="radio" name="branch" value="holdingbranch">Holding Branch</input>
+        </li><li>
         <label for="branchloop">Library</label><select id="branchloop" name="branchcode" style="width:12em;">
             <option value="">All Locations</option>
         <!-- TMPL_LOOP NAME="branchloop" -->
diff --git a/tools/inventory.pl b/tools/inventory.pl
index fea7c17..15f1c61 100755
--- a/tools/inventory.pl
+++ b/tools/inventory.pl
@@ -49,6 +49,7 @@ $offset = 0 unless $offset;
 my $pagesize = $input->param('pagesize');
 $pagesize = 50 unless $pagesize;
 my $branchcode = $input->param('branchcode');
+my $branch     = $input->param('branch');
 my $op         = $input->param('op');
 my $res;                                            #contains the results loop
 
@@ -191,7 +192,7 @@ if ( !( $uploadbarcodes && length($uploadbarcodes) > 0 ) || ( $input->param('com
         }
     }
     if ( $markseen or $op ) {
-        $res = GetItemsForInventory( $minlocation, $maxlocation, $location, $ignoreissued, $itemtype, $datelastseen, $branchcode, $offset, $pagesize, $staton );
+        $res = GetItemsForInventory( $minlocation, $maxlocation, $location, $ignoreissued, $itemtype, $datelastseen, $branchcode, $branch, $offset, $pagesize, $staton );
         $template->param(
             loop       => $res,
             nextoffset => ( $offset + $pagesize ),
-- 
1.7.0.4


From Katrin.Fischer.83 at web.de  Fri Jul  2 15:59:05 2010
From: Katrin.Fischer.83 at web.de (Katrin Fischer)
Date: Fri,  2 Jul 2010 15:59:05 +0200
Subject: [Koha-patches] [PATCH] Bug 4854: Show same subfields for 245 and
	880$6245
Message-ID: <1278079145-23720-1-git-send-email-Katrin.Fischer.83@web.de>

---
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
index 62a9f46..47045b9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -386,7 +386,7 @@
         <xsl:if test="$display880">
            <xsl:call-template name="m880Select">
               <xsl:with-param name="basetags">245</xsl:with-param>
-              <xsl:with-param name="codes">abh</xsl:with-param>
+              <xsl:with-param name="codes">abhfgknps</xsl:with-param>
               <xsl:with-param name="bibno"><xsl:value-of  select="$biblionumber"/></xsl:with-param>
            </xsl:call-template>
         </xsl:if>
-- 
1.6.3.3


From oleonard at myacpl.org  Fri Jul  2 16:02:44 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  2 Jul 2010 10:02:44 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4932,
	Serial Enumeration / chronology not populated on receive
Message-ID: <1278079364-14532-1-git-send-email-oleonard@myacpl.org>

- Correcting JavaScript so that serial enumeration / chronology is always
  prepopulated in the add item form when receiving a new issue.
- Altering the behavior of the "click to add item" link so that the
  "Arrived" option is automatically selected. This makes the link's
  behavior mirror the <select>'s behavior so that Arrived -> Add item
  and Add item -> Arrived.
---
 .../prog/en/modules/serials/serials-edit.tmpl      |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
index dd73db9..8805654 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
@@ -81,6 +81,9 @@ function HideItems(index,labelindex) {
 	label = document.getElementById(labelindex);
 	label.style.display='block';	
 }
+function setStatus(serialid){
+    $("#status"+serialid).val("2").attr("selected","selected");
+}
 function changeDate(adate) {
     var elem = document.getElementById("expecteddate");
     elem.value = adate;
@@ -224,7 +227,7 @@ function CloneSubfield(index){
               <select name="status" size="1"  disabled="disabled">
             <!--TMPL_ELSE-->
               <!--TMPL_IF Name="serialsadditems"-->
-              <select name="status" size="1" id="status<!-- TMPL_VAR NAME="serialid" -->" onchange="if (this.value==2){unHideItems('items'+<!-- TMPL_VAR NAME="subscriptionid" -->+<!-- TMPL_VAR NAME="serialid" -->,'label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->'); changeDate('<!-- TMPL_VAR NAME="arriveddate" -->')} else if (this.value==7){changeDate('<!-- TMPL_VAR NAME="arriveddate" -->')} else { HideItems('items'+<!-- TMPL_VAR NAME="subscriptionid" -->+<!-- TMPL_VAR NAME="serialid" -->,'label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->'); changeDate('<!-- TMPL_VAR NAME="planneddate" -->')}" >
+              <select name="status" size="1" id="status<!-- TMPL_VAR NAME="serialid" -->" onchange="if (this.value==2){unHideItems('items'+<!-- TMPL_VAR NAME="subscriptionid" --><!-- TMPL_VAR NAME="serialid" -->,'label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->','<!-- TMPL_VAR NAME="serialid" -->'); changeDate('<!-- TMPL_VAR NAME="arriveddate" -->')} else if (this.value==7){changeDate('<!-- TMPL_VAR NAME="arriveddate" -->')} else { HideItems('items'+<!-- TMPL_VAR NAME="subscriptionid" -->+<!-- TMPL_VAR NAME="serialid" -->,'label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->'); changeDate('<!-- TMPL_VAR NAME="planneddate" -->')}" >
                <!--TMPL_ELSE -->
               <select name="status" size="1" id="status<!-- TMPL_VAR NAME="serialid" -->" onchange="if (this.value==2 || this.value==7){changeDate('<!-- TMPL_VAR NAME="arriveddate" -->')} else {changeDate('<!-- TMPL_VAR NAME="planneddate" -->')}" >
                <!--/TMPL_IF--> 
@@ -273,7 +276,7 @@ function CloneSubfield(index){
   <!--TMPL_IF Name="serialsadditems"-->
           <tr>
           <td colspan="5">
-      <a id="label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->" style="color: grey; font-size: 80%; cursor: pointer;"  onclick="unHideItems('items<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->','label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->',  '<!--TMPL_VAR Name="serialid"-->')">
+      <a id="label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->" style="color: grey; font-size: 80%; cursor: pointer;"  onclick="unHideItems('items<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->','label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->',  '<!--TMPL_VAR Name="serialid"-->');setStatus(<!-- TMPL_VAR NAME="serialid" -->);">
              Click to add item</a>
         <fieldset class="rows" style="display:none;" id="items<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->">
         <legend><a style="cursor: pointer;"  onclick="HideItems('items<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->','label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')">
-- 
1.7.0.4


From gmcharlt at gmail.com  Fri Jul  2 16:56:42 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri,  2 Jul 2010 10:56:42 -0400
Subject: [Koha-patches] [PATCH] remove a bunch of unconditional debug warns
Message-ID: <1278082602-9063-1-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 C4/Acquisition.pm                                  |    3 ---
 C4/Items.pm                                        |    1 -
 C4/Labels/Label.pm                                 |    2 +-
 C4/Letters.pm                                      |    4 ----
 C4/Record.pm                                       |    1 -
 C4/Ris.pm                                          |    3 ---
 C4/Search.pm                                       |    1 -
 C4/Z3950.pm                                        |    1 -
 acqui/neworderbiblio.pl                            |    1 -
 acqui/parcel.pl                                    |    2 --
 acqui/z3950_search.pl                              |    1 -
 cataloguing/value_builder/labs_theses.pl           |    3 ---
 cataloguing/value_builder/marc21_leader_book.pl    |    1 -
 .../value_builder/marc21_leader_computerfile.pl    |    3 ---
 cataloguing/value_builder/marc21_leader_video.pl   |    1 -
 cataloguing/value_builder/stocknumberam123.pl      |    1 -
 cataloguing/value_builder/unimarc_field_010.pl     |    1 -
 labels/label-edit-template.pl                      |    1 -
 members/notices.pl                                 |    1 -
 opac/changelanguage.pl                             |    1 -
 opac/opac-search.pl                                |    1 -
 opac/opac-userupdate.pl                            |    1 -
 reports/cat_issues_top.pl                          |    1 -
 reports/guided_reports.pl                          |    1 -
 reports/issues_avg_stats.pl                        |    2 --
 reports/manager.pl                                 |    1 -
 tools/export.pl                                    |    1 -
 27 files changed, 1 insertions(+), 40 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 4ce47fc..984c15a 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -1012,8 +1012,6 @@ sub ModOrderItem {
 
     my $query = "UPDATE aqorders_items set itemnumber=? where itemnumber=? and ordernumber=?";
     my @params = ($orderiteminfo->{'newitemnumber'}, $orderiteminfo->{'itemnumber'}, $orderiteminfo->{'ordernumber'});
-    warn $query;
-    warn Data::Dumper::Dumper(@params);
     my $sth = $dbh->prepare($query);
     $sth->execute(@params);
     return 0;
@@ -1587,7 +1585,6 @@ sub GetHistory {
             }
         }
         $query .= " ORDER BY id";
-	warn $query;
         my $sth = $dbh->prepare($query);
         $sth->execute( @query_params );
         my $cnt = 1;
diff --git a/C4/Items.pm b/C4/Items.pm
index 96f60f0..794bff7 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -148,7 +148,6 @@ sub GetItem {
     my $ssth = $dbh->prepare("SELECT serialseq,publisheddate from serialitems left join serial on serialitems.serialid=serial.serialid where serialitems.itemnumber=?");
         $ssth->execute($data->{'itemnumber'}) ;
         ($data->{'serialseq'} , $data->{'publisheddate'}) = $ssth->fetchrow_array();
-		warn $data->{'serialseq'} , $data->{'publisheddate'};
     }
 	#if we don't have an items.itype, use biblioitems.itemtype.
 	if( ! $data->{'itype'} ) {
diff --git a/C4/Labels/Label.pm b/C4/Labels/Label.pm
index 9fb09f3..ef5fa15 100644
--- a/C4/Labels/Label.pm
+++ b/C4/Labels/Label.pm
@@ -286,7 +286,7 @@ sub _BIBBAR {
     my $barcode_y_scale_factor = 0.01 * $self->{'height'};              # this scales the barcode height to 10% of the label height
     my $line_spacer = ($self->{'font_size'} * 1);       # number of pixels between text rows (This is actually leading: baseline to baseline minus font size. Recommended starting point is 20% of font size.).
     my $text_lly = ($self->{'lly'} + ($self->{'height'} - $self->{'top_text_margin'}));
-    warn  "Label: llx $self->{'llx'}, lly $self->{'lly'}, Text: lly $text_lly, $line_spacer, Barcode: llx $barcode_llx, lly $barcode_lly, $barcode_width, $barcode_y_scale_factor\n";
+    $debug and warn  "Label: llx $self->{'llx'}, lly $self->{'lly'}, Text: lly $text_lly, $line_spacer, Barcode: llx $barcode_llx, lly $barcode_lly, $barcode_width, $barcode_y_scale_factor\n";
     return $self->{'llx'}, $text_lly, $line_spacer, $barcode_llx, $barcode_lly, $barcode_width, $barcode_y_scale_factor;
 }
 
diff --git a/C4/Letters.pm b/C4/Letters.pm
index 3f634e1..885ed5f 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -349,8 +349,6 @@ sub SendAlerts {
                 'Content-Type' => 'text/plain; charset="utf8"',
             );
             sendmail(%mail) or carp $Mail::Sendmail::error;
-            warn
-"sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}";
         }
         if ( C4::Context->preference("LetterLog") ) {
             logaction(
@@ -439,8 +437,6 @@ sub SendAlerts {
                   . $innerletter->{content}
             ) if C4::Context->preference("LetterLog");
         }
-        warn
-"sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}";
     }    
    # send an "account details" notice to a newly created user 
     elsif ( $type eq 'members' ) {
diff --git a/C4/Record.pm b/C4/Record.pm
index 37fc3e1..3b07398 100644
--- a/C4/Record.pm
+++ b/C4/Record.pm
@@ -324,7 +324,6 @@ sub marc2csv {
         ($preprocess,$postprocess, $fieldprocessing) = YAML::LoadFile($configfile);
     }
 
-    warn $fieldprocessing;
     # Preprocessing
     eval $preprocess if ($preprocess);
 
diff --git a/C4/Ris.pm b/C4/Ris.pm
index fcb5b89..11873d9 100644
--- a/C4/Ris.pm
+++ b/C4/Ris.pm
@@ -278,8 +278,6 @@ sub marc2ris {
 	## end RIS dataset
 	print "ER  - \n";
 
-    warn $outvar;
-
     # Let's re-redirect stdout
     close STDOUT;
     open STDOUT, ">&", $oldout;
@@ -947,7 +945,6 @@ sub charconv {
     }
     elsif ($uniout eq "t") {
 	## convert to utf-8
-	warn "marc8_to_utf8";
 	return marc8_to_utf8("@_");
     }
     else {
diff --git a/C4/Search.pm b/C4/Search.pm
index cb9eb71..8434886 100644
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1913,7 +1913,6 @@ sub NZanalyse {
         # depending of operand, intersect, union or exclude both lists
         # to get a result list
         if ( $operator eq ' and ' ) {
-            warn "NZAND";
             return NZoperatorAND($leftresult,$rightresult);
         }
         elsif ( $operator eq ' or ' ) {
diff --git a/C4/Z3950.pm b/C4/Z3950.pm
index 3f2f987..731df99 100644
--- a/C4/Z3950.pm
+++ b/C4/Z3950.pm
@@ -232,7 +232,6 @@ sub addz3950queue {
 				# spawn a separate 'cat' process.
 				my $pid=`cat $pidfile`;
 				chomp $pid;
-				warn "PID : $pid";
 				# Kill -HUP the Z39.50 daemon to tell it to process
 				# this query.
 				my $processcount=kill 1, $pid;
diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl
index a06faca..2333f89 100755
--- a/acqui/neworderbiblio.pl
+++ b/acqui/neworderbiblio.pl
@@ -100,7 +100,6 @@ my ( $builterror, $builtquery, $simple_query, $query_cgi, $query_desc, $limit, $
 my ( $error, $marcresults, $total_hits ) = SimpleSearch( $builtquery, $results_per_page * ( $page - 1 ), $results_per_page );
 
 if (defined $error) {
-    warn "error: ".$error;
     $template->param(
         query_error => $error,
         basketno             => $basketno,
diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index 5ee97b0..675b07d 100755
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -166,8 +166,6 @@ if ($action eq "cancelorder") {
     }
 
     if ($error_delitem || $error_delbiblio) {
-	warn $error_delitem;
-	warn $error_delbiblio;
 	if ($error_delitem)   { $template->param(error_delitem => 1); }
 	if ($error_delbiblio) { $template->param(error_delbiblio => 1); }
     } else {
diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl
index 1dc5519..7f04754 100755
--- a/acqui/z3950_search.pl
+++ b/acqui/z3950_search.pl
@@ -48,7 +48,6 @@ my $error        = $input->param('error');
 my $biblionumber = $input->param('biblionumber');
 $biblionumber = 0 unless $biblionumber;
 my $frameworkcode = $input->param('frameworkcode');
-warn($frameworkcode);
 my $title         = $input->param('title');
 my $author        = $input->param('author');
 my $isbn          = $input->param('isbn');
diff --git a/cataloguing/value_builder/labs_theses.pl b/cataloguing/value_builder/labs_theses.pl
index 5f327d2..24ce1e1 100755
--- a/cataloguing/value_builder/labs_theses.pl
+++ b/cataloguing/value_builder/labs_theses.pl
@@ -83,8 +83,6 @@ sub plugin {
 		my $strquery = "SELECT authorised_value, lib from authorised_values where category = ? and lib like ?";
 # 		$strquery .= " LIMIT $startfrom,$upperlimit";
 
-		warn 'category : '.$cat_auth.' recherche :'.$search;
-		warn "$strquery";
 		$search=~s/\*/%/g;
 		my $sth = $dbh->prepare($strquery);
 		$sth->execute($cat_auth,$search);
@@ -176,7 +174,6 @@ sub plugin {
 		$template->param(
 						'index'=>''.$query->param('index')
 		) if ($query->param('index'));
-		warn 'index : '.$query->param('index');
 		$template->param(
  						'cat_auth'=>$cat_auth
 		) if ($cat_auth);
diff --git a/cataloguing/value_builder/marc21_leader_book.pl b/cataloguing/value_builder/marc21_leader_book.pl
index 010c431..6eb0f61 100755
--- a/cataloguing/value_builder/marc21_leader_book.pl
+++ b/cataloguing/value_builder/marc21_leader_book.pl
@@ -82,7 +82,6 @@ my ($template, $loggedinuser, $cookie)
 	$result = "     nam         7a      " unless $result;
 	my $f5 = substr($result,5,1);
 	my $f6 = substr($result,6,1);
-	warn "F6".$f6;
 	my $f7 = substr($result,7,1);
 	my $f8 = substr($result,8,1);
 	my $f9 = substr($result,9,1);
diff --git a/cataloguing/value_builder/marc21_leader_computerfile.pl b/cataloguing/value_builder/marc21_leader_computerfile.pl
index a8ccf79..9ce7f91 100755
--- a/cataloguing/value_builder/marc21_leader_computerfile.pl
+++ b/cataloguing/value_builder/marc21_leader_computerfile.pl
@@ -80,12 +80,9 @@ my ($template, $loggedinuser, $cookie)
 			     debug => 1,
 			     });
 	$result = "     nmm         7a      " unless $result;
-	warn "RESULT:".$result;
 	my $f5 = substr($result,5,1);
 	my $f6 = substr($result,6,1);
-	warn "F6".$f6;
 	my $f7 = substr($result,7,1);
-	warn "F7:".$f7;
 	my $f8 = substr($result,8,1);
 	my $f9 = substr($result,9,1);
 	my $f17 = substr($result,17,1);
diff --git a/cataloguing/value_builder/marc21_leader_video.pl b/cataloguing/value_builder/marc21_leader_video.pl
index 87921bd..62e98da 100755
--- a/cataloguing/value_builder/marc21_leader_video.pl
+++ b/cataloguing/value_builder/marc21_leader_video.pl
@@ -82,7 +82,6 @@ my ($template, $loggedinuser, $cookie)
 	$result = "     ngm         7a      " unless $result;
 	my $f5 = substr($result,5,1);
 	my $f6 = substr($result,6,1);
-	warn "F6".$f6;
 	my $f7 = substr($result,7,1);
 	my $f8 = substr($result,8,1);
 	my $f9 = substr($result,9,1);
diff --git a/cataloguing/value_builder/stocknumberam123.pl b/cataloguing/value_builder/stocknumberam123.pl
index 99f782a..014fd86 100755
--- a/cataloguing/value_builder/stocknumberam123.pl
+++ b/cataloguing/value_builder/stocknumberam123.pl
@@ -111,7 +111,6 @@ sub plugin {
             return => $code,
         );
     }
-    warn $code;
     output_html_with_http_headers $input, $cookie, $template->output;
 }
 
diff --git a/cataloguing/value_builder/unimarc_field_010.pl b/cataloguing/value_builder/unimarc_field_010.pl
index 3d97994..5e319d9 100755
--- a/cataloguing/value_builder/unimarc_field_010.pl
+++ b/cataloguing/value_builder/unimarc_field_010.pl
@@ -92,7 +92,6 @@ sub plugin {
     my $sth = $dbh->prepare('SELECT publishercode FROM biblioitems WHERE isbn LIKE ? OR isbn LIKE ? LIMIT 1');
     
     $isbn =~ s/-//g;
-    warn $isbn;
     if (length ($isbn) == 13){
         $isbn = substr($isbn, 3, length($isbn)-3);
     }
diff --git a/labels/label-edit-template.pl b/labels/label-edit-template.pl
index 51e6fb5..a645fee 100755
--- a/labels/label-edit-template.pl
+++ b/labels/label-edit-template.pl
@@ -41,7 +41,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 );
 
 my $op = $cgi->param('op');
-warn "operation = $op\n";
 my $template_id = $cgi->param('template_id') || $cgi->param('element_id');
 my $label_template = undef;
 my $profile_list = undef;
diff --git a/members/notices.pl b/members/notices.pl
index fb8e91b..f6680d5 100755
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -52,7 +52,6 @@ $template->param( picture => 1 ) if $picture;
 # Getting the messages
 my $queued_messages = C4::Letters::GetQueuedMessages({borrowernumber => $borrowernumber});
 
-warn Data::Dumper::Dumper( $queued_messages );
 $template->param(
 			QUEUED_MESSAGES 	=> $queued_messages,
  			BORROWER_INFO         	=> [ $borrower ],
diff --git a/opac/changelanguage.pl b/opac/changelanguage.pl
index 16ef6d0..22b73e4 100755
--- a/opac/changelanguage.pl
+++ b/opac/changelanguage.pl
@@ -25,5 +25,4 @@ my $query    = new CGI;
 my $language = $query->param('language');
 my $url      = $query->referer();
 
-warn "Language : $query // $language // $url";
 setlanguagecookie( $query, $language, $url );
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index a142cb1..30bc34a 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -600,7 +600,6 @@ for (my $i=0;$i<=@servers;$i++) {
         for my $sup_record ( @{$results_hashref->{$server}->{"RECORDS"}} ) {
             my $marc_record_object = MARC::Record->new_from_usmarc($sup_record);
             my $title_field = $marc_record_object->field(100);
-             warn "Authority Found: ".$marc_record_object->as_formatted();
             push @inner_sup_results_array, {
                 'title' => $title_field->subfield('a'),
                 'link' => "&amp;idx=an&amp;q=".$marc_record_object->field('001')->as_string(),
diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index d15e740..b38a477 100755
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -136,7 +136,6 @@ EOF
     if ( sendmail %mail ) {
 
         # do something if it works....
-        warn "Mail sent ok\n";
         print $query->redirect('/cgi-bin/koha/opac-user.pl?patronupdate=sent');
         exit;
     }
diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl
index d7f2e44..d07335e 100755
--- a/reports/cat_issues_top.pl
+++ b/reports/cat_issues_top.pl
@@ -272,7 +272,6 @@ sub calculate {
         }
         $strsth2 .=" group by $colfield";
         $strsth2 .=" order by $colorder";
-        warn "". $strsth2;
         
         my $sth2 = $dbh->prepare( $strsth2 );
         if (( @colfilter ) and ($colfilter[1])){
diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index 269f7a8..dbda180 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -234,7 +234,6 @@ elsif ( $phase eq 'Choose these criteria' ) {
             $query_criteria .= " AND $crit='$value'";
         }
 	}
-	warn $query_criteria;
     }
 
     $template->param(
diff --git a/reports/issues_avg_stats.pl b/reports/issues_avg_stats.pl
index 678495f..8285bec 100755
--- a/reports/issues_avg_stats.pl
+++ b/reports/issues_avg_stats.pl
@@ -451,7 +451,6 @@ sub calculate {
     }
     $strsth2 .=" GROUP BY $colfield";
     $strsth2 .=" ORDER BY $colorder";
-    warn "". $strsth2;
     
     my $sth2 = $dbh->prepare( $strsth2 );
     if (( @colfilter ) and ($colfilter[1])){
@@ -522,7 +521,6 @@ sub calculate {
     $strcalc .= " AND monthname(returndate) like '" . @$filters[6] ."'" if ( @$filters[6] );
     
     $strcalc .= " group by  $linefield, $colfield, issuedate, returndate order by $linefield, $colfield";
-    warn "SQL :". $strcalc;
     
     my $dbcalc = $dbh->prepare($strcalc);
     $dbcalc->execute;
diff --git a/reports/manager.pl b/reports/manager.pl
index 4ca5595..177c64a 100755
--- a/reports/manager.pl
+++ b/reports/manager.pl
@@ -47,7 +47,6 @@ unless (-r $cgidir and -d $cgidir) {
 	$cgidir = C4::Context->intranetdir."/reports/";
 } 
 my $plugin = $cgidir.$report_name.".plugin";
-warn "PLUGIN:".$plugin;
 require $plugin;
 if ($do_it) {
 	my $results = calculate(\@values);
diff --git a/tools/export.pl b/tools/export.pl
index 66d1acc..a1e9a22 100755
--- a/tools/export.pl
+++ b/tools/export.pl
@@ -123,7 +123,6 @@ if ($op eq "export") {
         $query .= (C4::Context->preference('item-level_itypes')) ? " AND items.itype = ? " : " AND biblioitems.itemtype = ?";
         push @sql_params, $itemtype;
     }
-    warn "$query, @sql_params";
     my $sth = $dbh->prepare($query);
     $sth->execute(@sql_params);
     
-- 
1.7.0


From gmcharlt at gmail.com  Fri Jul  2 17:06:06 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri, 2 Jul 2010 11:06:06 -0400
Subject: [Koha-patches] [PATCH 3/4] bug 4188: move PDF templates for
	printed purchase orders
In-Reply-To: <4C2DE88D.7060207@biblibre.com>
References: <1278074895-7443-1-git-send-email-gmcharlt@gmail.com>
	<1278074895-7443-2-git-send-email-gmcharlt@gmail.com>
	<1278074895-7443-3-git-send-email-gmcharlt@gmail.com>
	<4C2DE88D.7060207@biblibre.com>
Message-ID: <AANLkTikI84NnyEWzWwbbXD42myU9V2_BlurrVU-xiEpt@mail.gmail.com>

Hi,

On Fri, Jul 2, 2010 at 9:24 AM, Paul Poulain <paul.poulain at biblibre.com> wrote:
> in git.biblibre.com version, the syspref now let you upload the layout
> (.pdf)

Good to know, and this can be dealt with in 3.4.  One point, though,
which I'm directing more at a broader audience than at you: the fact
that a patch is sitting in a Git repository somewhere is not
sufficient for it to be known about; if nothing else, the bugs
database would have been a way to single that BibLibre had a proposed
fix for 4188.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From camins at numismatics.org  Fri Jul  2 17:16:54 2010
From: camins at numismatics.org (Jared Camins-Esakov)
Date: Fri, 02 Jul 2010 11:16:54 -0400
Subject: [Koha-patches] [PATCH] Fix for bug 4928,
	problematic 78x display in OPAC
Message-ID: <4C2E02E6.6020405@numismatics.org>

- Add <xsl:if> wrappers around the display of subfield 'n' for 76x-78x 
fields
   This eliminates the issue in Firefox that caused the font size to grow
   progressively smaller on the OPAC Details page for records with multiple
   76x-78x fields
---
  .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |   11 ++++++++++-
  1 files changed, 10 insertions(+), 1 deletions(-)
  mode change 100644 => 100755 
koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl 
b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
old mode 100644
new mode 100755
index 1f8e897..73748fa
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -518,7 +518,9 @@
              </a>
          </span>
  +        <xsl:if test="marc:subfield[@code='n']">
              <span class="results_summary"><xsl:value-of 
select="marc:subfield[@code='n']"/></span>
+        </xsl:if>
           </xsl:if>
          </xsl:for-each>
@@ -592,7 +594,9 @@
              </a>
          </span>
  -        <span class="results_summary"><xsl:value-of 
select="marc:subfield[@code='n']"/></span>
+        <xsl:if test="marc:subfield[@code='n']">
+            <span class="results_summary"><xsl:value-of 
select="marc:subfield[@code='n']"/></span>
+        </xsl:if>
           </xsl:if>
          </xsl:for-each>
@@ -644,6 +648,11 @@
              </a>
           </span>
+
+        <xsl:if test="marc:subfield[@code='n']">
+            <span class="results_summary"><xsl:value-of 
select="marc:subfield[@code='n']"/></span>
+        </xsl:if>
+
          </xsl:if>
          </xsl:for-each>
          </xsl:if>
-- 
1.7.0.4


From camins at numismatics.org  Fri Jul  2 17:19:36 2010
From: camins at numismatics.org (Jared Camins-Esakov)
Date: Fri, 02 Jul 2010 11:19:36 -0400
Subject: [Koha-patches] [PATCH] Bug 4422 Show article icon w/
	DisplayOPACiconsXSLT
Message-ID: <4C2E0388.6050706@numismatics.org>

Show article (open book) icon on results and details screen when 
DisplayOPACiconsXSLT is enabled.
---
  .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |   10 ++++++----
  .../prog/en/xslt/MARC21slim2OPACResults.xsl        |    5 +++--
  koha-tmpl/opac-tmpl/prog/famfamfam/AR.png          |  Bin 0 -> 622 bytes
  3 files changed, 9 insertions(+), 6 deletions(-)
  create mode 100644 koha-tmpl/opac-tmpl/prog/famfamfam/AR.png

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl 
b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index 73748fa..3572379 100755
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -28,8 +28,9 @@
              <xsl:choose>
                  <xsl:when test="$leader6='a'">
                      <xsl:choose>
-                        <xsl:when test="$leader7='a' or $leader7='c' or 
$leader7='d' or $leader7='m'">BK</xsl:when>
-                        <xsl:when test="$leader7='b' or $leader7='i' or 
$leader7='s'">SE</xsl:when>
+                        <xsl:when test="$leader7='c' or $leader7='d' or 
$leader7='m'">BK</xsl:when>
+                        <xsl:when test="$leader7='i' or 
$leader7='s'">SE</xsl:when>
+                        <xsl:when test="$leader7='a' or 
$leader7='b'">AR</xsl:when>
                      </xsl:choose>
                  </xsl:when>
                  <xsl:when test="$leader6='t'">BK</xsl:when>
@@ -45,8 +46,9 @@
              <xsl:choose>
                  <xsl:when test="$leader6='a'">
                      <xsl:choose>
-                        <xsl:when test="$leader7='a' or $leader7='c' or 
$leader7='d' or $leader7='m'">Book</xsl:when>
-                        <xsl:when test="$leader7='b' or $leader7='i' or 
$leader7='s'">Continuing Resource</xsl:when>
+                        <xsl:when test="$leader7='c' or $leader7='d' or 
$leader7='m'">Book</xsl:when>
+                        <xsl:when test="$leader7='i' or 
$leader7='s'">Continuing Resource</xsl:when>
+                        <xsl:when test="$leader7='a' or 
$leader7='b'">Article</xsl:when>
                      </xsl:choose>
                  </xsl:when>
                  <xsl:when test="$leader6='t'">Book</xsl:when>
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl 
b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
index 62a9f46..1c1bfd0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -514,8 +514,9 @@
              <xsl:choose>
                  <xsl:when test="$leader6='a'">
                      <xsl:choose>
-                        <xsl:when test="$leader7='a' or $leader7='c' or 
$leader7='d' or $leader7='m'"><img 
src="/opac-tmpl/prog/famfamfam/silk/book.png" alt="book" title="book"/> 
Book</xsl:when>
-                        <xsl:when test="$leader7='b' or $leader7='i' or 
$leader7='s'"><img src="/opac-tmpl/prog/famfamfam/silk/newspaper.png" 
alt="serial" title="serial"/> Continuing Resource</xsl:when>
+                        <xsl:when test="$leader7='c' or $leader7='d' or 
$leader7='m'"><img src="/opac-tmpl/prog/famfamfam/silk/book.png" 
alt="book" title="book"/> Book</xsl:when>
+                        <xsl:when test="$leader7='i' or 
$leader7='s'"><img src="/opac-tmpl/prog/famfamfam/silk/newspaper.png" 
alt="serial" title="serial"/> Continuing Resource</xsl:when>
+                        <xsl:when test="$leader7='a' or 
$leader7='b'"><img src="/opac-tmpl/prog/famfamfam/silk/book_open.png" 
alt="article" title="article"/> Article</xsl:when>
                      </xsl:choose>
                  </xsl:when>
                  <xsl:when test="$leader6='t'"><img 
src="/opac-tmpl/prog/famfamfam/silk/book.png" alt="book" title="book"/> 
Book</xsl:when>
diff --git a/koha-tmpl/opac-tmpl/prog/famfamfam/AR.png 
b/koha-tmpl/opac-tmpl/prog/famfamfam/AR.png
new file mode 100644
index 
0000000000000000000000000000000000000000..7d863f949741ff83fd8373a77c0d95a3d95e441f
GIT binary patch
literal 622
zcmV-!0+IcRP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!07*naR5;6}
zQ_pJ?Q4pS$w at qAVekfW^Q_+&87>YeaZ-G+53gSTz{SPWVdFiPaPX+$~@n)fi9>qgJ
zh4fN-QcEhq^wI<|vImjml9)pF*W2zl+qWbTPaSyKyqWKt`DS)j3xa?yVgf%ewhl|m
zA$_0x^Rx4E at d&=>uRoSN*Cm&aL#`7&zr0;L(pKMn1G#$ZszFkMC^?B8f`0w&-UD$u
zd-(?iK6#!;xZ`>J^A9DGiTfguewDOKwDEK<mL;X6%J<*Yu-X+69xa&k<iYHS^wR1Z
zn$Yzsw*a}YdcDs7QDJF*p6*-`Hzy}kG&7Z at TCK*he!oxUa+w^*4qKUsW&i at rG))Gf
zSIe@<YPG0XERt;-9D~2t>oL}`ZE_M}0=xvsgf$usmJeV$oo28d0#yu!pdgpag$giC
zhlKP!CMX3wsPMGgZ5n>Xg+hV--ENofAcH61#0B7Hvl-7Il}g2A6;lfG`FxbX8A>p$
z0P;GW4il9Mr9jO9)xB^Rgy%*CSTdQ6D;kDDnM{U{5Q21FA4#ZM71$_Dba8z<-Y_Na
zS@|v#c0PZNDux9AoXD-ZoWP~q)7QrC`G<o;20dP08XMo;{X}9g7*MPCZ)C at nf*VuU
zxl(0sf2;zmy!OAZ(OlWwK0WO}#Ezsh*^}n`SIgsY+C at L-GloW+?l6nAU;qFB07*qo
IM6N<$f=tvEoB#j-

literal 0
HcmV?d00001

-- 
1.7.0.4


From camins at numismatics.org  Fri Jul  2 17:29:30 2010
From: camins at numismatics.org (Jared Camins-Esakov)
Date: Fri, 02 Jul 2010 11:29:30 -0400
Subject: [Koha-patches] [PATCH] Fix for bug 4928,
 problematic 78x display in OPAC
In-Reply-To: <4C2E02E6.6020405@numismatics.org>
References: <4C2E02E6.6020405@numismatics.org>
Message-ID: <4C2E05DA.1030008@numismatics.org>

Trying again, this time with the patch attached instead of inline. Sorry 
about the deluge of non-working patches.

Regards,
Jared

-- 
Jared Camins-Esakov
Assistant Librarian - American Numismatic Society
75 Varick Street, 11th Floor
New York, NY  10013
Tel: (212) 571-4470, ext. 171
camins at numismatics.org
http://www.numismatics.org/Library/Library

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 0001-Fix-for-bug-4928-problematic-78x-display-in-OPAC.patch
URL: </pipermail/koha-patches/attachments/20100702/c3a64001/attachment.asc>

From camins at numismatics.org  Fri Jul  2 16:05:45 2010
From: camins at numismatics.org (Jared CAMINS-ESAKOV)
Date: Fri, 2 Jul 2010 10:05:45 -0400
Subject: [PATCH] Fix for bug 4928, problematic 78x display in OPAC
Message-ID: <mailman.0.1278084640.18001.koha-patches@lists.koha-community.org>

- Add <xsl:if> wrappers around the display of subfield 'n' for 76x-78x fields
  This eliminates the issue in Firefox that caused the font size to grow
  progressively smaller on the OPAC Details page for records with multiple
  76x-78x fields
---
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
 mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
old mode 100644
new mode 100755
index 1f8e897..73748fa
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -518,7 +518,9 @@
             </a>
         </span>
 
+        <xsl:if test="marc:subfield[@code='n']">
             <span class="results_summary"><xsl:value-of select="marc:subfield[@code='n']"/></span>
+        </xsl:if>
 
         </xsl:if>
         </xsl:for-each>
@@ -592,7 +594,9 @@
             </a>
         </span>
 
-        <span class="results_summary"><xsl:value-of select="marc:subfield[@code='n']"/></span>
+        <xsl:if test="marc:subfield[@code='n']">
+            <span class="results_summary"><xsl:value-of select="marc:subfield[@code='n']"/></span>
+        </xsl:if>
 
         </xsl:if>
         </xsl:for-each>
@@ -644,6 +648,11 @@
             </a>
 
         </span>
+
+        <xsl:if test="marc:subfield[@code='n']">
+            <span class="results_summary"><xsl:value-of select="marc:subfield[@code='n']"/></span>
+        </xsl:if>
+
         </xsl:if>
         </xsl:for-each>
         </xsl:if>
-- 
1.7.0.4


--------------090202000500050609060602--

From camins at numismatics.org  Fri Jul  2 17:32:12 2010
From: camins at numismatics.org (Jared Camins-Esakov)
Date: Fri, 02 Jul 2010 11:32:12 -0400
Subject: [Koha-patches] [PATCH] Bug 4422 Show article icon w/
	DisplayOPACiconsXSLT
In-Reply-To: <4C2E0388.6050706@numismatics.org>
References: <4C2E0388.6050706@numismatics.org>
Message-ID: <4C2E067C.70500@numismatics.org>

When I tried sending this patch inline, it failed to come through 
properly. Please see the attached patch for a (hopefully) usable 
version. Sorry for all the patches!

Regards,
Jared

-- 
Jared Camins-Esakov
Assistant Librarian - American Numismatic Society
75 Varick Street, 11th Floor
New York, NY  10013
Tel: (212) 571-4470, ext. 171
camins at numismatics.org
http://www.numismatics.org/Library/Library

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 0001-Show-article-icon-with-DisplayOPACiconsXSLT.patch
URL: </pipermail/koha-patches/attachments/20100702/e048542f/attachment.txt>

From oleonard at myacpl.org  Fri Jul  2 17:34:32 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  2 Jul 2010 11:34:32 -0400
Subject: [Koha-patches] [PATCH] Partial fix for Bug 4924,
	Public/Internal notes missing in staff normal view
Message-ID: <1278084872-15348-1-git-send-email-oleonard@myacpl.org>

This fix adds only public notes. A div is added as a hook for styling
---
 catalogue/detail.pl                                |    3 ++-
 .../prog/en/modules/catalogue/detail.tmpl          |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 85819c0..faffc4e 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -159,7 +159,7 @@ foreach my $item (@items) {
     $item->{'location'} = $shelflocations->{$shelfcode} if ( defined( $shelfcode ) && defined($shelflocations) && exists( $shelflocations->{$shelfcode} ) );
     my $ccode = $item->{'ccode'};
     $item->{'ccode'} = $collections->{$ccode} if ( defined( $ccode ) && defined($collections) && exists( $collections->{$ccode} ) );
-    foreach (qw(ccode enumchron copynumber uri)) {
+    foreach (qw(ccode enumchron copynumber itemnotes uri)) {
         $itemfields{$_} = 1 if ( $item->{$_} );
     }
 
@@ -212,6 +212,7 @@ $template->param(
 	itemdata_enumchron  => $itemfields{enumchron},
 	itemdata_uri        => $itemfields{uri},
 	itemdata_copynumber => $itemfields{copynumber},
+    itemdata_itemnotes  => $itemfields{itemnotes},
 	volinfo				=> $itemfields{enumchron} || $dat->{'serial'} ,
 	z3950_search_params	=> C4::Search::z3950_search_args($dat),
 	C4::Search::enabled_staff_search_views,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 1861028..547a36d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -214,6 +214,7 @@ function verify_images() {
                 <!-- TMPL_IF NAME="volinfo" --><th>Publication Details</th><!-- /TMPL_IF -->
                 <!-- TMPL_IF NAME="itemdata_uri" --><th>URL</th><!-- /TMPL_IF -->
                 <!-- TMPL_IF NAME="itemdata_copynumber" --><th>Copy No.</th><!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="itemdata_itemnotes" --><th>Public notes</th><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="SpineLabelShowPrintOnBibDetails" --><th>Spine Label</th><!-- /TMPL_IF -->
             </tr>
             <!-- TMPL_LOOP NAME="itemloop" -->
@@ -333,6 +334,7 @@ function verify_images() {
 				<!-- TMPL_IF NAME="itemdata_copynumber" -->
 					<td class="copynumber"><!-- TMPL_VAR NAME="copynumber" --></td>
 				<!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="itemdata_itemnotes" --><td><div class="itemnotes"><!-- TMPL_VAR NAME="itemnotes" --></div></td><!-- /TMPL_IF -->
                 <!-- 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 -->
-- 
1.7.0.4


From oleonard at myacpl.org  Fri Jul  2 18:35:57 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  2 Jul 2010 12:35:57 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4933,
	Link to subfield's edit tab from subfield structure admin
Message-ID: <1278088557-15574-1-git-send-email-oleonard@myacpl.org>

- Also corrects framework display in the case of the default
---
 .../en/modules/admin/marc_subfields_structure.tmpl |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index 2ea58de..7873296 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -165,7 +165,7 @@
 
 
 <!-- TMPL_IF NAME="else" -->
-<h1>MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> (framework <!--TMPL_VAR NAME="frameworkcode" -->)</h1>
+<h1>MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> <!-- TMPL_IF NAME="frameworkcode" -->(framework <!--TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->(default framework)<!-- /TMPL_IF --></h1>
 <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
 <p>The column Koha field shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, or a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.</p>
 
@@ -174,6 +174,7 @@
     <th>Subfield</th>
     <th>Text</th>
     <th>Constraints</th>
+    <th>Edit</th>
     <th>Delete</th>
 </tr>
 <!-- TMPL_LOOP NAME="loop" -->
@@ -182,7 +183,7 @@
 <!-- TMPL_ELSE -->
 <tr>
 <!-- /TMPL_UNLESS -->
-    <td><!-- TMPL_VAR NAME="tagsubfield" --></td>
+    <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&amp;tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->#sub<!-- TMPL_VAR NAME="tagsubfield" -->field"><!-- TMPL_VAR NAME="tagsubfield" --></a></td>
     <td>
         <!-- TMPL_IF NAME="subfield_ignored" -->
             <i><!-- TMPL_VAR NAME="liblibrarian" --></i>
@@ -207,7 +208,8 @@
             <!-- TMPL_IF NAME="link" --> | Link:<!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
     </td>
-    <td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+    <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&amp;tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->#sub<!-- TMPL_VAR NAME="tagsubfield" -->field">Edit</a></td>
+    <td><a class="" href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
-- 
1.7.0.4


From oleonard at myacpl.org  Fri Jul  2 18:46:02 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  2 Jul 2010 12:46:02 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4934 - Image missing for linked
	subfields in MARC display
Message-ID: <1278089162-15694-1-git-send-email-oleonard@myacpl.org>

---
 .../prog/en/modules/catalogue/MARCdetail.tmpl      |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index 8fa7d1b..b5dd80b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -92,7 +92,7 @@ function Changefwk(FwkList) {
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -122,7 +122,7 @@ function Changefwk(FwkList) {
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -152,7 +152,7 @@ function Changefwk(FwkList) {
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -182,7 +182,7 @@ function Changefwk(FwkList) {
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -212,7 +212,7 @@ function Changefwk(FwkList) {
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -242,7 +242,7 @@ function Changefwk(FwkList) {
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -272,7 +272,7 @@ function Changefwk(FwkList) {
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -302,7 +302,7 @@ function Changefwk(FwkList) {
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -332,7 +332,7 @@ function Changefwk(FwkList) {
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
@@ -362,7 +362,7 @@ function Changefwk(FwkList) {
                     <!-- TMPL_IF NAME="is_url" --><a href="<!-- TMPL_VAR NAME="marc_value" -->"><!-- TMPL_VAR NAME="marc_value" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="marc_value" ESCAPE="html" --><!-- /TMPL_IF -->
                     <!-- TMPL_IF name="link" -->
                         <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;idx=<!-- TMPL_VAR NAME="link" -->,phr&amp;type=intranet&amp;q=<!-- TMPL_VAR NAME="marc_value" ESCAPE="URL" -->">
-                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/img/filefind.png" height="15" title="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" alt="Search on <!-- TMPL_VAR NAME="marc_value" ESCAPE="html" -->" />
                         </a>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF NAME="authority" -->
-- 
1.7.0.4


From gmcharlt at gmail.com  Fri Jul  2 19:17:09 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri,  2 Jul 2010 13:17:09 -0400
Subject: [Koha-patches] [PATCH] bug 3916: set final "no change" dropdwon in
	batch item modification
Message-ID: <1278091029-12581-1-git-send-email-gmcharlt@gmail.com>

Classification source drop-down in the batch item modification tool
now has its default value set to the 'no change' value.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 tools/batchMod.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index abeaf15..3580b91 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -307,7 +307,7 @@ foreach my $tag (sort keys %{$tagslib}) {
               push @authorised_values, $class_source;
               $authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'};
           }
-		  $value = $default_source unless ($value);
+		  $value = '';
 
           #---- "true" authorised value
       }
-- 
1.7.0


From gmcharlt at gmail.com  Fri Jul  2 20:57:16 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri,  2 Jul 2010 14:57:16 -0400
Subject: [Koha-patches] [PATCH] bug 4808: allow limited-permission circ
	operators to print receipts
Message-ID: <1278097036-13794-1-git-send-email-gmcharlt@gmail.com>

Staff users now only need circulation privileges to print
checkout receipts and slips; the 'borrowers' permission, which
allows editing patron records, is no longer required.

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 .../prog/en/includes/circ-toolbar.inc              |    2 +
 members/moremember.pl                              |   23 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index 47815d7..976de15 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -52,7 +52,9 @@ function update_child() {
 
 	function yuiToolbar() {
 	    var printmenu = [
+            <!-- TMPL_IF NAME="CAN_user_borrowers" -->
 	        { text: _("Print Page"), onclick: {fn: function(){printx_window("page")}} },
+            <!-- /TMPL_IF -->
 	        { text: _("Print Slip"), onclick: {fn: function(){printx_window("slip")}} },
 	        { text: _("Quick Slip"), onclick: {fn: function(){printx_window("qslip")}} }
 	    ];
diff --git a/members/moremember.pl b/members/moremember.pl
index 4d4d9bb..34a3e09 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -76,10 +76,23 @@ for my $failedret (@failedreturns) { $return_failed{$failedret} = 1; }
 my $template_name;
 my $quickslip = 0;
 
-if    ($print eq "page") { $template_name = "members/moremember-print.tmpl";   }
-elsif ($print eq "slip") { $template_name = "members/moremember-receipt.tmpl"; }
-elsif ($print eq "qslip") { $template_name = "members/moremember-receipt.tmpl"; $quickslip = 1; }
-else {                     $template_name = "members/moremember.tmpl";         }
+my $flagsrequired;
+if ($print eq "page") {
+    $template_name = "members/moremember-print.tmpl";
+    $flagsrequired = { borrowers => 1 };
+} elsif ($print eq "slip") {
+    $template_name = "members/moremember-receipt.tmpl";
+    # circ staff who process checkouts but can't edit
+    # patrons still need to be able to print receipts
+    $flagsrequired =  { circulate => "circulate_remaining_permissions" };
+} elsif ($print eq "qslip") {
+    $template_name = "members/moremember-receipt.tmpl";
+    $quickslip = 1;
+    $flagsrequired =  { circulate => "circulate_remaining_permissions" };
+} else {
+    $template_name = "members/moremember.tmpl";
+    $flagsrequired = { borrowers => 1 };
+}
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -87,7 +100,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { borrowers => 1 },
+        flagsrequired   => $flagsrequired,
         debug           => 1,
     }
 );
-- 
1.7.0


From gmcharlt at gmail.com  Fri Jul  2 21:14:53 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Fri,  2 Jul 2010 15:14:53 -0400
Subject: [Koha-patches] [PATCH] bug 3902: item class source can now be set
	during serials receiving
Message-ID: <1278098093-14168-1-git-send-email-gmcharlt@gmail.com>

Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
---
 C4/Biblio.pm |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 974f068..81ccfbb 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -2272,6 +2272,19 @@ sub PrepareItemrecordDisplay {
                             push @authorised_values, $itemtype;
                             $authorised_lib{$itemtype} = $description;
                         }
+                        #---- class_sources
+                    } elsif ( $tagslib->{$tag}->{$subfield}->{authorised_value} eq "cn_source" ) {
+                        push @authorised_values, "" unless ( $tagslib->{$tag}->{$subfield}->{mandatory} );
+
+                        my $class_sources = GetClassSources();
+                        my $default_source = C4::Context->preference("DefaultClassificationSource");
+
+                        foreach my $class_source (sort keys %$class_sources) {
+                            next unless $class_sources->{$class_source}->{'used'} or
+                                        ($class_source eq $default_source);
+                            push @authorised_values, $class_source;
+                            $authorised_lib{$class_source} = $class_sources->{$class_source}->{'description'};
+                        }
 
                         #---- "true" authorised value
                     } else {
-- 
1.7.0


From gcollum at gmail.com  Sat Jul  3 15:17:01 2010
From: gcollum at gmail.com (Garry Collum)
Date: Sat,  3 Jul 2010 09:17:01 -0400
Subject: [Koha-patches] [PATCH] Bug 2725: Fixes uppercasesurnames preference.
Message-ID: <1278163021-3215-1-git-send-email-gcollum@gmail.com>

---
 members/memberentry.pl |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/members/memberentry.pl b/members/memberentry.pl
index 5cb4d72..c121460 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -246,6 +246,11 @@ if ($op eq 'save' || $op eq 'insert'){
 	  $template->param('ERROR_age_limitations' => "$low to $high");
     }
   }
+  
+    if(C4::Context->preference('uppercasesurnames')) {
+        $newdata{'surname'} = uc($newdata{'surname'});
+    }
+
   if (C4::Context->preference("IndependantBranches")) {
     if ($userenv && $userenv->{flags} % 2 != 1){
       $debug and print STDERR "  $newdata{'branchcode'} : ".$userenv->{flags}.":".$userenv->{branch};
-- 
1.5.6.5


From f.demians at tamil.fr  Sat Jul  3 16:32:44 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Sat,  3 Jul 2010 16:32:44 +0200
Subject: [Koha-patches] [PATCH] Bug 4188 Valid PDF file name when printing
	basket group with no name
Message-ID: <1278167564-5569-1-git-send-email-f.demians@tamil.fr>

---
 acqui/basketgroup.pl |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
index a3b7dc9..69de099 100755
--- a/acqui/basketgroup.pl
+++ b/acqui/basketgroup.pl
@@ -238,7 +238,10 @@ sub printbasketgrouppdf{
         }
         $orders{$basket->{basketno}}=\@ba_orders;
     }
-    print $input->header( -type => 'application/pdf', -attachment => $basketgroup->{name}.'.pdf' );
+    print $input->header(
+        -type       => 'application/pdf',
+        -attachment => ( $basketgroup->{name} || $basketgroupid ) . '.pdf'
+    );
     my $pdf = printpdf($basketgroup, $bookseller, $baskets, \%orders, $bookseller->{gstrate} || C4::Context->preference("gist")) || die "pdf generation failed";
     print $pdf;
     exit;
-- 
1.7.1


From gcollum at gmail.com  Sat Jul  3 23:19:17 2010
From: gcollum at gmail.com (Garry Collum)
Date: Sat,  3 Jul 2010 17:19:17 -0400
Subject: [Koha-patches] [PATCH] Bug 2889: Fixes or adds highlighting to
	several reports.
Message-ID: <1278191957-3231-1-git-send-email-gcollum@gmail.com>

---
 .../en/modules/reports/acquisitions_stats.tmpl     |   23 ++++++++----------
 .../prog/en/modules/reports/bor_issues_top.tmpl    |   11 +++-----
 .../prog/en/modules/reports/cat_issues_top.tmpl    |    2 +-
 .../prog/en/modules/reports/catalogue_stats.tmpl   |   23 ++++++++----------
 .../prog/en/modules/reports/issues_avg_stats.tmpl  |   25 ++++++++-----------
 .../prog/en/modules/reports/itemtypes.tmpl         |    2 +-
 6 files changed, 37 insertions(+), 49 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
index 0bf5daf..73c392a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
@@ -34,18 +34,15 @@
 				<th>TOTAL</th>
 			</tr>
 				<!-- TMPL_LOOP NAME="looprow" -->
-					<tr>
-						<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-						<!-- TMPL_VAR NAME="rowtitle" --></td>
+				    <!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
+						<td><!-- TMPL_VAR NAME="rowtitle" --></td>
 						<!-- TMPL_LOOP NAME="loopcell" -->
-							<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-								<!-- TMPL_IF Name="value" --><!-- TMPL_VAR NAME="value" -->
+							<td><!-- TMPL_IF Name="value" --><!-- TMPL_VAR NAME="value" -->
 								<!-- TMPL_ELSE--> &nbsp;
 								<!-- /TMPL_IF -->
 							</td>
 						<!-- /TMPL_LOOP -->
-						<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-							<!-- TMPL_VAR NAME="totalrow" -->
+						<td><!-- TMPL_VAR NAME="totalrow" -->
 						</td>
 					</tr>
 				<!-- /TMPL_LOOP -->
@@ -74,7 +71,7 @@
 			</tr>
 		</thead>
 		<tbody>
-			<tr class="hilighted">
+			<tr class="highlight">
 				<td>Placed On</td>
 				<td><input type="radio" name="Line" value="aqbasket.closedate" /></td>
 				<td><input type="radio" checked="checked" name="Column" value="aqbasket.closedate" /> </td>
@@ -144,7 +141,7 @@
 				<span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
 				</td>
 			</tr>
-			<tr class="hilighted">
+			<tr class="highlight">
 				<td>&nbsp;</td>
 				<td colspan="2">group by <select name="PlacedOnDisplay">
 					<option value="">None</option>
@@ -238,7 +235,7 @@
 				</td>
 				<td>&nbsp;</td>
 			</tr>
-			<tr class="hilighted">
+			<tr class="highlight">
 				<td>Vendor</td>
 				<td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>
 				<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
@@ -251,7 +248,7 @@
 				<td><!-- TMPL_VAR NAME="CGIItemType" --></td>
 			</tr>
 
-			<tr>
+			<tr class="highlight">
 				<td>Budget</td>
 				<td><input type="radio" name="Line" value="aqbudgets.budget_code" /></td>
 				<td><input type="radio" name="Column" value="aqbudgets.budget_code" /></td>
@@ -259,7 +256,7 @@
 			</tr>
 
 			<!-- TMPL_IF Name="hassort1" -->
-				<tr class="hilighted">
+				<tr class="highlight">
 					<td>Sort1</td>
 					<td><input type="radio" name="Line" value="aqorders.sort1" /></td>
 					<td><input type="radio" name="Column" value="aqorders.sort1" /></td>
@@ -267,7 +264,7 @@
 				</tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF Name="hassort2" -->
-				<!-- TMPL_IF Name="HglghtSort2"--><tr class="hilighted"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF -->
+				<!-- TMPL_IF Name="HglghtSort2"--><tr class="highlight"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF -->
 					<td>Sort2</td>
 					<td><input type="radio" name="Line" value="aqorders.sort2" /></td>
 					<td><input type="radio" name="Column" value="aqorders.sort2" /></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
index b20a2f7..5bf9341 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
@@ -46,17 +46,14 @@ function Dopop(link) {
 				<!-- /TMPL_LOOP -->
 			</tr>
 				<!-- TMPL_LOOP NAME="looprow" -->
-				<tr>
-					<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="rowtitle" --></td>
+				<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
+					<td><!-- TMPL_VAR NAME="rowtitle" --></td>
 					<!-- TMPL_LOOP NAME="loopcell" -->
-						<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-							<!-- TMPL_IF NAME="reference" --><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="reference" -->"><!-- /TMPL_IF -->
+							<td><!-- TMPL_IF NAME="reference" --><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="reference" -->"><!-- /TMPL_IF -->
 							<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
 							<!-- TMPL_IF NAME="reference" --></a><!-- /TMPL_IF -->
 						</td>
-						<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-						<!-- TMPL_IF NAME="count" --><!-- TMPL_VAR NAME="count" --><!-- /TMPL_IF -->
+						<td><!-- TMPL_IF NAME="count" --><!-- TMPL_VAR NAME="count" --><!-- /TMPL_IF -->
 						</td>
 					<!-- /TMPL_LOOP -->
 				</tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
index 6a66948..b7b712c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
@@ -46,7 +46,7 @@ function Dopop(link) {
 				<!-- /TMPL_LOOP -->
 			  </tr>
 				<!-- TMPL_LOOP NAME="looprow" -->
-<!-- TMPL_IF NAME="hilighted" --><tr class="highlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
 						<td><!-- TMPL_VAR NAME="rowtitle" --></td>
 						<!-- TMPL_LOOP NAME="loopcell" -->
 							<td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
index 419193e..061bbd0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
@@ -33,18 +33,15 @@
 				<th>TOTAL</th>
 			</tr>
 				<!-- TMPL_LOOP NAME="looprow" -->
-					<tr>
-						<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-						<!-- TMPL_VAR NAME="rowtitle" --></td>
+				<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
+						<td><!-- TMPL_VAR NAME="rowtitle" --></td>
 						<!-- TMPL_LOOP NAME="loopcell" -->
-							<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-								<!--TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" -->
-								<!--TMPL_ELSE-->&nbsp;
-								<!--/TMPL_IF-->
+							<td><!--TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" -->
+							<!--TMPL_ELSE-->&nbsp;
+							<!--/TMPL_IF-->
 							</td>
 						<!-- /TMPL_LOOP -->
-						<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-							<!-- TMPL_VAR NAME="totalrow" -->
+						<td><!-- TMPL_VAR NAME="totalrow" -->
 						</td>
 					</tr>
 				<!-- /TMPL_LOOP-->
@@ -124,7 +121,7 @@
 				<!-- TMPL_ELSE -->
 				<tr><td colspan="4"><input type="hidden" name="Filter" /> <input type="hidden" name="Filter" /></td></tr>
 			<!-- /TMPL_IF -->
-			 <tr>
+			 <tr class="highlight">
 				<td>Item Type</td>
 				<td><input type="radio" name="Line" value="<!-- TMPL_VAR NAME="item_itype" -->" /></td>
 				<td><input type="radio" name="Column" value="<!-- TMPL_VAR NAME="item_itype" -->" /></td>
@@ -144,7 +141,7 @@
 				<td><input type="radio" name="Column" value="publishercode" /></td>
 				<td><input type="text" name="Filter" /></td>
 			</tr>
-			<tr>
+			<tr class="highlight">
 				<td>Publication Year</td>
 				<td><input type="radio" name="Line" value="publicationyear" /></td>
 				<td><input type="radio" name="Column" value="publicationyear" /></td>
@@ -162,7 +159,7 @@
 					</select>
 				</td>
 			</tr>
-			<tr>
+			<tr class="highlight">
 				<td>Shelving Location</td>
 				<td><input type="radio" name="Line" value="items.location" /></td>
 				<td><input type="radio" name="Column" value="items.location" /></td>
@@ -186,7 +183,7 @@
 					</select>
 				</td>
 			</tr>
-            <tr>
+            <tr class="highlight">
                 <td colspan="3">Filter barcode</td>
                 <td>
                     <select name="Filter" id="like">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
index 26d671b..6753208 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
@@ -34,16 +34,13 @@
 				<th>TOTAL</th>
 			</tr>
 				<!-- TMPL_LOOP NAME="looprow" -->
-					<tr>
-						<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-						<!-- TMPL_VAR NAME="rowtitle" --></td>
+				<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
+						<td><!-- TMPL_VAR NAME="rowtitle" --></td>
 						<!-- TMPL_LOOP NAME="loopcell" -->
-							<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
-							</td>
+						<td><!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
+						</td>
 						<!-- /TMPL_LOOP -->
-						<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-							<!-- TMPL_VAR NAME="totalrow" -->
+						<td><!-- TMPL_VAR NAME="totalrow" -->
 						</td>
 					</tr>
 				<!-- /TMPL_LOOP -->
@@ -73,7 +70,7 @@
 			</tr>
 		</thead>
 		<tbody>
-			<tr class="hilighted">
+			<tr class="highlight">
 				<td>Checkout date</td>
 				<td><input type="radio" name="Line" value="timestamp" /></td>
 				<td><input type="radio" name="Column" value="timestamp" /></td>
@@ -137,7 +134,7 @@
 							</script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span>
 				</td>
 			</tr>
-			<tr class="hilighted"> 
+			<tr class="highlight"> 
 				<td>&nbsp;</td>
 				<td colspan="2">by <select name="IssueDisplay">
 					<option value=""> </option>
@@ -225,7 +222,7 @@
 				</td>
 				<td><input type="hidden" name="Filter" value="" /><input type="hidden" name="Filter" value="" /></td>
 			</tr>
-			<tr class="hilighted">
+			<tr class="highlight">
 				<td>Patron category</td>
 				<td><input type="radio" name="Line" value="borrowers.categorycode" /></td>
 				<td><input type="radio" name="Column" value="borrowers.categorycode" /></td>
@@ -237,7 +234,7 @@
 				<td><input type="radio" name="Column" value="itemtype" /></td>
 				<td ><!-- TMPL_VAR NAME="CGIItemType" --></td>
 			</tr>
-			<tr class="hilighted">
+			<tr class="highlight">
 				<td>Library</td>
 				<td><input type="radio" name="Line" value="branchcode" /></td>
 				<td><input type="radio" name="Column" value="branchcode" /></td>
@@ -252,7 +249,7 @@
 			</tr> -->
 <!--End Modified -->
 			<!-- TMPL_IF Name="hassort1" -->
-				<tr class="hilighted"> 
+				<tr class="highlight"> 
 					<td>Sort1</td>
 					<td><input type="radio" name="Line" value="borrowers.sort1" /></td>
 					<td><input type="radio" name="Column" value="borrowers.sort1" /></td>
@@ -260,7 +257,7 @@
 				</tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF Name="hassort2" -->
-				<!-- TMPL_IF Name="HglghtSort2"--><tr class="hilighted"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF --> 
+				<!-- TMPL_IF Name="HglghtSort2"--><tr class="highlight"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF --> 
 					<td>Sort2</td>
 					<td><input type="radio" name="Line" value="borrowers.sort2" /></td>
 					<td><input type="radio" name="Column" value="borrowers.sort2" /></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
index 22a39dc..df4a731 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
@@ -23,7 +23,7 @@
 			<th>count</th>
 		</tr>
 			<!-- TMPL_LOOP NAME="loopitemtype" -->
-				<tr>
+				<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
 					<td><!-- TMPL_VAR NAME="itemtype" --></td>
 					<td><!-- TMPL_VAR NAME="count" --></td>
 				</tr>
-- 
1.5.6.5


From gcollum at gmail.com  Sun Jul  4 00:09:37 2010
From: gcollum at gmail.com (Garry Collum)
Date: Sat,  3 Jul 2010 18:09:37 -0400
Subject: [Koha-patches] [PATCH] Bug 2889: Adds highlighting to guided
	reports.
Message-ID: <1278194977-3374-1-git-send-email-gcollum@gmail.com>

Adds highlighting to guided reports and fixes a display issue with the pagination links in the reports.
---
 .../en/modules/reports/guided_reports_start.tmpl   |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
index 7a24859..222526d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
@@ -437,13 +437,13 @@ NAME="name" -->"><!-- TMPL_VAR NAME="name"--></label></td><td>
 <h1><!-- TMPL_VAR NAME="name" --></h1>
 <!-- TMPL_IF NAME="notes" --><p><!-- TMPL_VAR NAME="notes" --></p><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="unlimited_total" --><p>Total number of rows matching the (unlimited) query is <!-- TMPL_VAR NAME="unlimited_total" -->.</p><!-- /TMPL_IF -->
-<!-- TMPL_VAR name="sql" -->
-<!-- TMPL_VAR NAME='pagination_bar' DEFAULT="" -->
+<p><!-- TMPL_VAR name="sql" --></p>
+<p><!-- TMPL_VAR NAME='pagination_bar' DEFAULT="" --></p>
 <!-- TMPL_UNLESS name="errors" -->
 <table>
 <tr><!-- TMPL_LOOP NAME="header_row" --><th><!-- TMPL_VAR NAME="cell" --></th><!-- /TMPL_LOOP --></tr>
 <!-- TMPL_LOOP NAME="results" -->
-<tr>
+<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
     <!-- TMPL_LOOP NAME="cells" --><td><!-- TMPL_VAR NAME="cell" --></td><!-- /TMPL_LOOP -->
 </tr>
 <!-- /TMPL_LOOP -->
-- 
1.5.6.5


From gcollum at gmail.com  Sun Jul  4 00:20:24 2010
From: gcollum at gmail.com (Garry Collum)
Date: Sat,  3 Jul 2010 18:20:24 -0400
Subject: [Koha-patches] [PATCH] Bug 4937: Fixes XHTML in the pagination
	links of a saved report.
Message-ID: <1278195624-3435-1-git-send-email-gcollum@gmail.com>

---
 reports/guided_reports.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index 269f7a8..4d7bafb 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -501,7 +501,7 @@ elsif ($phase eq 'Run this report'){
         }
 
         my $totpages = int($total/$limit) + (($total % $limit) > 0 ? 1 : 0);
-        my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report&phase=Run%20this%20report";
+        my $url = "/cgi-bin/koha/reports/guided_reports.pl?reports=$report&amp;phase=Run%20this%20report";
         $template->param(
             'results' => \@rows,
             'sql'     => $sql,
-- 
1.5.6.5


From nahuel.angelinetti at biblibre.com  Mon Jul  5 11:02:24 2010
From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI)
Date: Mon,  5 Jul 2010 11:02:24 +0200
Subject: [Koha-patches] [PATCH] [3.0.x] (bug #4939) automaticitemtransfert
	break holdingbranch
Message-ID: <1278320544-15820-1-git-send-email-nahuel.angelinetti@biblibre.com>

This patch fix the call to moditemtransfert in the case of automaticitemtransfert set to ON.
---
 C4/Circulation.pm |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 5fcd294..0766efd 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1429,7 +1429,6 @@ sub AddReturn {
         $borrower = C4::Members::GetMemberDetails( $iteminformation->{borrowernumber}, 0 );
     
     # case of a return of document (deal with issues and holdingbranch)
-            
         if ($doreturn) {
 			my $circControlBranch;
 			if($dropbox) {
@@ -1517,7 +1516,7 @@ sub AddReturn {
             and ($validTransfert ne 1) 
             and ($reserveDone ne 1) ){
 			if (C4::Context->preference("AutomaticItemReturn") == 1) {
-				ModItemTransfer($iteminformation->{'itemnumber'}, $branch, $iteminformation->{$hbr});
+				ModItemTransfer($iteminformation->{'itemnumber'}, $branch, $hbr);
 				$messages->{'WasTransfered'} = 1;
 			}
 			else {
-- 
1.7.0.4


From chris at bigballofwax.co.nz  Tue Jul  6 10:58:03 2010
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Tue,  6 Jul 2010 20:58:03 +1200
Subject: [Koha-patches] [PATCH] Bug 4139 - Adding some indexes to deal with
	a performance issue with overdue reports
Message-ID: <1278406683-18060-1-git-send-email-chris@bigballofwax.co.nz>

---
 installer/data/mysql/kohastructure.sql |    6 ++++--
 installer/data/mysql/updatedatabase.pl |    8 ++++++++
 kohaversion.pl                         |    2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index d8ed27d..e42cecd 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -104,7 +104,8 @@ CREATE TABLE `authorised_values` (
   `imageurl` varchar(200) default NULL,
   PRIMARY KEY  (`id`),
   KEY `name` (`category`),
-  KEY `lib` (`lib`)
+  KEY `lib` (`lib`),
+  KEY `auth_value_idx` (`authorised_value`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
@@ -279,7 +280,8 @@ CREATE TABLE `borrower_attribute_types` (
   `password_allowed` tinyint(1) NOT NULL default 0,
   `staff_searchable` tinyint(1) NOT NULL default 0,
   `authorised_value_category` varchar(10) default NULL,
-  PRIMARY KEY  (`code`)
+  PRIMARY KEY  (`code`),
+  KEY `auth_val_cat_idx` (`authorised_value_category`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 --
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index f32d43c..4210328 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3677,6 +3677,14 @@ if (C4::Context->preference('Version') < TransformToNum($DBversion)){
     SetVersion ($DBversion);
 }
 
+$DBversion = 'XXXX';
+if (C4::Context->preference('Version') < TransformToNum($DBversion)){
+    $dbh->do(qq{CREATE INDEX auth_value_idx ON authorised_values (authorised_value)});
+    $dbh->do(qq{CREATE INDEX auth_val_cat_idx ON borrower_attribute_types (authorised_value_category)});
+    print "Create index on authorised_values and borrower_attribute_types (bug 4139)";
+    SetVersion ($DBversion);
+}
+
 
 =item DropAllForeignKeys($table)
 
diff --git a/kohaversion.pl b/kohaversion.pl
index d2cf8db..04bf493 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -11,7 +11,7 @@ use strict;
 
 sub kohaversion {
 
-    our $VERSION = '3.01.00.142';
+    our $VERSION = 'XXXX';
 
     # version needs to be set this way
     # so that it can be picked up by Makefile.PL
-- 
1.6.3.3


From oleonard at myacpl.org  Tue Jul  6 16:48:41 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  6 Jul 2010 10:48:41 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4359,
	noItemTypeImages not active in OPAC
Message-ID: <1278427721-2884-1-git-send-email-oleonard@myacpl.org>

- Auth.pm put the noItemTypeImages preference under "intranet only."
  Moved it to "OPAC or intranet."
- Added check for the preference on the OPAC advanced search page.
- Improved logic for displaying images on the reading history page.
---
 C4/Auth.pm                                         |    2 +-
 .../opac-tmpl/prog/en/modules/opac-advsearch.tmpl  |    2 +-
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |    2 +-
 .../prog/en/modules/opac-readingrecord.tmpl        |    4 ++--
 opac/opac-readingrecord.pl                         |    1 +
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 593f36e..9a599af 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -339,6 +339,7 @@ sub get_template_and_user {
             XSLTResultsDisplay           => C4::Context->preference("XSLTResultsDisplay"),
             BranchesLoop                 => GetBranchesLoop(),
             using_https                  => $in->{'query'}->https() ? 1 : 0,
+            noItemTypeImages            => C4::Context->preference("noItemTypeImages"),
     );
 
     if ( $in->{'type'} eq "intranet" ) {
@@ -364,7 +365,6 @@ sub get_template_and_user {
             intranetstylesheet          => C4::Context->preference("intranetstylesheet"),
             intranetuserjs              => C4::Context->preference("intranetuserjs"),
             intranetbookbag             => C4::Context->preference("intranetbookbag"),
-            noItemTypeImages            => C4::Context->preference("noItemTypeImages"),
             suggestion                  => C4::Context->preference("suggestion"),
             virtualshelves              => C4::Context->preference("virtualshelves"),
             StaffSerialIssueDisplayCount => C4::Context->preference("StaffSerialIssueDisplayCount"),
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
index 52b00e7..2ba2629 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
@@ -134,7 +134,7 @@
     <table>
         <tr>
     <!--TMPL_LOOP Name="itemtypeloop"-->
-        <td><input type="checkbox" id="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->" name="limit" value="mc-<!-- TMPL_VAR NAME="ccl" -->:<!--TMPL_VAR Name="code" -->"/><label for="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->"><!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF -->&nbsp;
+        <td><input type="checkbox" id="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->" name="limit" value="mc-<!-- TMPL_VAR NAME="ccl" -->:<!--TMPL_VAR Name="code" -->"/><label for="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->"><!-- TMPL_UNLESS NAME="noItemTypeImages" --><!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF -->&nbsp;<!-- /TMPL_UNLESS -->
         <!--TMPL_VAR Name="description" --></label></td>
         <!-- TMPL_UNLESS name="count5" --><!-- TMPL_UNLESS name="__last__" --></tr><tr><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS -->
     <!--/TMPL_LOOP-->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index b1fdf84..fe7239b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -395,7 +395,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 		<th>Date Due</th>
 	    </tr></thead>
 	    <tbody><!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
-	    <tr><!-- TMPL_IF NAME="item-level_itypes" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR NAME="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="description" --></td><!-- /TMPL_IF -->
+	    <tr><!-- TMPL_IF NAME="item-level_itypes" --><td><!-- TMPL_UNLESS NAME="noItemTypeImages" --><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR NAME="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="description" --></td><!-- /TMPL_IF -->
 		<td><!-- TMPL_UNLESS NAME="singleBranchMode" --><!-- TMPL_IF name="branchurl" --><a href="<!-- TMPL_VAR NAME="branchurl" -->"><!-- TMPL_VAR NAME="branchname" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="branchname" --><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="location_description" --> </td>
 		<!-- TMPL_IF NAME="itemdata_ccode" --><td><!-- TMPL_VAR NAME="ccode" --></td><!-- /TMPL_IF -->
 		<td><!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="OPACShelfBrowser" -->(<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser">Browse Shelf</a>)<!-- /TMPL_IF --></td>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
index 250a77a..5f55177 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
@@ -54,7 +54,7 @@ You have never borrowed anything from this library.
 <div class="ui-tabs-panel"><table id="readingrec">
 <tr>
 <th colspan="2">Title</th>
-<!-- TMPL_UNLESS NAME="item-level_itypes" --><th>Item Type</th><!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS NAME="noItemTypeImages" --><th>Item Type</th><!-- /TMPL_UNLESS -->
 <th>Call No.</th>
 <th>Date</th>
 </tr>
@@ -80,7 +80,7 @@ You have never borrowed anything from this library.
                     <span class="item-details">
                         <!-- TMPL_VAR NAME="author" -->
                     </span></td>
-<!-- TMPL_UNLESS NAME="item-level_itypes" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR name="itypedescription" -->" alt="<!-- TMPL_VAR NAME="itypedescription" -->" /><!-- /TMPL_IF --> <!-- TMPL_VAR name="itypedescription" --></td><!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS NAME="noItemTypeImages" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF --> <!-- TMPL_VAR name="description" --></td><!-- /TMPL_UNLESS -->
 <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
 <td><!-- TMPL_IF NAME="returndate" --><!-- TMPL_VAR NAME="returndate" --><!-- TMPL_ELSE --><em>(Checked out)</em><!-- /TMPL_IF --></td>
 </tr>
diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index 7a77f59..c9d5819 100755
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -95,6 +95,7 @@ foreach my $issue (@{$issues} ) {
     $line{date_due}        = format_date( $issue->{'date_due'} );
     $line{returndate}      = format_date( $issue->{'returndate'} );
     $line{volumeddesc}     = $issue->{'volumeddesc'};
+    $issue->{'itemtype'}   = C4::Context->preference('item-level_itypes') ? $issue->{'itype'} : $issue->{'itemtype'};
     if($issue->{'itemtype'}) {
         $line{'description'}   = $itemtypes->{ $issue->{'itemtype'} }->{'description'};
         $line{imageurl}        = getitemtypeimagelocation( 'opac', $itemtypes->{ $issue->{'itemtype'}  }->{'imageurl'} );
-- 
1.7.0.4


From oleonard at myacpl.org  Tue Jul  6 18:53:50 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue,  6 Jul 2010 12:53:50 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4290 - search for author in
	repository
Message-ID: <1278435230-3645-1-git-send-email-oleonard@myacpl.org>

Reimplementation of Nahuel's patch from 2010-03-02
---
 C4/Breeding.pm |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/C4/Breeding.pm b/C4/Breeding.pm
index 2b73729..9003f9a 100644
--- a/C4/Breeding.pm
+++ b/C4/Breeding.pm
@@ -169,7 +169,7 @@ C<import_biblios> tables of the Koha database.
 =cut
 
 sub BreedingSearch {
-    my ($title,$isbn,$z3950random) = @_;
+    my ($search,$isbn,$z3950random) = @_;
     my $dbh   = C4::Context->dbh;
     my $count = 0;
     my ($query, at bind);
@@ -185,12 +185,13 @@ sub BreedingSearch {
         $query .= "z3950random = ?";
         @bind=($z3950random);
     } else {
+        $search =~ s/(\s+)/\%/g;
         @bind=();
-        if ($title) {
-            $query .= "title like ?";
-            push(@bind,"$title%");
+    if ($search) {
+            $query .= "title like ? OR author like ?";
+            push(@bind,"%$search%", "%$search%");
         }
-        if ($title && $isbn) {
+        if ($search && $isbn) {
             $query .= " and ";
         }
         if ($isbn) {
-- 
1.7.0.4


From robin at catalyst.net.nz  Wed Jul  7 04:24:44 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Wed,  7 Jul 2010 14:24:44 +1200
Subject: [Koha-patches] [PATCH] bug 4952 - make the koha-remove script stop
	zebra for the instance
Message-ID: <1278469484-9659-1-git-send-email-robin@catalyst.net.nz>

---
 debian/scripts/koha-remove |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/debian/scripts/koha-remove b/debian/scripts/koha-remove
index de3fe1c..97399cc 100755
--- a/debian/scripts/koha-remove
+++ b/debian/scripts/koha-remove
@@ -30,6 +30,7 @@ DROP DATABASE koha_$name;
 FLUSH PRIVILEGES;
 eof
     
+    koha-stop-zebra $name
     rm "/etc/apache2/sites-available/$name"
     rm "/etc/koha/sites/$name/koha-conf.xml"
     rm "/etc/koha/sites/$name/zebra-biblios.cfg"
-- 
1.7.0.4


From robin at catalyst.net.nz  Wed Jul  7 06:43:30 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Wed,  7 Jul 2010 16:43:30 +1200
Subject: [Koha-patches] [PATCH] bug 4929 - add validation to patron
	administration
Message-ID: <1278477810-14002-1-git-send-email-robin@catalyst.net.nz>

This validation requires an enrollment period or a date to be provided
before the form will save, which will prevent invalid dates getting into
the system.
---
 .../prog/en/modules/admin/categorie.tmpl           |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
index 2c1f022..db66f34 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
@@ -60,16 +60,20 @@
 			_alertString += _("- upperagelimit is not a number") + "\n";
 				
 		}
+                if(!(ff.enrolmentperioddate.value || ff.enrolmentperiod.value)) {
+                    ok=1;
+                    _alertString += _("- either Enrollment period or Until date must be provided") + "\n";
+                }
 		if(ff.enrolmentperioddate.value && ff.enrolmentperiod.value){
 			document.getElementById('enrolmentmessage').className = "error";
 			return false;
 		}
 		
 		if (ok) { // if there is a problem
-			alert(_alertString);
-             return false;
-        }
-        // if all is good
+		    alert(_alertString);
+                    return false;
+                }
+                // if all is good
 		ff.submit();
 	}
 	//]]>
-- 
1.7.0.4


From robin at catalyst.net.nz  Wed Jul  7 06:46:28 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Wed, 07 Jul 2010 16:46:28 +1200
Subject: [Koha-patches] [PATCH] bug 4929 - add validation to patron
	administration
In-Reply-To: <1278477810-14002-1-git-send-email-robin@catalyst.net.nz>
References: <1278477810-14002-1-git-send-email-robin@catalyst.net.nz>
Message-ID: <1278477988.2249.19.camel@zarathud>

Sorry, wrong bug number there - this is actually for this:
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=4942

Op woensdag 07-07-2010 om 16:43 uur [tijdzone +1200], schreef Robin
Sheat:
> This validation requires an enrollment period or a date to be provided
> before the form will save, which will prevent invalid dates getting into
> the system.
> ---
>  .../prog/en/modules/admin/categorie.tmpl           |   12 ++++++++----
>  1 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
> index 2c1f022..db66f34 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
> +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
> @@ -60,16 +60,20 @@
>  			_alertString += _("- upperagelimit is not a number") + "\n";
>  				
>  		}
> +                if(!(ff.enrolmentperioddate.value || ff.enrolmentperiod.value)) {
> +                    ok=1;
> +                    _alertString += _("- either Enrollment period or Until date must be provided") + "\n";
> +                }
>  		if(ff.enrolmentperioddate.value && ff.enrolmentperiod.value){
>  			document.getElementById('enrolmentmessage').className = "error";
>  			return false;
>  		}
>  		
>  		if (ok) { // if there is a problem
> -			alert(_alertString);
> -             return false;
> -        }
> -        // if all is good
> +		    alert(_alertString);
> +                    return false;
> +                }
> +                // if all is good
>  		ff.submit();
>  	}
>  	//]]>

-- 
Robin Sheat
Catalyst IT Ltd.
? +64 4 803 2204
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Dit berichtdeel is digitaal ondertekend
URL: </pipermail/koha-patches/attachments/20100707/cda18798/attachment.pgp>

From robin at catalyst.net.nz  Wed Jul  7 09:11:10 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Wed,  7 Jul 2010 19:11:10 +1200
Subject: [Koha-patches] [PATCH] bug 4953 - make the debian package copy in
	YUI images
Message-ID: <1278486670-18210-1-git-send-email-robin@catalyst.net.nz>

---
 debian/rules |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/debian/rules b/debian/rules
index 2a8aa0d..25f111a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,6 +55,38 @@ override_dh_auto_install:
 	install -m 0644 koha-tmpl/opac-tmpl/prog/en/lib/yui/skin.css \
 		koha-tmpl/opac-tmpl/prog/en/lib/yui/reset-fonts-grids.css \
 		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png \
+		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow-disabled.png \
+		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow.png \
+		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/menu-button-arrow.png \
+		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-active.png \
+		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-active.png \
+		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-disabled.png \
+		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-disabled.png \
+		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-focus.png \
+		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-focus.png \
+		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-hover.png \
+		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow-hover.png \
+		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow.png \
+		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/split-button-arrow.png \
+		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/sprite.png \
+		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css
+	install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/sprite.png  \
+		$(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css
 	sed -i -e 's:url(.*/reset-fonts-grids.css.*):url(reset-fonts-grids.css):' \
 		   -e 's:url(.*/skin.css.*):url(skin.css):' \
 		$(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css/opac.css \
-- 
1.7.0.4


From nahuel.angelinetti at biblibre.com  Wed Jul  7 10:23:16 2010
From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI)
Date: Wed,  7 Jul 2010 10:23:16 +0200
Subject: [Koha-patches] [PATCH] (bug #4954) allow date expiry modification
	only on step 0 and 3
Message-ID: <1278490996-26865-1-git-send-email-nahuel.angelinetti@biblibre.com>

This add a verification, to allow automatic modification of expiry date, only if we are on a page that allow modification of expiry date.
---
 members/memberentry.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/members/memberentry.pl b/members/memberentry.pl
index 3b62849..b861ca9 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -237,7 +237,7 @@ if ($op eq 'save' || $op eq 'insert'){
   }
 }
 
-if ($op eq 'modify' || $op eq 'insert' || $op eq 'save' ){
+if ( ($op eq 'modify' || $op eq 'insert' || $op eq 'save') and ($step == 0 or $step == 3 )){
     unless ($newdata{'dateexpiry'}){
         my $arg2 = $newdata{'dateenrolled'} || C4::Dates->today('iso');
         $newdata{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2);
-- 
1.7.0.4


From henridamien.laurent at biblibre.com  Wed Jul  7 15:58:59 2010
From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT)
Date: Wed,  7 Jul 2010 15:58:59 +0200
Subject: [Koha-patches] [PATCH 2/7] (bug #4954) allow date expiry
	modification only on step 0 and 3
In-Reply-To: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>
References: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>
Message-ID: <1278511144-11363-2-git-send-email-henridamien.laurent@biblibre.com>

This add a verification, to allow automatic modification of expiry date, only if we are on a page that allow modification of expiry date.
---
 members/memberentry.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/members/memberentry.pl b/members/memberentry.pl
index c121460..6ec6d8e 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -278,7 +278,7 @@ if ($op eq 'save' || $op eq 'insert'){
   }
 }
 
-if ($op eq 'modify' || $op eq 'insert' || $op eq 'save' ){
+if ( ($op eq 'modify' || $op eq 'insert' || $op eq 'save') and ($step == 0 or $step == 3 )){
     if (exists ($newdata{'dateexpiry'}) && !($newdata{'dateexpiry'})){
         my $arg2 = $newdata{'dateenrolled'} || C4::Dates->today('iso');
         $newdata{'dateexpiry'} = GetExpiryDate($newdata{'categorycode'},$arg2);
-- 
1.7.0.4


From henridamien.laurent at biblibre.com  Wed Jul  7 15:59:00 2010
From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT)
Date: Wed,  7 Jul 2010 15:59:00 +0200
Subject: [Koha-patches] [PATCH 3/7] MT4049: OverdueNotices : missing
	to_address in emails.
In-Reply-To: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>
References: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>
Message-ID: <1278511144-11363-3-git-send-email-henridamien.laurent@biblibre.com>

Overduenotices were not sent automatically to borrowers, since their adress is not passed as to_adress.
---
 misc/cronjobs/overdue_notices.pl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl
index 4de6cdd..ca4efe7 100755
--- a/misc/cronjobs/overdue_notices.pl
+++ b/misc/cronjobs/overdue_notices.pl
@@ -537,6 +537,7 @@ END_SQL
                                 borrowernumber         => $borrowernumber,
                                 message_transport_type => 'email',
                                 from_address           => $admin_email_address,
+                                to_address             => $email,
                             }
                         );
                     } else {
-- 
1.7.0.4


From henridamien.laurent at biblibre.com  Wed Jul  7 15:59:01 2010
From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT)
Date: Wed,  7 Jul 2010 15:59:01 +0200
Subject: [Koha-patches] [PATCH 4/7] UNIMARC coded field search : No results
In-Reply-To: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>
References: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>
Message-ID: <1278511144-11363-4-git-send-email-henridamien.laurent@biblibre.com>

ccl.properties had to be adapted in order to be able to request the good index
---
 etc/zebradb/ccl.properties |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/etc/zebradb/ccl.properties b/etc/zebradb/ccl.properties
index 3dbf9be..231c420 100644
--- a/etc/zebradb/ccl.properties
+++ b/etc/zebradb/ccl.properties
@@ -775,6 +775,19 @@ Host-item 1=1033
 #                           language and/or script.
 #Title-parallel         1=35
 
+#Video
+video-mt 1=Video-mt
+Video-mt video-mt
+Graphics-type 1=Graphic-type
+Graphics-support 1=Graphic-support
+Type-Of-Serial 1=Type-Of-Serial
+Frequency-code 1=Frequency-code
+Regularity-code 1=Regularity-code
+Material-type	1=Material-type
+Literature-Code	1=Literature-Code
+Biography-code	1=Biography-code
+Illustration-code	1=Illustration-code
+
 #Title-related-       1026  Serial titles related to this   247, 780, 785
 #periodical                 item, either the immediate
 #                           predecessor or the immediate
-- 
1.7.0.4


From henridamien.laurent at biblibre.com  Wed Jul  7 15:59:02 2010
From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT)
Date: Wed,  7 Jul 2010 15:59:02 +0200
Subject: [Koha-patches] [PATCH 5/7] opac-ISBDdetail.pl Error 500
In-Reply-To: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>
References: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>
Message-ID: <1278511144-11363-5-git-send-email-henridamien.laurent@biblibre.com>

Use C4::Items was missing to make usage of GetItemsInfo
Adding it
---
 opac/opac-ISBDdetail.pl |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
index 9b5c031..11c9bd5 100755
--- a/opac/opac-ISBDdetail.pl
+++ b/opac/opac-ISBDdetail.pl
@@ -55,6 +55,7 @@ use C4::Review;
 use C4::Serials;    # uses getsubscriptionfrom biblionumber
 use C4::Koha;
 use C4::Members;    # GetMember
+use C4::Items;
 use C4::External::Amazon;
 
 my $query = CGI->new();
-- 
1.7.0.4


From henridamien.laurent at biblibre.com  Wed Jul  7 15:59:03 2010
From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT)
Date: Wed,  7 Jul 2010 15:59:03 +0200
Subject: [Koha-patches] [PATCH 6/7] error 500 when record cannot be loaded
In-Reply-To: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>
References: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>
Message-ID: <1278511144-11363-6-git-send-email-henridamien.laurent@biblibre.com>

On a basket or a basket download, or csv export, if Koha cannot get a biblio, then it failed with error 500.
This patch fixes that behaviour skipping the faulty record in order to present the user with the biblios which are not causing trouble.
---
 C4/Record.pm               |    2 +-
 opac/opac-basket.pl        |    1 +
 opac/opac-downloadcart.pl  |    1 +
 opac/opac-downloadshelf.pl |    1 +
 4 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/C4/Record.pm b/C4/Record.pm
index 3b07398..8e09adf 100644
--- a/C4/Record.pm
+++ b/C4/Record.pm
@@ -362,7 +362,7 @@ sub marcrecord2csv {
 
     # Getting the record
     my $record = GetMarcBiblio($biblio);
-
+    next unless $record;
     # Getting the framework
     my $frameworkcode = GetFrameworkCode($biblio);
 
diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl
index 9562d2f..c453c87 100755
--- a/opac/opac-basket.pl
+++ b/opac/opac-basket.pl
@@ -62,6 +62,7 @@ foreach my $biblionumber ( @bibs ) {
 
     my $dat              = &GetBiblioData($biblionumber);
     my $record           = &GetMarcBiblio($biblionumber);
+    next unless $record;
     my $marcnotesarray   = GetMarcNotes( $record, $marcflavour );
     my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
     my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
diff --git a/opac/opac-downloadcart.pl b/opac/opac-downloadcart.pl
index 53d1b77..ff1b58f 100755
--- a/opac/opac-downloadcart.pl
+++ b/opac/opac-downloadcart.pl
@@ -66,6 +66,7 @@ if ($bib_list && $format) {
 	foreach my $biblio (@bibs) {
 
 	    my $record = GetMarcBiblio($biblio);
+        next unless $record;
 
 	    switch ($format) {
 		case "iso2709" { $output .= $record->as_usmarc(); }
diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl
index 5a3fb1f..d73a8e7 100755
--- a/opac/opac-downloadshelf.pl
+++ b/opac/opac-downloadshelf.pl
@@ -70,6 +70,7 @@ if ($shelfid && $format) {
 	    my $biblionumber = $biblio->{biblionumber};
 
 	    my $record = GetMarcBiblio($biblionumber);
+        next unless $record;
 
 	    switch ($format) {
 		case "iso2709" { $output .= $record->as_usmarc(); }
-- 
1.7.0.4


From henridamien.laurent at biblibre.com  Wed Jul  7 15:59:04 2010
From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT)
Date: Wed,  7 Jul 2010 15:59:04 +0200
Subject: [Koha-patches] [PATCH 7/7] newordersuggestion would not filter by
	status
In-Reply-To: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>
References: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>
Message-ID: <1278511144-11363-7-git-send-email-henridamien.laurent@biblibre.com>

All the suggestions would be displayed without any consideration of their status.
---
 acqui/newordersuggestion.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/acqui/newordersuggestion.pl b/acqui/newordersuggestion.pl
index ba966b6..156dab8 100755
--- a/acqui/newordersuggestion.pl
+++ b/acqui/newordersuggestion.pl
@@ -133,7 +133,7 @@ my $suggestions_loop =
                 author		  	=> $author, 
                 title			=> $title, 
                 publishercode	=> $publishercode,
-                status		    => 'ACCEPTED'});
+                STATUS        => 'ACCEPTED'});
 my $vendor = GetBookSellerFromId($supplierid);
 $template->param(
     suggestions_loop        => $suggestions_loop,
-- 
1.7.0.4


From henridamien.laurent at biblibre.com  Wed Jul  7 15:58:58 2010
From: henridamien.laurent at biblibre.com (Henri-Damien LAURENT)
Date: Wed,  7 Jul 2010 15:58:58 +0200
Subject: [Koha-patches] [PATCH 1/7] Update 3.0 to 3.2 budgets
Message-ID: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>

FOREIGN_KEY_CHECKS had to be set to 0
in order to make the upgrade of aqbudgets table work.
---
 installer/data/mysql/updatedatabase.pl |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 5db690a..68e7cbc 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2874,6 +2874,8 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 
 $DBversion = '3.01.00.077';
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+
+    $dbh->do("SET FOREIGN_KEY_CHECKS=0 ");
     $dbh->do("DROP TABLE IF EXISTS `aqbudgetperiods` ");
     $dbh->do(qq|
                     CREATE TABLE `aqbudgetperiods` (
@@ -2890,7 +2892,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 
    $dbh->do(<<ADDPERIODS);
 INSERT INTO aqbudgetperiods (budget_period_startdate,budget_period_enddate,budget_period_active,budget_period_description,budget_period_locked)
-SELECT DISTINCT startdate, enddate, 1, concat(startdate," ",enddate),1 from aqbudget
+SELECT DISTINCT startdate, enddate, NOW() BETWEEN startdate and enddate, concat(startdate," ",enddate),NOT NOW() BETWEEN startdate AND enddate from aqbudget
 ADDPERIODS
 # SORRY , NO AQBUDGET/AQBOOKFUND -> AQBUDGETS IMPORT JUST YET,
 # BUT A NEW CLEAN AQBUDGETS TABLE CREATE FOR NOW..
@@ -2906,18 +2908,19 @@ ADDPERIODS
   #$dbh->do("drop table aqbudget;");
 
 
-    $dbh->do(<<BUDGETNAME);
-ALTER TABLE aqbudget RENAME `aqbudgets`
-BUDGETNAME
-    my $maxbudgetid=$dbh->selectcol_arrayref(<<IDsBUDGET);
-SELECT MAX(aqbudgetid) from aqbudgets
+    my $maxbudgetid = $dbh->selectcol_arrayref(<<IDsBUDGET);
+SELECT MAX(aqbudgetid) from aqbudget
 IDsBUDGET
 
 $$maxbudgetid[0] = 0 if !$$maxbudgetid[0];
 
     $dbh->do(<<BUDGETAUTOINCREMENT);
-ALTER TABLE `aqbudgets` AUTO_INCREMENT=$$maxbudgetid[0]
+ALTER TABLE aqbudget AUTO_INCREMENT=$$maxbudgetid[0]
 BUDGETAUTOINCREMENT
+    
+    $dbh->do(<<BUDGETNAME);
+ALTER TABLE aqbudget RENAME `aqbudgets`
+BUDGETNAME
 
     $dbh->do(<<BUDGETS);
 ALTER TABLE `aqbudgets`
@@ -2996,9 +2999,8 @@ BUDGETDROPDATES
                 # cannot do until aqorderbreakdown removed
 #    $dbh->do("DROP TABLE aqbookfund ");
 
-
-
 #    $dbh->do("ALTER TABLE aqorders  ADD FOREIGN KEY (`budget_id`) REFERENCES `aqbudgets` (`budget_id`) ON UPDATE CASCADE  " ); ????
+    $dbh->do("SET FOREIGN_KEY_CHECKS=1 ");
 
     print "Upgrade to $DBversion done (Adding new aqbudgetperiods, aqbudgets and aqbudget_planning tables  )\n";
     SetVersion ($DBversion);
-- 
1.7.0.4


From gmcharlt at gmail.com  Wed Jul  7 18:18:46 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 7 Jul 2010 12:18:46 -0400
Subject: [Koha-patches] [PATCH 3/7] MT4049: OverdueNotices : missing
	to_address in emails.
In-Reply-To: <1278511144-11363-3-git-send-email-henridamien.laurent@biblibre.com>
References: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>
	<1278511144-11363-3-git-send-email-henridamien.laurent@biblibre.com>
Message-ID: <AANLkTikM7ujWg50M5E1GOByq3IwQoQIPGD7ul3IAckhK@mail.gmail.com>

Hi,

On Wed, Jul 7, 2010 at 9:59 AM, Henri-Damien LAURENT
<henridamien.laurent at biblibre.com> wrote:
> Overduenotices were not sent automatically to borrowers, since their adress is not passed as to_adress.

Can you provide a replication scenario for this bug?
C4::Letters::_send_message_by_email does not require that to_address
be supplied when the notice is added to the message queue, since it
can and does look it up.  Since that is also where the check of the
AutoEmailPrimaryAddress syspref resides, specifying the patron email
address explicitly would break the functionality of that syspref for
overdue notices.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From oleonard at myacpl.org  Wed Jul  7 18:27:47 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed,  7 Jul 2010 12:27:47 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4484,
	Rss tag is not escaped in search result
Message-ID: <1278520067-6779-1-git-send-email-oleonard@myacpl.org>

---
 .../opac-tmpl/prog/en/modules/opac-results.tmpl    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index d5d87a2..3282600 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -6,7 +6,7 @@
     You did not specify any search criteria.
 <!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<link rel="alternate" type="application/rss+xml" title="<!-- TMPL_VAR NAME="LibraryName" --> Search RSS Feed" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" ESCAPE="HTML" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" ESCAPE="HTML" --><!-- /TMPL_IF -->&amp;format=rss2" />
+<link rel="alternate" type="application/rss+xml" title="<!-- TMPL_VAR NAME="LibraryName" ESCAPE="HTML" --> Search RSS Feed" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" ESCAPE="HTML" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" ESCAPE="HTML" --><!-- /TMPL_IF -->&amp;format=rss2" />
 
 
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
-- 
1.7.0.4


From gmcharlt at gmail.com  Wed Jul  7 18:33:17 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Wed, 7 Jul 2010 12:33:17 -0400
Subject: [Koha-patches] [PATCH 5/7] opac-ISBDdetail.pl Error 500
In-Reply-To: <1278511144-11363-5-git-send-email-henridamien.laurent@biblibre.com>
References: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>
	<1278511144-11363-5-git-send-email-henridamien.laurent@biblibre.com>
Message-ID: <AANLkTimkSDwMIZhtuGMMTEEW-tQLhKa7tIdHtDOIfCvN@mail.gmail.com>

Hi,

On Wed, Jul 7, 2010 at 9:59 AM, Henri-Damien LAURENT
<henridamien.laurent at biblibre.com> wrote:
> Use C4::Items was missing to make usage of GetItemsInfo
> Adding it

This wasn't a problem in master, near as I can tell.  In any event,
opac-ISBDdetail.pl does include 'use C4::Items', so this patch won't
be pushed.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From henridamien.laurent at biblibre.com  Wed Jul  7 19:50:02 2010
From: henridamien.laurent at biblibre.com (LAURENT Henri-Damien)
Date: Wed, 07 Jul 2010 19:50:02 +0200
Subject: [Koha-patches] [PATCH 3/7] MT4049: OverdueNotices : missing
 to_address in emails.
In-Reply-To: <AANLkTikM7ujWg50M5E1GOByq3IwQoQIPGD7ul3IAckhK@mail.gmail.com>
References: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>	<1278511144-11363-3-git-send-email-henridamien.laurent@biblibre.com>
	<AANLkTikM7ujWg50M5E1GOByq3IwQoQIPGD7ul3IAckhK@mail.gmail.com>
Message-ID: <4C34BE4A.30407@biblibre.com>

Le 07/07/2010 18:18, Galen Charlton a ?crit :
> Hi,
> 
> On Wed, Jul 7, 2010 at 9:59 AM, Henri-Damien LAURENT
> <henridamien.laurent at biblibre.com> wrote:
>> Overduenotices were not sent automatically to borrowers, since their adress is not passed as to_adress.
> 
> Can you provide a replication scenario for this bug?
> C4::Letters::_send_message_by_email does not require that to_address
> be supplied when the notice is added to the message queue, since it
> can and does look it up.  Since that is also where the check of the
> AutoEmailPrimaryAddress syspref resides, specifying the patron email
> address explicitly would break the functionality of that syspref for
> overdue notices.
> 
In case the system preference is missing, it is not using the first
valid email adress. I guess it is that thing I was trying to address.
sending a new patch for that then.
Thanks

From jwagner at ptfs.com  Wed Jul  7 19:55:11 2010
From: jwagner at ptfs.com (Jane Wagner)
Date: Wed, 7 Jul 2010 13:55:11 -0400
Subject: [Koha-patches] [PATCH 3/7] MT4049: OverdueNotices : missing
	to_address in emails.
In-Reply-To: <4C34BE4A.30407@biblibre.com>
References: <1278511144-11363-1-git-send-email-henridamien.laurent@biblibre.com>	
	<1278511144-11363-3-git-send-email-henridamien.laurent@biblibre.com>	
	<AANLkTikM7ujWg50M5E1GOByq3IwQoQIPGD7ul3IAckhK@mail.gmail.com> 
	<4C34BE4A.30407@biblibre.com>
Message-ID: <08e67acbfe6f8a89a8b82d5ff55d65ba@mail.gmail.com>

hdl, see Bug 3755

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3755

where I reported that the syspref isn't being set by default to something
valid.  That might be an easier fix?

Jane Wagner
Library Systems Analyst
PTFS Inc.
Content Management and Library Solutions
6400 Goldsboro Road, Suite 200
Bethesda, MD  20817
(301) 654-8088 x 151
jwagner at ptfs.com


-----Original Message-----
From: koha-patches-bounces at lists.koha-community.org
[mailto:koha-patches-bounces at lists.koha-community.org] On Behalf Of LAURENT
Henri-Damien
Sent: Wednesday, July 07, 2010 1:50 PM
To: Galen Charlton
Cc: koha-patches at lists.koha-community.org
Subject: Re: [Koha-patches] [PATCH 3/7] MT4049: OverdueNotices : missing
to_address in emails.

Le 07/07/2010 18:18, Galen Charlton a ?crit :
> Hi,
>
> On Wed, Jul 7, 2010 at 9:59 AM, Henri-Damien LAURENT
> <henridamien.laurent at biblibre.com> wrote:
>> Overduenotices were not sent automatically to borrowers, since their
>> adress is not passed as to_adress.
>
> Can you provide a replication scenario for this bug?
> C4::Letters::_send_message_by_email does not require that to_address
> be supplied when the notice is added to the message queue, since it
> can and does look it up.  Since that is also where the check of the
> AutoEmailPrimaryAddress syspref resides, specifying the patron email
> address explicitly would break the functionality of that syspref for
> overdue notices.
>
In case the system preference is missing, it is not using the first
valid email adress. I guess it is that thing I was trying to address.
sending a new patch for that then.
Thanks
_______________________________________________
Koha-patches mailing list
Koha-patches at lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches

From camins at numismatics.org  Wed Jul  7 22:54:35 2010
From: camins at numismatics.org (Jared Camins-Esakov)
Date: Wed, 07 Jul 2010 16:54:35 -0400
Subject: [Koha-patches] [PATCH] Fix bug 3811; Index language as word
Message-ID: <4C34E98B.9050005@numismatics.org>

An incorrect definition in record.abs was resulting in searches on 
languages returning incorrect results.  By changing the indexing mode 
from numeric to word, the attached patch fixes that problem. This may 
also fix bug 2560, although I am not certain.

-- 
Jared Camins-Esakov
Assistant Librarian - American Numismatic Society
75 Varick Street, 11th Floor
New York, NY  10013
Tel: (212) 571-4470, ext. 171
camins at numismatics.org
http://www.numismatics.org/Library/Library

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 0001-Fix-bug-3811-Index-language-as-word.patch
URL: </pipermail/koha-patches/attachments/20100707/caa678ba/attachment.asc>

From camins at numismatics.org  Wed Jul  7 22:45:59 2010
From: camins at numismatics.org (Jared CAMINS-ESAKOV)
Date: Wed, 7 Jul 2010 16:45:59 -0400
Subject: [PATCH] Fix bug 3811; Index language as word
Message-ID: <mailman.3.1278536151.18001.koha-patches@lists.koha-community.org>

An incorrect definition in record.abs was resulting in searches on languages returning incorrect results.  By changing the indexing mode from numeric to word, this patch fixes that problem.
---
 etc/zebradb/marc_defs/marc21/biblios/record.abs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
 mode change 100644 => 100755 etc/zebradb/marc_defs/marc21/biblios/record.abs

diff --git a/etc/zebradb/marc_defs/marc21/biblios/record.abs b/etc/zebradb/marc_defs/marc21/biblios/record.abs
old mode 100644
new mode 100755
index 6cf37ba..ba46db1
--- a/etc/zebradb/marc_defs/marc21/biblios/record.abs
+++ b/etc/zebradb/marc_defs/marc21/biblios/record.abs
@@ -44,7 +44,7 @@ melm 001        Control-number
 melm 005        Date/time-last-modified
 melm 007        Microform-generation:n:range(data,11,1),Material-type,ff7-00:w:range(data,0,1),ff7-01:w:range(data,1,1),ff7-02:w:range(data,2,1),ff7-01-02:w:range(data,0,2)
 
-melm 008        date-entered-on-file:n:range(data,0,5),date-entered-on-file:s:range(data,0,5),pubdate:w:range(data,7,4),pubdate:n:range(data,7,4),pubdate:y:range(data,7,4),pubdate:s:range(data,7,4),pl:w:range(data,15,3),ta:w:range(data,22,1),ff8-23:w:range(data,23,1),ff8-29:w:range(data,29,1),lf:w:range(data,33,1),bio:w:range(data,34,1),ln:n:range(data,35,3),ctype:w:range(data,24,4),Record-source:w:range(data,39,0)
+melm 008        date-entered-on-file:n:range(data,0,5),date-entered-on-file:s:range(data,0,5),pubdate:w:range(data,7,4),pubdate:n:range(data,7,4),pubdate:y:range(data,7,4),pubdate:s:range(data,7,4),pl:w:range(data,15,3),ta:w:range(data,22,1),ff8-23:w:range(data,23,1),ff8-29:w:range(data,29,1),lf:w:range(data,33,1),bio:w:range(data,34,1),ln:w:range(data,35,3),ctype:w:range(data,24,4),Record-source:w:range(data,39,0)
 
 melm 010        LC-card-number,Identifier-standard
 melm 011        LC-card-number,Identifier-standard
-- 
1.7.0.4


--------------080904030905020402070409--

From oleonard at myacpl.org  Thu Jul  8 16:46:34 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  8 Jul 2010 10:46:34 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4946 - hold warning needs
	rewording
Message-ID: <1278600394-8688-1-git-send-email-oleonard@myacpl.org>

This patch improves the phrasing of several messages by
breaking the message variable into distinct parts for more
natural-sounding warnings when:

- Checking out an item on hold for another patron
- Checking out an item which is waiting for another patron
- Checking out an item which is checked out to another patron
- Checking out an item which is checked out to this patron
- Checking out to a patron who has too many checked out

I would appreciate special attention to my changes to the
TooMany function in Circulation.pm to make sure I handled
it correctly.
---
 C4/Circulation.pm                                  |   42 ++++++++++++++------
 C4/Reserves.pm                                     |    1 +
 circ/circulation.pl                                |    1 +
 .../prog/en/modules/circ/circulation.tmpl          |   10 ++--
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 034a8d6..aee335c 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -31,6 +31,7 @@ use C4::Dates;
 use C4::Calendar;
 use C4::Accounts;
 use C4::ItemCirculationAlertPreference;
+use C4::Dates qw(format_date);
 use C4::Message;
 use C4::Debug;
 use Date::Calc qw(
@@ -412,7 +413,7 @@ sub TooMany {
 
         my $max_loans_allowed = $issuing_rule->{'maxissueqty'};
         if ($current_loan_count >= $max_loans_allowed) {
-            return "$current_loan_count / $max_loans_allowed";
+            return ($current_loan_count, $max_loans_allowed);
         }
     }
 
@@ -440,7 +441,7 @@ sub TooMany {
 
         my $max_loans_allowed = $branch_borrower_circ_rule->{maxissueqty};
         if ($current_loan_count >= $max_loans_allowed) {
-            return "$current_loan_count / $max_loans_allowed";
+            return ($current_loan_count, $max_loans_allowed);
         }
     }
 
@@ -747,12 +748,16 @@ sub CanBookBeIssued {
 #
     # JB34 CHECKS IF BORROWERS DONT HAVE ISSUE TOO MANY BOOKS
     #
-	my $toomany = TooMany( $borrower, $item->{biblionumber}, $item );
-    # if TooMany return / 0, then the user has no permission to check out this book
-    if ($toomany =~ /\/ 0/) {
+	my ($current_loan_count, $max_loans_allowed) = TooMany( $borrower, $item->{biblionumber}, $item );
+    # if TooMany max_loans_allowed returns 0 the user doesn't have permission to check out this book
+    if ($max_loans_allowed eq 0) {
         $needsconfirmation{PATRON_CANT} = 1;
     } else {
-        $needsconfirmation{TOO_MANY} = $toomany if $toomany;
+        if($max_loans_allowed){
+            $needsconfirmation{TOO_MANY} = 1;
+            $needsconfirmation{current_loan_count} = $current_loan_count;
+            $needsconfirmation{max_loans_allowed} = $max_loans_allowed;
+        }
     }
 
     #
@@ -835,8 +840,11 @@ sub CanBookBeIssued {
         my $currborinfo =    C4::Members::GetMemberDetails( $issue->{borrowernumber} );
 
 #        warn "=>.$currborinfo->{'firstname'} $currborinfo->{'surname'} ($currborinfo->{'cardnumber'})";
-        $needsconfirmation{ISSUED_TO_ANOTHER} =
-"$currborinfo->{'reservedate'} : $currborinfo->{'firstname'} $currborinfo->{'surname'} ($currborinfo->{'cardnumber'})";
+        $needsconfirmation{ISSUED_TO_ANOTHER} = 1;
+        $needsconfirmation{issued_firstname} = $currborinfo->{'firstname'};
+        $needsconfirmation{issued_surname} = $currborinfo->{'surname'};
+        $needsconfirmation{issued_cardnumber} = $currborinfo->{'cardnumber'};
+        $needsconfirmation{issued_borrowernumber} = $currborinfo->{'borrowernumber'};
     }
 
     # See if the item is on reserve.
@@ -850,13 +858,23 @@ sub CanBookBeIssued {
         {
             # The item is on reserve and waiting, but has been
             # reserved by some other patron.
-            $needsconfirmation{RESERVE_WAITING} =
-"$resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'}, $branchname)";
+            $needsconfirmation{RESERVE_WAITING} = 1;
+            $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'};
+            $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
+            $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
+            $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
+            $needsconfirmation{'resbranchname'} = $branchname;
+            $needsconfirmation{'reswaitingdate'} = format_date($res->{'waitingdate'});
         }
         elsif ( $restype eq "Reserved" ) {
             # The item is on reserve for someone else.
-            $needsconfirmation{RESERVED} =
-"$res->{'reservedate'} : $resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'})";
+            $needsconfirmation{RESERVED} = 1;
+            $needsconfirmation{'resfirstname'} = $resborrower->{'firstname'};
+            $needsconfirmation{'ressurname'} = $resborrower->{'surname'};
+            $needsconfirmation{'rescardnumber'} = $resborrower->{'cardnumber'};
+            $needsconfirmation{'resborrowernumber'} = $resborrower->{'borrowernumber'};
+            $needsconfirmation{'resbranchname'} = $branchname;
+            $needsconfirmation{'resreservedate'} = format_date($res->{'reservedate'});
         }
     }
 	return ( \%issuingimpossible, \%needsconfirmation );
diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 9b7014e..f6ffd83 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -1677,6 +1677,7 @@ sub _Findgroupreserve {
         SELECT reserves.biblionumber               AS biblionumber,
                reserves.borrowernumber             AS borrowernumber,
                reserves.reservedate                AS reservedate,
+               reserves.waitingdate                AS waitingdate,
                reserves.branchcode                 AS branchcode,
                reserves.cancellationdate           AS cancellationdate,
                reserves.found                      AS found,
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 4b67920..2762b4c 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -298,6 +298,7 @@ if ($barcode) {
                 $template->param(
                     $needsconfirmation => $$question{$needsconfirmation},
                     getTitleMessageIteminfo => $getmessageiteminfo->{'title'},
+                    getBarcodeMessageIteminfo => $getmessageiteminfo->{'barcode'},
                     NEEDSCONFIRMATION  => 1
                 );
                 $confirm_required = 1;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 980d195..9ab95a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -212,23 +212,23 @@ function refocus(calendar) {
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="RENEW_ISSUE" -->
-    <li>Item is currently checked out to this patron.  Renew?</li>
+    <li>Item <i><!-- TMPL_VAR NAME="getTitleMessageIteminfo" --></i> (<!-- TMPL_VAR NAME="getBarcodeMessageIteminfo" -->) is currently checked out to this patron.  Renew?</li>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="RESERVE_WAITING" -->
-    <li>Item is consigned for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></li>
+    <li>Item <i><!-- TMPL_VAR NAME="getTitleMessageIteminfo" --></i> (<!-- TMPL_VAR NAME="getBarcodeMessageIteminfo" -->) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="resborrowernumber" -->"><!-- TMPL_VAR NAME="resfirstname" --> <!-- TMPL_VAR NAME="ressurname" --></a> (<!-- TMPL_VAR NAME="rescardnumber" -->) at <!-- TMPL_VAR NAME="resbranchname" --> since <!-- TMPL_VAR NAME="reswaitingdate" --></li>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="RESERVED" -->
-    <li>Item is on hold for <!-- TMPL_VAR NAME="RESERVED" --></li>
+    <li>Item <i><!-- TMPL_VAR NAME="getTitleMessageIteminfo" --></i> (<!-- TMPL_VAR NAME="getBarcodeMessageIteminfo" -->) has been on hold for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="resborrowernumber" -->"><!-- TMPL_VAR NAME="resfirstname" --> <!-- TMPL_VAR NAME="ressurname" --></a> (<!-- TMPL_VAR NAME="rescardnumber" -->) at <!-- TMPL_VAR NAME="resbranchname" --> since <!-- TMPL_VAR NAME="resreservedate" --></li>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
-    <li>Item ( <!-- TMPL_VAR NAME="getTitleMessageIteminfo" --> ) checked out to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Check in and check out?</li>
+    <li>Item <i><!-- TMPL_VAR NAME="getTitleMessageIteminfo" --></i> (<!-- TMPL_VAR NAME="getBarcodeMessageIteminfo" -->) is checked out to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="issued_borrowernumber" -->"><!-- TMPL_VAR NAME="issued_firstname" --> <!-- TMPL_VAR NAME="issued_surname" --></a> (<!-- TMPL_VAR NAME="issued_cardnumber" -->). Check in and check out?</li>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="TOO_MANY" -->
-    <li>Too many checked out (already checked out / max : <!-- TMPL_VAR name="TOO_MANY" -->)</li>
+    <li>Too many checked out. <!-- TMPL_VAR NAME="current_loan_count" --> checked out, only <!-- TMPL_VAR NAME="max_loans_allowed" --> are allowed.</li>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="BORRNOTSAMEBRANCH" -->
-- 
1.7.0.4


From colin.campbell at ptfs-europe.com  Thu Jul  8 17:19:17 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Thu,  8 Jul 2010 16:19:17 +0100
Subject: [Koha-patches] [PATCH] Bug 4972 Fix table creations failing due to
	foreign key checks
Message-ID: <1278602357-5038-1-git-send-email-colin.campbell@ptfs-europe.com>

create tables were failing with cryptic 1005 error from mysql
wrapped creation of aqbasketgroups and aqcontract in
FOREIGN_KEY_CHECKS=0 and FOREIGN_KEY_CHECKS=1
---
 installer/data/mysql/updatedatabase.pl |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 68e7cbc..53edfbf 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2818,6 +2818,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 
 $DBversion = '3.01.00.073';
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do('SET FOREIGN_KEY_CHECKS=0 ');
     $dbh->do(<<'END_SQL');
 CREATE TABLE IF NOT EXISTS `aqcontract` (
   `contractnumber` int(11) NOT NULL auto_increment,
@@ -2831,6 +2832,7 @@ CREATE TABLE IF NOT EXISTS `aqcontract` (
         REFERENCES `aqbooksellers` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 END_SQL
+    $dbh->do('SET FOREIGN_KEY_CHECKS=1 ');
     print "Upgrade to $DBversion done (adding aqcontract table)\n";
     SetVersion ($DBversion);
 }
@@ -2856,6 +2858,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 
 $DBversion = '3.01.00.076';
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do('SET FOREIGN_KEY_CHECKS=0 ');
     $dbh->do("CREATE TABLE IF NOT EXISTS `aqbasketgroups` (
                          `id` int(11) NOT NULL auto_increment,
                          `name` varchar(50) default NULL,
@@ -2868,6 +2871,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     $dbh->do("ALTER TABLE aqbasket ADD COLUMN `basketgroupid` int(11)");
     $dbh->do("ALTER TABLE aqbasket ADD FOREIGN KEY (`basketgroupid`) REFERENCES `aqbasketgroups` (`id`) ON UPDATE CASCADE ON DELETE SET NULL");
     $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('pdfformat','pdfformat::layout2pages','Controls what script is used for printing (basketgroups)','','free')");
+    $dbh->do('SET FOREIGN_KEY_CHECKS=1 ');
     print "Upgrade to $DBversion done (adding basketgroups)\n";
     SetVersion ($DBversion);
 }
-- 
1.7.1


From pianohacker at gmail.com  Thu Jul  8 21:50:59 2010
From: pianohacker at gmail.com (Jesse Weaver)
Date: Thu,  8 Jul 2010 13:50:59 -0600
Subject: [Koha-patches] [PATCH] Add extra information to overdues report
Message-ID: <1278618659-7489-1-git-send-email-pianohacker@gmail.com>

This allows staff to see the call number and, optionally, the number of days an
item is overdue.

This work sponsored by John C. Fremont Library District, Florence, CO, USA.
---
 circ/overdue.pl                                    |   55 +++++++++++++++-----
 installer/data/mysql/en/mandatory/sysprefs.sql     |    1 +
 installer/data/mysql/updatedatabase.pl             |    7 +++
 .../en/modules/admin/preferences/circulation.pref  |    6 ++
 .../prog/en/modules/circ/overdue.tmpl              |   27 ++++++----
 5 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/circ/overdue.pl b/circ/overdue.pl
index cad8e6d..579b1c7 100755
--- a/circ/overdue.pl
+++ b/circ/overdue.pl
@@ -26,8 +26,9 @@ use CGI qw(-oldstyle_urls);
 use C4::Auth;
 use C4::Branch;
 use C4::Debug;
+use C4::Calendar qw();
 use C4::Dates qw/format_date/;
-use Date::Calc qw/Today/;
+use Date::Calc qw( Today Delta_Days );
 use Text::CSV_XS;
 
 my $input = new CGI;
@@ -233,6 +234,7 @@ if ($noreport) {
         borrowers.email,
         issues.itemnumber,
         items.barcode,
+        items.itemcallnumber,
         biblio.title,
         biblio.author,
         borrowers.borrowernumber,
@@ -270,6 +272,8 @@ if ($noreport) {
     $sth->execute();
 
     my @overduedata;
+    my $prevbor = -1;
+    my $prevrow;
     while (my $data = $sth->fetchrow_hashref) {
 
         # most of the overdue report data is linked to the database schema, i.e. things like borrowernumber and phone
@@ -284,22 +288,34 @@ if ($noreport) {
             push @patron_attr_value_loop, { value => join(', ', sort { lc $a cmp lc $b } @displayvalues) };
         }
 
-        push @overduedata, {
-            duedate                => format_date($data->{date_due}),
-            borrowernumber         => $data->{borrowernumber},
-            barcode                => $data->{barcode},
-            itemnum                => $data->{itemnumber},
-            name                   => $data->{borrower},
-            phone                  => $data->{phone},
-            email                  => $data->{email},
-            biblionumber           => $data->{biblionumber},
-            title                  => $data->{title},
-            author                 => $data->{author},
-            branchcode             => $data->{branchcode},
+        my $row = {
+            rowspan        => 1,
+            duedate        => format_date($data->{date_due}),
+            difference     => C4::Context->preference( 'ShowDifferenceOnOverdueReport' ) ? GetDaysOverdue( $data->{'branchcode'}, $data->{'date_due'} ) : 0,
+            borrowernumber => $data->{borrowernumber},
+            barcode        => $data->{barcode},
+            itemnum        => $data->{itemnumber},
+            biblionumber   => $data->{biblionumber},
+            title          => $data->{title},
+            author         => $data->{author},
+            itemcallnumber => $data->{itemcallnumber},
+            branchcode     => $data->{branchcode},
             itemcallnumber         => $data->{itemcallnumber},
             replacementprice       => $data->{replacementprice},
             patron_attr_value_loop => \@patron_attr_value_loop,
         };
+
+        if ( $prevbor eq $data->{'borrowernumber'} && $op ne 'csv' ) {
+            $prevrow->{'rowspan'}++;
+        } else {
+            $row->{'email'} = $data->{'email'};
+            $row->{'phone'} = $data->{'phone'} || '&nbsp;';
+            $row->{'name'} = $data->{'borrower'};
+            $prevrow = $row;
+            $prevbor = $row->{'borrowernumber'};
+        }
+
+        push ( @overduedata, $row );
     }
 
     my ($attrorder) = $order =~ /patron_attr_(.*)$/; 
@@ -379,3 +395,16 @@ sub build_csv {
 
     return join("\n", @lines) . "\n";
 }
+
+our %calendars;
+
+sub GetDaysOverdue {
+    my ( $branchcode, $date_due ) = @_;
+
+    if ( C4::Context->preference( 'useDaysMode' ) eq 'Calendar' && $branchcode ) {
+        my $calendar = defined( $calendars{$branchcode} ) ? $calendars{$branchcode} : ( $calendars{$branchcode} = C4::Calendar->new( branchcode => $branchcode ) );
+        return $calendars{$branchcode}->daysBetween( C4::Dates->new( $date_due, 'iso' ), C4::Dates->new() );
+    } else {
+        return Delta_Days( split( "-", $date_due ), Today() );
+    }
+}
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
index 8bfed37..19c8b58 100644
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -286,3 +286,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI:Authorized_IPs','','.','Restricts usage of ILS-DI to some IPs','Free');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OverduesBlockCirc','noblock','When checking out an item should overdues block checkout, generate a confirmation dialogue, or allow checkout','noblock|confirmation|block','Choice');
 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('DisplayMultiPlaceHold','1','Display the ability to place multiple holds or not','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('ShowDifferenceOnOverdueReport','0','Show the number of days overdue for each item on the overdues report','','YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 68e7cbc..a032f0f 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3687,6 +3687,13 @@ if (C4::Context->preference('Version') < TransformToNum($DBversion)){
     SetVersion ($DBversion);
 }
 
+$DBversion = '';
+if (C4::Context->preference('Version') < TransformToNum($DBversion)){
+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('ShowDifferenceOnOverdueReport','0','Show the number of days overdue for each item on the overdues report','','YesNo')");
+    print "Upgrade to $DBversion done (adding syspref ShowDifferenceOnOverdueReport)\n";
+    SetVersion ($DBversion);
+}
+
 
 =item DropAllForeignKeys($table)
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index ab92915..5793c87 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -60,6 +60,12 @@ Circulation:
                   yes: Require
                   no: "Don't require"
             - staff to choose which checkouts to show before running the overdues report.
+        -
+            - pref: ShowDifferenceOnOverdueReport
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - the number of days that each item is overdue on the overdues report.
         -            
             - pref: DisplayClearScreenButton
               choices:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
index 5ac278b..ca9ff94 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
@@ -106,24 +106,31 @@
 <thead><tr>
     <th>Due Date</th>
     <th>Patron</th>
-    <th>Library</th>
     <th>Title</th>
-    <th>Barcode</th>
     <th>Call number</th>
+    <th>Barcode</th>
 </tr></thead>
 
 <tbody><!-- TMPL_LOOP NAME="overdueloop" -->
     <tr>
-        <td><!-- TMPL_VAR NAME="duedate" --></td>
-        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber"-->"><!-- TMPL_VAR NAME="name" --></a>
-        <!-- TMPL_IF NAME="email" -->[<a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" ESCAPE="html" -->">email</a>]<!-- /TMPL_IF -->
-        (<!--TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSIF NAME="mobile" --><!-- TMPL_VAR NAME="mobile" --><!-- TMPL_ELSIF NAME="phonepro" --><!-- TMPL_VAR NAME="phonepro" --><!-- /TMPL_IF -->)</td>
-        <td><!-- TMPL_VAR name="branchcode" --></td>
-        <td><!-- TMPL_INCLUDE NAME="biblio-default-view.inc" --><!-- TMPL_VAR NAME="title" ESCAPE="html" -->  <!-- TMPL_VAR NAME="subtitle" --></a> <!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
+        <td><!-- TMPL_VAR NAME="duedate" --> <!-- TMPL_IF NAME="difference" -->(<!-- TMPL_VAR NAME="difference" --><!-- TMPL_IF NAME="__first__" --> days ago<!-- /TMPL_IF -->)<!-- /TMPL_IF --></td>
+        <!-- TMPL_IF NAME="name" -->
+        <td rowspan="<!-- TMPL_VAR rowspan -->">
+        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber"-->"><!-- TMPL_VAR NAME="name" --></a>
+        <!-- TMPL_IF NAME="email" -->[<a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->">email</a>]<!-- /TMPL_IF -->
+        (<!--TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSIF NAME="mobile" --><!-- TMPL_VAR NAME="mobile" --><!-- TMPL_ELSIF NAME="phonepro" --><!-- TMPL_VAR NAME="phonepro" --><!-- /TMPL_IF -->)
+        </td>
+        <!-- /TMPL_IF -->
+        <td><!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></a>
+<!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
+<a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></a>
+<!-- TMPL_ELSE -->
+<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" ESCAPE="html" -->  <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --> <!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
         </td>
-		<td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnum" -->#item<!-- TMPL_VAR NAME="itemnum" -->"><!-- TMPL_VAR name="barcode" --></a></td>
 		<td><!-- TMPL_VAR name="itemcallnumber" --></td>
-        </tr>
+        <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnum" -->#item<!-- TMPL_VAR NAME="itemnum" -->"><!-- TMPL_VAR name="barcode" --></a></td>
+    </tr>
 <!-- /TMPL_LOOP --></tbody>
 </table>
 
-- 
1.7.0.4


From ian.walls at bywatersolutions.com  Thu Jul  8 22:21:01 2010
From: ian.walls at bywatersolutions.com (Ian Walls)
Date: Thu,  8 Jul 2010 16:21:01 -0400
Subject: [Koha-patches] [PATCH] Fixes Bug 4978: longoverdues.pl claims
	undefined subroutine ModItem
Message-ID: <1278620461-10158-1-git-send-email-ian.walls@bywatersolutions.com>

Adds an explicit C4::Items:: prefix to the ModItem call on line 323
---
 C4/Accounts.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Accounts.pm b/C4/Accounts.pm
index ff2188b..610f0f4 100644
--- a/C4/Accounts.pm
+++ b/C4/Accounts.pm
@@ -320,7 +320,7 @@ sub chargelostitem{
         warn " $issues->{'borrowernumber'}  /  $itemnumber ";
         C4::Circulation::MarkIssueReturned($issues->{borrowernumber},$itemnumber);
 	#  Shouldn't MarkIssueReturned do this?
-        ModItem({ onloan => undef }, undef, $itemnumber);
+        C4::Items::ModItem({ onloan => undef }, undef, $itemnumber);
     }
     $sth->finish;
 }
-- 
1.5.6.5


From oleonard at myacpl.org  Fri Jul  9 14:48:45 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  9 Jul 2010 08:48:45 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4451 Batch item tool can't
	process file with Windows line endings
Message-ID: <1278679725-9331-1-git-send-email-oleonard@myacpl.org>

---
 tools/batchMod.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index f5138d1..67ebc8c 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -171,7 +171,7 @@ if ($op eq "show"){
     my @contentlist;
     if ($filefh){
         while (my $content=<$filefh>){
-            chomp $content;
+            $content = s/[\r\n]*$//g;
             push @contentlist, $content if $content;
         }
 
-- 
1.7.0.4


From oleonard at myacpl.org  Fri Jul  9 15:02:54 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  9 Jul 2010 09:02:54 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4957 Browse shelf shouldn't
	appear if no call number
Message-ID: <1278680574-9708-1-git-send-email-oleonard@myacpl.org>

---
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index b1fdf84..01c55d5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -398,7 +398,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 	    <tr><!-- TMPL_IF NAME="item-level_itypes" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR NAME="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="description" --></td><!-- /TMPL_IF -->
 		<td><!-- TMPL_UNLESS NAME="singleBranchMode" --><!-- TMPL_IF name="branchurl" --><a href="<!-- TMPL_VAR NAME="branchurl" -->"><!-- TMPL_VAR NAME="branchname" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="branchname" --><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="location_description" --> </td>
 		<!-- TMPL_IF NAME="itemdata_ccode" --><td><!-- TMPL_VAR NAME="ccode" --></td><!-- /TMPL_IF -->
-		<td><!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="OPACShelfBrowser" -->(<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser">Browse Shelf</a>)<!-- /TMPL_IF --></td>
+		<td><!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="OPACShelfBrowser" --><!-- TMPL_IF NAME="itemcallnumber" -->(<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser">Browse Shelf</a>)<!-- /TMPL_IF --><!-- /TMPL_IF --></td>
 		<!-- TMPL_IF NAME="itemdata_enumchron" --><td><!-- TMPL_VAR NAME="enumchron" --></td><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="itemdata_uri" --><td><a href="<!-- TMPL_VAR NAME="uri" -->"><!-- TMPL_VAR NAME="uri" --></a></td><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="itemdata_copynumber" --><td><!-- TMPL_VAR NAME="copynumber" --></td><!-- /TMPL_IF -->
-- 
1.7.0.4


From oleonard at myacpl.org  Fri Jul  9 15:33:19 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  9 Jul 2010 09:33:19 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4981,
	Tweak style of item listing on MARC display
Message-ID: <1278682399-9864-1-git-send-email-oleonard@myacpl.org>

---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css |   63 ++++++++++++++++++------------
 1 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 5142dd2..cde0460 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -25,8 +25,9 @@ body {
 
 caption {
 	font-size : 140%;
-	text-align : left;
 	font-weight : bold;
+	line-height : 144%;
+	text-align : left;
 }
 
 fieldset {
@@ -53,7 +54,7 @@ fieldset.rows legend {
 	font-size : 110%;
 }
 
-fieldset.rows label, fieldset.rows span.label {  
+fieldset.rows label, fieldset.rows span.label {
 	float: left;  
 	font-weight : bold;
 	width: 9em;  
@@ -863,14 +864,47 @@ em {
 	font-style : italic;
 }
 
-#catalogue_detail_biblio p span.label {  
+
+table#marc,
+table#marc td,
+table#marc th {
+	background-color : transparent;
+	border : 0;
+}
+
+table#marc p span.label {
 	font-weight : bold;
 }
 
-#catalogue_detail_biblio p, #catalogue_detail_biblio ul {  
+table#marc p,
+table#marc ul {
 	padding-bottom: .6em;
 }
 
+table#items,
+table#items td
+table#items th {
+	border-width : 1px solid #EEE;
+	font-size : 90%;
+}
+
+
+table#marc div.results_summary {
+	clear :  left;
+}
+table#marc div.results_summary ul {
+	display : inline;
+	float :  none;
+	clear :  none;
+	margin: 0;
+	padding: 0;
+	list-style : none;
+}
+
+table#marc div.results_summary ul li {
+	display : inline;
+}
+
 #basketcount {
 	display : inline;
 }
@@ -1183,11 +1217,6 @@ div.tab-container {
 	width : 90%;
 }
 
-#catalogue_detail_biblio table, #catalogue_detail_biblio td, #catalogue_detail_biblio th {
-	background-color : transparent;
-	border : 0;
-}
-
 tr.overdue td {
 	background-color : #ffcccc;
 	border-bottom : 1px solid #ffaeae;
@@ -1295,22 +1324,6 @@ padding-left : .4em;
 	padding-left : 13px;
 }
 
-#catalogue_detail_biblio div.results_summary {
-	clear :  left;
-}
-#catalogue_detail_biblio div.results_summary ul {
-	display : inline;
-	float :  none;
-	clear :  none;
-	margin: 0;
-	padding: 0;
-	list-style : none;
-}
-
-#catalogue_detail_biblio div.results_summary ul li {
-	display : inline;
-}
-
 .dialog {
   border: 1px solid #bcbcbc;
 	padding : .5em;
-- 
1.7.0.4


From oleonard at myacpl.org  Fri Jul  9 17:53:01 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  9 Jul 2010 11:53:01 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4950 - checkbox should be
	removed when can't place a hold
Message-ID: <1278690781-10626-1-git-send-email-oleonard@myacpl.org>

- Hiding form controls for titles which can't be placed on hold
- Highlighting hold blocked message for better visibility
- Showing table of blocked holds even if none can be placed on
  hold: hiding the table hides the messages explaining why
  titles can't be placed on hold
- Removing an unused line from the script which was leaving errors
  in the error log
- Consolidating error messages into one box which were displaying
  in two.
- Correcting link to unused opac-userdetails.pl
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |    4 +-
 .../opac-tmpl/prog/en/modules/opac-reserve.tmpl    |  364 ++++++++++----------
 opac/opac-reserve.pl                               |   10 +-
 3 files changed, 187 insertions(+), 191 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 5142dd2..fb9f1fc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -1406,6 +1406,7 @@ div#changelanguage{
 	color : #666;
 	font-size : 85%;
 	padding : 1em;
+	margin-top : 2em;
  }
  
 div#changelanguage a {
@@ -1957,4 +1958,5 @@ div.ft {
 	font-size:90%;
 	list-style:disc outside url("../../images/item-bullet.gif");
 	padding:0.2em 0;
-}
\ No newline at end of file
+}
+div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px; margin : 2px; }
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index 812c91b..0fa3a2b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
@@ -160,27 +160,23 @@
     <div id="bd">
 	  <div id="yui-g">
         <div id="holds" class="container">
-
-          <!-- TMPL_IF NAME="message" -->
+        <!-- TMPL_IF NAME="message" -->
             <!-- TMPL_IF NAME="GNA" -->
-              <div class="dialog alert">
-                <strong>Sorry</strong>, you cannot place holds because the library doesn't have up-to-date <a href="/cgi-bin/koha/opac-userdetails.pl">contact information</a> on file.
-              </div>
-              <div class="dialog alert">Please contact your librarian, or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)
+              <div id="gna" class="dialog alert">
+                <p><strong>Sorry</strong>, you cannot place holds because the library doesn't have up-to-date <a href="/cgi-bin/koha/opac-userupdate.pl">contact information</a> on file.</p>
+              <p>Please contact your librarian, or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)</p>
               </div>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="lost" -->
-              <div class="dialog alert">
-                <strong>Sorry</strong>, you cannot place holds because your library card has been marked as lost or stolen.
-              </div>
-              <div class="dialog alert">If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.
+              <div id="lost" class="dialog alert">
+                <p><strong>Sorry</strong>, you cannot place holds because your library card has been marked as lost or stolen.</p>
+                <p>If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</p>
               </div>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="debarred" -->
-              <div class="dialog alert">
-                <strong>Sorry</strong>, you cannot place holds because your account has been frozen.
-              </div>
-              <div class="dialog alert">Usually the reason for freezing an account is old overdues or damage fees.   If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please consult a librarian.
+              <div id="debarred" class="dialog alert">
+                <p><strong>Sorry</strong>, you cannot place holds because your account has been frozen.</p>
+                <p>Usually the reason for freezing an account is old overdues or damage fees.   If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please consult a librarian.</p>
               </div>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="too_much_oweing" -->
@@ -211,18 +207,18 @@
             <!-- TMPL_IF NAME="bad_data" -->
               <div class="dialog alert">ERROR: Internal error: incomplete hold request.</div>
             <!-- /TMPL_IF -->
+          <!-- TMPL_ELSE -->
             <!-- TMPL_IF NAME="none_available" -->
-              <div class="dialog alert"><strong>Sorry</strong>, none of these items can be placed on hold.
-              </div>
-            <!-- /TMPL_IF -->
+                <div class="dialog alert"><strong>Sorry</strong>, none of these items can be placed on hold.
+                </div>
+              <!-- /TMPL_IF -->
           <!-- /TMPL_IF --><!-- NAME="message" -->
 
-          <!-- TMPL_UNLESS NAME="message" -->
-              <h3>Confirm holds for:
-                <!-- TMPL_LOOP NAME="USER_INFO" -->
-                  <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)
-                <!-- /TMPL_LOOP -->
-              </h3>
+      <!-- TMPL_UNLESS NAME="message" --><!-- TMPL_UNLESS NAME="none_available" --><h3>Confirm holds for:
+                      <!-- TMPL_LOOP NAME="USER_INFO" -->
+                        <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)
+                      <!-- /TMPL_LOOP -->
+                    </h3><!-- /TMPL_UNLESS -->
 
             <form action="/cgi-bin/koha/opac-reserve.pl" method="post">
             <input type="hidden" name="place_reserve" value="1"/>
@@ -232,8 +228,8 @@
             <input type="hidden" name="selecteditems" id="selections"/>
             <div id="bigloop">
               <table id="bibitemloop">
-                <tr>
-                  <th colspan="2">Hold</th>
+                <!-- TMPL_UNLESS NAME="none_available" --><tr>
+                  <th>Hold</th>
                   <th>Title</th>
                   <!-- TMPL_UNLESS NAME="item-level_itypes" -->
                     <th>Item Type</th>
@@ -251,12 +247,12 @@
                   <!-- TMPL_UNLESS NAME="singleBranchMode" -->
                     <th>Pickup Location</th>
                   <!-- /TMPL_UNLESS -->
-                </tr>
+                </tr><!-- TMPL_ELSE --><tr><th colspan="5">Title</th></tr><!-- /TMPL_UNLESS -->
 
                 <!-- TMPL_LOOP name="bibitemloop" -->
                   <tr>
                       <!-- TMPL_IF NAME="holdable" -->
-					  <td colspan="2">
+					  <td>
                       <input class="reserve_mode" name="reserve_mode" type="hidden" value="single"/>
                       <input class="single_bib" name="single_bib" type="hidden" value="<!-- TMPL_VAR NAME="biblionumber" -->"/>
                         <span class="confirmjs_hold" title="<!-- TMPL_VAR NAME="biblionumber" -->"></span>
@@ -269,173 +265,170 @@
                         </span>
 					</td>
                       <!-- TMPL_ELSE -->
-					  <td>
-                      <input class="reserve_mode" name="reserve_mode" type="hidden" value="single"/>
-                      <input class="single_bib" name="single_bib" type="hidden" value="<!-- TMPL_VAR NAME="biblionumber" -->"/>
-                        <span class="confirmjs_nohold" title="<!-- TMPL_VAR NAME="biblionumber" -->"></span>
-                        <span class="confirm_nonjs">
-                          <input type="radio" class="confirmbox checkitem <!-- TMPL_VAR NAME="checkitem_bib" -->"
-                                 name="<!-- TMPL_VAR NAME="checkitem_bib" -->" disabled="disabled"
-                                 id="<!-- TMPL_VAR NAME="checkitem_bib" -->"
-                                 value="any" />
-                        </span>
-					</td><td>
+					  <!-- TMPL_UNLESS NAME="none_available" --><td>&nbsp;</td><!-- /TMPL_UNLESS -->
+                      <!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="holdable" --><td><!-- TMPL_ELSE --><td colspan="5"><!-- /TMPL_IF -->
+                      <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --><!-- TMPL_IF NAME="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!--TMPL VAR Name="subfield"--><!--/TMPL_LOOP--><!-- /TMPL_IF --></a>
+                      <!-- TMPL_IF NAME="author" -->,  by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> 
+
+                      <!-- TMPL_UNLESS NAME="holdable" -->
+
                         <!-- TMPL_IF NAME="already_reserved" -->
                           <div class="bibmessage">You have already requested this title.</div>
-                        <!-- /TMPL_IF -->
-                        <!-- TMPL_UNLESS NAME="bib_available" -->
-                          <div class="bibmessage">No available items.</div>
                         <!-- TMPL_ELSE -->
-                          <div class="bibmessage">This title cannot be requested.</div>
+                          <!-- TMPL_UNLESS NAME="bib_available" -->
+                            <div class="bibmessage">No available items.</div>
+                          <!-- TMPL_ELSE -->
+                            <div class="bibmessage">This title cannot be requested.</div>
+                          <!-- /TMPL_UNLESS -->
+                        <!-- /TMPL_IF -->
+
+
                         <!-- /TMPL_UNLESS -->
+
                     </td>
-                      <!-- /TMPL_IF -->
-                    <td>
-                      <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --><!-- TMPL_IF NAME="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!--TMPL VAR Name="subfield"--><!--/TMPL_LOOP--><!-- /TMPL_IF --></a>
-                      <!-- TMPL_IF NAME="author" -->,  by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
-                    </td>
-                    <!-- TMPL_UNLESS NAME="item-level_itypes" -->
-                      <td>
-                        <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF -->
-						<!-- TMPL_VAR NAME="description" -->
-                      </td>
-                    <!-- /TMPL_UNLESS -->
-                    <!-- TMPL_IF NAME="showpriority" --><td><!-- TMPL_VAR name="rank" --> out of <!-- TMPL_VAR NAME="reservecount" --></td><!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="holdable" --><!-- TMPL_UNLESS NAME="item-level_itypes" -->
+                                          <td>
+                                            <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF -->
+                                <!-- TMPL_VAR NAME="description" -->
+                                          </td>
+                                        <!-- /TMPL_UNLESS --><!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="holdable" --><!-- TMPL_IF NAME="showpriority" --><td><!-- TMPL_VAR name="rank" --> out of <!-- TMPL_VAR NAME="reservecount" --></td><!-- /TMPL_IF --><!-- /TMPL_IF -->
 		    <!-- TMPL_IF NAME="reserve_in_future" -->
-		    <td>
-			<input name="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" id="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" size="10">
-		  <script language="JavaScript" type="text/javascript">
-			//<![CDATA[
-			$("#reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->").attr( 'readonly', 'readonly' );
-
-			var cal_img = document.createElement('img');
-			cal_img.src = "<!-- TMPL_VAR NAME="themelang" -->/lib/calendar/cal.gif";
-			cal_img.alt = "Show Calendar";
-			cal_img.border = "0";
-			cal_img.id = "CalendarReserveDate<!-- TMPL_VAR NAME="biblionumber" -->";
-			cal_img.style.cursor = "pointer";
-			document.getElementById("reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->").parentNode.appendChild( cal_img );
-
-			function validate<!-- TMPL_VAR NAME="biblionumber" -->(date) {
-			    var today = new Date();
-                if ( (date > today) ||
-                        ( date.getDate() == today.getDate() &&
-                          date.getMonth() == today.getMonth() &&
-                          date.getFullYear() == today.getFullYear() ) ) {
-                    return false;
-                } else {
-                    return true;
-                }
-			};
-			Calendar.setup(
-			{
-				inputField : "reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->",
-				ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
-				button : "CalendarReserveDate<!-- TMPL_VAR NAME="biblionumber" -->",
-				disableFunc : validate<!-- TMPL_VAR NAME="biblionumber" -->,
-				dateStatusFunc : validate<!-- TMPL_VAR NAME="biblionumber" -->,
-			}
-			);
-			//]]>
-			</script>
-		    </td>
+		    <!-- TMPL_IF NAME="holdable" --><td>
+              <input name="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" id="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" size="10">
+              <script language="JavaScript" type="text/javascript">
+              //<![CDATA[
+              $("#reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->").attr( 'readonly', 'readonly' );
+
+              var cal_img = document.createElement('img');
+              cal_img.src = "<!-- TMPL_VAR NAME="themelang" -->/lib/calendar/cal.gif";
+              cal_img.alt = "Show Calendar";
+              cal_img.border = "0";
+              cal_img.id = "CalendarReserveDate<!-- TMPL_VAR NAME="biblionumber" -->";
+              cal_img.style.cursor = "pointer";
+              document.getElementById("reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->").parentNode.appendChild( cal_img );
+
+              function validate<!-- TMPL_VAR NAME="biblionumber" -->(date) {
+                  var today = new Date();
+                        if ( (date > today) ||
+                                ( date.getDate() == today.getDate() &&
+                                  date.getMonth() == today.getMonth() &&
+                                  date.getFullYear() == today.getFullYear() ) ) {
+                            return false;
+                        } else {
+                            return true;
+                        }
+              };
+              Calendar.setup(
+              {
+                inputField : "reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->",
+                ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                button : "CalendarReserveDate<!-- TMPL_VAR NAME="biblionumber" -->",
+                disableFunc : validate<!-- TMPL_VAR NAME="biblionumber" -->,
+                dateStatusFunc : validate<!-- TMPL_VAR NAME="biblionumber" -->,
+              }
+              );
+              //]]>
+              </script>
+                </td><!-- /TMPL_IF -->
 
 		    <!-- /TMPL_IF -->
-	<td>
-	    <input name="expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->" id="expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->" size="10" readonly="readonly" />
-	    <img src="<!-- TMPL_VAR NAME="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarExpirationDate_<!-- TMPL_VAR NAME="biblionumber" -->" style="cursor: pointer;" />
-	    <script language="JavaScript" type="text/javascript">
-		//<![CDATA[
-		function validate1(date) {
-			var today = new Date();
-			if ( (date > today) ||
-                    ( date.getDate() == today.getDate() &&
-                      date.getMonth() == today.getMonth() &&
-                      date.getFullYear() == today.getFullYear() ) ) {
-				return false;
-			} else {
-				return true;
-			}
-		};
-		Calendar.setup(
-			{
-				inputField : "expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->",
-				ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
-				button : "CalendarExpirationDate_<!-- TMPL_VAR NAME="biblionumber" -->",
-				disableFunc : validate1,
-				dateStatusFunc : validate1,
-			}
-		);
-		//]]>
-	    </script>
-		<p style="margin:.3em 2em;">
-		<a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->').value='';return false;">Clear Date</a></p>
-	</td>
-
-                    <!-- TMPL_IF NAME="OPACItemHolds" -->
-                      <td class="place_on_type" style="display:none">
-                        <table>
-                          <tr>
-                            <td>
-                              <!-- TMPL_UNLESS NAME="holdable" -->
-                                <input type="radio" name="reqtype_<!-- TMPL_VAR NAME="biblionumber" -->"
-                                       id="reqany_<!-- TMPL_VAR NAME="biblionumber" -->"
-                                       class="selectany"
-                                       value="Any"
-                                       disabled="disabled"
-                                />
-                              <!-- TMPL_ELSE -->
-                                <input type="radio" name="reqtype_<!-- TMPL_VAR NAME="biblionumber" -->"
-                                       id="reqany_<!-- TMPL_VAR NAME="biblionumber" -->"
-                                       class="selectany"
-                                       value="Any"
-                                       checked="checked"
-                                />
-                              <!-- /TMPL_UNLESS -->
-                              <label for="reqany_<!-- TMPL_VAR NAME="biblionumber" -->">Next available copy</label>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td>
-                              <!-- TMPL_UNLESS NAME="holdable" -->
-                                <input type="radio" name="reqtype_<!-- TMPL_VAR NAME="biblionumber" -->"
-                                       id="reqspecific_<!-- TMPL_VAR NAME="biblionumber" -->"
-                                       class="selectspecific"
-                                       disabled="disabled"
-                                       value="Specific"
-                                />
-                              <!-- TMPL_ELSE -->
-                                <input type="radio" name="reqtype_<!-- TMPL_VAR NAME="biblionumber" -->"
-                                       id="reqspecific_<!-- TMPL_VAR NAME="biblionumber" -->"
-                                       class="selectspecific"
-                                       value="Specific"
-                                />
-                              <!-- /TMPL_UNLESS -->
-                              <label for="reqspecific_<!-- TMPL_VAR NAME="biblionumber"-->">A specific copy</label>
-                            </td>
-                          </tr>
-                        </table>
-                      </td>
-                    <!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="holdable" --><td>
+        <input name="expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->" id="expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->" size="10" readonly="readonly" />
+        <img src="<!-- TMPL_VAR NAME="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarExpirationDate_<!-- TMPL_VAR NAME="biblionumber" -->" style="cursor: pointer;" />
+        <script language="JavaScript" type="text/javascript">
+      //<![CDATA[
+      function validate1(date) {
+        var today = new Date();
+        if ( (date > today) ||
+                      ( date.getDate() == today.getDate() &&
+                        date.getMonth() == today.getMonth() &&
+                        date.getFullYear() == today.getFullYear() ) ) {
+          return false;
+        } else {
+          return true;
+        }
+      };
+      Calendar.setup(
+        {
+          inputField : "expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->",
+          ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+          button : "CalendarExpirationDate_<!-- TMPL_VAR NAME="biblionumber" -->",
+          disableFunc : validate1,
+          dateStatusFunc : validate1,
+        }
+      );
+      //]]>
+        </script>
+      <p style="margin:.3em 2em;">
+      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->').value='';return false;">Clear Date</a></p>
+    </td><!-- /TMPL_IF -->
+
+                    <!-- TMPL_IF NAME="holdable" --><!-- TMPL_IF NAME="OPACItemHolds" -->
+                                          <td class="place_on_type" style="display:none">
+                                            <table>
+                                              <tr>
+                                                <td>
+                                                  <!-- TMPL_UNLESS NAME="holdable" -->
+                                                    <input type="radio" name="reqtype_<!-- TMPL_VAR NAME="biblionumber" -->"
+                                                           id="reqany_<!-- TMPL_VAR NAME="biblionumber" -->"
+                                                           class="selectany"
+                                                           value="Any"
+                                                           disabled="disabled"
+                                                    />
+                                                  <!-- TMPL_ELSE -->
+                                                    <input type="radio" name="reqtype_<!-- TMPL_VAR NAME="biblionumber" -->"
+                                                           id="reqany_<!-- TMPL_VAR NAME="biblionumber" -->"
+                                                           class="selectany"
+                                                           value="Any"
+                                                           checked="checked"
+                                                    />
+                                                  <!-- /TMPL_UNLESS -->
+                                                  <label for="reqany_<!-- TMPL_VAR NAME="biblionumber" -->">Next available copy</label>
+                                                </td>
+                                              </tr>
+                                              <tr>
+                                                <td>
+                                                  <!-- TMPL_UNLESS NAME="holdable" -->
+                                                    <input type="radio" name="reqtype_<!-- TMPL_VAR NAME="biblionumber" -->"
+                                                           id="reqspecific_<!-- TMPL_VAR NAME="biblionumber" -->"
+                                                           class="selectspecific"
+                                                           disabled="disabled"
+                                                           value="Specific"
+                                                    />
+                                                  <!-- TMPL_ELSE -->
+                                                    <input type="radio" name="reqtype_<!-- TMPL_VAR NAME="biblionumber" -->"
+                                                           id="reqspecific_<!-- TMPL_VAR NAME="biblionumber" -->"
+                                                           class="selectspecific"
+                                                           value="Specific"
+                                                    />
+                                                  <!-- /TMPL_UNLESS -->
+                                                  <label for="reqspecific_<!-- TMPL_VAR NAME="biblionumber"-->">A specific copy</label>
+                                                </td>
+                                              </tr>
+                                            </table>
+                                          </td>
+                                        <!-- /TMPL_IF --><!-- /TMPL_IF -->
 
                     <!-- TMPL_UNLESS NAME="singleBranchMode" -->
-                      <td>
-                        <select name="branch" id="branch_<!-- TMPL_VAR NAME="biblionumber" -->"
-                          <!-- TMPL_UNLESS NAME="holdable" -->disabled="disabled"<!-- /TMPL_UNLESS --> >
-                          <!-- TMPL_LOOP NAME="branchChoicesLoop" -->
-                            <!-- TMPL_IF name="selected" -->
-                              <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
-                            <!-- TMPL_ELSE -->
-                              <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
-                            <!-- /TMPL_IF -->
-                          <!-- /TMPL_LOOP -->
-                        </select>
-                      </td>
+                      <!-- TMPL_IF NAME="holdable" --><td>
+                                              <select name="branch" id="branch_<!-- TMPL_VAR NAME="biblionumber" -->"
+                                                <!-- TMPL_UNLESS NAME="holdable" -->disabled="disabled"<!-- /TMPL_UNLESS --> >
+                                                <!-- TMPL_LOOP NAME="branchChoicesLoop" -->
+                                                  <!-- TMPL_IF name="selected" -->
+                                                    <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
+                                                  <!-- TMPL_ELSE -->
+                                                    <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
+                                                  <!-- /TMPL_IF -->
+                                                <!-- /TMPL_LOOP -->
+                                              </select>
+                                            </td><!-- /TMPL_IF -->
                     <!-- /TMPL_UNLESS -->
                   </tr>
 
                   <!-- TMPL_IF NAME="OPACItemHolds" -->
-                  <!-- TMPL_IF NAME="bib_available" -->
+                  <!-- TMPL_IF NAME="holdable" -->
                     <tr class="copiesrow" id="copiesrow_<!-- TMPL_VAR NAME="biblionumber"-->">
                       <td colspan="1">
                       </td>
@@ -517,18 +510,17 @@
                   <!-- /TMPL_IF --><!-- OPACItemHolds -->
                 <!-- /TMPL_LOOP -->
               </table><!-- bibitemloop -->
+              <!-- /TMPL_UNLESS --> <!-- if message -->
             </div><!-- bigloop -->
 
-            <!-- TMPL_IF NAME="none_available" -->
-            <input type="submit" disabled="disabled" value="Place Hold" />
-            <!-- TMPL_ELSE -->
+            <!-- TMPL_UNLESS NAME="message" -->
+            <!-- TMPL_UNLESS NAME="none_available" -->
             <input type="submit" value="Place Hold" class="placehold" />
-            <!-- /TMPL_IF -->
+            <!-- /TMPL_UNLESS -->
+            <!-- /TMPL_UNLESS -->
 
             </form>
 
-          <!-- /TMPL_UNLESS --><!-- message -->
-
         </div><!-- holds -->
       </div><!-- yui-g -->
     </div><!-- bd    -->
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index d5d39db..5e040c0 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -288,6 +288,7 @@ my $notforloan_label_of = get_notforloan_label_of();
 my $biblioLoop = [];
 my $numBibsAvailable = 0;
 my $itemdata_enumchron = 0;
+my $anyholdable;
 my $itemLevelTypes = C4::Context->preference('item-level_itypes');
 $template->param('item-level_itypes' => $itemLevelTypes);
 
@@ -335,8 +336,6 @@ foreach my $biblioNum (@biblionumbers) {
         }
     }
 
-    $biblioLoopIter{itemTypeDescription} = $itemTypes->{$biblioData->{itemtype}}{description};
-
     $biblioLoopIter{itemLoop} = [];
     my $numCopiesAvailable = 0;
     foreach my $itemInfo (@{$biblioData->{itemInfos}}) {
@@ -454,19 +453,22 @@ foreach my $biblioNum (@biblionumbers) {
         $numBibsAvailable++;
         $biblioLoopIter{bib_available} = 1;
         $biblioLoopIter{holdable} = 1;
+        $anyholdable = 1;
     }
     if ($biblioLoopIter{already_reserved}) {
         $biblioLoopIter{holdable} = undef;
+        $anyholdable = undef;
     }
     if(not CanBookBeReserved($borrowernumber,$biblioNum)){
         $biblioLoopIter{holdable} = undef;
+        $anyholdable = undef;
     }
 
     push @$biblioLoop, \%biblioLoopIter;
 }
 
-if ( $numBibsAvailable == 0 ) {
-    $template->param( none_available => 1, message => 1 );
+if ( $numBibsAvailable == 0 || !$anyholdable) {
+    $template->param( none_available => 1 );
 }
 
 my $itemTableColspan = 5;
-- 
1.7.0.4


From oleonard at myacpl.org  Fri Jul  9 19:42:41 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  9 Jul 2010 13:42:41 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4451 Batch item tool can't
	process file with Windows line endings
Message-ID: <1278697361-11284-1-git-send-email-oleonard@myacpl.org>

---
 tools/batchMod.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index f5138d1..d511d98 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -171,7 +171,7 @@ if ($op eq "show"){
     my @contentlist;
     if ($filefh){
         while (my $content=<$filefh>){
-            chomp $content;
+            $content =~ s/[\r\n]*$//g;
             push @contentlist, $content if $content;
         }
 
-- 
1.7.0.4


From oleonard at myacpl.org  Fri Jul  9 19:44:33 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 9 Jul 2010 13:44:33 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4451 Batch item tool can't
	process file with Windows line endings
In-Reply-To: <1278697361-11284-1-git-send-email-oleonard@myacpl.org>
References: <1278697361-11284-1-git-send-email-oleonard@myacpl.org>
Message-ID: <AANLkTimTGMEi8_7wz7I7iam5glmDCt1J6gQpx9zpoRmd@mail.gmail.com>

The first patch contained a typo. Please try the second.

  -- Owen

-- 
Web Developer
Athens County Public Libraries
http://www.myacpl.org

From f.demians at tamil.fr  Sun Jul 11 17:53:21 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Sun, 11 Jul 2010 17:53:21 +0200
Subject: [Koha-patches] [PATCH] Bug 4472 Fix how &nbsp;
	are injected into XSL files
Message-ID: <1278863601-25667-1-git-send-email-f.demians@tamil.fr>

tmpl_process is patched to handle properly specific XML directives.
UNIMARC XSL files are modified to gain knowledge of HTML &nbsp; entity
which isn't the case by default. It may be necessary to do the same
thing for MARC21 XSL.
---
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl        |    3 +++
 .../prog/en/xslt/UNIMARCslim2OPACResults.xsl       |    4 +++-
 .../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl    |    5 ++++-
 misc/translator/tmpl_process3.pl                   |    2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
index 26aed37..69e5cf6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACDetail.xsl
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
   xmlns:items="http://www.koha.org/items"
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
index 6917ca2..1290e94 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
+
+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+
 <xsl:stylesheet version="1.0"
   xmlns:marc="http://www.loc.gov/MARC21/slim"
   xmlns:items="http://www.koha.org/items"
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
index ce7f459..f5cf99f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
@@ -1,4 +1,7 @@
 <?xml version='1.0'?>
+
+<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
+
 <xsl:stylesheet version="1.0" xmlns:marc="http://www.loc.gov/MARC21/slim" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:template name="datafield">
@@ -296,4 +299,4 @@
     </xsl:if>
   </xsl:template>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
diff --git a/misc/translator/tmpl_process3.pl b/misc/translator/tmpl_process3.pl
index af0cde1..b916cab 100755
--- a/misc/translator/tmpl_process3.pl
+++ b/misc/translator/tmpl_process3.pl
@@ -116,6 +116,8 @@ sub text_replace (**) {
         }
         }
     } elsif (defined $t) {
+        # Quick fix to bug 4472
+        $t = "<!DOCTYPE stylesheet ["  if $t =~ /DOCTYPE stylesheet/ ;
         print $output $t;
     }
     }
-- 
1.7.1


From chrisc at catalyst.net.nz  Mon Jul 12 00:40:51 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Mon, 12 Jul 2010 10:40:51 +1200
Subject: [Koha-patches] [PATCH] Pendingreserves didn't restrict to items,
	if a particular item was requested
Message-ID: <1278888051-30512-1-git-send-email-chrisc@catalyst.net.nz>

It now does, and it will print the copy number to help people get the
right item.
---
 circ/pendingreserves.pl                            |    4 ++++
 .../prog/en/modules/circ/pendingreserves.tmpl      |    8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index cf71094..5ac0701 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -141,6 +141,8 @@ if ( $run_report ) {
                     ORDER BY items.itemnumber SEPARATOR '<br/>') l_location,
             GROUP_CONCAT(DISTINCT items.itemcallnumber 
                     ORDER BY items.itemnumber SEPARATOR '<br/>') l_itemcallnumber,
+            GROUP_CONCAT(DISTINCT items.copynumber
+                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_copynumber,
             items.itemnumber,
             notes,
             notificationdate,
@@ -159,6 +161,7 @@ if ( $run_report ) {
     WHERE
     reserves.found IS NULL
     $sqldatewhere
+    AND (reserves.itemnumber IS NULL OR reserves.itemnumber = items.itemnumber)
     AND items.itemnumber NOT IN (SELECT itemnumber FROM branchtransfers where datearrived IS NULL)
     AND issues.itemnumber IS NULL
     AND reserves.priority <> 0 
@@ -200,6 +203,7 @@ if ( $run_report ) {
                 holdingbranch    => $data->{l_holdingbranch},
                 branch           => $data->{l_branch},
                 itemcallnumber   => $data->{l_itemcallnumber},
+		copyno           => $data->{l_copynumber},
                 notes            => $data->{notes},
                 notificationdate => $data->{notificationdate},
                 reminderdate     => $data->{reminderdate},
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
index 7b5ea18..d322206 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
@@ -72,6 +72,9 @@ $.tablesorter.addParser({
 				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=call&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
         <th>
+            Available Copy No
+        </th>
+        <th>
             Available Itypes
 				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=itype&amp;from=<!-- TMPL_VAR NAME="from" -->&amp;to=<!-- TMPL_VAR NAME="to" -->">Sort</a>
         </th>
@@ -131,8 +134,9 @@ $.tablesorter.addParser({
             <!-- /TMPL_IF -->
             <td><p><!-- TMPL_VAR NAME="holdingbranch" --></p></td>
             <td><p><!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
-				<td><p><!-- TMPL_VAR NAME="itype" --></p></td> 
-				<td><p><!-- TMPL_VAR NAME="location" --></p></td>
+	    <td><p><!-- TMPL_VAR NAME="copyno" --></p></td>
+	    <td><p><!-- TMPL_VAR NAME="itype" --></p></td> 
+	    <td><p><!-- TMPL_VAR NAME="location" --></p></td>
             <td width="15%">
                 <p><!-- TMPL_VAR NAME="reservedate" --></p>
                 <p>in <!-- TMPL_VAR NAME="branch" --></p>
-- 
1.6.3.3


From chrisc at catalyst.net.nz  Mon Jul 12 00:57:58 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Mon, 12 Jul 2010 10:57:58 +1200
Subject: [Koha-patches] [PATCH] Adding a copynumber column to holds awaiting
	pickup report
Message-ID: <1278889078-418-1-git-send-email-chrisc@catalyst.net.nz>

---
 circ/waitingreserves.pl                            |    1 +
 .../prog/en/modules/circ/waitingreserves.tmpl      |    5 +++++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
index e924bcf..e84339f 100755
--- a/circ/waitingreserves.pl
+++ b/circ/waitingreserves.pl
@@ -128,6 +128,7 @@ foreach my $num (@getreserves) {
     $getreserv{'homebranch'}     = GetBranchName($gettitle->{'homebranch'});
     $getreserv{'holdingbranch'}  = $gettitle->{'holdingbranch'};
     $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
+    $getreserv{'copynumber'}     = $gettitle->{'copynumber'};
     if ( $gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'} ) {
         $getreserv{'dotransfer'} = 1;
     }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
index bbb5dfb..2e2e14b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -79,6 +79,7 @@ $.tablesorter.addParser({
                     <th>Title</th>
                     <th>Patron</th>
                     <th>Location</th>
+		    <th>Copy Number</th>
                     <th>Action</th>
                </tr></thead>
                <tbody><!-- TMPL_LOOP NAME="reserveloop" -->
@@ -97,12 +98,14 @@ $.tablesorter.addParser({
                         <!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
                     </td>
                     <td><!-- TMPL_VAR NAME="homebranch" --><br /><!-- TMPL_VAR NAME="itemcallnumber" --></td>
+		    <td><!-- TMPL_VAR NAME="copynumber" --></td>
                     <td>
                         <form name="cancelReserve" action="waitingreserves.pl" method="post">
                             <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernum" -->" />
                             <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
                             <input type="hidden" name="fbr" value="<!-- TMPL_VAR NAME="holdingbranch" -->" />
                             <input type="hidden" name="tbr" value="<!-- TMPL_VAR NAME="homebranch" -->" />
+			    
                             <!-- TMPL_IF NAME="dotransfer" -->
                             <input type="submit" value="Cancel hold and return to : <!-- TMPL_VAR NAME="homebranch" -->" /> 
                             <!-- TMPL_ELSE -->
@@ -125,6 +128,7 @@ $.tablesorter.addParser({
                     <th>Title</th>
                     <th>Patron</th>
                     <th>Location</th>
+		    <th>Copy Number</th>
                     <th>Action</th>
                </tr></thead>
                <tbody><!-- TMPL_LOOP NAME="overloop" -->
@@ -149,6 +153,7 @@ $.tablesorter.addParser({
         <!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
                     </td>
                     <td><!-- TMPL_VAR NAME="homebranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></td>
+		    <td><!-- TMPL_VAR NAME="copynumber" --></td>
                     <td>
                         <form name="cancelReserve" action="waitingreserves.pl" method="post">
                             <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernum" -->" />
-- 
1.6.3.3


From chrisc at catalyst.net.nz  Mon Jul 12 01:09:40 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Mon, 12 Jul 2010 11:09:40 +1200
Subject: [Koha-patches] [PATCH] Adding copynumber to holds queue report also
Message-ID: <1278889780-2245-1-git-send-email-chrisc@catalyst.net.nz>

---
 circ/view_holdsqueue.pl                            |    2 +-
 .../prog/en/modules/circ/view_holdsqueue.tmpl      |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl
index 668bdd1..c9d1b27 100755
--- a/circ/view_holdsqueue.pl
+++ b/circ/view_holdsqueue.pl
@@ -81,7 +81,7 @@ sub GetHoldsQueueItems {
 	my $dbh = C4::Context->dbh;
 
     my @bind_params = ();
-	my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn
+	my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn,items.copynumber
                   FROM tmp_holdsqueue
                        JOIN biblio      USING (biblionumber)
 				  LEFT JOIN biblioitems USING (biblionumber)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl
index 52ddd85..99c376f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl
@@ -37,6 +37,7 @@
         <th>Title</th>
         <th>Collection</th>
         <th>Call Number</th>
+	<th>Copy Number</th>
         <th>Barcode</th>
 		<th>Patron</th>
         <th>Send To</th>
@@ -55,6 +56,7 @@
 			</td>
             <td><!-- TMPL_VAR NAME="ccode" --></td>
             <td><!-- TMPL_VAR NAME="location" --> <!-- TMPL_VAR NAME="itemcallnumber"--> <!-- TMPL_VAR NAME="enumchron" --></td>
+	    <td><!-- TMPL_VAR NAME="copynumber" --></td>
             <td>
                 <!-- TMPL_IF NAME="item_level_request" -->
                     <!-- TMPL_VAR NAME="barcode" -->
-- 
1.6.3.3


From chrisc at catalyst.net.nz  Mon Jul 12 06:20:46 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Mon, 12 Jul 2010 16:20:46 +1200
Subject: [Koha-patches] [PATCH] Fix for IE7 and 8 basket.pl,
	adding a </button> to force the IE's to render the page correctly
Message-ID: <1278908446-10466-1-git-send-email-chrisc@catalyst.net.nz>

Have tested under chrome and firefox, page still renders ok.
---
 .../prog/en/modules/acqui/basket.tmpl              |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
index 3021681..7887d26 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -59,7 +59,6 @@
 
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a> &rsaquo; <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS --><!-- TMPL_IF NAME="delete_confirm" -->Delete <!-- /TMPL_IF -->Basket <!-- TMPL_VAR NAME="basketname" --> (<!-- TMPL_VAR NAME="basketno" -->) for <!-- TMPL_VAR NAME="name" --></div>
-
 <div id="doc3" class="yui-t2">
 
 <div id="bd">
@@ -90,11 +89,12 @@
                         }
                         //]]>
                     </script>
+
                     <ul id="toolbar-list" class="toolbar">
                     <li><a href="basketheader.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;op=add_form" class="button" id="basketheadbutton">Edit basket header information</a></li>
                     <li><a href="javascript:confirm_deletion();" class="button" id="delbasketbutton">Delete this basket</a></li>
                     <!-- TMPL_IF name="unclosable" -->
-                        <li><button onclick="confirm_close()" class="yui-button-disabled" id="closebutton" type="button" disabled="disabled" title="You can not close this basket" />Can not close basket</li>
+                        <li><button onclick="confirm_close()" class="yui-button-disabled" id="closebutton" type="button" disabled="disabled" title="You can not close this basket" />Can not close basket</button></li>
                     <!-- TMPL_ELSIF name="uncertainprices" -->
                         <li><a href="/cgi-bin/koha/acqui/uncertainprice.pl?booksellerid=<!-- TMPL_VAR name="booksellerid" -->&amp;owner=1" class="button" id="uncertpricesbutton">Uncertain prices</a></li>
                     <!-- TMPL_ELSE -->
-- 
1.7.0.4


From oleonard at myacpl.org  Mon Jul 12 16:51:36 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 12 Jul 2010 10:51:36 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4983 - Add edit record / edit
	item links to search results
Message-ID: <1278946296-12922-1-git-send-email-oleonard@myacpl.org>

---
 .../intranet-tmpl/prog/en/css/staff-global.css     |    5 +++--
 .../prog/en/modules/catalogue/results.tmpl         |   18 ++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 13ac2c7..e9bde20 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1337,9 +1337,10 @@ li.email {
 	font-size : 105%;
 }
 
-.reserve {
+.hold {
 	float : right;
-	font-weight : bold;
+	font-size: 90%;
+	margin: 0;
 }
 
 .thumbnail {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
index 916ee31..f833f33 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -439,7 +439,7 @@ function GetZ3950Terms(){
                                         <!-- TMPL_IF name="timestamp" --> <i>(modified on <!-- TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF -->
                                         <!-- TMPL_IF name="cn_class" -->[<a href="/cgi-bin/koha/catalogue/search.pl?q=callnum:<!-- TMPL_VAR NAME="cn_class" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="cn_class" --></a>]<!-- /TMPL_IF -->
                                     </p>
-                                    <p class="searchhighlightblob"><!-- TMPL_VAR NAME="searchhighlightblob" --></p>
+                                    <!-- TMPL_IF NAME="searchhighlightblob" --><p class="searchhighlightblob"><!-- TMPL_VAR NAME="searchhighlightblob" --></p><!-- /TMPL_IF -->
 
                                     <!-- TMPL_IF NAME="authorised_value_images" -->
                                 <p>
@@ -450,11 +450,17 @@ function GetZ3950Terms(){
                                 <!-- /TMPL_IF -->
 
                                 <!-- /TMPL_IF -->
-                                  <!-- TMPL_IF NAME="norequests" -->
-                                        <span class="noholdstext">No holds allowed</span>
-                                    <!-- TMPL_ELSE -->
-                                        <a class="reserve" id="reserve_<!-- TMPL_VAR NAME="biblionumber" -->" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Holds</a>
-                                    <!-- /TMPL_IF -->
+                                  <p class="hold"><!-- TMPL_IF NAME="norequests" -->
+                                  <span class="noholdstext">No holds allowed</span>
+                              <!-- TMPL_ELSE -->
+                                  <a id="reserve_<!-- TMPL_VAR NAME="biblionumber" -->" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Holds</a>
+                              <!-- /TMPL_IF -->
+                          <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" -->
+                          | <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit record</a>
+                          <!-- /TMPL_IF -->
+                          <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->
+                          | <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit items</a>
+                          <!-- /TMPL_IF --></p>
                                 </td>
 
                                 <td><div class="availability">
-- 
1.7.0.4


From oleonard at myacpl.org  Mon Jul 12 17:21:36 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 12 Jul 2010 11:21:36 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4984,
	Invalid XHTML in staff client search results
Message-ID: <1278948096-13070-1-git-send-email-oleonard@myacpl.org>

---
 .../intranet-tmpl/prog/en/includes/facets.inc      |    6 ++--
 .../prog/en/includes/page-numbers.inc              |    6 ++--
 .../prog/en/modules/catalogue/results.tmpl         |   21 ++++++++++---------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
index ff67047..95d912d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
@@ -3,7 +3,7 @@
 <div id="search-facets">
 <h4>Refine your search</h4>
 <ul>
-	<li>Availability<ul><li><!-- TMPL_IF NAME="available" -->Showing only <strong>available</strong> items. <a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi_not_availablity" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->">Show all items</a><!-- TMPL_ELSE -->Limit to <a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=available">currently available items.</a><!-- /TMPL_IF --></li></ul>
+	<li>Availability<ul><li><!-- TMPL_IF NAME="available" -->Showing only <strong>available</strong> items. <a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi_not_availablity" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->">Show all items</a><!-- TMPL_ELSE -->Limit to <a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=available">currently available items.</a><!-- /TMPL_IF --></li></ul>
 	<!-- TMPL_IF NAME="related" --> <li>(related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->)</li><!-- /TMPL_IF -->
 	</li>
 
@@ -17,8 +17,8 @@
 <!-- TMPL_IF NAME="type_label_Series" -->Series<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="type_label_Libraries" -->Libraries<!-- /TMPL_IF -->
 <ul>
-        <!-- TMPL_LOOP NAME="facets" --><li><a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=<!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value" -->"><!-- TMPL_VAR NAME="facet_label_value" --></a> <!-- (<!-- TMPL_VAR NAME="facet_count" -->) --></li><!-- /TMPL_LOOP --><!-- TMPL_IF NAME="expandable" -->
-        <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
+        <!-- TMPL_LOOP NAME="facets" --><li><a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=<!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value" -->"><!-- TMPL_VAR NAME="facet_label_value" --></a> <!-- (<!-- TMPL_VAR NAME="facet_count" -->) --></li><!-- /TMPL_LOOP --><!-- TMPL_IF NAME="expandable" -->
+        <li class="showmore"><a href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
 <!-- /TMPL_IF -->
 </ul></li>
 <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc
index e7e6d0e..a9b8575 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc
@@ -1,7 +1,7 @@
 <!-- TMPL_IF NAME="PAGE_NUMBERS" --><div class="pages">
     <!-- Row of numbers corresponding to search result pages -->
-        <!-- TMPL_IF NAME="previous_page_offset" --><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" -->&amp;offset=<!-- TMPL_VAR NAME="previous_page_offset" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->">&lt;&lt; Previous</a><!-- /TMPL_IF -->
-    <!-- TMPL_LOOP NAME="PAGE_NUMBERS" --><!-- TMPL_IF NAME="highlight" --><span class="current"><!-- TMPL_VAR NAME="pg" --></span><!-- TMPL_ELSE -->        <a class="nav" href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" -->&amp;offset=<!-- TMPL_VAR NAME="offset" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->"><!-- TMPL_VAR NAME="pg" --></a><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="previous_page_offset" --><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" -->&amp;offset=<!-- TMPL_VAR NAME="previous_page_offset" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->">&lt;&lt; Previous</a><!-- /TMPL_IF -->
+    <!-- TMPL_LOOP NAME="PAGE_NUMBERS" --><!-- TMPL_IF NAME="highlight" --><span class="current"><!-- TMPL_VAR NAME="pg" --></span><!-- TMPL_ELSE -->        <a class="nav" href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" -->&amp;offset=<!-- TMPL_VAR NAME="offset" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->"><!-- TMPL_VAR NAME="pg" --></a><!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
-        <!-- TMPL_IF NAME="next_page_offset" --><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" -->&amp;offset=<!-- TMPL_VAR NAME="next_page_offset" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->">Next &gt;&gt;</a><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="next_page_offset" --><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?<!-- TMPL_VAR NAME="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" -->&amp;offset=<!-- TMPL_VAR NAME="next_page_offset" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->">Next &gt;&gt;</a><!-- /TMPL_IF -->
 </div><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
index 916ee31..363eddc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -321,10 +321,10 @@ function GetZ3950Terms(){
             </form>
         <!-- TMPL_ELSE -->
 
-            <!-- ######### -->
-            <div id="facets">
-                <dl>
                 <!-- TMPL_IF NAME="NoZebra" -->
+                <!-- ######### -->
+                <div id="facets">
+                <dl>
                 <!-- FACETS START -->
                 <!-- TMPL_IF NAME="opacfacets" -->
                     <dt id="facets1" onclick="var Elt=document.getElementById('facets_list');if (Elt.style.display!='block'){Elt.style.display='block';} else {Elt.style.display='none';}">
@@ -356,10 +356,11 @@ function GetZ3950Terms(){
                     </dd>
                 <!-- /TMPL_IF -->
                 <!-- FACETS END -->
-                <!-- /TMPL_IF --> <!-- NoZebra -->
                 </dl>
             </div>
             <!-- ######### -->
+            <!-- NoZebra --><!-- /TMPL_IF --> 
+            
 
             <div id="searchresults">
                 <form action="/cgi-bin/koha/catalogue/search.pl" method="get" name="bookbag_form" id="bookbag_form">
@@ -386,7 +387,7 @@ function GetZ3950Terms(){
                                 <td>
                                     <a class="p1" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
 									
-                                        <img src="<!-- TMPL_IF NAME="normalized_isbn" -->http://images.amazon.com/images/P/<!-- TMPL_VAR name="normalized_isbn" -->.01.TZZZZZZZ.jpg<!-- TMPL_ELSE -->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!-- /TMPL_IF -->" alt="image" class="thumbnail" /> 
+                                        <img src="<!-- TMPL_IF NAME="normalized_isbn" -->http://images.amazon.com/images/P/<!-- TMPL_VAR name="normalized_isbn" -->.01.TZZZZZZZ.jpg<!-- TMPL_ELSE -->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!-- /TMPL_IF -->" alt="" class="thumbnail" /> 
                                     </a></td>
                             <!-- /TMPL_IF --><!-- /TMPL_IF -->
                             <td>
@@ -427,7 +428,7 @@ function GetZ3950Terms(){
                                             &nbsp;
                                         <!-- /TMPL_IF -->
 
-                                        <!-- TMPL_IF name="publishercode" --><!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
+                                        <!-- TMPL_IF name="publishercode" --><!-- TMPL_VAR name="publishercode" ESCAPE="HTML" --><!-- /TMPL_IF -->
 										<!-- TMPL_IF NAME="edition" -->Edition: <!-- TMPL_VAR NAME="edition" --><!-- /TMPL_IF -->
                                         Description:
                                         <!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
@@ -444,7 +445,7 @@ function GetZ3950Terms(){
                                     <!-- TMPL_IF NAME="authorised_value_images" -->
                                 <p>
                                   <!-- TMPL_LOOP NAME="authorised_value_images" -->
-                                  <img src="<!-- TMPL_VAR name="imageurl" -->" />
+                                  <img src="<!-- TMPL_VAR name="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" />
                                   <!-- /TMPL_LOOP -->
                                 </p>
                                 <!-- /TMPL_IF -->
@@ -466,7 +467,7 @@ function GetZ3950Terms(){
                                     <ul>
                                     <!-- TMPL_LOOP NAME="available_items_loop" -->
 
-                                        <!-- TMPL_IF NAME="noItemTypeImages" --><li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="item-level_itypes" --><!-- TMPL_IF name="imageurl" --><li style="list-style: none; list-style-type: none;"><img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" /><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- /TMPL_IF -->
+                                        <!-- TMPL_IF NAME="noItemTypeImages" --><li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="item-level_itypes" --><!-- TMPL_IF name="imageurl" --><li style="list-style: none; list-style-type: none;"><img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR name="description" -->" /><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- /TMPL_IF -->
                                         <!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><!-- /TMPL_IF -->
                                         <!-- TMPL_IF NAME="location" --><!-- TMPL_VAR NAME="location" --><!-- /TMPL_IF -->
                                         <!-- TMPL_IF NAME="itemcallnumber" -->[<a href="/cgi-bin/koha/catalogue/search.pl?q=callnum:<!-- TMPL_VAR NAME="itemcallnumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="itemcallnumber" --></a>]<!-- /TMPL_IF -->
@@ -480,7 +481,7 @@ function GetZ3950Terms(){
                                     <!-- TMPL_LOOP NAME="onloan_items_loop" -->
                                        <!-- TMPL_IF NAME="noItemTypeImages" --><li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="item-level_itypes" -->
                                         <!-- TMPL_IF name="imageurl" -->
-                                        <li style="list-style: none; list-style-type: none;"><img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" />
+                                        <li style="list-style: none; list-style-type: none;"><img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR name="description" -->" />
                                         <!-- TMPL_ELSE --><li><!-- /TMPL_IF -->
                                         <!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
@@ -497,7 +498,7 @@ function GetZ3950Terms(){
                                     <!-- TMPL_LOOP NAME="other_items_loop" -->
                                         <!-- TMPL_IF NAME="noItemTypeImages" --><li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="item-level_itypes" -->
                                         <!-- TMPL_IF name="imageurl" -->
-                                        <li style="list-style: none; list-style-type: none;"><img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" />
+                                        <li style="list-style: none; list-style-type: none;"><img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR name="description" -->" />
                                         <!-- TMPL_ELSE --><li><!-- /TMPL_IF -->
                                         <!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
-- 
1.7.0.4


From ian.walls at bywatersolutions.com  Mon Jul 12 20:22:48 2010
From: ian.walls at bywatersolutions.com (Ian Walls)
Date: Mon, 12 Jul 2010 14:22:48 -0400
Subject: [Koha-patches] [PATCH] Bugfix 3419: fixes typo in inequality.
Message-ID: <1278958968-18943-1-git-send-email-ian.walls@bywatersolutions.com>

---
 C4/Reports/Guided.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm
index 5cdad46..51e608b 100644
--- a/C4/Reports/Guided.pm
+++ b/C4/Reports/Guided.pm
@@ -460,7 +460,7 @@ sub execute_query ($;$$$) {
     if (defined($userlimit)) {
         if ($offset + $limit > $userlimit ) {
             $limit = $userlimit - $offset;
-        } elsif ( ! $offset && $limit > $userlimit ) {
+        } elsif ( ! $offset && $limit < $userlimit ) {
             $limit = $userlimit;
         }
     }
-- 
1.5.6.5


From chrisc at catalyst.net.nz  Mon Jul 12 23:18:50 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Tue, 13 Jul 2010 09:18:50 +1200
Subject: [Koha-patches] [PATCH] Bug 3756: Adding the ability to have
	localuse systempreferences
Message-ID: <1278969530-18609-1-git-send-email-chrisc@catalyst.net.nz>

From: Chris Nighswonger <cnighswonger at foundations.edu>

Squashed commit of the following:

commit d42198bfadff20f40c38b3d9bc7f210ecc372e7c
Author: Chris Nighswonger <cnighswonger at foundations.edu>
Date:   Mon Jul 12 16:48:16 2010 -0400

    Bug 3756 [4/?] new sys prefs - no way to add a new local use preference

        Fixing Global Administration link

commit 060a52bc8d9da1d83387455967ca05292e5987b9
Author: Chris Nighswonger <cnighswonger at foundations.edu>
Date:   Mon Jul 12 16:45:07 2010 -0400

    Bug 3756 [3/?] new sys prefs - no way to add a new local use preference

        Hiding non-local sysprefs

commit d63858e13037fa91f18bc248ab770d757e31153c
Author: Chris Nighswonger <cnighswonger at foundations.edu>
Date:   Mon Jul 12 16:44:40 2010 -0400

    Bug 3756 [2/?]new sys prefs - no way to add a new local use preference

        Fixing a typo

commit 5b23a615018e049b1e11dbc10b131ecb30dfc6ab
Author: Chris Nighswonger <cnighswonger at foundations.edu>
Date:   Mon Jul 12 15:52:04 2010 -0400

    Bug 3756 new sys prefs - no way to add a new local use preference

        A quick and dirty fix

Signed-off-by: Chris Cormack <chrisc at catalyst.nz>
---
 admin/systempreferences.pl                         |   31 ++++++++++++++++++++
 .../intranet-tmpl/prog/en/includes/prefs-menu.inc  |    2 +-
 .../prog/en/includes/sysprefs-menu.inc             |   30 +++++++++---------
 .../prog/en/modules/admin/admin-home.tmpl          |    2 +-
 4 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 9e90d61..9191ecf 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -95,8 +95,39 @@ $tabsysprefs{Intranet_includes}     = "Admin";
 $tabsysprefs{AutoLocation}          = "Admin";
 $tabsysprefs{DebugLevel}            = "Admin";
 $tabsysprefs{SessionStorage}        = "Admin";
+
+# This script is depricated so all of these prefs are lumped here to avoid their being displayed in the local use prefs tab
+
 $tabsysprefs{noItemTypeImages}      = "Admin";
 $tabsysprefs{OPACBaseURL}           = "Admin";
+$tabsysprefs{AnonymousPatron}       = "Admin";
+$tabsysprefs{casAuthentication}     = "Admin";
+$tabsysprefs{casLogout}             = "Admin";
+$tabsysprefs{casServerUrl}          = "Admin";
+$tabsysprefs{Disable_Dictionary}    = "Admin";
+$tabsysprefs{EnableOpacSearchHistory}   = "Admin";
+$tabsysprefs{'ILS-DI:AuthorizedIPs'}    = "Admin";
+$tabsysprefs{Intranetbookbag}       = "Admin";
+$tabsysprefs{maxitemsinSearchResults}   = "Admin";
+$tabsysprefs{noOPACUserLogin}       = "Admin";
+$tabsysprefs{'OAI-PMH:ConfFile'}    = "Admin";
+$tabsysprefs{OpacAddMastheadLibraryPulldown}    = "Admin";
+$tabsysprefs{opaclargeimage}        = "Admin";
+$tabsysprefs{OpacPrivacy}           = "Admin";
+$tabsysprefs{OPACXSLTDetailsDisplay}    = "Admin";
+$tabsysprefs{OPACXSLTResultsDisplay}    = "Admin";
+$tabsysprefs{PDFFontType}           = "Admin";
+$tabsysprefs{PINESISBN}             = "Admin";
+$tabsysprefs{PrintNoticesMaxLines}  = "Admin";
+$tabsysprefs{ReservesControlBranch} = "Admin";
+$tabsysprefs{ResultsDisplay}        = "Admin";
+$tabsysprefs{NoReturnSetLost}       = "Admin";
+$tabsysprefs{SearchURL}             = "Admin";
+$tabsysprefs{ShowPictures}          = "Admin";
+$tabsysprefs{soundon}               = "Admin";
+$tabsysprefs{SpineLabelShowPrintOnBibDetails}   = "Admin";
+$tabsysprefs{WebBasedSelfCheckHeader}           = "Admin";
+$tabsysprefs{WebBasedSelfCheckTimeout}          = "Admin";
 
 # Authorities
 $tabsysprefs{authoritysep}          = "Authorities";
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
index 2716ec8..b72e305 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
@@ -8,7 +8,7 @@
 <!-- TMPL_IF NAME="Creators" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Creators" href="/cgi-bin/koha/admin/preferences.pl?tab=creators">Creators</a></li>
 <!-- TMPL_IF NAME="enhanced-content" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Enhanced Content Settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced-content">Enhanced Content</a></li>
 <!-- TMPL_IF NAME="i18n-l10n" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n-l10n">I18N/L10N</a></li>
-<!-- TMPL_IF NAME="local-use" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/admin/preferences.pl">Local Use</a></li>
+<!-- TMPL_IF NAME="local-use" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/admin/systempreferences.pl">Local Use</a></li>
 <!-- TMPL_IF NAME="logs" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Transaction Logs" href="/cgi-bin/koha/admin/preferences.pl?tab=logs">Logs</a></li>
 <!-- TMPL_IF NAME="opac" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/preferences.pl?tab=opac">OPAC</a></li>
 <!-- TMPL_IF NAME="patrons" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Patrons" href="/cgi-bin/koha/admin/preferences.pl?tab=patrons">Patrons</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc
index 6e535a5..3b2fea4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc
@@ -1,20 +1,20 @@
 <div id="menu">
 <ul>
-<!-- TMPL_IF NAME="Admin" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Administration" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin</a></li>
-<!-- TMPL_IF NAME="Acquisitions" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Acquisitions" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions</a></li>
-<!-- TMPL_IF NAME="Authorities" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Authority Control" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities</a></li>
-<!-- TMPL_IF NAME="Cataloging" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Cataloging" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Cataloging">Cataloging</a></li>
-<!-- TMPL_IF NAME="Circulation" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Circulation" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation</a></li>
-<!-- TMPL_IF NAME="Creators" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Creators" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Creators">Creators</a></li>
-<!-- TMPL_IF NAME="EnhancedContent" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Enhanced content settings" href="/cgi-bin/koha/admin/systempreferences.pl?tab=EnhancedContent">Enhanced Content</a></li>
-<!-- TMPL_IF NAME="I18N/L10N" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/systempreferences.pl?tab=I18N/L10N">I18N/L10N</a></li>
-<!-- TMPL_IF NAME="Logs" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Transaction Logs" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Logs">Logs</a></li>
-<!-- TMPL_IF NAME="OAI-PMH" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="OAI-PMH" href="/cgi-bin/koha/admin/systempreferences.pl?tab=OAI-PMH">OAI-PMH</a></li>
-<!-- TMPL_IF NAME="OPAC" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC</a></li>
-<!-- TMPL_IF NAME="Patrons" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Patrons" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Patrons">Patrons</a></li>
-<!-- TMPL_IF NAME="Searching" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Searching" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Searching">Searching</a></li>
-<!-- TMPL_IF NAME="Serials" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Serials" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Serials">Serials</a></li>
-<!-- TMPL_IF NAME="StaffClient" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Staff Client" href="/cgi-bin/koha/admin/systempreferences.pl?tab=StaffClient">Staff Client</a></li>
+<!-- TMPL_IF NAME="Acquisitions" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Acquisitions" href="/cgi-bin/koha/admin/preferences.pl?tab=acquisitions">Acquisitions</a></li>
+<!-- TMPL_IF NAME="Admin" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Administration" href="/cgi-bin/koha/admin/preferences.pl?tab=admin">Administration</a></li>
+<!-- TMPL_IF NAME="Authorities" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Authority Control" href="/cgi-bin/koha/admin/preferences.pl?tab=authorities">Authorities</a></li>
+<!-- TMPL_IF NAME="Cataloging" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Cataloging" href="/cgi-bin/koha/admin/preferences.pl?tab=cataloging">Cataloging</a></li>
+<!-- TMPL_IF NAME="Circulation" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Circulation" href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">Circulation</a></li>
+<!-- TMPL_IF NAME="Creators" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Creators" href="/cgi-bin/koha/admin/preferences.pl?tab=creators">Creators</a></li>
+<!-- TMPL_IF NAME="EnhancedContent" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Enhanced content settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced-content">Enhanced Content</a></li>
+<!-- TMPL_IF NAME="I18N/L10N" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n-l10n">I18N/L10N</a></li>
 <!-- TMPL_IF NAME="" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/admin/systempreferences.pl">Local Use</a></li>
+<!-- TMPL_IF NAME="Logs" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Transaction Logs" href="/cgi-bin/koha/admin/preferences.pl?tab=logs">Logs</a></li>
+<!-- TMPL_IF NAME="OPAC" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/preferences.pl?tab=opac">OPAC</a></li>
+<!-- TMPL_IF NAME="Patrons" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Patrons" href="/cgi-bin/koha/admin/preferences.pl?tab=patrons">Patrons</a></li>
+<!-- TMPL_IF NAME="Searching" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Searching" href="/cgi-bin/koha/admin/preferences.pl?tab=searching">Searching</a></li>
+<!-- TMPL_IF NAME="Serials" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Serials" href="/cgi-bin/koha/admin/preferences.pl?tab=serials">Serials</a></li>
+<!-- TMPL_IF NAME="StaffClient" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Staff Client" href="/cgi-bin/koha/admin/preferences.pl?tab=staff-client">Staff Client</a></li>
+<!-- TMPL_IF NAME="OAI-PMH" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Web Services" href="/cgi-bin/koha/admin/preferences.pl?tab=web-services">Web Services</a></li>
 </ul>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
index 05ca4e4..afa2a35 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
@@ -18,7 +18,7 @@
 <div class="yui-u first">
 <form action="/cgi-bin/koha/admin/preferences.pl" method="post">
 <fieldset>
-<h4><a href="/cgi-bin/koha/admin/preferences.pl">Global system preferences</a></h4>
+<h4><a href="/cgi-bin/koha/admin/systempreferences.pl">Global system preferences</a></h4>
 	<p>Manage global system preferences like MARC flavor, date format, administrator email, and templates.</p>
         <input type="hidden" name="op" value="search" />
         <input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-- 
1.7.0.4


From nahuel.angelinetti at biblibre.com  Tue Jul 13 10:54:18 2010
From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI)
Date: Tue, 13 Jul 2010 10:54:18 +0200
Subject: [Koha-patches] [PATCH] [3.0.x] (bug 4989) add index on guarantorid
Message-ID: <1279011258-31201-1-git-send-email-nahuel.angelinetti@biblibre.com>

---
 installer/data/mysql/kohastructure.sql   |    1 +
 installer/data/mysql/updatedatabase30.pl |    7 ++++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index c4f2558..3759d5c 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -493,6 +493,7 @@ CREATE TABLE `borrowers` (
   KEY `categorycode` (`categorycode`),
   KEY `branchcode` (`branchcode`),
   KEY `userid` (`userid`),
+  KEY `guarantorid` (`guarantorid`),
   CONSTRAINT `borrowers_ibfk_1` FOREIGN KEY (`categorycode`) REFERENCES `categories` (`categorycode`),
   CONSTRAINT `borrowers_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/installer/data/mysql/updatedatabase30.pl b/installer/data/mysql/updatedatabase30.pl
index 68b2796..c94535a 100644
--- a/installer/data/mysql/updatedatabase30.pl
+++ b/installer/data/mysql/updatedatabase30.pl
@@ -767,7 +767,12 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
-
+$DBversion = "3.00.06.011";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("ALTER TABLE borrowers ADD KEY `guarantorid` (guarantorid);");
+    print "Upgrade to $DBversion done (Add index on guarantorid)\n";
+    SetVersion ($DBversion);
+}
 
 =item DropAllForeignKeys($table)
 
-- 
1.7.0.4


From nahuel.angelinetti at biblibre.com  Tue Jul 13 10:56:12 2010
From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI)
Date: Tue, 13 Jul 2010 10:56:12 +0200
Subject: [Koha-patches] [PATCH] [HEAD](bug 4989) add index on guarantorid
Message-ID: <1279011372-31278-1-git-send-email-nahuel.angelinetti@biblibre.com>

---
 installer/data/mysql/kohastructure.sql |    1 +
 installer/data/mysql/updatedatabase.pl |    7 ++++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 7bc5e51..fc62421 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -260,6 +260,7 @@ CREATE TABLE `borrowers` (
   KEY `categorycode` (`categorycode`),
   KEY `branchcode` (`branchcode`),
   KEY `userid` (`userid`),
+  KEY `guarantorid` (`guarantorid`),
   CONSTRAINT `borrowers_ibfk_1` FOREIGN KEY (`categorycode`) REFERENCES `categories` (`categorycode`),
   CONSTRAINT `borrowers_ibfk_2` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index dd3b999..f38b2da 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4444,7 +4444,12 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
-
+$DBversion = "3.02.00.025";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("ALTER TABLE borrowers ADD KEY `guarantorid` (guarantorid);");
+    print "Upgrade to $DBversion done (Add index on guarantorid)\n";
+    SetVersion ($DBversion);
+}
 =item DropAllForeignKeys($table)
 
   Drop all foreign keys of the table $table
-- 
1.7.0.4


From nahuel.angelinetti at biblibre.com  Tue Jul 13 12:05:58 2010
From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI)
Date: Tue, 13 Jul 2010 12:05:58 +0200
Subject: [Koha-patches] [PATCH][followup] (bug #4931) fix forgottens input
	in buttons
Message-ID: <1279015558-2128-1-git-send-email-nahuel.angelinetti@biblibre.com>

the previous patch missed an hidden input in next buttons that break next page. This fix it.
---
 .../prog/en/modules/tools/inventory.tmpl           |    2 ++
 tools/inventory.pl                                 |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
index 36e8cc4..480441d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
@@ -232,6 +232,7 @@ $(document).ready(function(){
     </form>
     <!-- TMPL_IF NAME="offset" -->
     <form method="post" action="/cgi-bin/koha/tools/inventory.pl">
+        <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
         <input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" />
         <input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->" />
         <input type="hidden" name="location" value="<!-- TMPL_VAR NAME="location" -->" />
@@ -245,6 +246,7 @@ $(document).ready(function(){
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="nextoffset" -->
     <form method="post">
+        <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
         <input type="hidden" name="location" value="<!-- TMPL_VAR NAME="location" -->" />
         <input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->" />
         <input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" />
diff --git a/tools/inventory.pl b/tools/inventory.pl
index 15f1c61..069d7c4 100755
--- a/tools/inventory.pl
+++ b/tools/inventory.pl
@@ -135,6 +135,7 @@ $template->param(
     location                 => $location,
     ignoreissued             => $ignoreissued,
     branchcode               => $branchcode,
+    branch                   => $branch,
     offset                   => $offset,
     pagesize                 => $pagesize,
     datelastseen             => $datelastseen,
-- 
1.7.0.4


From oleonard at myacpl.org  Tue Jul 13 15:57:34 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 13 Jul 2010 09:57:34 -0400
Subject: [Koha-patches] [PATCH] Possible fix for Bug 2307,
	Calendar widget cannot be translated
Message-ID: <1279029454-14807-1-git-send-email-oleonard@myacpl.org>

This patch copies the calendar's language strings from a stand-
alone javascript file into calendar.inc where they can be
translated along with other strings.
---
 .../intranet-tmpl/prog/en/includes/calendar.inc    |   62 +++++++++++++++++++-
 1 files changed, 61 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
index c36daa6..aa6e9c7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
@@ -1,6 +1,66 @@
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-system.css"/>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-en.js"></script>
+<script type="text/javascript">
+// full day names
+Calendar._DN = new Array(_("Sunday"),_("Monday"),_("Tuesday"),_("Wednesday"),_("Thursday"),_("Friday"),_("Saturday"),_("Sunday"));
+// short day names
+Calendar._SDN = new Array(_("Sun"),_("Mon"),_("Tue"),_("Wed"),_("Thu"),_("Fri"),_("Sat"),_("Sun"));
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+// full month names
+Calendar._MN = new Array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December"));
+// short month names
+Calendar._SMN = new Array(_("Jan"),_("Feb"),_("Mar"),_("Apr"),_("May"),_("Jun"),_("Jul"),_("Aug"),_("Sep"),_("Oct"),_("Nov"),_("Dec"));
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = _("About the calendar");
+
+Calendar._TT["ABOUT"] =
+_("DHTML Date/Time Selector")+"\n" +
+"(c) dynarch.com 2002-2003\n" + // don't translate this this ;-)
+_("For latest version visit: http://dynarch.com/mishoo/calendar.epl")+"\n" +
+_("Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details.") +
+"\n\n" +
+_("Date selection:")+"\n" +
+_("- Use the \xab, \xbb buttons to select year")+"\n" +
+_("- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month")+"\n" +
+_("- Hold mouse button on any of the above buttons for faster selection.");
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+_("Time selection:")+"\n" +
+_("- Click on any of the time parts to increase it")+"\n" +
+_("- or Shift-click to decrease it")+"\n" +
+_("- or click and drag for faster selection.");
+
+Calendar._TT["PREV_YEAR"] = _("Prev. year (hold for menu)");
+Calendar._TT["PREV_MONTH"] = _("Prev. month (hold for menu)");
+Calendar._TT["GO_TODAY"] = _("Go to Today");
+Calendar._TT["NEXT_MONTH"] = _("Next month (hold for menu)");
+Calendar._TT["NEXT_YEAR"] = _("Next year (hold for menu)");
+Calendar._TT["SEL_DATE"] = _("Select date");
+Calendar._TT["DRAG_TO_MOVE"] = _("Drag to move");
+Calendar._TT["PART_TODAY"] = _(" (today)");
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = _("Display %s first");
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = _("Close");
+Calendar._TT["TODAY"] = _("Today");
+Calendar._TT["TIME_PART"] = _("(Shift-)Click or drag to change value");
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = _("wk");
+Calendar._TT["TIME"] = _("Time:");
+</script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/calendar/calendar-setup.js"></script>
 <script type="text/javascript">
 //<![CDATA[
-- 
1.7.0.4


From nahuel.angelinetti at biblibre.com  Tue Jul 13 16:03:49 2010
From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI)
Date: Tue, 13 Jul 2010 16:03:49 +0200
Subject: [Koha-patches] [PATCH] (bug #4990) fix email link in overdues to
	have a pre-generated message
Message-ID: <1279029829-10427-1-git-send-email-nahuel.angelinetti@biblibre.com>

This fix the link in overdues.pl to have great link with pre-generated emails, they are based on the letter "MANUAL_ODUE" in "circulation" module.
---
 circ/overdue.pl                                    |   21 ++++++++++++++++++++
 .../prog/en/modules/circ/overdue.tmpl              |    4 ++-
 2 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/circ/overdue.pl b/circ/overdue.pl
index 2bd2302..e8e8b58 100755
--- a/circ/overdue.pl
+++ b/circ/overdue.pl
@@ -122,6 +122,27 @@ my $datedueto   = format_date_in_iso($input->param( 'datedueto' ));
 
 my @overduedata = @{GetOverduesByBorrowers($branchfilter, $borcatfilter, $itemtypefilter, $borflagsfilter, $bornamefilter, $order, $dateduefrom, $datedueto)};
 
+# Generate letters
+
+for my $borrower (@overduedata){
+    my $letter = C4::Letters::getletter( 'circulation', 'MANUAL_ODUE' );
+    
+    my $itemscontent;
+    for my $overdue( @{$borrower->{overdues}} ){
+        $itemscontent .= 
+             "$overdue->{title} $overdue->{author}  $overdue->{barcode} $overdue->{itemcallnumber} $overdue->{issuedate}\n";
+    } 
+    $letter->{content}   =~ s/<<items.content>>/$itemscontent/g;
+   
+    C4::Letters::parseletter( $letter, 'borrowers', $borrower->{borrowernumber});
+    C4::Letters::parseletter( $letter, 'branches', $borrower->{'branchcode'} );
+
+    $letter->{content} =~ s/\n/%0D%0A/g;
+
+    $borrower->{letter_content} = $letter->{content};
+    $borrower->{letter_title}   = $letter->{title};
+}
+
 $template->param(
     todaysdate  => format_date($todaysdate),
     overdueloop => \@overduedata 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
index bdd98ae..7e78dcd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
@@ -39,7 +39,9 @@
 <tbody><!-- TMPL_LOOP NAME="overdueloop" -->
     <tr>
         <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber"-->"><!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR NAME="firstname" --></a>
-        <!-- TMPL_IF NAME="email" -->[<a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->">email</a>]<!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="email" -->
+            [<a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=<!-- TMPL_VAR ESCAPE="HTML" NAME="letter_title" -->&amp;body=<!-- TMPL_VAR ESCAPE="HTML" NAME="letter_content" -->">email</a>]
+        <!-- /TMPL_IF -->
         (<!--TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSIF NAME="mobile" --><!-- TMPL_VAR NAME="mobile" --><!-- TMPL_ELSIF NAME="phonepro" --><!-- TMPL_VAR NAME="phonepro" --><!-- /TMPL_IF -->)</td>
         <td><!-- TMPL_VAR name="branchcode" --></td>
         <td>
-- 
1.7.0.4


From oleonard at myacpl.org  Tue Jul 13 18:44:03 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 13 Jul 2010 12:44:03 -0400
Subject: [Koha-patches] [PATCH] Another fix for Bug 2704, 440 Display Issues
Message-ID: <1279039443-16169-1-git-send-email-oleonard@myacpl.org>

Removing the check for 490 @ind1=0 since the
alternative 8xx tag will not display anyway
---
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    2 +-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 0067cef..47fd3be 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -193,7 +193,7 @@
             <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
         </xsl:for-each>
 
-        <xsl:for-each select="marc:datafield[@tag=490][@ind1=0]">
+        <xsl:for-each select="marc:datafield[@tag=490]">
              <a href="/cgi-bin/koha/catalogue/search.pl?q=se:{marc:subfield[@code='a']}">
                         <xsl:call-template name="chopPunctuation">
                             <xsl:with-param name="chopString">
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index 3572379..58f4298 100755
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -213,7 +213,7 @@
             <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
         </xsl:for-each>
 
-        <xsl:for-each select="marc:datafield[@tag=490][@ind1=0]">
+        <xsl:for-each select="marc:datafield[@tag=490]">
              <a href="/cgi-bin/koha/opac-search.pl?q=se:{marc:subfield[@code='a']}">
                         <xsl:call-template name="chopPunctuation">
                             <xsl:with-param name="chopString">
-- 
1.7.0.4


From oleonard at myacpl.org  Tue Jul 13 19:55:43 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 13 Jul 2010 13:55:43 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4908 - OPAC patron details page
	doesn't show patron's home library
Message-ID: <1279043744-16545-1-git-send-email-oleonard@myacpl.org>

---
 .../opac-tmpl/prog/en/modules/opac-userupdate.tmpl |    1 +
 opac/opac-userupdate.pl                            |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
index bb0a473..fdb2ae0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
@@ -73,6 +73,7 @@
 <legend>Library Use:</legend>
 <ol>
 	<li><label for="cardnumber">Card number:</label><input type="text" id="cardnumber" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="cardnumber" -->" /></li>
+    <li><label for="branchcode">Home library:</label><input type="text" id="branchcode" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="branchcode" -->" /></li>
 	<li><label for="borrowernumber">Patron Number:</label><input type="text" id="borrowernumber" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /></li>
 	<li><label for="categorycode">Patron Category:</label><input type="text" id="categorycode" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="description" --> (<!-- TMPL_VAR NAME="categorycode" -->)" /></li>
 	<li><label for="dateenrolled">Joined: </label><input type="text" id="dateenrolled" disabled="disabled" readonly="readonly" value="<!-- TMPL_VAR NAME="dateenrolled" -->" /></li>
diff --git a/opac/opac-userupdate.pl b/opac/opac-userupdate.pl
index b38a477..a9d0101 100755
--- a/opac/opac-userupdate.pl
+++ b/opac/opac-userupdate.pl
@@ -147,9 +147,10 @@ EOF
 }
 
 $borr->{'dateenrolled'} = format_date( $borr->{'dateenrolled'} );
-$borr->{'dateexpiry'}       = format_date( $borr->{'dateexpiry'} );
+$borr->{'dateexpiry'}   = format_date( $borr->{'dateexpiry'} );
 $borr->{'dateofbirth'}  = format_date( $borr->{'dateofbirth'} );
 $borr->{'ethnicity'}    = fixEthnicity( $borr->{'ethnicity'} );
+$borr->{'branchcode'}   = GetBranchName($borr->{'branchcode'});
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber, 'opac');
-- 
1.7.0.4


From f.demians at tamil.fr  Tue Jul 13 20:49:25 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Tue, 13 Jul 2010 20:49:25 +0200
Subject: [Koha-patches] [PATCH] Bug 3756 Difference between original and
	local sysprefs
Message-ID: <1279046965-19537-1-git-send-email-f.demians@tamil.fr>

Amend Chris N. patch in order to display local sysprefs as the
difference between DB sysprefs and .pref files sysprefs.

As a side effect, local sysprefs editor displays also deprecated
sysprefs which is a feature from my point of view. For example,
GranularPermissions is displayed as a local syspref because it has been
removed recently from admin.pref but hasn't been yet removed from DB
(could be done later with a DB update).
---
 admin/systempreferences.pl |   90 +++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 9191ecf..24d83d9 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -52,6 +52,8 @@ use C4::Languages qw(getTranslatedLanguages);
 use C4::ClassSource;
 use C4::Log;
 use C4::Output;
+use YAML::Syck qw( Dump LoadFile );
+
 
 # use Smart::Comments;
 
@@ -458,12 +460,14 @@ sub StringSearch {
               ORDER BY VARIABLE" );
             $sth->execute( "%$searchstring%", "%$searchstring%" );
         } else {
-            my $strsth = "Select variable,value,explanation,type,options from systempreferences where variable not in (";
-            foreach my $syspref ( keys %tabsysprefs ) {
-                $strsth .= $dbh->quote($syspref) . ",";
+            my $strsth = "Select variable,value,explanation,type,options from systempreferences where variable in (";
+            my $first = 1;
+            for my $name ( get_local_prefs() ) {
+                $strsth .= ',' unless $first;
+                $strsth .= "'$name'";
+                $first = 0;
             }
-            $strsth =~ s/,$/) /;
-            $strsth .= " order by variable";
+            $strsth .= ") order by variable";
             $sth = $dbh->prepare($strsth);
             $sth->execute();
         }
@@ -810,3 +814,79 @@ if ( $op eq 'add_form' ) {
     $template->param( tab => $tab, );
 }    #---- END $OP eq DEFAULT
 output_html_with_http_headers $input, $cookie, $template->output;
+
+
+# Return an array containing all preferences defined in current Koha instance
+# .pref files.
+
+sub get_prefs_from_files {
+    my $context       = C4::Context->new();
+    my $path_pref_en  = $context->config('intrahtdocs') .
+                        '/prog/en/modules/admin/preferences';
+    # Get all .pref file names
+    opendir ( my $fh, $path_pref_en );
+    my @pref_files = grep { /.pref/ } readdir($fh);
+    close $fh;
+
+    my @names = ();
+    my $append = sub {
+        my $prefs = shift;
+        for my $pref ( @$prefs ) {
+            for my $element ( @$pref ) {
+                if ( ref( $element) eq 'HASH' ) {
+                    my $name = $element->{pref};
+                    next unless $name;
+                    push @names, $name;
+                    last;
+                }
+            }
+        }
+    };
+    for my $file (@pref_files) {
+        my $pref = LoadFile( "$path_pref_en/$file" );
+        for my $tab ( keys %$pref ) {
+            my $content = $pref->{$tab};
+            if ( ref($content) eq 'ARRAY' ) {
+                $append->($content);
+                next;
+            }
+            for my $section ( keys %$content ) {
+                my $syspref = $content->{$section};
+                $append->($syspref);
+            }
+        }
+    }
+    return @names;
+}
+
+
+# Return an array containg all preferences defined in DB
+
+sub get_prefs_from_db {
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare("SELECT variable FROM systempreferences");
+    $sth->execute;
+    my @names = ();
+    while ( (my $name) = $sth->fetchrow_array ) {
+        push @names, $name if $name;
+    }
+    return @names;
+}
+
+
+# Return an array containing all local preferences: those which are defined in
+# DB and not defined in Koha .pref files.
+
+sub get_local_prefs {
+    my @prefs_file = get_prefs_from_files();
+    my @prefs_db = get_prefs_from_db();
+
+    my %prefs_file = map { $_ => 1 } @prefs_file;
+    my @names = ();
+    foreach my $name (@prefs_db) {
+        push @names, $name  unless $prefs_file{$name};
+    }
+
+    return @names;
+}
+
-- 
1.7.1


From dpavlin at rot13.org  Tue Jul 13 21:18:26 2010
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Tue, 13 Jul 2010 21:18:26 +0200
Subject: [Koha-patches] [PATCH] Bug 4993 checkpw_ldap - do bind just once
Message-ID: <1279048706-2636-1-git-send-email-dpavlin@rot13.org>

When using auth_by_bind, search was always done as anonymous user.
This is a problem if we want to fetch LDAP values which have ACL
permissions only for users.

This change moves bind from search_method back into checkpw_ldap,
making code cleaner and easier to understand
---
 C4/Auth_with_ldap.pm |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm
index b25697c..9ae7f91 100644
--- a/C4/Auth_with_ldap.pm
+++ b/C4/Auth_with_ldap.pm
@@ -82,11 +82,6 @@ sub search_method {
     my $userid = shift or return;
 	my $uid_field = $mapping{userid}->{is} or die ldapserver_error("mapping for 'userid'");
 	my $filter = Net::LDAP::Filter->new("$uid_field=$userid") or die "Failed to create new Net::LDAP::Filter";
-    my $res = ($config{anonymous}) ? $db->bind : $db->bind($ldapname, password=>$ldappassword);
-    if ($res->code) {		# connection refused
-        warn "LDAP bind failed as ldapuser " . ($ldapname || '[ANONYMOUS]') . ": " . description($res);
-        return 0;
-    }
 	my $search = $db->search(
 		  base => $base,
 	 	filter => $filter,
@@ -128,6 +123,11 @@ sub checkpw_ldap {
 	$userldapentry = $search->shift_entry;
 
 	} else {
+		my $res = ($config{anonymous}) ? $db->bind : $db->bind($ldapname, password=>$ldappassword);
+		if ($res->code) {		# connection refused
+			warn "LDAP bind failed as ldapuser " . ($ldapname || '[ANONYMOUS]') . ": " . description($res);
+			return 0;
+		}
         my $search = search_method($db, $userid) or return 0;   # warnings are in the sub
         $userldapentry = $search->shift_entry;
 		my $cmpmesg = $db->compare( $userldapentry, attr=>'userpassword', value => $password );
-- 
1.5.6.5


From dpavlin at rot13.org  Tue Jul 13 23:28:08 2010
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Tue, 13 Jul 2010 23:28:08 +0200
Subject: [Koha-patches] [PATCH] Bug 4994 - Net::LDAP returns lowercase names
Message-ID: <1279056488-6456-1-git-send-email-dpavlin@rot13.org>

This requires us to specify all LDAP mappings in koha-conf.xml in lowercase,
instead of original case used withing LDAP.

Compare readability of

<userid      is="hrEduPersonUniqueID"  ></userid>

(which doesn't work) with required (and non-intuitive)

<userid      is="hredupersonuniqueid"  ></userid>
---
 C4/Auth_with_ldap.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm
index b25697c..00fd9fd 100644
--- a/C4/Auth_with_ldap.pm
+++ b/C4/Auth_with_ldap.pm
@@ -210,7 +210,7 @@ sub ldap_entry_2_hash ($$) {
 	$debug and print STDERR "Finsihed \%memberhash has ", scalar(keys %memberhash), " keys\n",
 					"Referencing \%mapping with ", scalar(keys %mapping), " keys\n";
 	foreach my $key (keys %mapping) {
-		my  $data = $memberhash{$mapping{$key}->{is}}; 
+		my  $data = $memberhash{ lc($mapping{$key}->{is}) }; # Net::LDAP returns all names in lowercase
 		$debug and printf STDERR "mapping %20s ==> %-20s (%s)\n", $key, $mapping{$key}->{is}, $data;
 		unless (defined $data) { 
 			$data = $mapping{$key}->{content} || '';	# default or failsafe ''
-- 
1.5.6.5


From dpavlin at rot13.org  Tue Jul 13 23:43:44 2010
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Tue, 13 Jul 2010 23:43:44 +0200
Subject: [Koha-patches] [PATCH] Bug 4995 - extended attributes replication
	from LDAP
Message-ID: <1279057424-7059-1-git-send-email-dpavlin@rot13.org>

---
 C4/Auth_with_ldap.pm |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm
index b25697c..d3f8333 100644
--- a/C4/Auth_with_ldap.pm
+++ b/C4/Auth_with_ldap.pm
@@ -164,9 +164,8 @@ sub checkpw_ldap {
     }
 	if (C4::Context->preference('ExtendedPatronAttributes') && $borrowernumber && ($config{update} ||$config{replicate})) {
    		my @types = C4::Members::AttributeTypes::GetAttributeTypes();
-		my @attributes = grep{my $key=$_; any{$_ eq $key}@types;} keys %borrower;
-		my $extended_patron_attributes = map{{code=>$_,value=>$borrower{$_}}}@attributes;
-		my $extended_patron_attributes = [] unless $extended_patron_attributes;
+		my @attributes = grep{my $key=$_; any{$_->{code} eq $key}@types;} keys %borrower;
+		my $extended_patron_attributes = [ map{{code=>$_,value=>$borrower{$_}}}@attributes ];
 		my @errors;
 		#Check before add
 		for (my $i; $i< scalar(@$extended_patron_attributes)-1;$i++) {
-- 
1.5.6.5


From chrisc at catalyst.net.nz  Wed Jul 14 06:32:42 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Wed, 14 Jul 2010 16:32:42 +1200
Subject: [Koha-patches] [PATCH] Bug 2505: Quieting warns in
	acqui/z3950_search.pl
Message-ID: <1279081964-11736-1-git-send-email-chrisc@catalyst.net.nz>

Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
---
 acqui/z3950_search.pl |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl
index 7f04754..015aac6 100755
--- a/acqui/z3950_search.pl
+++ b/acqui/z3950_search.pl
@@ -2,6 +2,7 @@
 
 # This is a completely new Z3950 clients search using async ZOOM -TG 02/11/06
 # Copyright 2000-2002 Katipo Communications
+# Copyright 2010 Catalyst IT
 #
 # This file is part of Koha.
 #
@@ -89,12 +90,12 @@ my $DEBUG = 0;    # if set to 1, many debug message are send on syslog.
 my $frameworks = getframeworks;
 my @frameworkcodeloop;
 foreach my $thisframeworkcode ( keys %$frameworks ) {
-    my $row = {
+    my %row = {
         value         => $thisframeworkcode,
         frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
     };
-    if ( $row->{'value'} eq $frameworkcode){
-        $row->{'active'} = 'true';
+    if ( $row{'value'} eq $frameworkcode){
+        $row{'active'} = 'true';
     }
     push @frameworkcodeloop, $row;
 }
-- 
1.7.0.4


From chrisc at catalyst.net.nz  Wed Jul 14 06:32:44 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Wed, 14 Jul 2010 16:32:44 +1200
Subject: [Koha-patches] [PATCH] wr72054 fixing the z3950 search for
	acquisitions
In-Reply-To: <1279081964-11736-1-git-send-email-chrisc@catalyst.net.nz>
References: <1279081964-11736-1-git-send-email-chrisc@catalyst.net.nz>
Message-ID: <1279081964-11736-3-git-send-email-chrisc@catalyst.net.nz>

From: Chris Cormack <chrisc at library.org.nz>

Signed-off-by: Chris Cormack <chrisc at catalyst.nz>
---
 acqui/z3950_search.pl |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl
index 015aac6..1238e16 100755
--- a/acqui/z3950_search.pl
+++ b/acqui/z3950_search.pl
@@ -90,10 +90,10 @@ my $DEBUG = 0;    # if set to 1, many debug message are send on syslog.
 my $frameworks = getframeworks;
 my @frameworkcodeloop;
 foreach my $thisframeworkcode ( keys %$frameworks ) {
-    my %row = {
+    my %row = (
         value         => $thisframeworkcode,
         frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
-    };
+    );
     if ( $row{'value'} eq $frameworkcode){
         $row{'active'} = 'true';
     }
@@ -247,8 +247,8 @@ sub displayresults {
 # In rel2_2 i am not sure what encoding is so no character conversion is done here
 ##Add necessary encoding changes to here -TG
                         my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" );
-                        $oldbiblio->{isbn}   =~ s/ |-|\.//g,
-                          $oldbiblio->{issn} =~ s/ |-|\.//g,
+                        $oldbiblio->{isbn}   =~ s/ |-|\.//g if $oldbiblio->{isbn};
+                         $oldbiblio->{issn} =~ s/ |-|\.//g if $oldbiblio->{issn};
                           my (
                             $notmarcrecord, $alreadyindb, $alreadyinfarm,
                             $imported,      $breedingid
@@ -284,14 +284,13 @@ sub displayresults {
         server        => $servername[$k],
         numberpending => $numberpending,
     );
-    
     output_html_with_http_headers $input, $cookie, $template->output if $numberpending == 0;
 
     #  	print  $template->output  if $firstresult !=1;
     $firstresult++;
 }
 displayresults();
-if ( --$nremaining > 0 ) {
+while ( --$nremaining > 0 ) {
         displayresults();
     }
 }    ## if op=search
-- 
1.7.0.4


From chrisc at catalyst.net.nz  Wed Jul 14 06:32:43 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Wed, 14 Jul 2010 16:32:43 +1200
Subject: [Koha-patches] [PATCH] bug2505: Quieting a warn on
	acqui/neworderempty.pl
In-Reply-To: <1279081964-11736-1-git-send-email-chrisc@catalyst.net.nz>
References: <1279081964-11736-1-git-send-email-chrisc@catalyst.net.nz>
Message-ID: <1279081964-11736-2-git-send-email-chrisc@catalyst.net.nz>

---
 acqui/basket.pl |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/acqui/basket.pl b/acqui/basket.pl
index 005fcb9..2f2d85a 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -230,8 +230,9 @@ if ( $op eq 'delete_confirm' ) {
     my @books_loop;
 
     for my $order ( @results ) {
-        my $rrp = $order->{'listprice'} || 0;
-		my $qty = $order->{'quantity'} || 0;
+        my $rrp = 0;
+	$rrp =  $order->{'listprice'} if (defined $order->{'listprice'});
+	my $qty = $order->{'quantity'} || 0;
         if (!defined $order->{quantityreceived}) {
             $order->{quantityreceived} = 0;
         }
-- 
1.7.0.4


From amit.gupta at osslabs.biz  Wed Jul 14 09:03:43 2010
From: amit.gupta at osslabs.biz (amit gupta)
Date: Wed, 14 Jul 2010 12:33:43 +0530
Subject: [Koha-patches] [PATCH] Fixes Bug 2969: Report Name should be
	mandatory for saved reports
In-Reply-To: <1279090008-7215-1-git-send-email-amit.gupta@osslabs.biz>
References: <amit.gupta@osslabs.biz>
	<1279090008-7215-1-git-send-email-amit.gupta@osslabs.biz>
Message-ID: <AANLkTinuCVaZMMXmOYnUs9jrlv0-PnOh7uAg_4ojfbpb@mail.gmail.com>


From amit.gupta at osslabs.biz  Wed Jul 14 08:43:49 2010
From: amit.gupta at osslabs.biz (Amit Gupta)
Date: Wed, 14 Jul 2010 12:13:49 +0530
Subject: [PATCH] Fixes Bug 2969: Report Name should be mandatory for saved
Message-ID: <mailman.4.1279091029.18001.koha-patches@lists.koha-community.org>

reports

---
 installer/data/mysql/kohastructure.sql             |    2 +-
 .../en/modules/reports/guided_reports_start.tmpl   |   26
++++++++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql
b/installer/data/mysql/kohastructure.sql
index e42cecd..6d712df 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1589,7 +1589,7 @@ CREATE TABLE saved_sql (
   `last_modified` datetime default NULL,
   `savedsql` text,
   `last_run` datetime default NULL,
-   `report_name` varchar(255) default NULL,
+   `report_name` varchar(255) NOT NULL default '',
   `type` varchar(255) default NULL,
   `notes` text,
   PRIMARY KEY  (`id`),
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
index 7a24859..aa8ce67 100644
---
a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
+++
b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
@@ -406,6 +406,17 @@ NAME="name" -->"><!-- TMPL_VAR
NAME="name"--></label></td><td>
 <!-- /TMPL_IF -->

 <!-- TMPL_IF NAME="save" -->
+<script type="text/javascript">
+//<![CDATA[
+function check(f) {
+if (f.reportname.value == "") {
+    alert(_("You must specify a Report name."));
+    return false;
+}
+    f.submit();
+}
+//]]>
+</script>
 <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
 <input type="hidden" name="sql" value="<!-- TMPL_VAR NAME="sql"
ESCAPE="html" -->" />
 <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" />
@@ -416,7 +427,7 @@ NAME="name" -->"><!-- TMPL_VAR
NAME="name"--></label></td><td>
    <li><label for="notes">Notes:</label> <textarea name="notes"
id="notes"></textarea></li>
 </ol></fieldset>
 <fieldset class="action"><input type="hidden" name="phase" value="Save
Report" />
-<input type="submit" name="submit" value="Save Report" /></fieldset>
+<input type="button" value="Save" onclick="check(this.form);"/></fieldset>
 </form>
 <!-- /TMPL_IF -->

@@ -531,6 +542,17 @@ Sub report:<select name="subreport">
 <!-- /TMPL_IF -->

 <!-- TMPL_IF NAME="editsql" -->
+<script type="text/javascript">
+//<![CDATA[
+function check(f) {
+if (f.reportname.value == "") {
+    alert(_("You must specify a Report name."));
+    return false;
+}
+    f.submit();
+}
+//]]>
+</script>
 <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
 <input type="hidden" name="phase" value="Update SQL" />
 <input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->"/>
@@ -544,7 +566,7 @@ Sub report:<select name="subreport">
 </fieldset>

 <fieldset class="action">
-<input type="submit" name="submit" value="Update SQL" /></fieldset>
+<input type="button" value="Update SQL" onclick="check(this.form);"
/></fieldset>
 </form>


--
1.5.4.5

--0016362845cc19da3c048b5396d9
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

<div class=3D"gmail_quote">From 4404a9069067f2c937d6dbb78a4b2b3ee3479751 Mo=
n Sep 17 00:00:00 2001<br>From: Amit Gupta &lt;<a href=3D"mailto:amit.gupta=
@osslabs.biz">amit.gupta at osslabs.biz</a>&gt;<br>Date: Wed, 14 Jul 2010 12:1=
3:49 +0530<br>
Subject: [PATCH] Fixes Bug 2969: Report Name should be mandatory for saved =
reports<br><br>
---<br>
=A0installer/data/mysql/kohastructure.sql =A0 =A0 =A0 =A0 =A0 =A0 | =A0 =A0=
2 +-<br>
=A0.../en/modules/reports/guided_reports_start.tmpl =A0 | =A0 26 ++++++++++=
++++++++-<br>
=A02 files changed, 25 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/=
kohastructure.sql<br>
index e42cecd..6d712df 100644<br>
--- a/installer/data/mysql/kohastructure.sql<br>
+++ b/installer/data/mysql/kohastructure.sql<br>
@@ -1589,7 +1589,7 @@ CREATE TABLE saved_sql (<br>
 =A0 =A0`last_modified` datetime default NULL,<br>
 =A0 =A0`savedsql` text,<br>
 =A0 =A0`last_run` datetime default NULL,<br>
- =A0 `report_name` varchar(255) default NULL,<br>
+ =A0 `report_name` varchar(255) NOT NULL default &#39;&#39;,<br>
 =A0 =A0`type` varchar(255) default NULL,<br>
 =A0 =A0`notes` text,<br>
 =A0 =A0PRIMARY KEY =A0(`id`),<br>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports=
_start.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_report=
s_start.tmpl<br>
index 7a24859..aa8ce67 100644<br>
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.=
tmpl<br>
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.=
tmpl<br>
@@ -406,6 +406,17 @@ NAME=3D&quot;name&quot; --&gt;&quot;&gt;&lt;!-- TMPL_V=
AR NAME=3D&quot;name&quot;--&gt;&lt;/label&gt;&lt;/td&gt;&lt;td&gt;<br>
=A0&lt;!-- /TMPL_IF --&gt;<br>
<br>
=A0&lt;!-- TMPL_IF NAME=3D&quot;save&quot; --&gt;<br>
+&lt;script type=3D&quot;text/javascript&quot;&gt;<br>
+//&lt;![CDATA[<br>
+function check(f) {<br>
+if (f.reportname.value =3D=3D &quot;&quot;) {<br>
+ =A0 =A0alert(_(&quot;You must specify a Report name.&quot;));<br>
+ =A0 =A0return false;<br>
+}<br>
+ =A0 =A0f.submit();<br>
+}<br>
+//]]&gt;<br>
+&lt;/script&gt;<br>
=A0&lt;form action=3D&quot;/cgi-bin/koha/reports/<a href=3D"http://guided_r=
eports.pl" target=3D"_blank">guided_reports.pl</a>&quot; method=3D&quot;pos=
t&quot;&gt;<br>
=A0&lt;input type=3D&quot;hidden&quot; name=3D&quot;sql&quot; value=3D&quot=
;&lt;!-- TMPL_VAR NAME=3D&quot;sql&quot; ESCAPE=3D&quot;html&quot; --&gt;&q=
uot; /&gt;<br>
=A0&lt;input type=3D&quot;hidden&quot; name=3D&quot;type&quot; value=3D&quo=
t;&lt;!-- TMPL_VAR NAME=3D&quot;type&quot; --&gt;&quot; /&gt;<br>
@@ -416,7 +427,7 @@ NAME=3D&quot;name&quot; --&gt;&quot;&gt;&lt;!-- TMPL_VA=
R NAME=3D&quot;name&quot;--&gt;&lt;/label&gt;&lt;/td&gt;&lt;td&gt;<br>
 =A0 =A0 &lt;li&gt;&lt;label for=3D&quot;notes&quot;&gt;Notes:&lt;/label&gt=
; &lt;textarea name=3D&quot;notes&quot; id=3D&quot;notes&quot;&gt;&lt;/text=
area&gt;&lt;/li&gt;<br>
=A0&lt;/ol&gt;&lt;/fieldset&gt;<br>
=A0&lt;fieldset class=3D&quot;action&quot;&gt;&lt;input type=3D&quot;hidden=
&quot; name=3D&quot;phase&quot; value=3D&quot;Save Report&quot; /&gt;<br>
-&lt;input type=3D&quot;submit&quot; name=3D&quot;submit&quot; value=3D&quo=
t;Save Report&quot; /&gt;&lt;/fieldset&gt;<br>
+&lt;input type=3D&quot;button&quot; value=3D&quot;Save&quot; onclick=3D&qu=
ot;check(this.form);&quot;/&gt;&lt;/fieldset&gt;<br>
=A0&lt;/form&gt;<br>
=A0&lt;!-- /TMPL_IF --&gt;<br>
<br>
@@ -531,6 +542,17 @@ Sub report:&lt;select name=3D&quot;subreport&quot;&gt;=
<br>
=A0&lt;!-- /TMPL_IF --&gt;<br>
<br>
=A0&lt;!-- TMPL_IF NAME=3D&quot;editsql&quot; --&gt;<br>
+&lt;script type=3D&quot;text/javascript&quot;&gt;<br>
+//&lt;![CDATA[<br>
+function check(f) {<br>
+if (f.reportname.value =3D=3D &quot;&quot;) {<br>
+ =A0 =A0alert(_(&quot;You must specify a Report name.&quot;));<br>
+ =A0 =A0return false;<br>
+}<br>
+ =A0 =A0f.submit();<br>
+}<br>
+//]]&gt;<br>
+&lt;/script&gt;<br>
=A0&lt;form action=3D&quot;/cgi-bin/koha/reports/<a href=3D"http://guided_r=
eports.pl" target=3D"_blank">guided_reports.pl</a>&quot; method=3D&quot;pos=
t&quot;&gt;<br>
=A0&lt;input type=3D&quot;hidden&quot; name=3D&quot;phase&quot; value=3D&qu=
ot;Update SQL&quot; /&gt;<br>
=A0&lt;input type=3D&quot;hidden&quot; name=3D&quot;id&quot; value=3D&quot;=
&lt;!-- TMPL_VAR NAME=3D&quot;id&quot; --&gt;&quot;/&gt;<br>
@@ -544,7 +566,7 @@ Sub report:&lt;select name=3D&quot;subreport&quot;&gt;<=
br>
=A0&lt;/fieldset&gt;<br>
<br>
=A0&lt;fieldset class=3D&quot;action&quot;&gt;<br>
-&lt;input type=3D&quot;submit&quot; name=3D&quot;submit&quot; value=3D&quo=
t;Update SQL&quot; /&gt;&lt;/fieldset&gt;<br>
+&lt;input type=3D&quot;button&quot; value=3D&quot;Update SQL&quot; onclick=
=3D&quot;check(this.form);&quot; /&gt;&lt;/fieldset&gt;<br>
=A0&lt;/form&gt;<br>
<font color=3D"#888888"><br>
<br>
--<br>
1.5.4.5<br>
<br>
</font></div><br><br>

--0016362845cc19da3c048b5396d9--

From M.de.Rooy at rijksmuseum.nl  Wed Jul 14 14:19:28 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Wed, 14 Jul 2010 12:19:28 +0000
Subject: [Koha-patches] [PATCH] Bug 4866 for master (Enable Change event for
	item plugins)
Message-ID: <32857065C79E3F4E8FDFBB0CAC6897F702912A24@S-MAIL-1A.rijksmuseum.intra>

---
 cataloguing/additem.pl |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl
index ea4daf9..df08c0e 100755
--- a/cataloguing/additem.pl
+++ b/cataloguing/additem.pl
@@ -523,8 +523,10 @@ foreach my $tag (sort keys %{$tagslib}) {
         if (do $plugin) {
             my $extended_param = plugin_parameters( $dbh, $temp, $tagslib, $subfield_data{id}, \@loop_data );
             my ( $function_name, $javascript ) = plugin_javascript( $dbh, $temp, $tagslib, $subfield_data{id}, \@loop_data );
+	    my $change= index($javascript, 'function Change')>-1?"return Change$function_name($subfield_data{random}, '$subfield_data{id}');": 'return 1;'; #enhancement 4866
             $subfield_data{marc_value} = qq[<input $attributes
                 onfocus="Focus$function_name($subfield_data{random}, '$subfield_data{id}');"
+		 onchange=" $change"
                  onblur=" Blur$function_name($subfield_data{random}, '$subfield_data{id}');" />
                 <a href="#" class="buttonDot" onclick="Clic$function_name('$subfield_data{id}'); return false;" title="Tag Editor">...</a>
                 $javascript];
-- 
1.6.0.6


From oleonard at myacpl.org  Wed Jul 14 15:56:39 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 14 Jul 2010 09:56:39 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4999,
	OPAC error pages have incorrect markup structure
Message-ID: <1279115799-20008-1-git-send-email-oleonard@myacpl.org>

No strings have been harmed in the making of this patch.
---
 .../opac-tmpl/prog/en/modules/errors/400.tmpl      |   31 ++++++++++---------
 .../opac-tmpl/prog/en/modules/errors/401.tmpl      |   31 ++++++++++---------
 .../opac-tmpl/prog/en/modules/errors/402.tmpl      |   31 ++++++++++---------
 .../opac-tmpl/prog/en/modules/errors/403.tmpl      |   31 ++++++++++---------
 .../opac-tmpl/prog/en/modules/errors/404.tmpl      |   31 ++++++++++---------
 .../opac-tmpl/prog/en/modules/errors/500.tmpl      |   31 ++++++++++---------
 6 files changed, 96 insertions(+), 90 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tmpl
index 49fd9e6..e7ec2f2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tmpl
@@ -1,14 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  An Error Has Occurred
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
+<body id="error400">
+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+<div id="bd">
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="doc3" class="yui-t1">
-   <div id="bd">
-        <div id="yui-main">
-        <div class="yui-b"><div class="yui-g">
+<div id="yui-main">
+<div class="yui-b">
+<div class="yui-g">
             <h3>An Error has Occurred</h3>
             <h4>Error 400</h4>
             <ul>
@@ -17,13 +17,14 @@
                         <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>
-        </div>
-        </div>
-    </div>
 </div>
-
-<!-- <div id="main"> -->
-<!-- </div> -->
-</body>
-</html>
+</div>
+</div>
+<!-- TMPL_IF NAME="OpacNav" -->
+<div class="yui-b">
+<div class="container">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+</div>
+</div><!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tmpl
index 73ed72b..cd97560 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tmpl
@@ -1,14 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  An Error Has Occurred
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
+<body id="error401">
+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+<div id="bd">
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="doc3" class="yui-t1">
-   <div id="bd">
-        <div id="yui-main">
-        <div class="yui-b"><div class="yui-g">
+<div id="yui-main">
+<div class="yui-b">
+<div class="yui-g">
             <h3>An Error has Occurred</h3>
             <h4>Error 401</h4>
             <ul>
@@ -18,13 +18,14 @@
                         <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>
-        </div>
-        </div>
-    </div>
 </div>
-
-<!-- <div id="main"> -->
-<!-- </div> -->
-</body>
-</html>
+</div>
+</div>
+<!-- TMPL_IF NAME="OpacNav" -->
+<div class="yui-b">
+<div class="container">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+</div>
+</div><!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tmpl
index 13eb795..0035266 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tmpl
@@ -1,14 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  An Error Has Occurred
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
+<body id="error402">
+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+<div id="bd">
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="doc3" class="yui-t1">
-   <div id="bd">
-        <div id="yui-main">
-        <div class="yui-b"><div class="yui-g">
+<div id="yui-main">
+<div class="yui-b">
+<div class="yui-g">
             <h3>An Error has Occurred</h3>
             <h4>Error 402</h4>
             <ul>
@@ -17,13 +17,14 @@
                         <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>
-        </div>
-        </div>
-    </div>
 </div>
-
-<!-- <div id="main"> -->
-<!-- </div> -->
-</body>
-</html>
+</div>
+</div>
+<!-- TMPL_IF NAME="OpacNav" -->
+<div class="yui-b">
+<div class="container">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+</div>
+</div><!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tmpl
index 81b15da..f099511 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tmpl
@@ -1,14 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  An Error Has Occurred
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
+<body id="error403">
+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+<div id="bd">
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="doc3" class="yui-t1">
-   <div id="bd">
-        <div id="yui-main">
-        <div class="yui-b"><div class="yui-g">
+<div id="yui-main">
+<div class="yui-b">
+<div class="yui-g">
             <h3>An Error has Occurred</h3>
             <h4>Error 403</h4>
             <ul>
@@ -17,13 +17,14 @@
                         <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>
-        </div>
-        </div>
-    </div>
 </div>
-
-<!-- <div id="main"> -->
-<!-- </div> -->
-</body>
-</html>
+</div>
+</div>
+<!-- TMPL_IF NAME="OpacNav" -->
+<div class="yui-b">
+<div class="container">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+</div>
+</div><!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tmpl
index bb07e53..0f7472e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tmpl
@@ -1,14 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  An Error Has Occurred
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
+<body id="error404">
+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+<div id="bd">
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="doc3" class="yui-t1">
-   <div id="bd">
-        <div id="yui-main">
-        <div class="yui-b"><div class="yui-g">
+<div id="yui-main">
+<div class="yui-b">
+<div class="yui-g">
             <h3>An Error has Occurred</h3>
             <h4>Error 404</h4>
             <ul>
@@ -17,13 +17,14 @@
                         <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>
-        </div>
-        </div>
-    </div>
 </div>
-
-<!-- <div id="main"> -->
-<!-- </div> -->
-</body>
-</html>
+</div>
+</div>
+<!-- TMPL_IF NAME="OpacNav" -->
+<div class="yui-b">
+<div class="container">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+</div>
+</div><!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl
index f96e407..d45c5db 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl
@@ -1,14 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  An Error Has Occurred
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
+<body id="error500">
+<!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
+<div id="bd">
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="doc3" class="yui-t1">
-   <div id="bd">
-        <div id="yui-main">
-        <div class="yui-b"><div class="yui-g">
+<div id="yui-main">
+<div class="yui-b">
+<div class="yui-g">
             <h3>An Error has Occurred</h3>
             <h4>Error 500</h4>
             <ul>
@@ -17,13 +17,14 @@
                         <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>
-        </div>
-        </div>
-    </div>
 </div>
-
-<!-- <div id="main"> -->
-<!-- </div> -->
-</body>
-</html>
+</div>
+</div>
+<!-- TMPL_IF NAME="OpacNav" -->
+<div class="yui-b">
+<div class="container">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+</div>
+</div><!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
-- 
1.7.0.4


From oleonard at myacpl.org  Wed Jul 14 16:25:47 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 14 Jul 2010 10:25:47 -0400
Subject: [Koha-patches] [PATCH] Begin fix for Bug 3652 - XSS vulnerabilities
Message-ID: <1279117547-20186-1-git-send-email-oleonard@myacpl.org>

- Setting default_escape => "HTML" in C4::Output

In the OPAC:
- Removing redundant "ESCAPE='HTML'" from the templates
- Adding "ESCAPE='0'" where necessary:
  -- Variables like OpacNav which output HTML or JS
  -- Instances of CGI::scrolling_list variables
---
 C4/Output.pm                                       |    1 +
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |    4 +-
 .../opac-tmpl/prog/en/includes/doc-head-open.inc   |    6 ++-
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |    4 +-
 .../opac-tmpl/prog/en/includes/navigation.inc      |    2 +-
 .../opac-tmpl/prog/en/includes/opac-bottom.inc     |    6 +-
 koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tmpl     |    2 +-
 .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl |    2 +-
 .../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl |    2 +-
 .../opac-tmpl/prog/en/modules/opac-account.tmpl    |    2 +-
 .../prog/en/modules/opac-addbybiblionumber.tmpl    |    4 +-
 .../opac-tmpl/prog/en/modules/opac-basket.tmpl     |   14 +++---
 .../opac-tmpl/prog/en/modules/opac-browser.tmpl    |   10 ++--
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |   48 ++++++++--------
 koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl |    2 +-
 .../opac-tmpl/prog/en/modules/opac-mymessages.tmpl |   10 ++--
 .../opac-tmpl/prog/en/modules/opac-opensearch.tmpl |   56 ++++++++++----------
 .../prog/en/modules/opac-readingrecord.tmpl        |    8 ++--
 .../opac-tmpl/prog/en/modules/opac-reserve.tmpl    |    4 +-
 .../prog/en/modules/opac-results-grouped.tmpl      |    2 +-
 .../opac-tmpl/prog/en/modules/opac-results.tmpl    |   18 +++---
 .../opac-tmpl/prog/en/modules/opac-review.tmpl     |    2 +-
 .../prog/en/modules/opac-search-history.tmpl       |    4 +-
 .../opac-tmpl/prog/en/modules/opac-sendbasket.tmpl |    2 +-
 .../opac-tmpl/prog/en/modules/opac-shelves.tmpl    |   22 ++++----
 .../opac-tmpl/prog/en/modules/opac-showmarc.tmpl   |    2 +-
 .../prog/en/modules/opac-showreviews.tmpl          |    2 +-
 .../prog/en/modules/opac-suggestions.tmpl          |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl |    6 +-
 .../prog/en/modules/opac-tags_subject.tmpl         |    2 +-
 .../opac-tmpl/prog/en/modules/opac-topissues.tmpl  |    2 +-
 31 files changed, 129 insertions(+), 124 deletions(-)

diff --git a/C4/Output.pm b/C4/Output.pm
index 9f5ed5e..1c2e8d5 100644
--- a/C4/Output.pm
+++ b/C4/Output.pm
@@ -98,6 +98,7 @@ sub gettemplate {
     my $template       = HTML::Template::Pro->new(
         filename          => $filename,
         die_on_bad_params => 1,
+        default_escape    => 'html',
         global_vars       => 1,
         case_sensitive    => 1,
         loop_context_vars => 1, # enable: __first__, __last__, __inner__, __odd__, __counter__ 
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
index fe7e7db..d3e85d3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
@@ -12,7 +12,7 @@
 <!-- /TMPL_IF -->
 <link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR NAME="themelang" -->/css/print.css" />
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/lib/jquery/plugins/ui.tabs.css" />
-<!-- TMPL_IF NAME="OPACUserCSS" --><style type="text/css"><!-- TMPL_VAR NAME="OPACUserCSS" --></style><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="OPACUserCSS" --><style type="text/css"><!-- TMPL_VAR NAME="OPACUserCSS" ESCAPE="0" --></style><!-- /TMPL_IF -->
 <!-- yui js --> 
 <script type="text/javascript" src="<!-- TMPL_VAR NAME="yuipath" -->/utilities/utilities.js"></script> 
 <script type="text/javascript" src="<!-- TMPL_VAR NAME="yuipath" -->/container/container-min.js"></script> 
@@ -57,7 +57,7 @@
 	<!-- TMPL_IF NAME="SyndeticsCoverImages" -->$(window).load(function() {
             verify_images();
          });<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="opacuserjs" --><!-- TMPL_VAR NAME="opacuserjs" --><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="opacuserjs" --><!-- TMPL_VAR NAME="opacuserjs" ESCAPE="0" --><!-- /TMPL_IF -->
 	//]]>
 </script><script type="text/javascript" language="javascript"
 <!-- TMPL_IF NAME="opacbookbag" -->src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"><!-- TMPL_ELSIF NAME="virtualshelves" -->src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"><!-- TMPL_ELSE -->>var readCookie;<!-- /TMPL_IF --></script>
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc
index 7af0218..c3f4adf 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc
@@ -1,5 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="<!-- TMPL_VAR NAME="lang" -->" xml:lang="<!-- TMPL_VAR NAME="lang" -->" <!-- TMPL_IF NAME="bidi" -->dir="<!-- TMPL_VAR NAME="bidi" -->"<!-- /TMPL_IF --> xmlns="http://www.w3.org/1999/xhtml">
+<!-- TMPL_IF NAME="bidi" -->
+<html lang="<!-- TMPL_VAR NAME="lang" -->" xml:lang="<!-- TMPL_VAR NAME="lang" -->" dir="<!-- TMPL_VAR NAME="bidi" -->" xmlns="http://www.w3.org/1999/xhtml">
+<!-- TMPL_ELSE -->
+<html lang="<!-- TMPL_VAR NAME="lang" -->" xml:lang="<!-- TMPL_VAR NAME="lang" -->" xmlns="http://www.w3.org/1999/xhtml">
+<!-- /TMPL_IF -->
 <head>
 <title>
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 878a412..2830905 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -15,7 +15,7 @@
   <!-- /TMPL_IF -->
 </div>
   <!-- TMPL_IF NAME="opacheader" -->
-	<!-- TMPL_VAR NAME="opacheader" -->
+	<!-- TMPL_VAR NAME="opacheader" ESCAPE="0" -->
   <!-- /TMPL_IF -->
 <div id="opac-main-search" class="yui-g">
    <!-- TMPL_IF NAME="opacsmallimage" -->
@@ -78,7 +78,7 @@
       <select name="limit" id="masthead_search" class="left" style="max-width:10em;width:10em;">
          <option value="">All Libraries</option>
          <!-- TMPL_LOOP NAME="BranchesLoop" -->
-            <option <!-- TMPL_IF NAME="selected" -->SELECTED<!-- /TMPL_IF --> value="branch:<!-- TMPL_VAR NAME='value' -->"><!-- TMPL_VAR NAME='branchname' --></option>
+            <option <!-- TMPL_IF NAME="selected" -->SELECTED<!-- /TMPL_IF --> value="branch:<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
          <!-- /TMPL_LOOP -->
       </select>
    <!-- TMPL_ELSE -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
index 78841ce..9167e7a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
@@ -1 +1 @@
-<!-- TMPL_VAR NAME="OpacNav" -->
\ No newline at end of file
+<!-- TMPL_VAR NAME="OpacNav" ESCAPE="0" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
index 94a86e9..db2b02f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
@@ -1,7 +1,7 @@
 
 <!-- TMPL_IF NAME="opaccredits" -->
 	<div class="ft">
-        <!-- TMPL_VAR NAME="opaccredits" -->
+        <!-- TMPL_VAR NAME="opaccredits" ESCAPE="0" -->
     </div>
 <!-- /TMPL_IF -->
 </div>
@@ -12,7 +12,7 @@
         <!-- TMPL_LOOP NAME="languages_loop" -->
             <!-- TMPL_IF NAME="group_enabled" -->
             <!-- TMPL_IF NAME="plural" -->
-            <a id="show<!-- TMPL_VAR NAME="rfc4646_subtag" -->" class="sublangs more" href="#"><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" --><!-- /TMPL_IF --></a>
+            <a id="show<!-- TMPL_VAR NAME="rfc4646_subtag" -->" class="sublangs more" href="#"><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" ESCAPE="0" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" --><!-- /TMPL_IF --></a>
 			<div id="sub<!-- TMPL_VAR NAME="rfc4646_subtag" -->">
             <div class="bd"><ul>
             <!-- TMPL_LOOP NAME="sublanguages_loop" -->
@@ -20,7 +20,7 @@
                 <!-- TMPL_IF NAME="sublanguage_current" -->
                     <li> <!-- TMPL_VAR NAME="native_description" --> <!-- TMPL_VAR NAME="script_description" --> <!-- TMPL_VAR NAME="region_description" --> <!-- TMPL_VAR NAME="variant_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</li>
                 <!-- TMPL_ELSE -->
-                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"> <!-- TMPL_VAR NAME="native_description" --> <!-- TMPL_VAR NAME="script_description" --> <!-- TMPL_VAR NAME="region_description" --> <!-- TMPL_VAR NAME="variant_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a></li>
+                <li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"> <!-- TMPL_VAR NAME="native_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="script_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="region_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="variant_description" ESCAPE="0" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a></li>
                 <!-- /TMPL_IF -->
 		<!-- /TMPL_IF -->
             <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tmpl
index dfe1495..2a78374 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" DEFAULT="Koha Online" --> &rsaquo; ILS-DI
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; ILS-DI
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
index 039e2ea..e90b0b2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
@@ -37,7 +37,7 @@
 <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></span>
 <!-- /TMPL_IF --> <span class="view"><span id="ISBDview">ISBD View</span></span>
 </div>
-    <div id="isbdcontents"><!-- TMPL_VAR name="ISBD" --></div>
+    <div id="isbdcontents"><!-- TMPL_VAR name="ISBD" ESCAPE="0" --></div>
 	
 	</div>
 	</div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
index 319d0d7..26119ca 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
@@ -148,7 +148,7 @@
                 </tr>
                 <!-- TMPL_LOOP name="item_loop" -->
                     <tr>
-                        <!-- TMPL_VAR name="item_value" -->
+                        <!-- TMPL_VAR name="item_value" ESCAPE="0" -->
                     </tr>
                 <!-- /TMPL_LOOP -->
         </table><!-- TMPL_ELSE -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
index 0b7f220..81888ee 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
@@ -37,7 +37,7 @@
                     <!-- TMPL_IF NAME="odd" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
                         <td><!-- TMPL_VAR NAME="date" --></td>
                         <td><!-- TMPL_VAR NAME="description" -->
-                        <!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" escape="html" --><!-- /TMPL_IF --></td>
+                        <!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
                         <!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amount" --></td>
                         <!-- TMPL_IF NAME="amountoutstandingcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="amountoutstanding" --></td>
                     </tr>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl
index f85d914..d57d9c0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl
@@ -17,7 +17,7 @@
 		<!-- /TMPL_IF -->
     	<ul>
 		<!-- TMPL_LOOP NAME="biblios"-->
-    		<li> <span class="title"><!-- TMPL_VAR NAME="title" ESCAPE="html"--></span>
+    		<li> <span class="title"><!-- TMPL_VAR NAME="title"--></span>
         	<!-- TMPL_IF NAME="author"--><span class="author"> <!-- TMPL_VAR NAME="author"--> </span><!-- /TMPL_IF -->
         	</li>
         <!-- /TMPL_LOOP -->
@@ -25,7 +25,7 @@
 		<!-- TMPL_IF NAME="CGIvirtualshelves"-->
 			<form name="f1" action="/cgi-bin/koha/opac-addbybiblionumber.pl" method="post">
     		<fieldset class="rows"><legend>Select a List</legend>
-			<ol><li>    <label for="shelfnumber">Add to list:</label> <!-- TMPL_VAR NAME="CGIvirtualshelves" --></li></ol>
+			<ol><li>    <label for="shelfnumber">Add to list:</label> <!-- TMPL_VAR NAME="CGIvirtualshelves" ESCAPE="0" --></li></ol>
  			<!-- TMPL_LOOP NAME="biblios" --> <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><!-- /TMPL_LOOP -->
     		<input type="hidden" name="modifyshelfcontents" value="1" /></fieldset>
     		<fieldset class="action"><input type="submit" value="Save" class="submit" /> <a class="close cancel" href="#">Cancel</a></fieldset>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
index e314342..0d46c1e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
@@ -161,14 +161,14 @@ function tagAdded() {
     <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
     <h3>
         <!-- TMPL_IF NAME="print_basket" -->
-            <!-- TMPL_VAR NAME="title" escape="html" -->
-                <!-- TMPL_IF name="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" escape="html" --><!-- /TMPL_LOOP --><!-- /TMPL_IF -->
-                <!-- TMPL_IF name="author" --> <!-- TMPL_VAR NAME="author" escape="html" --><!-- /TMPL_IF -->
+            <!-- TMPL_VAR NAME="title" -->
+                <!-- TMPL_IF name="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF -->
+                <!-- TMPL_IF name="author" --> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
         <!-- TMPL_ELSE -->
                 <input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" onclick="selRecord(value,checked)" />
-                <!-- TMPL_VAR NAME="title" escape="html" -->
-                <!-- TMPL_IF name="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" escape="html" --><!-- /TMPL_LOOP --><!-- /TMPL_IF -->
-                <!-- TMPL_IF name="author" --> <!-- TMPL_VAR NAME="author" escape="html"--><!-- /TMPL_IF -->
+                <!-- TMPL_VAR NAME="title" -->
+                <!-- TMPL_IF name="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF -->
+                <!-- TMPL_IF name="author" --> <!-- TMPL_VAR NAME="author"--><!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
     </h3>
 	    <!-- COinS / OpenURL -->
@@ -352,7 +352,7 @@ function tagAdded() {
                 </td> <!-- /TMPL_UNLESS -->
             <td>
 		<a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)">
-                        <!-- TMPL_VAR NAME="title" escape="html" --><!-- TMPL_IF name="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" escape="html" --><!-- /TMPL_LOOP --><!-- /TMPL_IF -->
+                        <!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF -->
                 </a>
                 <!-- COinS / OpenURL -->
 		    <span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&amp;rft.au=<!-- TMPL_VAR NAME="author" -->&amp;rft.btitle=<!-- TMPL_VAR NAME="title" ESCAPE="url" -->&amp;rft.date=<!-- TMPL_VAR NAME="publicationyear" -->&amp;rft.tpages=<!-- TMPL_VAR NAME="size" -->&amp;rft.isbn=<!-- TMPL_VAR NAME="isbn"  ESCAPE="url" -->&amp;rft.aucorp=&amp;rft.place=<!-- TMPL_VAR NAME="place" -->&amp;rft.pub=<!-- TMPL_VAR NAME="publisher" ESCAPE="url" -->&amp;rft.edition=<!-- TMPL_VAR NAME="edition" -->&amp;rft.series=<!-- TMPL_VAR NAME="series" -->&amp;rft.genre="></span>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
index 66f2a66..048f514 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  ISBD
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  Browse by Hierarchy
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body id="opac-browser">
@@ -18,7 +18,7 @@
         <li style="list-style-type: none;"><ul>
         <!-- TMPL_LOOP name="HIERARCHY_LOOP" -->
                 <li>
-                    <a href="opac-browser.pl?level=<!-- TMPL_VAR name="level"-->&amp;filter=<!-- TMPL_VAR name="classification" ESCAPE="uri" -->"><!-- TMPL_VAR name="description" ESCAPE="html" --></a>
+                    <a href="opac-browser.pl?level=<!-- TMPL_VAR name="level"-->&amp;filter=<!-- TMPL_VAR name="classification" ESCAPE="uri" -->"><!-- TMPL_VAR name="description" --></a>
                 </li>
             <li  style="list-style-type: none;"><ul>
         <!-- /TMPL_LOOP -->
@@ -27,9 +27,9 @@
                 <td width="33%">
                 <p>
                 <!-- TMPL_IF name="endnode" -->
-                    <a href="opac-search.pl?q=Dewey-classification:<!-- TMPL_VAR name="classification" ESCAPE="uri" -->"><!-- TMPL_VAR name="description" ESCAPE="html" --></a>
+                    <a href="opac-search.pl?q=Dewey-classification:<!-- TMPL_VAR name="classification" ESCAPE="uri" -->"><!-- TMPL_VAR name="description" --></a>
                 <!-- TMPL_ELSE -->
-                    <a href="opac-browser.pl?level=<!-- TMPL_VAR name="level"-->&amp;filter=<!-- TMPL_VAR name="classification" ESCAPE="uri" -->"><!-- TMPL_VAR name="description" ESCAPE="html" --></a>
+                    <a href="opac-browser.pl?level=<!-- TMPL_VAR name="level"-->&amp;filter=<!-- TMPL_VAR name="classification" ESCAPE="uri" -->"><!-- TMPL_VAR name="description" --></a>
                 <!-- /TMPL_IF --></p>
                 <p style="font-size:0.75em"><i>(<!-- TMPL_VAR name="number"--> biblios)</i></p>
                 </td>
@@ -41,7 +41,7 @@
         <!-- /TMPL_LOOP -->
         </ul></li></ul>
         <!-- TMPL_ELSE -->
-            <div class="warning">The browser table is empty. this feature is not fully set-up. See the <a href="http://wiki.koha.org/doku.php?id=opacbrowser">Koha Wiki</a> for more information on what it does and how to configure it.</div>
+            <div class="dialog message">The browser table is empty. this feature is not fully set-up. See the <a href="http://wiki.koha.org/doku.php?id=opacbrowser">Koha Wiki</a> for more information on what it does and how to configure it.</div>
         <!-- /TMPL_IF -->
 </div></div>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index b1fdf84..118c5c4 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; Details for: <!-- TMPL_VAR NAME="title" escape="html" --><!-- TMPL_LOOP NAME="subtitle" -->, <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; Details for: <!-- TMPL_VAR NAME="title" --><!-- TMPL_LOOP NAME="subtitle" -->, <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/JavaScript" language="JavaScript">
@@ -80,7 +80,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     <!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
     <!-- TMPL_IF NAME="GoogleJackets" --><div style="block" title="<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" class="<!-- TMPL_VAR NAME="normalized_isbn" -->" id="gbs-thumbnail-preview"></div><!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="normalized_isbn" --><!-- TMPL_IF NAME="OPACURLOpenInNewWindow" --><a href="https://<!-- TMPL_VAR NAME="BakerTaylorBookstoreURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="normalized_isbn" -->" target="_blank"><img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="normalized_isbn" -->" /></a><!-- TMPL_ELSE --><a href="https://<!-- TMPL_VAR NAME="BakerTaylorBookstoreURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="normalized_isbn" -->"><img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="normalized_isbn" -->" /></a><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="normalized_isbn" --><!-- TMPL_IF NAME="OPACURLOpenInNewWindow" --><a href="https://<!-- TMPL_VAR NAME="BakerTaylorBookstoreURL" --><!-- TMPL_VAR NAME="normalized_isbn" -->" target="_blank"><img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" --><!-- TMPL_VAR NAME="normalized_isbn" -->" /></a><!-- TMPL_ELSE --><a href="https://<!-- TMPL_VAR NAME="BakerTaylorBookstoreURL" --><!-- TMPL_VAR NAME="normalized_isbn" -->"><img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" --><!-- TMPL_VAR NAME="normalized_isbn" -->" /></a><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
     </div>
 
     <abbr class="unapi-id" title="koha:biblionumber:<!-- TMPL_VAR NAME="biblionumber" -->"><!-- unAPI --></abbr>
@@ -90,10 +90,10 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     <!-- /TMPL_IF -->
 
     <!-- TMPL_IF NAME="OPACXSLTDetailsDisplay" -->
-        <!-- TMPL_VAR NAME="XSLTBloc" -->
+        <!-- TMPL_VAR NAME="XSLTBloc" ESCAPE="0" -->
     <!-- TMPL_ELSE -->
-    <h1><!-- TMPL_VAR NAME="title" escape="html" --><!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --> <!-- /TMPL_LOOP --></span><!-- /TMPL_IF --></h1>
-    <!-- TMPL_IF NAME="author" --><h5 class="author">by <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" ESCAPE="HTML" --></a></h5><!-- /TMPL_IF --> 
+    <h1><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> <span class="subtitle"><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --> <!-- /TMPL_LOOP --></span><!-- /TMPL_IF --></h1>
+    <!-- TMPL_IF NAME="author" --><h5 class="author">by <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a></h5><!-- /TMPL_IF --> 
     <div id="views"><span class="view"><span id="Normalview">Normal View</span></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></span> <!-- TMPL_IF NAME="ISBD" --><span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD View</a></span><!-- /TMPL_IF -->
     </div>
 
@@ -133,7 +133,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     <!-- TMPL_IF name="publishercode" -->
     <span class="results_summary"><span class="label">Published by :</span>
         <a href="/cgi-bin/koha/opac-search.pl?q=pb:<!-- TMPL_VAR NAME="publishercode" ESCAPE="URL" --> ">
-            <!-- TMPL_VAR NAME="publishercode" ESCAPE="HTML" --> 
+            <!-- TMPL_VAR NAME="publishercode" --> 
         </a> <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
     </span>
     <!-- /TMPL_IF -->
@@ -228,7 +228,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <!-- TMPL_IF NAME="GetShelves" -->
 	<span class="results_summary"><span class="label">List(s) this item appears in: </span>
 	<!-- TMPL_LOOP NAME="GetShelves" -->
-		<a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelfnumber" -->&sortfield=title"><!-- TMPL_VAR NAME="shelfname" --></a> 
+		<a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelfnumber" -->&amp;sortfield=title"><!-- TMPL_VAR NAME="shelfname" --></a> 
 		<!-- TMPL_IF NAME="__LAST__" --><!-- TMPL_ELSE -->|<!-- /TMPL_IF -->
 	<!-- /TMPL_LOOP -->
 	</span>
@@ -239,7 +239,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
         <!-- TMPL_IF NAME="TagLoop" -->
         <span class="label">Tags from this library:</span>
             <ul><!-- TMPL_LOOP NAME="TagLoop" -->
-            <li><a href="/cgi-bin/koha/opac-search.pl?tag=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->&amp;q=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="term" ESCAPE="HTML" --></a> <span class="weight">(<!-- TMPL_VAR NAME="weight_total" -->)</span></li>
+            <li><a href="/cgi-bin/koha/opac-search.pl?tag=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->&amp;q=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="term" --></a> <span class="weight">(<!-- TMPL_VAR NAME="weight_total" -->)</span></li>
             <!-- /TMPL_LOOP -->
             </ul><!-- TMPL_ELSE --><span class="label">Tags from this library:</span><div>No tags from this library for this title.</div> 
         <!-- /TMPL_IF -->
@@ -302,7 +302,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 
     <!-- TMPL_IF NAME="BakerTaylorContentURL" -->
         <span class="results_summary">
-        <span class="label">Enhanced Content:</span><!-- TMPL_IF NAME="OPACURLOpenInNewWindow" --><a href="<!-- TMPL_VAR NAME="BakerTaylorContentURL" ESCAPE="HTML" -->" target="_blank">Content Cafe</a><!-- TMPL_ELSE --><a href="<!-- TMPL_VAR NAME="BakerTaylorContentURL" ESCAPE="HTML" -->">Content Cafe</a><!-- /TMPL_IF -->
+        <span class="label">Enhanced Content:</span><!-- TMPL_IF NAME="OPACURLOpenInNewWindow" --><a href="<!-- TMPL_VAR NAME="BakerTaylorContentURL" -->" target="_blank">Content Cafe</a><!-- TMPL_ELSE --><a href="<!-- TMPL_VAR NAME="BakerTaylorContentURL" -->">Content Cafe</a><!-- /TMPL_IF -->
         </span>
     <!-- /TMPL_IF -->
 </div>
@@ -433,7 +433,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     <!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="GoogleJackets" --><!-- TMPL_IF NAME="browser_normalized_isbn" --><div style="block" title="<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" class="<!-- TMPL_VAR name="browser_normalized_isbn" -->" id="gbs-thumbnail-preview<!--TMPL_VAR NAME="__counter__"-->"></div><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="browser_normalized_isbn" -->
-    <img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="browser_normalized_isbn" -->" /><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
+    <img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" --><!-- TMPL_VAR NAME="browser_normalized_isbn" -->" /><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
 </a></td>
 <!-- /TMPL_LOOP -->
@@ -452,7 +452,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 
     <!-- TMPL_IF NAME="GoogleJackets" --><!-- TMPL_IF NAME="browser_normalized_isbn" --><div style="block" title="<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" class="<!-- TMPL_VAR name="browser_normalized_isbn" -->" id="gbs-thumbnail-preview<!--TMPL_VAR NAME="__counter__"-->"></div><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="browser_normalized_isbn" -->
-    <img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="browser_normalized_isbn" -->" /><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
+    <img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" --><!-- TMPL_VAR NAME="browser_normalized_isbn" -->" /><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
 </a></td>
 <!-- /TMPL_LOOP -->
@@ -461,11 +461,11 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 
 <tr>
 <!-- TMPL_LOOP NAME="PREVIOUS_SHELF_BROWSE" -->
-<td class="top"><!-- TMPL_VAR NAME="itemcallnumber" --><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser"><!-- TMPL_VAR NAME="title" escape="html" --></a></td>
+<td class="top"><!-- TMPL_VAR NAME="itemcallnumber" --><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser"><!-- TMPL_VAR NAME="title" --></a></td>
 <!-- /TMPL_LOOP -->
 
 <!-- TMPL_LOOP NAME="NEXT_SHELF_BROWSE" -->
-       <td class="top"><!-- TMPL_VAR NAME="itemcallnumber" --><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser"><!-- TMPL_VAR NAME="title" escape="html" --></a></td>
+       <td class="top"><!-- TMPL_VAR NAME="itemcallnumber" --><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser"><!-- TMPL_VAR NAME="title" --></a></td>
 <!-- /TMPL_LOOP -->
 </tr>
 </table>
@@ -483,7 +483,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <!-- TMPL_LOOP NAME="AMAZON_EDITORIAL_REVIEWS" -->
     <!-- TMPL_IF NAME="Content" -->
     <h4>From <!-- TMPL_VAR NAME="Source" -->:</h4>
-    <div><!-- TMPL_VAR NAME="Content" --></div>
+    <div><!-- TMPL_VAR NAME="Content" ESCAPE="0" --></div>
     <!-- /TMPL_IF -->
 <!-- /TMPL_LOOP -->
 <!-- /TMPL_IF-->
@@ -492,7 +492,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <!-- TMPL_IF NAME="SyndeticsSummary" -->
 <!-- TMPL_IF NAME="SYNDETICS_SUMMARY" -->
     <h4>Enhanced Descriptions from Syndetics:</h4>
-    <p><!-- TMPL_VAR NAME="SYNDETICS_SUMMARY" --></p>
+    <p><!-- TMPL_VAR NAME="SYNDETICS_SUMMARY" ESCAPE="0" --></p>
 <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
@@ -530,7 +530,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <div id="excerpt">
 <div class="content_set">
 <h3>Excerpt provided by Syndetics</h3>
-<!-- TMPL_VAR NAME="SYNDETICS_EXCERPT" -->
+<!-- TMPL_VAR NAME="SYNDETICS_EXCERPT" ESCAPE="0" -->
 </div>
 </div>
 <!-- /TMPL_IF --><!-- /TMPL_IF -->
@@ -545,7 +545,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 	<!-- TMPL_LOOP NAME="reviews" -->
 
 	<!-- TMPL_IF NAME="content" -->
-		<!-- TMPL_VAR NAME="content" -->
+		<!-- TMPL_VAR NAME="content" ESCAPE="0" -->
 	<!-- /TMPL_IF -->
 
 	<!-- /TMPL_LOOP -->
@@ -561,7 +561,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <h3>Author Notes provided by Syndetics</h3>
 <!-- TMPL_LOOP NAME="SYNDETICS_ANOTES" -->
     <!-- TMPL_IF NAME="content" -->
-        <!-- TMPL_VAR NAME="content" -->
+        <!-- TMPL_VAR NAME="content" ESCAPE="0" -->
     <!-- /TMPL_IF -->
 <!-- /TMPL_LOOP -->
 </div>
@@ -716,8 +716,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
 </td>
-<td><!-- TMPL_VAR NAME="description" --></td><td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a><!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR NAME="author" ESCAPE="HTML" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="copyrightdate" --> &copy;<!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->
-    <p><!-- TMPL_VAR NAME="publishercode" ESCAPE="HTML" --> 
+<td><!-- TMPL_VAR NAME="description" --></td><td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="copyrightdate" --> &copy;<!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->
+    <p><!-- TMPL_VAR NAME="publishercode" --> 
        <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="pages" --><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></p><!-- /TMPL_IF -->
     <!-- /TMPL_IF --></td>
@@ -744,7 +744,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     <img border="0" src="https://secure.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="browser_normalized_isbn" -->/SC.GIF&amp;client=<!-- TMPL_VAR NAME="SyndeticsClientCode" --><!-- TMPL_IF NAME="browser_normalized_upc" -->&amp;upc=<!-- TMPL_VAR NAME="browser_normalized_upc" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="browser_normalized_oclc" -->&amp;oclc=<!-- TMPL_VAR NAME="browser_normalized_oclc" --><!-- /TMPL_IF -->&amp;type=xw10" alt="" />
     <!-- TMPL_ELSE --><img border="0" src="http://www.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="browser_normalized_isbn" -->/SC.GIF&amp;client=<!-- TMPL_VAR NAME="SyndeticsClientCode" --><!-- TMPL_IF NAME="browser_normalized_upc" -->&amp;upc=<!-- TMPL_VAR NAME="browser_normalized_upc" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="browser_normalized_oclc" -->&amp;oclc=<!-- TMPL_VAR NAME="browser_normalized_oclc" --><!-- /TMPL_IF -->&amp;type=xw10" alt="" /><!-- /TMPL_IF -->
     <!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
-<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" ESCAPE="HTML" --></a> </td>
+<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> </td>
 <!-- /TMPL_LOOP -->
 <!-- /TMPL_LOOP -->
 </tr></table>
@@ -760,9 +760,9 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 
         <!-- TMPL_LOOP NAME="AMAZON_CUSTOMER_REVIEWS" -->
             <div class="content_set">
-            <div class="clearfix" style="margin: .5em 0;"><h4 style="float: left;"><!-- TMPL_VAR NAME="Summary" ESCAPE="HTML" --></h4>  <span class="starMT" style="float: left;"><span class="starFull" style="float: left; width:<!-- TMPL_VAR EXPR="Rating * 10" -->px"></span></span> </div>  <!-- TMPL_VAR NAME="Date" -->
+            <div class="clearfix" style="margin: .5em 0;"><h4 style="float: left;"><!-- TMPL_VAR NAME="Summary" --></h4>  <span class="starMT" style="float: left;"><span class="starFull" style="float: left; width:<!-- TMPL_VAR EXPR="Rating * 10" -->px"></span></span> </div>  <!-- TMPL_VAR NAME="Date" -->
             <!-- TMPL_IF NAME="Content" -->
-                <p style="margin-left: .2em;"><!-- TMPL_VAR NAME="Content" ESCAPE="HTML" --></p>
+                <p style="margin-left: .2em;"><!-- TMPL_VAR NAME="Content" ESCAPE="0" --></p>
             <!-- /TMPL_IF -->
             </div>
         <!-- /TMPL_LOOP -->
@@ -814,7 +814,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <h4>Search for this title in:</h4>
 <ul class="first-of-type">
 
-<!-- TMPL_VAR NAME="OPACSearchForTitleIn" -->
+<!-- TMPL_VAR NAME="OPACSearchForTitleIn" ESCAPE="0" -->
 
 </ul>
 </div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
index d1c5b3a..5d9eae4 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl
@@ -35,7 +35,7 @@
 </div>
 <!-- /TMPL_IF -->
 
-	<!-- TMPL_IF NAME="OpacMainUserBlock" --><div id="opacmainuserblock" class="container"><!-- TMPL_VAR NAME="OpacMainUserBlock" --></div><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="OpacMainUserBlock" --><div id="opacmainuserblock" class="container"><!-- TMPL_VAR NAME="OpacMainUserBlock" ESCAPE="0" --></div><!-- /TMPL_IF -->
 
 </div>
 		
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-mymessages.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-mymessages.tmpl
index 78d496d..6e102e9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-mymessages.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-mymessages.tmpl
@@ -13,11 +13,11 @@
       <webMaster></webMaster>
       <!-- TMPL_LOOP NAME="message_list" -->
       <item>
-        <title><!-- TMPL_VAR ESCAPE=HTML NAME="subject" --></title>
-        <link><!-- TMPL_VAR ESCAPE=HTML NAME="title" --></link>
-        <description><!-- TMPL_VAR ESCAPE=HTML NAME="content"--></description>
-        <pubDate><!-- TMPL_VAR ESCAPE=HTML NAME="time_queued" --></pubDate>
-        <guid><!-- TMPL_VAR ESCAPE=HTML NAME="title" --></guid>
+        <title><!-- TMPL_VAR NAME="subject" --></title>
+        <link><!-- TMPL_VAR NAME="title" --></link>
+        <description><!-- TMPL_VAR NAME="content"--></description>
+        <pubDate><!-- TMPL_VAR NAME="time_queued" --></pubDate>
+        <guid><!-- TMPL_VAR NAME="title" --></guid>
       </item>
       <!-- /TMPL_LOOP -->
    </channel>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tmpl
index 05b4221..a416aef 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tmpl
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='utf-8'  ?>
 <!-- TMPL_IF NAME="opensearchdescription" -->
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-   <ShortName><!-- TMPL_VAR NAME="LibraryName" ESCAPE="html" --> Search</ShortName>
-   <Description>Search the <!-- TMPL_VAR NAME="LibraryName" ESCAPE="html" --></Description>
-   <Tags>koha opac <!-- TMPL_VAR NAME="LibraryName" ESCAPE="html" --></Tags>
-   <Contact><!-- TMPL_VAR NAME="KohaAdminEmailAddress" ESCAPE="html" --></Contact>
+   <ShortName><!-- TMPL_VAR NAME="LibraryName" --> Search</ShortName>
+   <Description>Search the <!-- TMPL_VAR NAME="LibraryName" --></Description>
+   <Tags>koha opac <!-- TMPL_VAR NAME="LibraryName" --></Tags>
+   <Contact><!-- TMPL_VAR NAME="KohaAdminEmailAddress" --></Contact>
    <Url type="application/rss+xml"
         template="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?q={searchTerms}&amp;pw={startPage?}&amp;format=rss2"/>
 </OpenSearchDescription>
@@ -16,10 +16,10 @@
       xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"
       xmlns:atom="http://www.w3.org/2005/Atom">
    <channel>
-     <title><![CDATA[<!-- TMPL_VAR NAME="LibraryName" ESCAPE="html" --> Search <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" ESCAPE="html" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" --> with limit(s): '<!-- TMPL_VAR NAME="limit_desc" ESCAPE="html" -->'<!-- /TMPL_IF -->]]></title>
-     <link><!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi"  ESCAPE="HTML" -->&amp;format=rss2</link>
-     <atom:link rel="self" type="application/rss+xml" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi"  ESCAPE="HTML" -->&amp;format=rss2" />
-     <description><![CDATA[ Search results <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" ESCAPE="html" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" --> with limit(s): '<!-- TMPL_VAR NAME="limit_desc" ESCAPE="html" -->'<!-- /TMPL_IF --> at <!-- TMPL_VAR NAME="LibraryName" ESCAPE="html" -->]]></description>
+     <title><![CDATA[<!-- TMPL_VAR NAME="LibraryName" --> Search <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" --> with limit(s): '<!-- TMPL_VAR NAME="limit_desc" -->'<!-- /TMPL_IF -->]]></title>
+     <link><!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi"  -->&amp;format=rss2</link>
+     <atom:link rel="self" type="application/rss+xml" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi"  -->&amp;format=rss2" />
+     <description><![CDATA[ Search results <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" --> with limit(s): '<!-- TMPL_VAR NAME="limit_desc" -->'<!-- /TMPL_IF --> at <!-- TMPL_VAR NAME="LibraryName" -->]]></description>
      <opensearch:totalResults><!-- TMPL_VAR NAME="total" --></opensearch:totalResults>
      <opensearch:startIndex><!-- TMPL_VAR NAME="offset" --></opensearch:startIndex>
      <!-- TMPL_IF NAME="results_per_page" -->
@@ -28,11 +28,11 @@
        <opensearch:itemsPerPage>20</opensearch:itemsPerPage>
      <!-- /TMPL_IF -->
      <atom:link rel="search" type="application/opensearchdescription+xml" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?format=opensearchdescription"/>
-     <opensearch:Query role="request" searchTerms="<!-- TMPL_VAR NAME="query_desc" ESCAPE="html" --> <!-- TMPL_VAR NAME="limit_desc" ESCAPE="html" -->" startPage="<!-- TMPL_VAR NAME="page" -->" />
+     <opensearch:Query role="request" searchTerms="<!-- TMPL_VAR NAME="query_desc" --> <!-- TMPL_VAR NAME="limit_desc" -->" startPage="<!-- TMPL_VAR NAME="page" -->" />
 	 <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
      <item>
-       <title><!-- TMPL_VAR NAME="title" ESCAPE="html" --> <!-- TMPL_LOOP NAME="subtitle" -->, <!-- TMPL_VAR ESCAPE="HTML" NAME="subfield" --><!-- /TMPL_LOOP --></title>
-       <isbn><!-- TMPL_VAR NAME="isbn" ESCAPE="html" --></isbn>
+       <title><!-- TMPL_VAR NAME="title" --> <!-- TMPL_LOOP NAME="subtitle" -->, <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></title>
+       <isbn><!-- TMPL_VAR NAME="isbn" --></isbn>
        <link><!-- TMPL_IF name="BiblioDefaultViewmarc" --><!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" --><!-- TMPL_ELSE --><!-- TMPL_IF name="BiblioDefaultViewisbd" --><!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" --><!-- /TMPL_IF --><!-- /TMPL_IF --></link>
        <description><![CDATA[
 <!-- TMPL_IF NAME="OPACAmazonEnabled" --><!-- TMPL_IF NAME="OPACAmazonCoverImages" --><!-- TMPL_IF NAME="normalized_isbn" --><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01.TZZZZZZZ.jpg" alt="" /><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
@@ -42,16 +42,16 @@
 <img src="http://www.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="normalized_isbn" -->/SC.GIF&amp;client=<!-- TMPL_VAR NAME="SyndeticsClientCode" -->&amp;type=xw10&amp;upc=<!-- TMPL_VAR NAME="normalized_upc" -->&amp;oclc=<!-- TMPL_VAR NAME="normalized_oclc" -->" alt="" />
 <!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="https://<!-- TMPL_VAR name="BakerTaylorBookstoreURL" ESCAPE="HTML" --><!-- TMPL_VAR name="normalized_isbn" -->"><img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR name="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR name="normalized_isbn" -->" /></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
-	   <p><!-- TMPL_IF NAME="author" -->By <!-- TMPL_VAR NAME="author"  ESCAPE="html" -->. <!-- /TMPL_IF -->
-	   <!-- TMPL_IF name="place" --><!-- TMPL_VAR name="place"  ESCAPE="html" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" --><!-- TMPL_VAR name="publishercode"  ESCAPE="html" --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> <!-- TMPL_VAR name="publicationyear"  ESCAPE="html" -->
-                    <!-- TMPL_ELSE --><!-- TMPL_IF name="copyrightdate" --> <!-- TMPL_VAR name="copyrightdate"  ESCAPE="html" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="pages" -->. <!-- TMPL_VAR name="pages"  ESCAPE="html" --><!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="notes" -->, <!-- TMPL_VAR name="notes"  ESCAPE="html" --><!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="size" --> <!-- TMPL_VAR name="size"  ESCAPE="html" -->. <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="isbn" --> <!-- TMPL_VAR name="isbn"  ESCAPE="html" --><!-- /TMPL_IF --> </p><p>
+<!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="https://<!-- TMPL_VAR name="BakerTaylorBookstoreURL" --><!-- TMPL_VAR name="normalized_isbn" -->"><img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR name="BakerTaylorImageURL" --><!-- TMPL_VAR name="normalized_isbn" -->" /></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
+	   <p><!-- TMPL_IF NAME="author" -->By <!-- TMPL_VAR NAME="author"  -->. <!-- /TMPL_IF -->
+	   <!-- TMPL_IF name="place" --><!-- TMPL_VAR name="place"  --> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" --><!-- TMPL_VAR name="publishercode"  --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> <!-- TMPL_VAR name="publicationyear"  -->
+                    <!-- TMPL_ELSE --><!-- TMPL_IF name="copyrightdate" --> <!-- TMPL_VAR name="copyrightdate"  --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="pages" -->. <!-- TMPL_VAR name="pages"  --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="notes" -->, <!-- TMPL_VAR name="notes"  --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="size" --> <!-- TMPL_VAR name="size"  -->. <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="isbn" --> <!-- TMPL_VAR name="isbn"  --><!-- /TMPL_IF --> </p><p>
 <!-- TMPL_IF NAME="RequestOnOpac" -->
-<a href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold on <i><!-- TMPL_VAR NAME="title" ESCAPE="html" --></i></a></p>
+<a href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold on <i><!-- TMPL_VAR NAME="title" --></i></a></p>
 <!-- /TMPL_IF -->
 						]]></description>
        <guid><!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" --></guid>
@@ -64,12 +64,12 @@
 <!-- TMPL_IF NAME="atom" -->
 <feed xmlns="http://www.w3.org/2005/Atom"
        xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/">
-   <id><!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="html" --><!-- TMPL_VAR NAME="limit_cgi" ESCAPE="html" -->&amp;format=atom</id>
-   <title><!-- TMPL_VAR NAME="LibraryName" ESCAPE="html" --> Search <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" ESCAPE="html" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" -->&nbsp;with limit(s):&nbsp;'<!-- TMPL_VAR NAME="limit_desc" ESCAPE="html" -->'<!-- /TMPL_IF --></title>
-    <link href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi"  ESCAPE="HTML" -->&amp;format=rss2"/>
+   <id><!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" -->&amp;format=atom</id>
+   <title><!-- TMPL_VAR NAME="LibraryName" --> Search <!-- TMPL_IF NAME="query_desc" -->for '<!-- TMPL_VAR NAME="query_desc" -->'<!-- /TMPL_IF --><!-- TMPL_IF NAME="limit_desc" -->&nbsp;with limit(s):&nbsp;'<!-- TMPL_VAR NAME="limit_desc" -->'<!-- /TMPL_IF --></title>
+    <link href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi"  -->&amp;format=rss2"/>
    <updated><!-- TMPL_VAR NAME="timestamp" --></updated>
    <author>
-     <name><!-- TMPL_VAR NAME="LibraryName" ESCAPE="html" --></name>
+     <name><!-- TMPL_VAR NAME="LibraryName" --></name>
    </author>
    <!-- <id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id> -->
    <opensearch:totalResults><!-- TMPL_VAR NAME="total" --></opensearch:totalResults>
@@ -79,18 +79,18 @@
    <!-- TMPL_ELSE -->
      <opensearch:itemsPerPage>20</opensearch:itemsPerPage>
    <!-- /TMPL_IF -->
-   <opensearch:Query role="request" searchTerms="<!-- TMPL_VAR NAME="query_desc" ESCAPE="html" --> <!-- TMPL_VAR NAME="limit_desc" ESCAPE="html" -->" startPage="<!-- TMPL_VAR NAME="page" ESCAPE="html" -->" />
-   <link rel="alternate" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi"  ESCAPE="HTML" -->pw=<!-- TMPL_VAR NAME="page" -->" type="text/html"/>
+   <opensearch:Query role="request" searchTerms="<!-- TMPL_VAR NAME="query_desc" --> <!-- TMPL_VAR NAME="limit_desc" -->" startPage="<!-- TMPL_VAR NAME="page" -->" />
+   <link rel="alternate" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi"  -->pw=<!-- TMPL_VAR NAME="page" -->" type="text/html"/>
    <link rel="self" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" -->&amp;format=atom" type="application/atom+xml"/>
    <link rel="first" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" -->pw=1&amp;format=atom" type="application/atom+xml"/>
    <link rel="previous" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" -->pw=2&amp;format=atom" type="application/atom+xml"/>
    <link rel="next" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" -->pw=4&amp;format=atom" type="application/atom+xml"/>
-   <link rel="last" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi"  ESCAPE="HTML" -->pw=42299&amp;format=atom" type="application/atom+xml"/>
+   <link rel="last" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi"  -->pw=42299&amp;format=atom" type="application/atom+xml"/>
    <link rel="search" type="application/opensearchdescription+xml" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?format=opensearchdescription"/>
 
    <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
    <entry>
-     <title><!-- TMPL_VAR NAME="title" ESCAPE="html" --></title>
+     <title><!-- TMPL_VAR NAME="title" --></title>
      <link href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"/>
      <!-- <id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id> -->
      <updated><!-- TMPL_VAR NAME="timestamp" --></updated>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
index 250a77a..66f2f88 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
@@ -67,16 +67,16 @@ You have never borrowed anything from this library.
 
     <!-- TMPL_IF NAME="GoogleJackets" --><!-- TMPL_IF NAME="normalized_isbn" --><div style="block" title="<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" class="<!-- TMPL_VAR name="normalized_isbn" -->" id="gbs-thumbnail<!--TMPL_VAR NAME="__counter__"-->"></div><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
-    <!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="https://<!-- TMPL_VAR NAME="BakerTaylorBookstoreURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="normalized_isbn" -->"><img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="normalized_isbn" -->" /></a><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="https://<!-- TMPL_VAR NAME="BakerTaylorBookstoreURL" --><!-- TMPL_VAR NAME="normalized_isbn" -->"><img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" --><!-- TMPL_VAR NAME="normalized_isbn" -->" /></a><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
 	<!-- TMPL_IF NAME="SyndeticsEnabled" --><!-- TMPL_IF NAME="SyndeticsCoverImages" --><!-- TMPL_IF NAME="using_https" -->
 	<img src="https://secure.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="normalized_isbn" -->/SC.GIF&amp;client=<!-- TMPL_VAR NAME="SyndeticsClientCode" -->&amp;type=xw10&amp;upc=<!-- TMPL_VAR NAME="normalized_upc" -->&amp;oclc=<!-- TMPL_VAR NAME="normalized_oclc" -->" alt="" class="thumbnail" />
 	<!--TMPL_ELSE -->
 	<img src="http://www.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="normalized_isbn" -->/SC.GIF&amp;client=<!-- TMPL_VAR NAME="SyndeticsClientCode" -->&amp;type=xw10&amp;upc=<!-- TMPL_VAR NAME="normalized_upc" -->&amp;oclc=<!-- TMPL_VAR NAME="normalized_oclc" -->" alt="" class="thumbnail" /><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
 </td>
-<td><!-- TMPL_IF NAME="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- TMPL_ELSE -->
-<!-- TMPL_IF NAME="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- TMPL_ELSE -->
-<a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
+<td><!-- TMPL_IF NAME="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- TMPL_ELSE -->
+<!-- TMPL_IF NAME="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- TMPL_ELSE -->
+<a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
                     <span class="item-details">
                         <!-- TMPL_VAR NAME="author" -->
                     </span></td>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index 812c91b..a24300b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" DEFAULT="Koha Online" --> Catalog &rsaquo;  Placing hold <!-- TMPL_VAR NAME="title" escape="html" --> for <!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" DEFAULT="Koha Online" --> Catalog &rsaquo;  Placing hold <!-- TMPL_VAR NAME="title" --> for <!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <script type="text/javascript">
@@ -291,7 +291,7 @@
                     </td>
                       <!-- /TMPL_IF -->
                     <td>
-                      <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --><!-- TMPL_IF NAME="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!--TMPL VAR Name="subfield"--><!--/TMPL_LOOP--><!-- /TMPL_IF --></a>
+                      <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!--TMPL VAR Name="subfield"--><!--/TMPL_LOOP--><!-- /TMPL_IF --></a>
                       <!-- TMPL_IF NAME="author" -->,  by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
                     </td>
                     <!-- TMPL_UNLESS NAME="item-level_itypes" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl
index 1d5e8f1..db42c66 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl
@@ -153,7 +153,7 @@ function highlightOn() {
 			<tr>
 			<!-- /TMPL_IF -->
                 <td>
-                    <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->&quot;<!-- TMPL_VAR NAME="title" ESCAPE="url" -->&quot;"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></a>
+                    <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->&quot;<!-- TMPL_VAR NAME="title" ESCAPE="url" -->&quot;"><!-- TMPL_VAR NAME="title" --></a>
                 </td>
                 <td>
                     <!-- TMPL_VAR NAME="subtitle" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index 3282600..5a6cd34 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -6,7 +6,7 @@
     You did not specify any search criteria.
 <!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<link rel="alternate" type="application/rss+xml" title="<!-- TMPL_VAR NAME="LibraryName" ESCAPE="HTML" --> Search RSS Feed" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" ESCAPE="HTML" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" ESCAPE="HTML" --><!-- /TMPL_IF -->&amp;format=rss2" />
+<link rel="alternate" type="application/rss+xml" title="<!-- TMPL_VAR NAME="LibraryName" --> Search RSS Feed" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;format=rss2" />
 
 
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
@@ -104,9 +104,9 @@ $(document).ready(function(){
 	<!-- TMPL_IF name="opacbookbag" -->	param1 += "<option value=\"addtocart\">"+_("Cart")+"<\/option>";
 	<!-- /TMPL_IF --><!-- TMPL_IF NAME="virtualshelves" --><!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="addbarshelves" -->
 	param1 += "<optgroup label=\""+_("Your Lists:")+"\">";<!-- TMPL_LOOP NAME="addbarshelvesloop" -->
-	param1 += "<option id=\"s<!-- TMPL_VAR NAME="shelfnumber" -->\" value=\"addtolist\"><!-- TMPL_VAR NAME="shelfname" ESCAPE="html"--><\/option>";<!-- /TMPL_LOOP -->
+	param1 += "<option id=\"s<!-- TMPL_VAR NAME="shelfnumber" -->\" value=\"addtolist\"><!-- TMPL_VAR NAME="shelfname"--><\/option>";<!-- /TMPL_LOOP -->
 	param1 += "<\/optgroup>";<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="addpubshelves" -->param1 += "<optgroup label=\""+_("Public Lists:")+"\">"<!-- TMPL_LOOP NAME="addpubshelvesloop" -->+"<option id=\"s<!-- TMPL_VAR NAME="shelfnumber" -->\" value=\"addtolist\"><!-- TMPL_VAR NAME="shelfname" ESCAPE="html"--><\/option>"<!-- /TMPL_LOOP --><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="addpubshelves" -->param1 += "<optgroup label=\""+_("Public Lists:")+"\">"<!-- TMPL_LOOP NAME="addpubshelvesloop" -->+"<option id=\"s<!-- TMPL_VAR NAME="shelfnumber" -->\" value=\"addtolist\"><!-- TMPL_VAR NAME="shelfname"--><\/option>"<!-- /TMPL_LOOP --><!-- /TMPL_IF -->
 	param1 +="<\/optgroup><option value=\"newlist\">[ "+_("New List")+" ]<\/option>"
 	<!-- /TMPL_IF -->
 	<!-- /TMPL_IF -->
@@ -118,9 +118,9 @@ $(document).ready(function(){
 		var param1 = "<label for=\"addto\">"+_("Add to list: ")+"<\/label><select name=\"addto\" id=\"addto\"><option value=\"\"><\/option>";
 <!-- TMPL_IF NAME="virtualshelves" --><!-- TMPL_IF NAME="loggedinusername" --><!-- TMPL_IF NAME="addbarshelves" -->
 	param1 += "<optgroup label=\""+_("Your Lists:")+"\">";<!-- TMPL_LOOP NAME="addbarshelvesloop" -->
-	param1 += "<option id=\"s<!-- TMPL_VAR NAME="shelfnumber" -->\" value=\"addtolist\"><!-- TMPL_VAR NAME="shelfname" ESCAPE="html"--><\/option>";<!-- /TMPL_LOOP -->
+	param1 += "<option id=\"s<!-- TMPL_VAR NAME="shelfnumber" -->\" value=\"addtolist\"><!-- TMPL_VAR NAME="shelfname"--><\/option>";<!-- /TMPL_LOOP -->
 	param1 += "<\/optgroup>";<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="addpubshelves" -->param1 += "<optgroup label=\""+_("Public Lists:")+"\">"<!-- TMPL_LOOP NAME="addpubshelvesloop" -->+"<option id=\"s<!-- TMPL_VAR NAME="shelfnumber" -->\" value=\"addtolist\"><!-- TMPL_VAR NAME="shelfname" ESCAPE="html"--><\/option>"<!-- /TMPL_LOOP --><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="addpubshelves" -->param1 += "<optgroup label=\""+_("Public Lists:")+"\">"<!-- TMPL_LOOP NAME="addpubshelvesloop" -->+"<option id=\"s<!-- TMPL_VAR NAME="shelfnumber" -->\" value=\"addtolist\"><!-- TMPL_VAR NAME="shelfname"--><\/option>"<!-- /TMPL_LOOP --><!-- /TMPL_IF -->
 	param1 +="<\/optgroup><option value=\"newlist\">[ "+_("New List")+" ]<\/option>"
 	<!-- /TMPL_IF -->
 	<!-- /TMPL_IF -->
@@ -302,7 +302,7 @@ $(document).ready(function(){
 			<tr>
 			<!-- /TMPL_IF -->
                 <td>
-                    <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->&quot;<!-- TMPL_VAR NAME="title"  ESCAPE="URL" -->&quot;"><!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" ESCAPE="html" --><!-- TMPL_ELSE -->No title<!-- /TMPL_IF --></a>
+                    <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->&quot;<!-- TMPL_VAR NAME="title"  ESCAPE="URL" -->&quot;"><!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" --><!-- TMPL_ELSE -->No title<!-- /TMPL_IF --></a>
                 </td>
                 <td>
                     <!-- TMPL_VAR NAME="author" -->
@@ -394,7 +394,7 @@ $(document).ready(function(){
                 <!-- /TMPL_IF -->
 
 				<!-- TMPL_IF NAME="OPACXSLTResultsDisplay" -->
-                <!-- TMPL_VAR NAME="XSLTResultsRecord" -->
+                <!-- TMPL_VAR NAME="XSLTResultsRecord" ESCAPE="0" -->
 				<!-- TMPL_ELSE -->
 				<!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title">
                                 <!-- TMPL_ELSE -->
@@ -402,7 +402,7 @@ $(document).ready(function(){
                                 <!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title">
                                 <!-- /TMPL_IF -->
                                 <!-- /TMPL_IF -->
-								<!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" ESCAPE="html" --><!-- TMPL_ELSE -->No title<!-- /TMPL_IF --> <!-- TMPL_LOOP NAME="subtitle"  --><!--TMPL_VAR Name="subfield"--><!--/TMPL_LOOP--></a>
+								<!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" --><!-- TMPL_ELSE -->No title<!-- /TMPL_IF --> <!-- TMPL_LOOP NAME="subtitle"  --><!--TMPL_VAR Name="subfield"--><!--/TMPL_LOOP--></a>
                                 <!-- TMPL_IF NAME="author" -->by <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->" title="Search for works by this author" class="author"><!-- TMPL_VAR NAME="author" --></a>
                                 <!-- TMPL_ELSE -->&nbsp;
                                 <!-- /TMPL_IF -->
@@ -515,7 +515,7 @@ $(document).ready(function(){
 
                 <!-- TMPL_IF NAME="GoogleJackets" --><!-- TMPL_IF NAME="normalized_isbn" --><div style="block" title="<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" class="<!-- TMPL_VAR name="normalized_isbn" -->" id="gbs-thumbnail<!--TMPL_VAR NAME="__counter__"-->"></div><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
                 </a>
-                <!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="https://<!-- TMPL_VAR name="BakerTaylorBookstoreURL" ESCAPE="HTML" --><!-- TMPL_VAR name="normalized_isbn" -->"><img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR name="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR name="normalized_isbn" -->" /></a><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="https://<!-- TMPL_VAR name="BakerTaylorBookstoreURL" --><!-- TMPL_VAR name="normalized_isbn" -->"><img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR name="BakerTaylorImageURL" --><!-- TMPL_VAR name="normalized_isbn" -->" /></a><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
 				</td>
                 </tr>
                 <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
index 573295e..6075fe0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
@@ -68,7 +68,7 @@
 <form id="reviewf" action="/cgi-bin/koha/opac-review.pl<!-- TMPL_IF NAME="cgi_debug" -->?debug=1<!-- /TMPL_IF -->" method="post">
     <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
 	<fieldset class="brief">
-	<legend>Comments on <i><!--TMPL_VAR NAME="title" ESCAPE="html" --> <!-- TMPL_VAR NAME="subtitle" --></i><!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></legend>
+	<legend>Comments on <i><!--TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></i><!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></legend>
             <ol><li><textarea id="review" name="review" cols="60" rows="8"><!--TMPL_VAR NAME="review"--></textarea></li></ol>
 		</fieldset>
     <p>Note: Your comment must be approved by a librarian. </p>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl
index 1847017..9667154 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl
@@ -47,7 +47,7 @@
 		    <!-- TMPL_LOOP NAME="recentSearches" -->
 		    <tr>
 			<td><!-- TMPL_VAR NAME="time" --></td>
-			<td><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" ESCAPE="html" -->"><!-- TMPL_VAR NAME="query_desc" ESCAPE="html" --></a></td>
+			<td><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" -->"><!-- TMPL_VAR NAME="query_desc" --></a></td>
 			<td><!-- TMPL_VAR NAME="total" --></td>
 		    </tr>
 		    <!-- /TMPL_LOOP -->
@@ -65,7 +65,7 @@
 		    <!-- TMPL_LOOP NAME="previousSearches" -->
 		    <tr>
 			<td><!-- TMPL_VAR NAME="time" --></td>
-			<td><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" ESCAPE="html" -->"><!-- TMPL_VAR NAME="query_desc" ESCAPE="html" --></a></td>
+			<td><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" -->"><!-- TMPL_VAR NAME="query_desc" --></a></td>
 			<td><!-- TMPL_VAR NAME="total" --></td>
 		    </tr>
 		    <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tmpl
index 5513198..c534743 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tmpl
@@ -15,7 +15,7 @@ Reference Manager or ProCite.
 <MESSAGE>
 ---------------------------------------------
 <!-- TMPL_IF NAME="comment" -->
-<!-- TMPL_VAR NAME="comment" -->
+<!-- TMPL_VAR NAME="comment" ESCAPE="0" -->
 <!-- /TMPL_IF -->
 <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><!-- TMPL_IF "HASAUTHORS" -->
 Author(s): <!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF name="MARCAUTHORS" --><!-- TMPL_IF NAME="author" -->; <!-- /TMPL_IF --><!-- TMPL_LOOP NAME="MARCAUTHORS" --><!-- TMPL_LOOP NAME="MARCAUTHOR_SUBFIELDS_LOOP" --><!-- TMPL_VAR NAME="separator" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_LOOP --><!-- TMPL_UNLESS NAME="__last__" -->; <!-- TMPL_ELSE --><!-- /TMPL_UNLESS --><!-- /TMPL_LOOP --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="ISBN" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index bb2078a..01bc460 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;   <!-- TMPL_IF NAME="viewshelf" -->Contents of <!-- TMPL_VAR NAME="shelfname" ESCAPE="html" --><!-- TMPL_ELSE -->My Lists<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;   <!-- TMPL_IF NAME="viewshelf" -->Contents of <!-- TMPL_VAR NAME="shelfname" --><!-- TMPL_ELSE -->My Lists<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/JavaScript" language="JavaScript">
@@ -183,7 +183,7 @@ $(function() {
             
 
             <!-- TMPL_IF NAME="viewshelf" --><!--  Viewing a particular shelf -->
-              <h3><a href="/cgi-bin/koha/opac-shelves.pl">Lists</a> <img src="<!-- TMPL_VAR NAME="themelang" -->/../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> <em><!-- TMPL_VAR NAME="shelfname" ESCAPE="html" --></em></h3>
+              <h3><a href="/cgi-bin/koha/opac-shelves.pl">Lists</a> <img src="<!-- TMPL_VAR NAME="themelang" -->/../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> <em><!-- TMPL_VAR NAME="shelfname" --></em></h3>
               <!-- TMPL_IF NAME="itemsloop" -->
                   <div id="toolbar" class="list-actions"> <span class="checkall"></span>
                     <span class="clearall"></span>
@@ -227,7 +227,7 @@ $(function() {
                     <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
                     <input type="hidden" name="modifyshelfcontents" value="1" />
                 <!-- /TMPL_IF -->
-                <!-- TMPL_VAR name='pagination_bar'-->
+                <!-- TMPL_VAR name="pagination_bar" ESCAPE="0"-->
                 <table id="listcontents">
                   <thead><tr>
                     <th>&nbsp;</th>
@@ -251,8 +251,8 @@ $(function() {
                           <img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /><!-- TMPL_VAR NAME="description" -->
                         </td>
                     <!-- /TMPL_UNLESS -->
-                        <td><!-- TMPL_IF NAME="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- TMPL_ELSE -->
-                        <!-- TMPL_IF NAME="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
+                        <td><!-- TMPL_IF NAME="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- TMPL_ELSE -->
+                        <!-- TMPL_IF NAME="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
                     <!-- COinS / OpenURL -->
                           <!-- COinS / OpenURL --><span class="Z3988" title="<!-- TMPL_VAR NAME="coins" -->"></span>
                           <br/>
@@ -303,13 +303,13 @@ $(function() {
 
             
             <!-- TMPL_IF NAME="edit" -->
-                <h3><a href="/cgi-bin/koha/opac-shelves.pl">Lists</a> <img src="<!-- TMPL_VAR NAME="themelang" -->/../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> <a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelfnumber" -->"><em><!-- TMPL_VAR NAME="shelfname" ESCAPE="html" --></em></a> <img src="<!-- TMPL_VAR NAME="themelang" -->/../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Editing</h3>
+                <h3><a href="/cgi-bin/koha/opac-shelves.pl">Lists</a> <img src="<!-- TMPL_VAR NAME="themelang" -->/../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> <a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelfnumber" -->"><em><!-- TMPL_VAR NAME="shelfname" --></em></a> <img src="<!-- TMPL_VAR NAME="themelang" -->/../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Editing</h3>
                 <form method="post" action="/cgi-bin/koha/opac-shelves.pl">
                   <input type="hidden" name="op" value="modifsave" />
                   <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
                   <fieldset class="rows">
                     <ol>
-                      <li><label for="shelfname">List Name: </label><input type="text" id="shelfname" name="shelfname" size="60" value="<!-- TMPL_VAR NAME="shelfname" ESCAPE="html" -->" /></li>
+                      <li><label for="shelfname">List Name: </label><input type="text" id="shelfname" name="shelfname" size="60" value="<!-- TMPL_VAR NAME="shelfname" -->" /></li>
                       <li>
                         <label for="sortfield" >Sort this list by: </label>
                         <select name="sortfield" id="sortfield">
@@ -359,7 +359,7 @@ $(function() {
                     <div id="toolbar"><a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New List</a></div>
                   <!-- TMPL_IF NAME="showprivateshelves" -->
                     <!-- TMPL_IF NAME="shelveslooppriv" -->
-                      <!-- TMPL_VAR name='pagination_bar'-->
+                      <!-- TMPL_VAR name="pagination_bar" ESCAPE="0" -->
                       <table>
                         <tr>
                           <th>List Name</th>
@@ -374,7 +374,7 @@ $(function() {
                           <!--TMPL_ELSE-->
                             <tr>
                           <!-- /TMPL_UNLESS -->
-                              <td><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves&amp;viewshelf=<!-- TMPL_VAR NAME="shelf" -->&amp;sortfield=<!-- TMPL_VAR NAME="sortfield" -->"><!-- TMPL_VAR NAME="shelfname" ESCAPE="html"  --></a></td>
+                              <td><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves&amp;viewshelf=<!-- TMPL_VAR NAME="shelf" -->&amp;sortfield=<!-- TMPL_VAR NAME="sortfield" -->"><!-- TMPL_VAR NAME="shelfname"  --></a></td>
                               <td><!-- TMPL_VAR NAME="count" --> item(s)</td>
                               <td><!-- TMPL_IF NAME="authorsort" -->Author<!-- TMPL_ELSIF NAME="yearsort" -->Year<!-- TMPL_ELSE -->Title<!-- /TMPL_IF -->
                           </td>
@@ -429,7 +429,7 @@ $(function() {
                   <div><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to create new Lists.</div>
                   <!-- /TMPL_IF -->
                   <!-- TMPL_IF NAME="shelvesloop" -->
-                    <!-- TMPL_VAR name='pagination_bar'-->
+                    <!-- TMPL_VAR name="pagination_bar" ESCAPE="0" -->
                       <table>
                         <tr>
                           <th>List Name</th>
@@ -443,7 +443,7 @@ $(function() {
                       <!--TMPL_ELSE-->
                         <tr>
                       <!-- /TMPL_UNLESS -->
-                          <td><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->&amp;sortfield=<!-- TMPL_VAR NAME="sortfield" -->"><!-- TMPL_VAR NAME="shelfname" ESCAPE="html"  --></a></td>
+                          <td><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->&amp;sortfield=<!-- TMPL_VAR NAME="sortfield" -->"><!-- TMPL_VAR NAME="shelfname"  --></a></td>
                           <td><!-- TMPL_VAR NAME="count" --> item(s)</td>
                           <td><!-- TMPL_IF NAME="authorsort" -->Author<!-- TMPL_ELSIF NAME="yearsort" -->Year<!-- TMPL_ELSE -->Title<!-- /TMPL_IF -->
                           </td>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tmpl
index 181c809..7f596f9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showmarc.tmpl
@@ -2,6 +2,6 @@
 </head>
 <body id="opac-showmarc">
 <div id="main">
-<pre><!-- TMPL_VAR NAME="MARC_FORMATTED" --></pre>
+<pre><!-- TMPL_VAR NAME="MARC_FORMATTED" ESCAPE="0" --></pre>
 <!-- div gets closed by opac-bottom.inc -->
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tmpl
index c8c7260..c677506 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tmpl
@@ -19,7 +19,7 @@
     </tr>
     <tr>
         <td>
-            <!--TMPL_VAR NAME="review" ESCAPE="HTML"-->
+            <!--TMPL_VAR NAME="review"-->
             <p><!--TMPL_VAR NAME="datereviewed"--></p>
         </td>
     </tr>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
index ab5b753..69cfeb7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
@@ -152,7 +152,7 @@ $.tablesorter.addParser({
     <!-- /TMPL_IF -->
                 </td><!-- /TMPL_IF -->
                 <td>
-                    <p><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></p>
+                    <p><strong><!-- TMPL_VAR NAME="title" --></strong></p>
                     <p><!-- TMPL_IF name="author" --><!-- TMPL_VAR NAME="author" -->,<!-- /TMPL_IF -->
                         <!-- TMPL_IF name="copyrightdate" --> - <!-- TMPL_VAR NAME="copyrightdate" -->,<!-- /TMPL_IF --> 
                         <!-- TMPL_IF name="publishercode" --> - <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl
index 8681a8a..d8f032a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl
@@ -97,7 +97,7 @@
 	<!-- TMPL_LOOP NAME="TAGLOOP" -->
 	<span class="tag" id="tag<!-- TMPL_VAR NAME="__counter__" -->" title="<!-- TMPL_VAR NAME="cloudweight" -->">
 		<a href="/cgi-bin/koha/opac-search.pl?tag=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->&amp;q=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->">
-		<!-- TMPL_VAR NAME="term" ESCAPE="HTML" --></a>
+		<!-- TMPL_VAR NAME="term" --></a>
 			<span class="tagweight"><!-- TMPL_VAR NAME="weight_total" --></span>
 	</span>
 	<!-- /TMPL_LOOP -->
@@ -121,10 +121,10 @@
 		</tr></thead>
 	<tbody><!-- TMPL_LOOP NAME="MY_TAGS" -->
 		<tr><td><a href="/cgi-bin/koha/opac-search.pl?tag=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->&amp;q=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->">
-				<!-- TMPL_VAR NAME="term" ESCAPE="HTML" --></a>
+				<!-- TMPL_VAR NAME="term" --></a>
 			</td>
 			<td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-				<!-- TMPL_VAR NAME="bib_summary" ESCAPE="HTML" --></a></td>
+				<!-- TMPL_VAR NAME="bib_summary" --></a></td>
 			<td><!-- TMPL_VAR NAME="date_created_display" --></td>
 			<td><input type="submit" name="del<!-- TMPL_VAR NAME="tag_id" -->" value="Delete" /></td>
 		</tr>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
index b5f3ce5..feae7ad 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
@@ -21,7 +21,7 @@
         </fieldset>
 
         <!-- TMPL_LOOP name="LOOP" -->
-            <a href="/cgi-bin/koha/opac-search.pl?idx=su&amp;q=&quot;<!-- TMPL_VAR name="entry" ESCAPE="HTML" -->&quot;" style="font-size:<!-- TMPL_VAR name="weight" -->px;"><!-- TMPL_VAR name="entry" --></a>
+            <a href="/cgi-bin/koha/opac-search.pl?idx=su&amp;q=&quot;<!-- TMPL_VAR name="entry" -->&quot;" style="font-size:<!-- TMPL_VAR name="weight" -->px;"><!-- TMPL_VAR name="entry" --></a>
         <!-- /TMPL_LOOP -->
 		<!-- TMPL_ELSE -->
 			<p>Note: This feature only available to French catalogs where ISBD subjects have been populated, and an index built by separate script.</p>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
index 871d6c9..4c6282d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
@@ -58,7 +58,7 @@ function Dopop(link) {
             </tr></thead>
                 <tbody><!-- TMPL_LOOP NAME="results_loop" -->
                     <tr>
-                        <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR name="title" escape="html" --></a><p><!-- TMPL_VAR NAME="author" -->
+                        <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR name="title" --></a><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 --> <!-- TMPL_IF name="seriestitle" -->(<!-- TMPL_VAR name="seriestitle" -->)<!-- /TMPL_IF -->
                         <!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
-- 
1.7.0.4


From oleonard at myacpl.org  Wed Jul 14 19:57:01 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 14 Jul 2010 13:57:01 -0400
Subject: [Koha-patches] [PATCH] Markup corrections
Message-ID: <1279130221-21656-1-git-send-email-oleonard@myacpl.org>

- Changing input "button" to "submit" so that confirmation
  dialog redirects the user as expected
- Changing non-standard message box styles to standard ones
---
 .../prog/en/modules/admin/classsources.tmpl        |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
index 2460c92..569d875 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
@@ -225,7 +225,7 @@ $(document).ready(function() {
     remove it from all classification source definitions before trying again.
     </p>
     <form action="<!-- TMPL_VAR name="script_name" -->" method="get">
-        <input type="button" value="OK" class="approve" />
+        <input type="submit" value="OK" class="approve" />
     </form>
 </div>
 <!-- /TMPL_IF -->
@@ -240,13 +240,13 @@ $(document).ready(function() {
 
 <h2>Classification Sources</h2>
 <!-- TMPL_IF name="added_source" -->
-<span class="problem">Added classification source <!-- TMPL_VAR name="added_source" --></span>
+<div class="dialog message">Added classification source <!-- TMPL_VAR name="added_source" --></div>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="edited_source" -->
-<span class="problem">Modified classification source <!-- TMPL_VAR name="edited_source" --></span>
+<div class="dialog message">Modified classification source <!-- TMPL_VAR name="edited_source" --></div>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="deleted_source" -->
-<span class="problem">Deleted classification source <!-- TMPL_VAR name="deleted_source" --></span>
+<div class="dialog message">Deleted classification source <!-- TMPL_VAR name="deleted_source" --></div>
 <!-- /TMPL_IF -->
 <table>
   <tr>
@@ -279,13 +279,13 @@ $(document).ready(function() {
 <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 <h2>Classification Filing Rules</h2>
 <!-- TMPL_IF name="added_rule" -->
-<span class="problem">Added filing rule <!-- TMPL_VAR name="added_rule" --></span>
+<div class="dialog message">Added filing rule <!-- TMPL_VAR name="added_rule" --></div>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="edited_rule" -->
-<span class="problem">Modified filing rule <!-- TMPL_VAR name="edited_rule" --></span>
+<div class="dialog message">Modified filing rule <!-- TMPL_VAR name="edited_rule" --></div>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="deleted_rule" -->
-<span class="problem">Deleted filing rule <!-- TMPL_VAR name="deleted_rule" --></span>
+<div class="dialog message">Deleted filing rule <!-- TMPL_VAR name="deleted_rule" --></div>
 <!-- /TMPL_IF -->
 <table>
   <tr>
-- 
1.7.0.4


From oleonard at myacpl.org  Wed Jul 14 21:59:07 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 14 Jul 2010 15:59:07 -0400
Subject: [Koha-patches] [PATCH] Minor markup correction to send Cart form
Message-ID: <1279137547-22121-1-git-send-email-oleonard@myacpl.org>

---
 .../prog/en/modules/basket/sendbasketform.tmpl     |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tmpl
index 9caef3c..a8207e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tmpl
@@ -1,4 +1,5 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  Sending Your Cart
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  Sending Your Cart</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body style="padding: 1em;" id="sendbasket">
-- 
1.7.0.4


From dpavlin at rot13.org  Wed Jul 14 22:02:18 2010
From: dpavlin at rot13.org (Dobrica Pavlinusic)
Date: Wed, 14 Jul 2010 22:02:18 +0200
Subject: [Koha-patches] [PATCH] Bug 5009 - autocomplete="off" for
	borrowernumbers and barcode forms
Message-ID: <1279137738-12745-1-git-send-email-dpavlin@rot13.org>

When using RFID readers which emulate keystrokes browser sometimes picks
numbers for barcodes or borrowers from history which generates wrong
transactions.
---
 .../intranet-tmpl/prog/en/includes/cat-search.inc  |    4 ++--
 .../intranet-tmpl/prog/en/includes/circ-search.inc |    2 +-
 .../prog/en/includes/patron-search-box.inc         |    2 +-
 .../prog/en/modules/circ/circulation.tmpl          |    2 +-
 .../prog/en/modules/circ/returns.tmpl              |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index 536d7ad..bed9620 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -48,7 +48,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<!-- TMPL_IF NAME="CAN_user_circulate" -->
 	<div id="circ_search" class="residentsearch" style="display:none;">
 	<p class="tip">Enter patron card number or partial name:</p>
-    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post" autocomplete="off">
     <!-- TMPL_IF NAME="CircAutocompl" -->
     <div class="autocomplete">
             <div id="borrowerautocomplete" class="autocomplete">
@@ -72,7 +72,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 <!-- TMPL_IF NAME="CAN_user_circulate" -->
 <div id="checkin_search" class="residentsearch" style="display:none;">
     <p class="tip">Scan a barcode to check in:</p>
-    <form method="post" action="/cgi-bin/koha/circ/returns.pl">
+    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
         <input name="barcode" id="ret_barcode" size="40" />
         <input value="Submit" class="submit" type="submit" />
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index 4b8841b..953f1fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -6,7 +6,7 @@
 <!-- TMPL_IF NAME="CAN_user_circulate" -->
 <div id="checkin_search" class="residentsearch" style="display:none;">
     <p class="tip">Scan a barcode to check in:</p>
-    <form method="post" action="/cgi-bin/koha/circ/returns.pl">
+    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
         <input name="barcode" id="ret_barcode" size="40" accesskey="r" />
         <input value="Submit" class="submit" type="submit" />
     </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
index e014be2..841d143 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
@@ -44,7 +44,7 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 </script><!-- /TMPL_IF -->
 	<div id="circ_search" class="residentsearch" style="display:none;">
 	<p class="tip">Enter patron card number or partial name:</p>
-    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post" autocomplete="off">
     <!-- TMPL_IF NAME="CircAutocompl" -->
     <div class="autocomplete">
             <div id="borrowerautocomplete" class="autocomplete">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 980d195..f184a18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -408,7 +408,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 <!-- /TMPL_IF -->
 
 
-<form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform">
+<form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform" autocomplete="off">
 <fieldset id="circ_circulation_issue">
     <!-- TMPL_IF NAME="DisplayClearScreenButton" -->
 	    <input type=button value="Clear Screen" onClick="window.location = '/cgi-bin/koha/circ/circulation.pl'">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
index 71934c9..feea2cc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
@@ -307,7 +307,7 @@ function Dopop(link) {
     </div>
 </div>
 	<div class="yui-g">
-    <form method="post" action="/cgi-bin/koha/circ/returns.pl" >
+    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
     <div class="yui-u first">
             <fieldset>
 	<legend>Check In</legend>
-- 
1.5.6.5


From nahuel.angelinetti at biblibre.com  Thu Jul 15 11:15:39 2010
From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI)
Date: Thu, 15 Jul 2010 11:15:39 +0200
Subject: [Koha-patches] [PATCH] [followup](bug #3825) fix problems in tmpl_if
Message-ID: <1279185339-2233-1-git-send-email-nahuel.angelinetti@biblibre.com>

In previous patch, and if was not fixed to be managed correctly, and allow user, if there is no hold waiting, to go the holds over.
---
 .../prog/en/modules/circ/waitingreserves.tmpl      |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
index 7f7f3dc..647aa10 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -60,13 +60,13 @@ $.tablesorter.addParser({
                 </form>
             </div>
         <!-- /TMPL_IF -->
-        <!-- TMPL_UNLESS NAME="message" -->
         <div id="resultlist" class="toptabs">
             <ul>
                 <li><a href="/cgi-bin/koha/circ/waitingreserves.pl#holdswaiting"><!-- TMPL_VAR NAME="reservecount" --> Hold(s) waiting</a></li>
                 <li><a href="/cgi-bin/koha/circ/waitingreserves.pl#holdsover"><!-- TMPL_VAR NAME="overcount" --> Hold(s) over</a></li>
             </ul>
             <div id="holdswaiting">
+            <!-- TMPL_UNLESS NAME="message" -->
             <!-- TMPL_IF NAME="reserveloop" -->
                <table id="holdst">
                <thead><tr>
@@ -113,7 +113,11 @@ $.tablesorter.addParser({
                     </td>
                 </tr>
                 <!-- /TMPL_LOOP --></tbody>
-        </table>
+                </table>
+                <!-- TMPL_ELSE -->
+                    <div class="dialog message">No holds found.</div>
+                <!-- /TMPL_IF -->
+            <!-- /TMPL_UNLESS -->
         </div>
         <div id="holdsover">
                <table id="holdso">
@@ -163,12 +167,7 @@ $.tablesorter.addParser({
                 <!-- /TMPL_LOOP --></tbody>
         </table>
         </div>
-        <!-- TMPL_ELSE -->
-            <div class="dialog message">No holds found.</div>
-        <!-- /TMPL_IF -->
-        </div>
-    <!-- /TMPL_UNLESS -->
-
+    </div>
 </div>
 </div>
 </div>
-- 
1.7.0.4


From colin.campbell at ptfs-europe.com  Thu Jul 15 17:59:17 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Thu, 15 Jul 2010 16:59:17 +0100
Subject: [Koha-patches] [PATCH] Bug 5011 install debian graphicsmagick not
	imagemagick
Message-ID: <1279209557-4281-1-git-send-email-colin.campbell@ptfs-europe.com>

Scripts in install-misc were installing Image Magick
not Graphics::Magick the actual Koha dependency
---
 install_misc/apt-get-debian-lenny.sh      |    2 +-
 install_misc/debian.packages              |    2 +-
 install_misc/install_koha_on_fresh_debian |    2 +-
 install_misc/ubuntu.packages              |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/install_misc/apt-get-debian-lenny.sh b/install_misc/apt-get-debian-lenny.sh
index eb3aa70..48c53e4 100755
--- a/install_misc/apt-get-debian-lenny.sh
+++ b/install_misc/apt-get-debian-lenny.sh
@@ -52,7 +52,7 @@ libidzebra-2.0-mod-grs-regx \
 libidzebra-2.0-mod-grs-xml \
 libidzebra-2.0-mod-text \
 libidzebra-2.0-modules \
-libimage-magick-perl  \
+libgraphics-magick-perl  \
 libjson-perl \
 libjson-xs-perl \
 liblingua-ispell-perl \
diff --git a/install_misc/debian.packages b/install_misc/debian.packages
index 11dfeb4..5ff782f 100644
--- a/install_misc/debian.packages
+++ b/install_misc/debian.packages
@@ -38,7 +38,7 @@ libidzebra-2.0-mod-grs-regx	install
 libidzebra-2.0-mod-grs-xml	install
 libidzebra-2.0-mod-text	install
 libidzebra-2.0-modules	install
-libimage-magick-perl install
+libgraphics-magick-perl install
 libjson-perl	install
 liblingua-ispell-perl	install
 liblingua-stem-perl install
diff --git a/install_misc/install_koha_on_fresh_debian b/install_misc/install_koha_on_fresh_debian
index 3595bf5..f20127b 100644
--- a/install_misc/install_koha_on_fresh_debian
+++ b/install_misc/install_koha_on_fresh_debian
@@ -467,7 +467,7 @@ libxslt1-dev
 libyaml-syck-perl
 libhtml-template-pro-perl
 libdbd-mysql-perl/testing
-libimage-magick-perl
+libgraphics-magick-perl
 liblist-moreutils-perl
 libtext-iconv-perl/testing
 libalgorithm-checkdigits-perl
diff --git a/install_misc/ubuntu.packages b/install_misc/ubuntu.packages
index 818358a..56430bf 100644
--- a/install_misc/ubuntu.packages
+++ b/install_misc/ubuntu.packages
@@ -14,7 +14,7 @@ libdate-calc-perl install
 libdate-manip-perl install
 libdate-ical-perl	install
 libdatetime-format-mail-perl install
-libimage-magick-perl install
+libgraphics-magick-perl install
 libmail-sendmail-perl install
 liblingua-ispell-perl	install
 liblingua-stem-perl install
-- 
1.7.1.1


From oleonard at myacpl.org  Thu Jul 15 18:32:12 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 15 Jul 2010 12:32:12 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 5013 "New patron" menu button
	broken on patron select screen
Message-ID: <1279211532-23632-1-git-send-email-oleonard@myacpl.org>

---
 .../prog/en/includes/patron-toolbar.inc            |    2 +-
 members/members-home.pl                            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
index d7c87c4..c508af0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
@@ -23,7 +23,7 @@
 
 		var newmenu = [
 <!--TMPL_IF Name="AddPatronLists_categorycode"-->
-<!--TMPL_LOOP Name="categoryloop"-->
+<!--TMPL_LOOP Name="categories"-->
 { text: "<!--TMPL_VAR Name="description"-->",  url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;categorycode=<!--TMPL_VAR Name="categorycode"-->" },
 <!--/TMPL_LOOP-->
 <!--TMPL_ELSE-->
diff --git a/members/members-home.pl b/members/members-home.pl
index e497f4a..04fc557 100755
--- a/members/members-home.pl
+++ b/members/members-home.pl
@@ -54,7 +54,7 @@ if($quicksearch){
 my @categories=C4::Category->all;
 $template->param(
     branchloop=>(defined $branch?GetBranchesLoop($branch):GetBranchesLoop()),
-	categoryloop=>\@categories,
+	categories=>\@categories,
 );
 $template->param( 
         "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1",
-- 
1.7.0.4


From ebin.joseph at osslabs.biz  Thu Jul 15 13:18:03 2010
From: ebin.joseph at osslabs.biz (Ebin Joseph)
Date: Thu, 15 Jul 2010 16:48:03 +0530
Subject: [Koha-patches] [PATCH] Fixes Bug 4851 Batch delete shouldn't show
	delete button if no items were found
In-Reply-To: <ebin.joseph@osslabs.biz>
References: <ebin.joseph@osslabs.biz>
Message-ID: <1279192683-4598-1-git-send-email-ebin.joseph@osslabs.biz>

---
 .../prog/en/modules/tools/batchMod-del.tmpl        |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
index c6f82b9..0d35e62 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
@@ -124,19 +124,32 @@
 
 		<div id="cataloguing_additem_newitem">
 	     <input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->" />
-	     <p>This will delete <!-- TMPL_IF NAME="too_many_items" -->all the<!-- TMPL_ELSE -->the selected<!-- /TMPL_IF --> items.</p>
+			 <!-- TMPL_IF name="notfoundbarcodes" -->
+			 <p>There are no matching items</p>
+			 <!-- TMPL_ELSE-->            	
+	     		 <p>This will delete <!-- TMPL_IF NAME="too_many_items" -->all the<!-- TMPL_ELSE -->the selected<!-- /TMPL_IF --> items.</p>
+			  <!-- /TMPL_IF -->
 	     <input type="hidden" name="del" value="1" />
 	     <fieldset class="action">    
 		<div id="jobpanel">
 		    <div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
 		    <div id="jobfailed"></div>
 		</div>
-		<input type="submit" name="mainformsubmit" value="Delete selected items" onclick="return submitBackgroundJob(this.form);" />
+			<!-- TMPL_IF name="notfoundbarcodes" -->
+			<input type="hidden" name="mainformsubmit" value="Delete selected items" onclick="return submitBackgroundJob(this.form);" />
+			<!-- /TMPL_IF-->
+			<!-- TMPL_IF name="too_many_items"-->
+			<input type="submit" name="mainformsubmit" value="Delete selected items" onclick="return submitBackgroundJob(this.form);" />
+			<!-- TMPL_ELSE-->
+			 <input type="hidden" name="mainformsubmit" value="Delete selected items" onclick="return submitBackgroundJob(this.form);" />
+                        <!-- /TMPL_IF -->
+	
 		<a href="/cgi-bin/koha/tools/batchMod.pl?del=1" class="cancel">Cancel</a>
 	    </fieldset>
 	</div>
 	<!-- /TMPL_IF -->
-    <!-- /TMPL_UNLESS -->
+    <!-- /TMPL_UNLESS --<!-- TMPL_IF name="notfoundbarcodes" -->
+
 
 <!-- TMPL_IF name="action" -->
 	<div class="dialog message"><p><!-- TMPL_VAR NAME="deleted_items" --> item(s) deleted.</p></div>
-- 
1.6.4.2


From gmcharlt at gmail.com  Fri Jul 16 05:25:14 2010
From: gmcharlt at gmail.com (Galen Charlton)
Date: Thu, 15 Jul 2010 23:25:14 -0400
Subject: [Koha-patches] [PATCH] Begin fix for Bug 3652 - XSS
	vulnerabilities
In-Reply-To: <1279117547-20186-1-git-send-email-oleonard@myacpl.org>
References: <1279117547-20186-1-git-send-email-oleonard@myacpl.org>
Message-ID: <AANLkTim1x8D5PQZ5IKCRtCmCrjtn4VAB4BJ-qDk-P8cS@mail.gmail.com>

Hi,

On Wed, Jul 14, 2010 at 10:25 AM, Owen Leonard <oleonard at myacpl.org> wrote:
> - Setting default_escape => "HTML" in C4::Output
>
> In the OPAC:
> - Removing redundant "ESCAPE='HTML'" from the templates
> - Adding "ESCAPE='0'" where necessary:
> ?-- Variables like OpacNav which output HTML or JS
> ?-- Instances of CGI::scrolling_list variables

Pushed to topic branch new/bug3652 - testing encouraged.

Regards,

Galen
-- 
Galen Charlton
gmcharlt at gmail.com

From colin.campbell at ptfs-europe.com  Fri Jul 16 13:55:19 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 16 Jul 2010 12:55:19 +0100
Subject: [Koha-patches] [PATCH] Bug 5021 Formatting of undefined serials
	dates
Message-ID: <1279281319-4318-1-git-send-email-colin.campbell@ptfs-europe.com>

Routine was checking undefinedness but such dates were
normalized on retrieval to 0000-00-00
Also planned/received date should also be checked
---
 C4/Serials.pm |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/C4/Serials.pm b/C4/Serials.pm
index 35cc5be..032246c 100644
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -405,14 +405,17 @@ sub PrepareSerialsData {
     my $first;
     my $previousnote = "";
 
-    foreach my $subs (@$lines) {
-        $subs->{'publisheddate'} = (
-            $subs->{'publisheddate'}
-            ? format_date( $subs->{'publisheddate'} )
-            : "XXX"
-        );
+    foreach my $subs (@{$lines}) {
+        for my $datefield ( qw(publisheddate planneddate) ) {
+            # handle both undef and undef returned as 0000-00-00
+            if (!defined $subs->{$datefield} or $subs->{$datefield}=~m/^00/) {
+                $subs->{$datefield} = 'XXX';
+            }
+            else {
+                $subs->{$datefield} = format_date( $subs->{$datefield}  );
+            }
+        }
         $subs->{'branchname'} = GetBranchName( $subs->{'branchcode'} );
-        $subs->{'planneddate'}                  = format_date( $subs->{'planneddate'} );
         $subs->{ "status" . $subs->{'status'} } = 1;
         $subs->{"checked"}                      = $subs->{'status'} =~ /1|3|4|7/;
 
-- 
1.7.1.1


From colin.campbell at ptfs-europe.com  Fri Jul 16 15:24:46 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 16 Jul 2010 14:24:46 +0100
Subject: [Koha-patches] [PATCH] Bug 5026 Undefined dates formatted poorly in
	serials-edit
Message-ID: <1279286686-4799-1-git-send-email-colin.campbell@ptfs-europe.com>

Makes behaviour consistent with serials-collectiona
---
 serials/serials-edit.pl |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl
index dee624c..8ce3dcb 100755
--- a/serials/serials-edit.pl
+++ b/serials/serials-edit.pl
@@ -133,8 +133,14 @@ foreach my $tmpserialid (@serialids) {
         && !$processedserialid{$tmpserialid} )
     {
         my $data = GetSerialInformation($tmpserialid);
-        $data->{publisheddate} = format_date( $data->{publisheddate} );
-        $data->{planneddate}   = format_date( $data->{planneddate} );
+        for my $date ( qw(publisheddate planneddate)) {
+            if ($data->{$date} ) {
+                $data->{$date} = format_date( $data->{$date} );
+            }
+            else {
+                $data->{$date} = 'XXX';
+            }
+        }
         $data->{arriveddate}=$today->output('syspref');
         $data->{'editdisable'} = (
             (
-- 
1.7.1.1


From oleonard at myacpl.org  Fri Jul 16 16:44:38 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 16 Jul 2010 10:44:38 -0400
Subject: [Koha-patches] [PATCH] Correcting URL typo in link back to labels
	home page
Message-ID: <1279291478-26014-1-git-send-email-oleonard@myacpl.org>

---
 .../prog/en/modules/labels/label-edit-batch.tmpl   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
index d132619..df1f556 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
@@ -9,7 +9,7 @@
     <div id="breadcrumbs">
         <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; 
         <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
-        <a href="/cgi-bin/koha/labels/labels-home.pl">Labels Home</a> &rsaquo;
+        <a href="/cgi-bin/koha/labels/label-home.pl">Labels Home</a> &rsaquo;
         <a href="/cgi-bin/koha/labels/label-manage.pl?label_element=batch">Mange Label Batches</a> &rsaquo;
         Manage Batch Number <!-- TMPL_VAR NAME="batch_id" -->
     </div>
-- 
1.7.0.4


From colin.campbell at ptfs-europe.com  Fri Jul 16 17:40:33 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Fri, 16 Jul 2010 16:40:33 +0100
Subject: [Koha-patches] [PATCH] Bug 5026 Undefined dates formatted poorly in
	serials-edit
Message-ID: <1279294833-5417-1-git-send-email-colin.campbell@ptfs-europe.com>

Don't display junk in empty fields
Don't generate errors

Merged some changes to make variable names moremeaningful
in loops ( within loops)
---
 C4/Serials.pm           |   13 +++++-
 serials/serials-edit.pl |  100 ++++++++++++++++++++++++++---------------------
 2 files changed, 65 insertions(+), 48 deletions(-)

diff --git a/C4/Serials.pm b/C4/Serials.pm
index 032246c..ddf20f7 100644
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -712,9 +712,16 @@ sub GetSerials2 {
     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"} );
-        $line->{"publisheddate"}              = format_date( $line->{"publisheddate"} );
+        $line->{ "status" . $line->{status} } = 1; # fills a "statusX" value, used for template status select list
+        # Format dates for display
+        for my $datefield ( qw( planneddate publisheddate ) ) {
+            if ($line->{$datefield} =~m/^00/) {
+                $line->{$datefield} = q{};
+            }
+            else {
+                $line->{"planneddate"} = format_date( $line->{$datefield} );
+            }
+        }
         push @serials, $line;
     }
     return @serials;
diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl
index dee624c..698ac8e 100755
--- a/serials/serials-edit.pl
+++ b/serials/serials-edit.pl
@@ -90,33 +90,29 @@ my @errseq;
 
 # If user comes from subscription details
 unless (@serialids) {
-    foreach my $subscriptionid (@subscriptionids) {
-        my $serstatus = $query->param('serstatus');
-        if ($serstatus) {
+    my $serstatus = $query->param('serstatus');
+    if ($serstatus) {
+        foreach my $subscriptionid (@subscriptionids) {
             my @tmpser = GetSerials2( $subscriptionid, $serstatus );
-            foreach (@tmpser) {
-                push @serialids, $_->{'serialid'};
-            }
+            @serialids = map { $_->{serialid} } @tmpser;
         }
     }
 }
 
-unless ( scalar(@serialids) ) {
+unless ( @serialids ) {
     my $string =
-      "serials-collection.pl?subscriptionid=" . join( ",", @subscriptionids );
-    $string =~ s/,$//;
-
+      'serials-collection.pl?subscriptionid=' . join ',', @subscriptionids;
     print $query->redirect($string);
 }
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-	template_name   => "serials/serials-edit.tmpl",
-	query           => $query,
-	type            => "intranet",
-	authnotrequired => 0,
-	flagsrequired   => {serials => 'receive_serials'},
-	debug           => 1,
+        template_name   => 'serials/serials-edit.tmpl',
+        query           => $query,
+        type            => 'intranet',
+        authnotrequired => 0,
+        flagsrequired   => { serials => 1 },
+        debug           => 1,
     }
 );
 
@@ -124,30 +120,37 @@ my @serialdatalist;
 my %processedserialid;
 
 my $today = C4::Dates->new();
-foreach my $tmpserialid (@serialids) {
+foreach my $serialid (@serialids) {
 
     #filtering serialid for duplication
     #NEW serial should appear only once and are created afterwards
-    if (   defined($tmpserialid)
-        && $tmpserialid =~ /^[0-9]+$/
-        && !$processedserialid{$tmpserialid} )
+    if (   $serialid
+        && $serialid =~ /^[0-9]+$/
+        && !$processedserialid{$serialid} )
     {
-        my $data = GetSerialInformation($tmpserialid);
-        $data->{publisheddate} = format_date( $data->{publisheddate} );
-        $data->{planneddate}   = format_date( $data->{planneddate} );
-        $data->{arriveddate}=$today->output('syspref');
-        $data->{'editdisable'} = (
+        my $serinfo = GetSerialInformation($serialid); #TODO duplicates work done by GetSerials2 above
+        for my $d ( qw( publisheddate planneddate )){
+            if ( $serinfo->{$d} =~m/^00/ ) {
+                $serinfo->{$d} = q{};
+            }
+            else {
+                $serinfo->{$d} = format_date( $serinfo->{$d} );
+            }
+        }
+        $serinfo->{arriveddate}=$today->output('syspref');
+
+        $serinfo->{'editdisable'} = (
             (
-                HasSubscriptionExpired( $data->{subscriptionid} )
-                  && $data->{'status1'}
+                HasSubscriptionExpired( $serinfo->{subscriptionid} )
+                && $serinfo->{'status1'}
             )
-              || $data->{'cannotedit'}
+            || $serinfo->{'cannotedit'}
         );
-        push @serialdatalist, $data;
-        $processedserialid{$tmpserialid} = 1;
+        push @serialdatalist, $serinfo;
+        $processedserialid{$serialid} = 1;
     }
 }
-my $bibdata = GetBiblioData( $serialdatalist[0]->{'biblionumber'} );
+my $biblio = GetBiblioData( $serialdatalist[0]->{'biblionumber'} );
 
 my @newserialloop;
 my @subscriptionloop;
@@ -157,8 +160,7 @@ my %processedsubscriptionid;
 foreach my $subscriptionid (@subscriptionids) {
 
     #Do not process subscriptionid twice if it was already processed.
-    if ( defined($subscriptionid)
-        && !$processedsubscriptionid{$subscriptionid} )
+    if ( $subscriptionid && !$processedsubscriptionid{$subscriptionid} )
     {
         my $cell;
         if ( $serialdatalist[0]->{'serialsadditems'} ) {
@@ -170,8 +172,8 @@ foreach my $subscriptionid (@subscriptionids) {
             $cell->{serialsadditems} = 1;
         }
         $cell->{'subscriptionid'} = $subscriptionid;
-        $cell->{'itemid'}         = "NNEW";
-        $cell->{'serialid'}       = "NEW";
+        $cell->{'itemid'}         = 'NNEW';
+        $cell->{'serialid'}       = 'NEW';
         $cell->{'issuesatonce'}   = 1;
         push @newserialloop, $cell;
         push @subscriptionloop,
@@ -190,8 +192,16 @@ if ( $op and $op eq 'serialchangestatus' ) {
 
     my $newserial;
     for ( my $i = 0 ; $i <= $#serialids ; $i++ ) {
+        my ($plan_date, $pub_date);
+
+        if (defined $planneddates[$i] && $planneddates[$i] ne 'XXX') {
+            $plan_date = format_date_in_iso( $planneddates[$i] );
+        }
+        if (defined $publisheddates[$i] && $publisheddates[$i] ne 'XXX') {
+            $pub_date = format_date_in_iso( $publisheddates[$i] );
+        }
 
-        if ( $serialids[$i] && $serialids[$i] eq "NEW" ) {
+        if ( $serialids[$i] && $serialids[$i] eq 'NEW' ) {
             if ( $serialseqs[$i] ) {
 
             #IF newserial was provided a name Then we have to create a newSerial
@@ -201,8 +211,8 @@ if ( $op and $op eq 'serialchangestatus' ) {
                     $subscriptionids[$i],
                     $serialdatalist[0]->{'biblionumber'},
                     $status[$i],
-                    format_date_in_iso( $planneddates[$i] ),
-                    format_date_in_iso( $publisheddates[$i] ),
+                    $plan_date,
+                    $pub_date,
                     $notes[$i]
                 );
             }
@@ -211,8 +221,8 @@ if ( $op and $op eq 'serialchangestatus' ) {
             ModSerialStatus(
                 $serialids[$i],
                 $serialseqs[$i],
-                format_date_in_iso( $planneddates[$i] ),
-                format_date_in_iso( $publisheddates[$i] ),
+                $plan_date,
+                $pub_date,
                 $status[$i],
                 $notes[$i]
             );
@@ -291,14 +301,14 @@ if ( $op and $op eq 'serialchangestatus' ) {
                             $serialdatalist[0]->{'biblionumber'}
                         )
                       );
-                    if ( C4::Context->preference("autoBarcode") eq
+                    if ( C4::Context->preference('autoBarcode') eq
                         'incremental' )
                     {
                         if ( !$bib_record->field($barcodetagfield)
                             ->subfield($barcodetagsubfield) )
                         {
                             my $sth_barcode = $dbh->prepare(
-                                "select max(abs(barcode)) from items");
+                                'select max(abs(barcode)) from items');
                             $sth_barcode->execute;
                             my ($newbarcode) = $sth_barcode->fetchrow;
 
@@ -356,8 +366,8 @@ if ( $op and $op eq 'serialchangestatus' ) {
         }
     }
     else {
-        my $redirect = "serials-collection.pl?";
-        $redirect .= join( '&', map { "subscriptionid=" . $_ } sort @subscriptionids );# ID The sort necessary
+        my $redirect = 'serials-collection.pl?';
+        $redirect .= join( '&', map { 'subscriptionid=' . $_ } @subscriptionids );
         print $query->redirect($redirect);
     }
 }
@@ -365,7 +375,7 @@ my $default_bib_view = get_default_view();
 
 $template->param(
     serialsadditems => $serialdatalist[0]->{'serialsadditems'},
-    bibliotitle     => $bibdata->{'title'},
+    bibliotitle     => $biblio->{'title'},
     biblionumber    => $serialdatalist[0]->{'biblionumber'},
     serialslist     => \@serialdatalist,
     default_bib_view => $default_bib_view,
-- 
1.7.1.1


From oleonard at myacpl.org  Fri Jul 16 17:43:09 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 16 Jul 2010 11:43:09 -0400
Subject: [Koha-patches] [PATCH] Follow-up fix for Bug 5013,
	"New patron" menu button broken
Message-ID: <1279294989-26546-1-git-send-email-oleonard@myacpl.org>

Menu was working on members-home.pl but not on members.pl
---
 members/member.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/members/member.pl b/members/member.pl
index 3b1b98e..dde29eb 100755
--- a/members/member.pl
+++ b/members/member.pl
@@ -157,7 +157,7 @@ $template->param(
 );
 $template->param(
     branchloop=>$branches,
-	categoryloop=>\@categories,
+    categories=>\@categories,
 );
 
 
-- 
1.7.0.4


From oleonard at myacpl.org  Fri Jul 16 21:33:51 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 16 Jul 2010 15:33:51 -0400
Subject: [Koha-patches] [PATCH] Further fixes for Bug 3652 - XSS
	vulnerabilities
Message-ID: <1279308831-29687-1-git-send-email-oleonard@myacpl.org>

Applying "ESCAPE='0'" where necessary in the staff client
---
 .../prog/en/includes/auth-finder-search.inc        |    6 ++--
 .../prog/en/includes/doc-head-close.inc            |    2 +-
 .../prog/en/includes/doc-head-open.inc             |    6 ++++-
 .../intranet-tmpl/prog/en/includes/header.inc      |    2 +-
 .../prog/en/includes/intranet-bottom.inc           |   10 ++++----
 .../prog/en/modules/acqui/neworderbiblio.tmpl      |    4 +-
 .../prog/en/modules/acqui/neworderempty.tmpl       |   12 +++++-----
 .../prog/en/modules/acqui/newordersuggestion.tmpl  |    2 +-
 .../prog/en/modules/acqui/z3950_search.tmpl        |    4 +-
 .../prog/en/modules/admin/aqbudgetperiods.tmpl     |    2 +-
 .../prog/en/modules/admin/aqbudgets.tmpl           |    4 +-
 .../prog/en/modules/admin/aqplan.tmpl              |    8 +++---
 .../en/modules/admin/auth_subfields_structure.tmpl |   18 ++++++++--------
 .../prog/en/modules/admin/authorised_values.tmpl   |    2 +-
 .../prog/en/modules/admin/classsources.tmpl        |    5 +--
 .../en/modules/admin/item_circulation_alerts.tmpl  |    4 +-
 .../prog/en/modules/admin/koha2marclinks.tmpl      |   22 ++++++++++----------
 .../en/modules/admin/marc_subfields_structure.tmpl |   16 +++++++-------
 .../prog/en/modules/admin/matching-rules.tmpl      |    2 +-
 .../prog/en/modules/admin/patron-attr-types.tmpl   |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl  |    2 +-
 .../prog/en/modules/authorities/authorities.tmpl   |    2 +-
 .../modules/authorities/searchresultlist-auth.tmpl |    2 +-
 .../en/modules/authorities/searchresultlist.tmpl   |    2 +-
 .../prog/en/modules/basket/basket.tmpl             |    6 ++--
 .../prog/en/modules/basket/sendbasket.tmpl         |    2 +-
 .../prog/en/modules/basket/sendbasketform.tmpl     |    2 +-
 .../prog/en/modules/catalogue/ISBDdetail.tmpl      |    2 +-
 .../prog/en/modules/catalogue/MARCdetail.tmpl      |    4 +-
 .../prog/en/modules/catalogue/detail.tmpl          |   20 +++++++++---------
 .../en/modules/catalogue/labeledMARCdetail.tmpl    |    2 +-
 .../prog/en/modules/cataloguing/addbiblio.tmpl     |    2 +-
 .../prog/en/modules/cataloguing/additem.tmpl       |    4 +-
 .../prog/en/modules/circ/circulation.tmpl          |   10 ++++----
 .../prog/en/modules/intranet-main.tmpl             |    4 +-
 .../prog/en/modules/labels/label-edit-batch.tmpl   |    2 +-
 .../prog/en/modules/labels/label-home.tmpl         |    4 +-
 .../prog/en/modules/labels/spinelabel-print.tmpl   |    2 +-
 .../prog/en/modules/members/borrowers_details.tmpl |    4 ++-
 .../prog/en/modules/members/member.tmpl            |    2 +-
 .../prog/en/modules/members/memberentrygen.tmpl    |    6 ++--
 .../en/modules/reports/acquisitions_stats.tmpl     |   14 ++++++------
 .../prog/en/modules/reports/bor_issues_top.tmpl    |    2 +-
 .../prog/en/modules/reports/borrowers_out.tmpl     |    4 +-
 .../prog/en/modules/reports/borrowers_stats.tmpl   |    4 +-
 .../prog/en/modules/reports/cat_issues_top.tmpl    |    4 +-
 .../prog/en/modules/reports/catalogue_out.tmpl     |    4 +-
 .../prog/en/modules/reports/catalogue_stats.tmpl   |    4 +-
 .../prog/en/modules/reports/issues_avg_stats.tmpl  |   16 +++++++-------
 .../reports/issues_by_borrower_category.tmpl       |    2 +-
 .../prog/en/modules/reports/issues_stats.tmpl      |    4 +-
 .../prog/en/modules/reports/itemtypes.tmpl         |    2 +-
 .../prog/en/modules/reports/serials_stats.tmpl     |    4 +-
 .../prog/en/modules/reserve/request.tmpl           |    4 +-
 54 files changed, 146 insertions(+), 141 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
index 8a725f0..aa7c69b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc
@@ -18,7 +18,7 @@
                         <option value="start">starts with</option>
                         <option value="is">is exactly</option>
                     </select>
-                    <input type="text" name="value_mainstr" value="<!-- TMPL_VAR ESCAPE="HTML" name="value_mainstr" -->" />
+                    <input type="text" name="value_mainstr" value="<!-- TMPL_VAR name="value_mainstr" -->" />
                 </li>
                 <li>
                     <label for="mainentry">Main entry</label>
@@ -30,7 +30,7 @@
                         <option value="start">starts with</option>
                         <option value="is">is exactly</option>
                     </select>
-                    <input type="text" name="value_main" value="<!-- TMPL_VAR ESCAPE="HTML" name="value_main" -->" />
+                    <input type="text" name="value_main" value="<!-- TMPL_VAR name="value_main" -->" />
                 </li>
                 <li>
                     <label for="marclist">Anywhere</label>
@@ -42,7 +42,7 @@
                         <option value="start">starts with</option>
                         <option value="is">is exactly</option>
                     </select>
-                    <input type="text" name="value_any" value="<!-- TMPL_VAR ESCAPE="HTML" name="value_any" -->" />
+                    <input type="text" name="value_any" value="<!-- TMPL_VAR name="value_any" -->" />
                 </li>
 		<li>
 		<label for="orderby">Sort by </label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index 1970440..f17bc29 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -75,7 +75,7 @@
 <!-- TMPL_IF NAME="intranetuserjs" -->
     <script type="text/javascript">
     //<![CDATA[
-    <!-- TMPL_VAR NAME="intranetuserjs" -->
+    <!-- TMPL_VAR NAME="intranetuserjs" ESCAPE="0" -->
     //]]>
     </script>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc
index df2dc01..d7b838d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc
@@ -1,4 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="<!-- TMPL_VAR NAME="lang" -->" xml:lang="<!-- TMPL_VAR NAME="lang" -->" <!-- TMPL_IF NAME="bidi" -->dir="<!-- TMPL_VAR NAME="bidi" -->"<!-- /TMPL_IF --> xmlns="http://www.w3.org/1999/xhtml">
+<!-- TMPL_IF NAME="bidi" -->
+<html lang="<!-- TMPL_VAR NAME="lang" -->" xml:lang="<!-- TMPL_VAR NAME="lang" -->" dir="<!-- TMPL_VAR NAME="bidi" -->" xmlns="http://www.w3.org/1999/xhtml">
+<!-- TMPL_ELSE -->
+<html lang="<!-- TMPL_VAR NAME="lang" -->" xml:lang="<!-- TMPL_VAR NAME="lang" -->" xmlns="http://www.w3.org/1999/xhtml">
+<!-- /TMPL_IF -->
 <head>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 95ce8dd..3e3ab36 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -9,7 +9,7 @@
                 <!-- TMPL_IF NAME="intranetbookbag" -->
                     <li><a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li>
                 <!-- /TMPL_IF -->
-                <!-- TMPL_VAR name="IntranetNav" -->
+                <!-- TMPL_VAR name="IntranetNav" ESCAPE="0" -->
                 <li class="more">
                     <a id="showmore" href="/cgi-bin/koha/mainpage.pl">More</a>
                     <div id="moremenu">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
index 78334b2..71eff05 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
@@ -7,14 +7,14 @@
         <!-- TMPL_LOOP NAME="languages_loop" -->
             <!-- TMPL_IF NAME="group_enabled" -->
             <!-- TMPL_IF NAME="plural" -->
-            <li class="more"><a id="showlang" href="#"><!-- TMPL_VAR NAME="native_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a><div id="sublangs">
+            <li class="more"><a id="showlang" href="#"><!-- TMPL_VAR NAME="native_description" ESCAPE="0" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" ESCAPE="0" -->)</a><div id="sublangs">
             <div class="bd"><ul>
             <!-- TMPL_LOOP NAME="sublanguages_loop" -->
 		<!-- TMPL_IF NAME="enabled" -->
                 <!-- TMPL_IF NAME="sublanguage_current" -->
-                    <li> <a href="#"><!-- TMPL_VAR NAME="native_description" --> <!-- TMPL_VAR NAME="script_description" --> <!-- TMPL_VAR NAME="region_description" --> <!-- TMPL_VAR NAME="variant_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a></li>
+                    <li> <a href="#"><!-- TMPL_VAR NAME="native_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="script_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="region_description" --> <!-- TMPL_VAR NAME="variant_description" ESCAPE="0" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" ESCAPE="0" -->)</a></li>
                 <!-- TMPL_ELSE -->
-                <li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"> <!-- TMPL_VAR NAME="native_description" --> <!-- TMPL_VAR NAME="script_description" --> <!-- TMPL_VAR NAME="region_description" --> <!-- TMPL_VAR NAME="variant_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a></li>
+                <li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"> <!-- TMPL_VAR NAME="native_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="script_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="region_description" ESCAPE="0" --> <!-- TMPL_VAR NAME="variant_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" ESCAPE="0" -->)</a></li>
 		<!-- /TMPL_IF -->
                 <!-- /TMPL_IF -->
 
@@ -24,9 +24,9 @@
             <!-- TMPL_ELSE -->
 	    	<!-- TMPL_IF NAME="group_enabled" -->
                 <!-- TMPL_IF NAME="current" -->
-                    <li><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" --><!-- /TMPL_IF --></li>
+                    <li><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" ESCAPE="0" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" ESCAPE="0" --><!-- /TMPL_IF --></li>
                 <!-- TMPL_ELSE -->
-                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" --><!-- /TMPL_IF --></a></li>
+                    <li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="rfc4646_subtag" -->"><!-- TMPL_IF NAME="native_description" --><!-- TMPL_VAR NAME="native_description" ESCAPE="0" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="rfc4646_subtag" ESCAPE="0" --><!-- /TMPL_IF --></a></li>
                 <!-- /TMPL_IF -->
 		<!-- /TMPL_IF -->
             <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
index e8ef0eb..f6e5d10 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
@@ -20,7 +20,7 @@
 
 <!-- TMPL_IF NAME="total" -->
 <b><!-- TMPL_VAR NAME="total" -->results found </b> 
-<!-- TMPL_VAR name='pagination_bar'-->
+<!-- TMPL_VAR name="pagination_bar" ESCAPE="HTML"-->
 <!-- TMPL_ELSE -->
 <h3> No results found</h3>
 <p>
@@ -48,7 +48,7 @@
     <!-- TMPL_LOOP NAME="resultsloop" -->
         <tr>
             <td>
-                <p><span class="title"><!-- TMPL_VAR NAME="title" escape="html" --></span>
+                <p><span class="title"><!-- TMPL_VAR NAME="title" --></span>
                 <!-- TMPL_IF name="author" -->  by <span class="author"><!-- TMPL_VAR NAME="author" --></span>,<!-- /TMPL_IF --></p>
                 <p><!-- TMPL_IF name="isbn" --> <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
                 <!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index 603d517..70697de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -140,10 +140,10 @@ ff.submit();
         <ol><li>
             <!-- TMPL_IF name="biblionumber" -->
             <span class="label">Title</span>
-                <input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="HTML" -->" /> <span class="title"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></span>
+                <input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" /> <span class="title"><!-- TMPL_VAR NAME="title" --></span>
             <!-- TMPL_ELSE -->
             <label for="entertitle" class="required">Title: </label>
-                <input type="text" id="entertitle" size="20" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="html" -->" />
+                <input type="text" id="entertitle" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
@@ -206,8 +206,8 @@ ff.submit();
             <ol><!-- TMPL_LOOP NAME="iteminformation" --><li>
                 <div class="subfield_line" style="<!-- TMPL_VAR NAME='hidden' -->;" id="subfield<!-- TMPL_VAR NAME='serialid' --><!-- TMPL_VAR NAME='countitems' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->">
 
-                    <label><!-- TMPL_VAR NAME="subfield" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
-                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <label><!-- TMPL_VAR NAME="subfield" ESCAPE="0" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" ESCAPE="0" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
+                    <!-- TMPL_VAR NAME="marc_value" ESCAPE="0" -->
                     <input type="hidden" name="itemid" value="1" />
                     <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->" />
                     <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->" />
@@ -340,7 +340,7 @@ ff.submit();
                 <label for="sort1">Planning value1: </label>
 
                 <!-- TMPL_IF Name="CGIsort1" -->
-                    <!-- TMPL_VAR Name="CGIsort1" -->
+                    <!-- TMPL_VAR Name="CGIsort1" ESCAPE="0" -->
                 <!-- TMPL_ELSE -->
 
                     <input type="text" id="sort1" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
@@ -350,7 +350,7 @@ ff.submit();
                 <label for="sort2">Planning value2: </label>
 
                 <!-- TMPL_IF Name="CGIsort2" -->
-                    <!-- TMPL_VAR Name="CGIsort2" -->
+                    <!-- TMPL_VAR Name="CGIsort2" ESCAPE="0" -->
                 <!-- TMPL_ELSE -->
                     <input type="text" id="sort2" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
                 <!--/TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
index e18b89f..bb1d0ad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tmpl
@@ -27,7 +27,7 @@
         <!-- TMPL_LOOP NAME="suggestions_loop" -->
             <tr>
                 <td>
-                    <p><!-- TMPL_VAR NAME="title" escape="html" --> - <!-- TMPL_VAR NAME="author" --></p>
+                    <p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
                     <p>
                         <!-- TMPL_IF name="copyrightdate" -->copy. year:<!-- TMPL_VAR NAME="copyrightdate" --> <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="volumedesc" -->volume:<i><!-- TMPL_VAR NAME="volumedesc" --></i> <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
index f9f96ae..74cfc1e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tmpl
@@ -47,7 +47,7 @@ $.tablesorter.addParser({
 	<div class="yui-g">
     <div class="yui-u first">
 	    <fieldset class="rows">
-		 <ol><li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle"  name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE="html" -->" /></li>
+		 <ol><li><label for="searchtitle">Title: </label> <input type="text" id="searchtitle"  name="title" value="<!-- TMPL_VAR NAME="title" -->" /></li>
 		 <li><label for="isbn">ISBN/ISSN: </label> <input type="text" id="isbn" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" /></li>
 		 <li><label for="lccall">LC Call Number: </label> <input type="text" id="lccall" name="lccall" value="" /></li></ol>
 		</fieldset>
@@ -115,7 +115,7 @@ $.tablesorter.addParser({
 
         <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
             <td><!-- TMPL_VAR name="server" --></td>
-            <td><!-- TMPL_VAR NAME="title" ESCAPE="html" --></td>
+            <td><!-- TMPL_VAR NAME="title" --></td>
             <td><!-- TMPL_VAR NAME="author" --></td>
             <td><!-- TMPL_VAR NAME="isbn" --></td>
             <td><!-- TMPL_VAR NAME="lccn" --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
index 204574b..15355c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
@@ -292,7 +292,7 @@
     	<!-- /TMPL_UNLESS -->
     </tbody>
     </table>
-    <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+    <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div>
 <!-- /TMPL_IF -->
 
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
index ce4d7da..620b86d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
@@ -241,7 +241,7 @@
 </table>
 
 <!-- TMPL_IF name="cur" --><p><b>Currency = <!-- TMPL_VAR NAME="cur" --> <!-- TMPL_VAR NAME="cur_format" --></b></p><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="pagination_bar" --><div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="pagination_bar" --><div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div><!-- /TMPL_IF -->
 <!-- /TMPL_IF --> <!-- else -->
 
 <!-- ********************************************************************************************** -->
@@ -315,7 +315,7 @@
 
     <li>
     <label for="budget_permission">Restrict access to: </label>
-    <!-- TMPL_VAR name="budget_perm_dropbox" -->
+    <!-- TMPL_VAR name="budget_perm_dropbox" ESCAPE="0" -->
     </li>
 
     <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
index 627b3f7..2a46c4e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
@@ -104,7 +104,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
     </td>
     <td>
         <label for="authcat"  > Select planning type:</label>
-        <!-- TMPL_VAR NAME="authcat_dropbox" -->
+        <!-- TMPL_VAR NAME="authcat_dropbox" ESCAPE="0" -->
         <input type="submit" name="option_submit" value="Select" />
     </td>
     </tr>
@@ -176,7 +176,7 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
         <tr > 
             <!--/TMPL_IF -->
 
-        <td align='left'><!-- TMPL_VAR NAME="budget_name_indent"--></td>
+        <td align='left'><!-- TMPL_VAR NAME="budget_name_indent" ESCAPE="0" --></td>
         <td align='right'><span id='budget_tot_formatted_<!-- TMPL_VAR NAME="budget_id" -->'><!-- TMPL_VAR NAME="budget_amount_formatted"-->&nbsp;</span>
 
         <!-- NEXT DIV ELEMENT IS USED BY JS FOR CALC-ING AUTO-FILL AND ESTIMATED AMOUNTS -->
@@ -279,8 +279,8 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
     <ol>
     <li><label for="basename">Output to a file named: </label><input type="text" name="basename" id="basename" value="Export" />
     <label class="inline" for="MIME">Into an application
-    </label><!-- TMPL_VAR NAME="CGIextChoice" -->
-    <!-- TMPL_VAR NAME="CGIsepChoice" --> &nbsp;&nbsp;&nbsp;
+    </label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+    <!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --> &nbsp;&nbsp;&nbsp;
     <input type="submit" value="Output"/>
     <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
     <input type="hidden" name="output" value="file" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
index 1b431ec..64d2a29 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
@@ -75,34 +75,34 @@ function displayMoreConstraint(numlayer){
 			<fieldset class="rows"><ol>
 
                     <!-- TMPL_IF NAME="new_subfield" -->
-                <li><label for="tagsubfieldinput<!-- TMPL_VAR NAME="row" -->">Subfield code: </label><!-- TMPL_VAR NAME="tagsubfieldinput" -->&nbsp;</li>
+                <li><label for="tagsubfieldinput<!-- TMPL_VAR NAME="row" -->">Subfield code: </label><!-- TMPL_VAR NAME="tagsubfieldinput" ESCAPE="0" -->&nbsp;</li>
                     <!-- TMPL_ELSE -->
                 <li>
                 <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR name="tagsubfield" -->" />
                  </li>
                     <!-- /TMPL_IF -->
-                <li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</li>
-                <li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</li>
+                <li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" ESCAPE="0" -->&nbsp;</li>
+                <li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" ESCAPE="0" -->&nbsp;</li>
                 <li><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian: </label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></li>
                 <li><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC: </label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></li>
-                <li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield does not display in the record editor)</li>
+                <li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" ESCAPE="0" --> (ignore means that the subfield does not display in the record editor)</li>
                 <li>
                     <fieldset>
                         <legend>Display</legend>
                         <ol>
-                            <li><label for="ohidden<!-- TMPL_VAR NAME="row" -->">Select to display or not:</label><!-- TMPL_VAR name="ohidden" -->  </li>
+                            <li><label for="ohidden<!-- TMPL_VAR NAME="row" -->">Select to display or not:</label><!-- TMPL_VAR name="ohidden" ESCAPE="0" -->  </li>
                             <!-- <li><label for="ihidden<!-- TMPL_VAR NAME="row" -->">Intranet:</label><!-- TMPL_VAR name="ihidden" --> </li> -->
                             <!-- <li><label for="ehidden<!-- TMPL_VAR NAME="row" -->">Editor:</label><!-- TMPL_VAR name="ehidden" --> (see online help)</li> -->
                         </ol>
                     </fieldset>
                 </li>
-                <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL:</label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is a URL and can be clicked)</li>
+                <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL:</label><!-- TMPL_VAR NAME="isurl" ESCAPE="0" --> (if checked, it means that the subfield is a URL and can be clicked)</li>
                 <li>
                     <fieldset><legend>Help input</legend>	
                         <ol>
-                            <li><label for="authorised_value<!-- TMPL_VAR NAME="row" -->">Authorized value:</label> <!-- TMPL_VAR NAME="authorised_value" --></li>
-                            <li><label for="frameworkcode<!-- TMPL_VAR NAME="row" -->">Thesaurus:</label> <!-- TMPL_VAR NAME="frameworkcode" --></li>
-                            <li><label for="value_builder<!-- TMPL_VAR NAME="row" -->">Plugin:</label> <!-- TMPL_VAR NAME="value_builder" --></li>
+                            <li><label for="authorised_value<!-- TMPL_VAR NAME="row" -->">Authorized value:</label> <!-- TMPL_VAR NAME="authorised_value" ESCAPE="0" --></li>
+                            <li><label for="frameworkcode<!-- TMPL_VAR NAME="row" -->">Thesaurus:</label> <!-- TMPL_VAR NAME="frameworkcode" ESCAPE="0" --></li>
+                            <li><label for="value_builder<!-- TMPL_VAR NAME="row" -->">Plugin:</label> <!-- TMPL_VAR NAME="value_builder" ESCAPE="0" --></li>
                         </ol>
                     </fieldset>
                 </li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
index 367930a..f0db677 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
@@ -174,7 +174,7 @@
 </span>
 </div>
 <!-- /TMPL_IF -->
-<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post" id="category"><label for="searchfield">Show Category: </label><!-- TMPL_VAR name="tab_list" --> <input type="submit" value="Submit" /></form>
+<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post" id="category"><label for="searchfield">Show Category: </label><!-- TMPL_VAR name="tab_list" ESCAPE="0" --> <input type="submit" value="Submit" /></form>
 <!-- TMPL_IF EXPR="category eq 'Bsort1'" -->
     <p>An authorized value attached to patrons, that can be used for stats purposes</p>
 <!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
index 2460c92..2c4953e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
@@ -274,9 +274,8 @@ $(document).ready(function() {
   <!-- /TMPL_LOOP -->
 </table>
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div>
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 <h2>Classification Filing Rules</h2>
 <!-- TMPL_IF name="added_rule" -->
 <span class="problem">Added filing rule <!-- TMPL_VAR name="added_rule" --></span>
@@ -310,7 +309,7 @@ $(document).ready(function() {
   </tr>
   <!-- /TMPL_LOOP -->
 </table>
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div>
 
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tmpl
index 48dd3ad..d2ffbaf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tmpl
@@ -157,7 +157,7 @@ $(function(){
 <tr>
   <th>&nbsp;</th>
   <!-- TMPL_LOOP NAME="item_types" -->
-  <th><!-- TMPL_VAR NAME="br_description" --></th>
+  <th><!-- TMPL_VAR NAME="br_description" ESCAPE="0" --></th>
   <!-- /TMPL_LOOP -->
 </tr>
 </thead>
@@ -181,7 +181,7 @@ $(function(){
 <tr>
   <th>&nbsp;</th>
   <!-- TMPL_LOOP NAME="item_types" -->
-  <th><!-- TMPL_VAR NAME="br_description" --></th>
+  <th><!-- TMPL_VAR NAME="br_description" ESCAPE="0"  --></th>
   <!-- /TMPL_LOOP -->
 </tr>
 </thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
index b8f664a..c1e3103 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tmpl
@@ -33,7 +33,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>000s</label>
-            <!-- TMPL_VAR name="marclist0" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist0" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     <li>
@@ -42,7 +42,7 @@
             <input type="hidden" name="op" value="add_validate" />
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <label>100s</label>
-            <!-- TMPL_VAR name="marclist1" -->
+            <!-- TMPL_VAR name="marclist1" ESCAPE="0" -->
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" /><input type="submit" value="OK" />	</form>
         
     </li>
@@ -53,7 +53,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>200s</label>
-            <!-- TMPL_VAR name="marclist2" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist2" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     <li>
@@ -63,7 +63,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>300s</label>
-            <!-- TMPL_VAR name="marclist3" --> <input type="submit" value="OK" />	</form>
+            <!-- TMPL_VAR name="marclist3" ESCAPE="0" --> <input type="submit" value="OK" />	</form>
         
     </li>
     <li>
@@ -73,7 +73,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>400s</label>
-            <!-- TMPL_VAR name="marclist4" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist4" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     <li>
@@ -83,7 +83,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>500s</label>
-            <!-- TMPL_VAR name="marclist5" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist5" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     <li>
@@ -93,7 +93,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>600s</label>
-            <!-- TMPL_VAR name="marclist6" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist6" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     <li>
@@ -103,7 +103,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>700s</label>
-            <!-- TMPL_VAR name="marclist7" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist7" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     <li>
@@ -113,7 +113,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>800s</label>
-            <!-- TMPL_VAR name="marclist8" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist8" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     <li>
@@ -123,7 +123,7 @@
             <input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
             <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
             <label>900s</label>
-            <!-- TMPL_VAR name="marclist9" --> <input type="submit" value="OK" /></form>
+            <!-- TMPL_VAR name="marclist9" ESCAPE="0" --> <input type="submit" value="OK" /></form>
         
     </li>
     </ol></fieldset>
@@ -144,7 +144,7 @@
 
 <h1>Koha to MARC Mapping <!-- TMPL_VAR name="tagfield" --></h1>
 <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-<p><!-- TMPL_VAR name="tablename" --> <input type="submit" value="OK" /></p>
+<p><!-- TMPL_VAR name="tablename" ESCAPE="0" --> <input type="submit" value="OK" /></p>
 </form>
 <table>
 <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
index 2ea58de..9fdf064 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
@@ -98,9 +98,9 @@
                 		<!-- /TMPL_IF -->
                 		<li><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian: </label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></li>
                 		<li><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC: </label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></li>
-                		<li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" --></li>
-                		<li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" --></li>
-                		<li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield does not display in the record editor)</li>
+                		<li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" ESCAPE="0"  --></li>
+                		<li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" ESCAPE="0"  --></li>
+                		<li><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab: </label><!-- TMPL_VAR NAME="tab" ESCAPE="0"  --> (ignore means that the subfield does not display in the record editor)</li>
                 	</ol>
             </fieldset>
 			
@@ -111,17 +111,17 @@
                 <ol><li><label for="defaultvalue<!-- TMPL_VAR NAME="row" -->">Default value:</label>
                     <input type="text" name="defaultvalue" id="defaultvalue<!-- TMPL_VAR NAME="row" -->" value="<!-- TMPL_VAR NAME="defaultvalue" -->" /></li>
                 <li><label for="hidden<!-- TMPL_VAR NAME="row" -->">hidden</label><input type="text" id="hidden<!-- TMPL_VAR NAME="row" -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" /> (see online help)</li>
-                <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL:</label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is a URL and can be clicked)</li>
+                <li><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL:</label><!-- TMPL_VAR NAME="isurl" ESCAPE="0"  --> (if checked, it means that the subfield is a URL and can be clicked)</li>
                 <li><label for="link<!-- TMPL_VAR NAME="row" -->">Link:</label><input type="text" id="link<!-- TMPL_VAR NAME="row" -->" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="80" /> (e.g., Title or Local-Number) <span class="error"><em>Warning: This value should not change after data has been added to your catalog</em></span></li>
-                <li><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha link:</label><!-- TMPL_VAR NAME="kohafield" --></li>
+                <li><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha link:</label><!-- TMPL_VAR NAME="kohafield" ESCAPE="0"  --></li>
 			</ol>
 	</fieldset>
 	 <fieldset class="rows">
                 <legend>Other Options: (choose one)</legend>
                     	<ol>
-                    		<li><label for="authorised_value<!-- TMPL_VAR NAME="row" -->">Authorized value:</label><!-- TMPL_VAR NAME="authorised_value" --></li>
-                    		<li><label for="authtypecode<!-- TMPL_VAR NAME="row" -->">Thesaurus:</label><!-- TMPL_VAR NAME="authtypes" --></li>
-                    		<li><label for="value_builder<!-- TMPL_VAR NAME="row" -->">Plugin:</label><!-- TMPL_VAR NAME="value_builder" --></li>
+                    		<li><label for="authorised_value<!-- TMPL_VAR NAME="row" -->">Authorized value:</label><!-- TMPL_VAR NAME="authorised_value" ESCAPE="0"  --></li>
+                    		<li><label for="authtypecode<!-- TMPL_VAR NAME="row" -->">Thesaurus:</label><!-- TMPL_VAR NAME="authtypes" ESCAPE="0"  --></li>
+                    		<li><label for="value_builder<!-- TMPL_VAR NAME="row" -->">Plugin:</label><!-- TMPL_VAR NAME="value_builder" ESCAPE="0"  --></li>
                     	</ol>
 				</fieldset>
             </div><br class="clear" /><!-- /more  -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
index bfa2ed9..df77592 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tmpl
@@ -572,7 +572,7 @@ function CheckRuleForm(f) {
   <!-- /TMPL_LOOP -->
 </table><!-- TMPL_ELSE --><p>There are no saved matching rules.</p><!-- /TMPL_IF -->
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div>
 
 <!-- /TMPL_IF -->
  <!-- TMPL_IF name="matching_rule_form" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
index 27c82c5..d899cad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
@@ -224,7 +224,7 @@ this feature on.</div>
   <!-- /TMPL_LOOP -->
 </table><!-- TMPL_ELSE --><p>There are no saved patron attribute types.</p><!-- /TMPL_IF -->
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="HTML" --></div>
 
 <!-- /TMPL_IF -->
  
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
index fe2cd96..5d8b767 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
@@ -39,7 +39,7 @@
 <form action="<!-- TMPL_VAR NAME="url" -->" method="post" name="loginform" id="loginform">
     <input type="hidden" name="koha_login_context" value="intranet" />
 <!-- TMPL_LOOP NAME="INPUTS" -->
-    <input type="hidden" name="<!-- TMPL_VAR ESCAPE=HTML NAME="name" -->" value="<!-- TMPL_VAR NAME="value" ESCAPE="html" -->" />
+    <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->" />
 <!-- /TMPL_LOOP -->
 <p><label for="userid">Username:</label>
 <input type="text" name="userid" id="userid" class="input focus" value="<!-- TMPL_VAR NAME="userid" -->" size="20" tabindex="1" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
index cadea08..877de7b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl
@@ -705,7 +705,7 @@ function searchauthority() {
                         </label>
                     <!-- /TMPL_UNLESS -->
                     
-                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <!-- TMPL_VAR NAME="marc_value" ESCAPE="0" -->
                     
                     <!-- TMPL_IF NAME="repeatable" -->
                         <a href="#" onclick="CloneSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' -->'); return false;"><img src="/intranet-tmpl/prog/img/clone-subfield.png" alt="Clone" title="Clone this subfield" /></a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
index e327451..80c7657 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tmpl
@@ -93,7 +93,7 @@ function jumpfull(page)
                     <!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
                 <!-- TMPL_IF name="displaynext" -->
-                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&amp;op=do_search&amp;type=intranet&amp;index=<!-- TMPL_VAR name="index" -->&amp;tagid=<!-- TMPL_VAR name="tagid" -->&amp;orderby=<!-- TMPL_VAR name="orderby" -->">
+                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&amp;<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&amp;op=do_search&amp;type=intranet&amp;index=<!-- TMPL_VAR name="index" -->&amp;tagid=<!-- TMPL_VAR name="tagid" -->&amp;orderby=<!-- TMPL_VAR name="orderby" -->">
                         &gt;&gt;</a>
                 <!-- /TMPL_IF -->
         </div><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
index 01667e5..6c7ccf6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tmpl
@@ -79,7 +79,7 @@ function searchauthority() {
   </table>
 </div>
 
-<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" ESCAPE="0" --></div>
 
 <!-- TMPL_ELSE -->
   No results found
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl
index 9257162..cf293c1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tmpl
@@ -131,12 +131,12 @@ function placeHold () {
     <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
     <h3>
         <!-- TMPL_IF NAME="print_basket" -->
-            <!-- TMPL_VAR NAME="title" ESCAPE="html" -->
+            <!-- TMPL_VAR NAME="title" -->
                 <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
                 <!-- TMPL_IF name="author" --> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
         <!-- TMPL_ELSE -->
                 <input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" onclick="selRecord(value,checked)" />
-                <!-- TMPL_VAR NAME="title" escape="html" -->
+                <!-- TMPL_VAR NAME="title" -->
                 <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
                 <!-- TMPL_IF name="author" --> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
@@ -316,7 +316,7 @@ function placeHold () {
 
                 </td> <!-- /TMPL_UNLESS -->
             <td><a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)">
-                        <!-- TMPL_VAR NAME="title" escape="html" -->
+                        <!-- TMPL_VAR NAME="title" -->
                     </a>
                         <!-- TMPL_VAR NAME="author" -->
                         <p><!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tmpl
index 033c4d2..fdff85e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tmpl
@@ -15,7 +15,7 @@ Reference Manager or ProCite.
 <MESSAGE>
 ---------------------------------------------
 <!-- TMPL_IF NAME="comment" -->
-<!-- TMPL_VAR NAME="comment" -->
+<!-- TMPL_VAR NAME="comment" ESCAPE="0" -->
 <!-- /TMPL_IF -->
 <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><!-- TMPL_IF "HASAUTHORS" -->
 Author(s): <!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF name="MARCAUTHORS" --><!-- TMPL_IF NAME="author" -->; <!-- /TMPL_IF --><!-- TMPL_LOOP NAME="MARCAUTHORS" --><!-- TMPL_LOOP NAME="MARCAUTHOR_SUBFIELDS_LOOP" --><!-- TMPL_VAR NAME="separator" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_LOOP --><!-- TMPL_UNLESS NAME="__last__" -->; <!-- TMPL_ELSE --><!-- /TMPL_UNLESS --><!-- /TMPL_LOOP --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="ISBN" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tmpl
index 9caef3c..26c5e7c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  Sending Your Cart
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  Sending Your Cart<title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body style="padding: 1em;" id="sendbasket">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
index 1516268..1fc87dc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
@@ -17,7 +17,7 @@
 <!-- TMPL_INCLUDE NAME="cat-toolbar.inc" -->
 
 	<div id="catalogue_ISBDdetail">
-		<!-- TMPL_VAR NAME="ISBD" -->
+		<!-- TMPL_VAR NAME="ISBD" ESCAPE="0" -->
 	</div>
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index b5dd80b..134c485 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -36,7 +36,7 @@ function Changefwk(FwkList) {
 
 <!-- /TMPL_UNLESS -->
 
-    <p><b>With Framework :<!--TMPL_VAR Name="framework" --></b></p>
+    <p><b>With Framework :<!--TMPL_VAR Name="framework" ESCAPE="0" --></b></p>
 
 <div id="bibliotabs" class="toptabs numbered">
 	<ul>
@@ -386,7 +386,7 @@ function Changefwk(FwkList) {
                 </tr>
                 <!-- TMPL_LOOP NAME="item_loop" -->
                     <tr>
-                        <!-- TMPL_VAR NAME="item_value" -->
+                        <!-- TMPL_VAR NAME="item_value" ESCAPE="0" -->
                     </tr>
                 <!-- /TMPL_LOOP -->
         </table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 1861028..6dcf229 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Catalog &rsaquo; Details for <!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></title>
+<title>Koha &rsaquo; Catalog &rsaquo; Details for <!-- TMPL_VAR NAME="title" --> <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --><script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
 // http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html
@@ -44,7 +44,7 @@ function verify_images() {
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Details for <i><!-- TMPL_VAR NAME="title" escape="html" -->  <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></i></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>  &rsaquo; Details for <i><!-- TMPL_VAR NAME="title" -->  <!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></i></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -72,17 +72,17 @@ function verify_images() {
     <!-- /TMPL_IF -->
 
         <!-- TMPL_IF NAME="XSLTDetailsDisplay" -->
-        <!-- TMPL_VAR NAME="XSLTBloc" -->
+        <!-- TMPL_VAR NAME="XSLTBloc" ESCAPE="0" -->
         <!-- TMPL_IF NAME="AmazonEnabled" --><!-- TMPL_IF NAME="AmazonCoverImages" --></div><div class="yui-u" id="bookcoverimg">
         <a href="http://www.amazon<!-- TMPL_VAR NAME="AmazonTld" -->/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01.MZZZZZZZ.jpg" alt="" /></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->
 
-    <h3><!-- TMPL_VAR NAME="title" escape="html"--></h3>
+    <h3><!-- TMPL_VAR NAME="title"--></h3>
     <!-- TMPL_LOOP NAME="subtitle" -->
     	<h4><!-- TMPL_VAR NAME="subfield" --></h4>
     <!-- /TMPL_LOOP -->
             <!-- TMPL_UNLESS NAME="item-level_itypes" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->"><!-- /TMPL_UNLESS -->
-            <!-- TMPL_IF name="unititle" --><p><!-- TMPL_VAR name="unititle" escape="html" --></p><!-- /TMPL_IF -->
+            <!-- TMPL_IF name="unititle" --><p><!-- TMPL_VAR name="unititle" --></p><!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="author" --><p>By <a href="/cgi-bin/koha/catalogue/search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="url" -->"><!-- TMPL_VAR NAME="author" --></a></p><!-- /TMPL_IF -->
         <ul>
         <!-- TMPL_IF name="MARCAUTHORS" -->
@@ -104,7 +104,7 @@ function verify_images() {
         <!-- TMPL_IF name="publishercode" -->
     <li><strong>Published by:</strong>
         <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:<!-- TMPL_VAR NAME="publishercode" ESCAPE="url" -->">
-            <!-- TMPL_VAR NAME="publishercode" ESCAPE="html" -->
+            <!-- TMPL_VAR NAME="publishercode" -->
         </a> <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionstatement" --><!-- TMPL_VAR NAME="editionstatement" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionresponsability" --><!-- TMPL_VAR NAME="editionresponsability" --><!-- /TMPL_IF -->
     </li>
     <!-- /TMPL_IF -->
@@ -153,7 +153,7 @@ function verify_images() {
             <li><strong>Subjects:</strong> 
             <ul>
                 <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
-                <li><!-- TMPL_LOOP NAME="MARCSUBJECT_SUBFIELDS_LOOP" --> <!-- TMPL_VAR NAME="separator" --> <a title="&#8225;<!-- TMPL_VAR NAME="code" --> <!-- TMPL_VAR NAME="value" -->" href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_LOOP NAME="link_loop" --><!-- TMPL_VAR NAME="operator" escape="url" --><!-- TMPL_VAR name="limit" -->:<!-- TMPL_VAR NAME="link" escape="url" --><!-- /TMPL_LOOP -->"><!-- TMPL_VAR NAME="value" ESCAPE="html" --></a><!-- /TMPL_LOOP --></li>
+                <li><!-- TMPL_LOOP NAME="MARCSUBJECT_SUBFIELDS_LOOP" --> <!-- TMPL_VAR NAME="separator" --> <a title="&#8225;<!-- TMPL_VAR NAME="code" --> <!-- TMPL_VAR NAME="value" -->" href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_LOOP NAME="link_loop" --><!-- TMPL_VAR NAME="operator" escape="url" --><!-- TMPL_VAR name="limit" -->:<!-- TMPL_VAR NAME="link" escape="url" --><!-- /TMPL_LOOP -->"><!-- TMPL_VAR NAME="value" --></a><!-- /TMPL_LOOP --></li>
                 <!-- /TMPL_LOOP -->
                 </ul>
             </li>
@@ -362,7 +362,7 @@ function verify_images() {
 <!-- TMPL_LOOP NAME="AMAZON_EDITORIAL_REVIEWS" -->
     <!-- TMPL_IF NAME="Content" -->
     <h4>From <!-- TMPL_VAR NAME="Source" -->:</h4>
-    <p><!-- TMPL_VAR NAME="Content" --></p>
+    <p><!-- TMPL_VAR NAME="Content" ESCAPE="0" --></p>
     <!-- /TMPL_IF -->
 <!-- /TMPL_LOOP -->
 <!-- /TMPL_IF-->
@@ -432,7 +432,7 @@ function verify_images() {
 <div id="editions"><h2>Editions</h2>
 <table>
 <!-- TMPL_LOOP NAME="XISBNS" --><tr><!-- TMPL_IF NAME="AmazonEnabled" --><td><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01._AA75_PU_PU-5_.jpg" /></a></td><!-- /TMPL_IF --><td><!-- TMPL_IF NAME="noItemTypeImages" --><!-- TMPL_VAR NAME="description" --><!-- TMPL_ELSE --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->"><!-- /TMPL_IF --></td><td>
-<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a> by <!-- TMPL_VAR NAME="author" --> &copy;<!-- TMPL_VAR NAME="copyrightdate" -->
+<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> by <!-- TMPL_VAR NAME="author" --> &copy;<!-- TMPL_VAR NAME="copyrightdate" -->
   <!-- TMPL_IF name="publishercode" -->
 <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionstatement" --><!-- TMPL_VAR NAME="editionstatement" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionresponsability" --><!-- TMPL_VAR NAME="editionresponsability" --><!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
@@ -450,7 +450,7 @@ function verify_images() {
 <ul>
 <!-- TMPL_LOOP NAME="AMAZON_SIMILAR_PRODUCTS" -->
 <!-- TMPL_LOOP NAME="similar_biblionumbers" -->
-<li><img alt="img" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="ASIN"-->.01._SS50_.jpg" /> <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" ESCAPE="HTML" --></a> </li>
+<li><img alt="img" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="ASIN"-->.01._SS50_.jpg" /> <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> </li>
 <!-- /TMPL_LOOP -->
 <!-- /TMPL_LOOP -->
 </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl
index ce26a71..9be4720 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/labeledMARCdetail.tmpl
@@ -35,7 +35,7 @@
 					<!-- TMPL_UNLESS name="popup" -->
 						<h1>Labeled MARC biblio : <!-- TMPL_VAR NAME="biblionumber" -->  ( <!-- TMPL_VAR NAME="bibliotitle" --> )</h1>
 					<!-- /TMPL_UNLESS -->
-					<p><b>With Framework :<!--TMPL_VAR Name="framework" --></b></p>
+					<p><b>With Framework :<!--TMPL_VAR Name="framework" ESCAPE="0" --></b></p>
 					<!-- div id="bibliotabs" class="toptabs numbered" -->
 					<div>
 						<table class="labeledmarc-table">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index e722afb..f6adb61 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -807,7 +807,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
                     </label>
                 <!-- /TMPL_UNLESS -->
                 
-                <!-- TMPL_VAR NAME="marc_value" -->
+                <!-- TMPL_VAR NAME="marc_value" ESCAPE="0" -->
                 
                 <!-- TMPL_IF NAME="repeatable" -->
                     <span class="subfield_controls"><a href="#" onclick="CloneSubfield('subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->'); return false;"><img src="/intranet-tmpl/prog/img/clone-subfield.png" alt="Clone" title="Clone this subfield" /></a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
index d0be875..677bdcc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tmpl
@@ -232,8 +232,8 @@ function set_to_today(id, force) {
         <!-- TMPL_LOOP NAME="item" -->
                <li><div class="subfield_line" style="<!-- TMPL_VAR NAME='visibility' -->" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='subfield' --><!-- TMPL_VAR name="random" -->">
 
-               <label><!-- TMPL_VAR NAME="subfield" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
-                <!-- TMPL_VAR NAME="marc_value" -->
+               <label><!-- TMPL_VAR NAME="subfield" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" ESCAPE="0" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
+                <!-- TMPL_VAR NAME="marc_value" ESCAPE="0" -->
                 <input type="hidden" name="tag"       value="<!-- TMPL_VAR NAME="tag" -->" />
                 <input type="hidden" name="subfield"  value="<!-- TMPL_VAR NAME="subfield" -->" />
                 <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 980d195..a24543b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -387,7 +387,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 
 <ol>    <li>
     <label for="borrowernumber">Select a patron: </label>
-    <!-- TMPL_VAR name="CGIselectborrower" -->
+    <!-- TMPL_VAR name="CGIselectborrower" ESCAPE="0" -->
     </li>
 </ol>
 <p><input type="submit" value="Select" /></p>
@@ -554,7 +554,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 		    <h4>Holds waiting:</h4>
 			        <!-- TMPL_LOOP NAME="WaitingReserveLoop" -->
 			            <ul>
-			                <li> <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a> (<!-- TMPL_VAR NAME="itemtype"-->), <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author"--><!-- /TMPL_IF --> Hold placed on <!-- TMPL_VAR NAME="reservedate"-->.
+			                <li> <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> (<!-- TMPL_VAR NAME="itemtype"-->), <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author"--><!-- /TMPL_IF --> Hold placed on <!-- TMPL_VAR NAME="reservedate"-->.
 			            <!-- TMPL_IF NAME="waitingat" -->
 			                <br /><!-- TMPL_IF NAME="waitinghere" --><strong class="waitinghere"><!-- TMPL_ELSE --><strong><!-- /TMPL_IF -->Waiting at <!-- TMPL_VAR NAME="waitingat" --></strong>
 			            <!-- /TMPL_IF -->
@@ -681,7 +681,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <tr class="highlight">
     <!-- /TMPL_IF -->
         <td><!-- TMPL_VAR NAME="dd" --></td>
-        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="itemnotes" -->- <span class="circ-hlt"><!-- TMPL_VAR name="itemnotes" --></span><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><strong><!-- TMPL_VAR NAME="title" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="itemnotes" -->- <span class="circ-hlt"><!-- TMPL_VAR name="itemnotes" --></span><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
         <td><!-- TMPL_UNLESS NAME="noItemTypeImages" --> <!-- TMPL_IF NAME="itemtype_image" --><img src="<!-- TMPL_VAR NAME="itemtype_image" -->" alt="" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- TMPL_VAR NAME="itemtype" --></td>
         <td><!-- TMPL_VAR NAME="checkoutdate" --></td>
         <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
@@ -745,7 +745,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <!-- TMPL_IF NAME="od" --><td class="od"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
         <!-- TMPL_VAR NAME="dd" -->
         </td>
-        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="itemnotes" -->- <!-- TMPL_VAR name="itemnotes" --><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><strong><!-- TMPL_VAR NAME="title" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="itemnotes" -->- <!-- TMPL_VAR name="itemnotes" --><!-- /TMPL_IF --> <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#item<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
         <td>
             <!-- TMPL_VAR NAME="itemtype" -->
         </td>
@@ -835,7 +835,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <!-- TMPL_LOOP NAME="reservloop" -->
         <tr class="<!-- TMPL_VAR NAME="color" -->">
                     <td><!-- TMPL_VAR NAME="reservedate" --></td>
-                    <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></td>
+                    <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><strong><!-- TMPL_VAR NAME="title" --></strong></a><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></td>
                     <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
 					<td><em><!-- TMPL_IF name="barcodereserv" -->Item <!-- TMPL_VAR NAME="barcodereserv" -->
                         <!-- /TMPL_IF --><!-- TMPL_IF name="waiting" --> <strong>waiting at <!-- TMPL_VAR NAME="waitingat" --></strong>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
index 420d7e1..7f299d6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
@@ -77,7 +77,7 @@
 	</div>
 	</div>
 		<!-- TMPL_IF NAME="IntranetmainUserblock" --><div id="mainuserblock" class="yui-g">
-			<!-- TMPL_VAR NAME="IntranetmainUserblock" -->
+			<!-- TMPL_VAR NAME="IntranetmainUserblock" ESCAPE="0" -->
 			</div><!-- TMPL_ELSE -->&nbsp;
 		<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="koha_news_count" -->
@@ -88,7 +88,7 @@
             <h3>News</h3>
             <!-- TMPL_LOOP name="koha_news" -->
                     <div class="newsitem" id="news<!-- TMPL_VAR NAME="idnew" -->"><h4><!-- TMPL_VAR name="title" --></h4>
-					 <p><!-- TMPL_VAR name="new" --></p>
+					 <p><!-- TMPL_VAR name="new" ESCAPE="0" --></p>
 					<p class="newsfooter"> Posted on <!-- TMPL_VAR name="newdate" --> <!-- TMPL_IF NAME="CAN_user_tools" -->
     <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=<!-- TMPL_VAR NAME="idnew" -->">Edit</a> | <a href="/cgi-bin/koha/tools/koha-news.pl?op=del&amp;ids=<!-- TMPL_VAR NAME="idnew" -->">Delete</a> | <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New</a><!-- /TMPL_IF --></p></div>
             <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
index d132619..dfbb051 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
@@ -38,7 +38,7 @@
                                         <!-- TMPL_IF NAME="select_field" -->
                                             <td align="center"><input type="checkbox" name="action" value="<!-- TMPL_VAR NAME="field_value" -->"></td>
                                         <!-- TMPL_ELSE -->
-                                            <td><!-- TMPL_VAR NAME="field_value" --></td>
+                                            <td><!-- TMPL_VAR NAME="field_value" ESCAPE="0" --></td>
                                         <!-- /TMPL_IF -->
                                         <!-- /TMPL_LOOP -->
                                         </tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
index 6460e44..173b54d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
@@ -7,8 +7,8 @@
     <!-- TMPL_INCLUDE NAME="header.inc" -->
     <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
     <div id="breadcrumbs">
-        <a href="/cgi-bin/koha/mainpage.pl">Home</a>&rsaquo;
-        <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>&rsaquo;
+        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; 
+        <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo;
         Labels Home
     </div>
     <div id="doc3" class="yui-t2">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl
index d7c1da5..9f4a707 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tmpl
@@ -24,7 +24,7 @@
 			<body>
 		<!-- /TMPL_IF --> 
 			<span id="spinelabel" class="label">
-				<!-- TMPL_VAR NAME="content" -->
+				<!-- TMPL_VAR NAME="content" ESCAPE="0" -->
 			</span>
 			<span id="print_button" class="noprint">
 				<button onclick="window.print()">Print This Label</button>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
index 763cf66..01b39a1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
@@ -60,4 +60,6 @@
 	</form>
 
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index fef7b69..9261388 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -75,7 +75,7 @@
 							<!-- /TMPL_LOOP -->
 							</tbody>
 							</table>
-							<div class="pages"><!--TMPL_IF Name="multipage"--><!--TMPL_VAR Name="paginationbar" --><!--/TMPL_IF--></div>
+							<div class="pages"><!--TMPL_IF Name="multipage"--><!--TMPL_VAR Name="paginationbar" ESCAPE="0" --><!--/TMPL_IF--></div>
 						</div>
 						<!-- TMPL_ELSE -->
 						<!-- TMPL_IF NAME="searching" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index b21d35a..52782f4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -170,7 +170,7 @@
                 <label for="btitle">
             <!-- /TMPL_IF-->
             Salutation: </label>
-            <!-- TMPL_VAR NAME="borrotitlepopup" -->
+            <!-- TMPL_VAR NAME="borrotitlepopup" ESCAPE="0" -->
             <!-- TMPL_IF NAME="mandatorytitle" --><span class="required">Required</span><!-- /TMPL_IF -->
             </li>
 		<!-- /TMPL_IF -->
@@ -370,7 +370,7 @@
       <label for="streettype">
       <!-- /TMPL_IF-->
       Street type: </label>
-      <!-- TMPL_VAR NAME="roadpopup" -->
+      <!-- TMPL_VAR NAME="roadpopup" ESCAPE="0" -->
 	  <!-- TMPL_IF NAME="mandatorystreettype" --><span class="required">Required</span><!-- /TMPL_IF -->
       </li>
     <!--/TMPL_IF--> 
@@ -724,7 +724,7 @@
         <label for="branchcode">
       <!-- /TMPL_IF-->
       Library: </label>
-      <!-- TMPL_VAR NAME="CGIbranch" -->
+      <!-- TMPL_VAR NAME="CGIbranch" ESCAPE="0" -->
 	  <!-- TMPL_IF NAME="mandatorybranchcode" --><span class="required">Required</span><!-- /TMPL_IF -->
     </li>
     <li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
index 0bf5daf..3f94373 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
@@ -242,20 +242,20 @@
 				<td>Vendor</td>
 				<td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>
 				<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
-				<td><!-- TMPL_VAR NAME="CGIBookSeller" --></td>
+				<td><!-- TMPL_VAR NAME="CGIBookSeller" ESCAPE="0" --></td>
 			</tr>
 			<tr>
 				<td>Item Type</td>
 				<td><input type="radio" name="Line" value="biblioitems.itemtype" /></td>
 				<td><input type="radio" name="Column" value="biblioitems.itemtype" /></td>
-				<td><!-- TMPL_VAR NAME="CGIItemType" --></td>
+				<td><!-- TMPL_VAR NAME="CGIItemType" ESCAPE="0" --></td>
 			</tr>
 
 			<tr>
 				<td>Budget</td>
 				<td><input type="radio" name="Line" value="aqbudgets.budget_code" /></td>
 				<td><input type="radio" name="Column" value="aqbudgets.budget_code" /></td>
-				<td><!-- TMPL_VAR NAME="CGIBudget" --></td>
+				<td><!-- TMPL_VAR NAME="CGIBudget" ESCAPE="0" --></td>
 			</tr>
 
 			<!-- TMPL_IF Name="hassort1" -->
@@ -263,7 +263,7 @@
 					<td>Sort1</td>
 					<td><input type="radio" name="Line" value="aqorders.sort1" /></td>
 					<td><input type="radio" name="Column" value="aqorders.sort1" /></td>
-					<td><!-- TMPL_VAR NAME="CGISort1" --> </td>
+					<td><!-- TMPL_VAR NAME="CGISort1" ESCAPE="0" --> </td>
 				</tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF Name="hassort2" -->
@@ -271,7 +271,7 @@
 					<td>Sort2</td>
 					<td><input type="radio" name="Line" value="aqorders.sort2" /></td>
 					<td><input type="radio" name="Column" value="aqorders.sort2" /></td>
-					<td><!-- TMPL_VAR NAME="CGISort2" --> </td>
+					<td><!-- TMPL_VAR NAME="CGISort2" ESCAPE="0" --> </td>
 				</tr>
 			<!-- /TMPL_IF -->
 		</tbody>
@@ -286,8 +286,8 @@
 	<legend>Output</legend>
 <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
 <li><label for="outputfile">To a file:</label> 		<input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application
-		</label><!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+		</label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+		<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
 	</fieldset>
 
 	<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
index b20a2f7..a6c1ac1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tmpl
@@ -257,7 +257,7 @@ function Dopop(link) {
 			<!-- /TMPL_LOOP -->
 			</select>
 			<label class="inline" for="sep">Delimiter: </label>
-			<!-- TMPL_VAR NAME="CGIseplist" -->
+			<!-- TMPL_VAR NAME="CGIseplist" ESCAPE="0" -->
 		</li>
 	</ol>
 	</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
index d624f99..fb4efc6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
@@ -98,8 +98,8 @@
 	<legend>Output</legend>
 <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
 <li><label for="outputfile">To a file:</label> 		<input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
-		</label><!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+		</label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+		<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
 	</fieldset>
 
 	<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
index 5e8f6a2..daefcff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tmpl
@@ -257,8 +257,8 @@
 	<legend>Output</legend>
 <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
 <li><label for="outputfile">To a file:</label> 		<input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
-		</label><!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+		</label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+		<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
 	</fieldset>
 
 	<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
index 6a66948..da0b019 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tmpl
@@ -247,8 +247,8 @@ function Dopop(link) {
 	<legend>Output</legend>
 <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
 <li><label for="outputfile">To a file:</label> 		<input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
-		</label><!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+		</label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+		<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
 	</fieldset>
 
 	<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
index d6218e1..a665be9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
@@ -139,11 +139,11 @@
 		<label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
 		<label class="inline" for="MIME">Into an application </label>
         <select name="MIME" id="MIME">
-        <!-- TMPL_LOOP NAME="CGIextChoice" -->
+        <!-- TMPL_LOOP NAME="CGIextChoice" ESCAPE="0" -->
           <option value="<!-- TMPL_VAR NAME="type" -->"><!-- TMPL_VAR NAME="type" --></option>
         <!-- /TMPL_LOOP -->
         </select>
-        <!-- TMPL_VAR NAME="CGIsepChoice" -->
+        <!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" -->
 	</li>
 </ol>
 	</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
index 419193e..129992b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
@@ -207,12 +207,12 @@
 			<label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
 			<label class="inline" for="MIME">Into an application: </label>
 			<select name="MIME" id="MIME">
-			<!-- TMPL_LOOP NAME="CGIextChoice" -->
+			<!-- TMPL_LOOP NAME="CGIextChoice" ESCAPE="0" -->
 			<option value="<!-- TMPL_VAR NAME="type" -->"><!-- TMPL_VAR NAME="type" --></option>
 			<!-- /TMPL_LOOP -->
 			</select>
 			<!-- <label class="inline" for="sep">Delimiter: </label> -->
-			<!-- TMPL_VAR NAME="CGIsepChoice" -->
+			<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" -->
 		</li>
 	</ol>
 	</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
index 26d671b..f961da5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tmpl
@@ -229,26 +229,26 @@
 				<td>Patron category</td>
 				<td><input type="radio" name="Line" value="borrowers.categorycode" /></td>
 				<td><input type="radio" name="Column" value="borrowers.categorycode" /></td>
-				<td><!-- TMPL_VAR NAME="CGIBorCat" --></td>
+				<td><!-- TMPL_VAR NAME="CGIBorCat" ESCAPE="0" --></td>
 			</tr>
 			<tr>
 				<td>Item type</td>
 				<td><input type="radio" name="Line" value="itemtype" /></td>
 				<td><input type="radio" name="Column" value="itemtype" /></td>
-				<td ><!-- TMPL_VAR NAME="CGIItemType" --></td>
+				<td ><!-- TMPL_VAR NAME="CGIItemType" ESCAPE="0" --></td>
 			</tr>
 			<tr class="hilighted">
 				<td>Library</td>
 				<td><input type="radio" name="Line" value="branchcode" /></td>
 				<td><input type="radio" name="Column" value="branchcode" /></td>
-				<td><!-- TMPL_VAR NAME="CGIBranch" --></td>
+				<td><!-- TMPL_VAR NAME="CGIBranch" ESCAPE="0" --></td>
 			</tr>
 <!-- Modified according to statistics table
 			<tr>
 				<td>Issuing Library</td>
 				<td><input type="radio" name="Line" value="issuingbranch"></td>
 				<td><input type="radio" name="Column" value="issuingbranch"></td>
-				<td ><! TMPL_VAR NAME="CGIBranch" ></td>
+				<td ><! TMPL_VAR NAME="CGIBranch" ESCAPE="0" ></td>
 			</tr> -->
 <!--End Modified -->
 			<!-- TMPL_IF Name="hassort1" -->
@@ -256,7 +256,7 @@
 					<td>Sort1</td>
 					<td><input type="radio" name="Line" value="borrowers.sort1" /></td>
 					<td><input type="radio" name="Column" value="borrowers.sort1" /></td>
-					<td><!-- TMPL_VAR NAME="CGISort1" --> </td>
+					<td><!-- TMPL_VAR NAME="CGISort1" ESCAPE="0" --> </td>
 				</tr>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF Name="hassort2" -->
@@ -264,7 +264,7 @@
 					<td>Sort2</td>
 					<td><input type="radio" name="Line" value="borrowers.sort2" /></td>
 					<td><input type="radio" name="Column" value="borrowers.sort2" /></td>
-					<td><!-- TMPL_VAR NAME="CGISort2" --> </td>
+					<td><!-- TMPL_VAR NAME="CGISort2" ESCAPE="0" --> </td>
 				</tr>
 			<!-- /TMPL_IF -->
 		</tbody>
@@ -275,8 +275,8 @@
 	<legend>Output</legend>
 <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
 <li><label for="outputfile">To a file:</label> 		<input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application:  
-		</label><!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+		</label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+		<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
 	</fieldset>
 
 	<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
index 2121551..87958c2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tmpl
@@ -60,7 +60,7 @@
         <option value="<!--TMPL_VAR Name="value"-->" ><!--TMPL_VAR Name="description"--> </option>  
      <!--/TMPL_LOOP --> 
     </select></li>
-		<li><label for="branch">Select a branch:</label> <!-- TMPL_VAR NAME="CGIbranch" --></li></ol></fieldset>
+		<li><label for="branch">Select a branch:</label> <!-- TMPL_VAR NAME="CGIbranch" ESCAPE="0" --></li></ol></fieldset>
 		<fieldset class="action"><input type="submit" value="Submit" />
 		<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
 		<input type="hidden" name="do_it" value="1" /></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
index 6eefeac..da69272 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
@@ -281,8 +281,8 @@
 	<legend>Output</legend>
 <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
 <li><label for="outputfile">To a file:</label> <input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" /> <label class="inline" for="MIME">Into an application  
-		</label><!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+		</label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+		<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
 	</fieldset>
 
 	<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
index 22a39dc..403535b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tmpl
@@ -37,7 +37,7 @@
 <!-- TMPL_ELSE -->
 
 	<form method="post" action="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">
-		<fieldset class="rows"><legend>View catalog group by item types</legend><ol><li><label for="value">Select a branch</label> <!-- TMPL_VAR NAME="CGIbranch" -->
+		<fieldset class="rows"><legend>View catalog group by item types</legend><ol><li><label for="value">Select a branch</label> <!-- TMPL_VAR NAME="CGIbranch" ESCAPE="0" -->
 		<span class="tip">Select none to see all branches</span></li></ol></fieldset>
 		<fieldset class="action"><input type="submit" value="Submit" />
 		<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl
index d8bb17b..956aa92 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl
@@ -96,8 +96,8 @@
 	<legend>Output</legend>
 <ol><li><label for="outputscreen">To screen into the browser: </label><input type="radio" checked="checked" name="output" id="outputscreen" value="screen" /> </li>
 <li><label for="outputfile">To a file:</label> 		<input type="radio" name="output" value="file" id="outputfile" /> <label class="inline" for="basename">Named: </label><input type="text" name="basename" id="basename" value="Export" />
-		<label class="inline" for="MIME">Into an application</label><!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" --></li></ol>
+		<label class="inline" for="MIME">Into an application</label><!-- TMPL_VAR NAME="CGIextChoice" ESCAPE="0" -->
+		<!-- TMPL_VAR NAME="CGIsepChoice" ESCAPE="0" --></li></ol>
 	</fieldset>
 
 	<fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
index 67baf2d..cb0fdd9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -184,7 +184,7 @@ function checkMultiHold() {
 			</fieldset>
         <!-- TMPL_ELSE -->
 			<fieldset>
-			<!-- TMPL_VAR NAME="CGIselectborrower" -->
+			<!-- TMPL_VAR NAME="CGIselectborrower" ESCAPE="0" -->
 			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber"-->" /><fieldset class="action"><input type="submit" value="Select" /></fieldset></fieldset>
 
         <!-- /TMPL_UNLESS -->
@@ -280,7 +280,7 @@ function checkMultiHold() {
         </li>
         <li>
             <label for="pickup">Pickup at:</label>
-            <!-- TMPL_VAR NAME="CGIbranch" -->
+            <!-- TMPL_VAR NAME="CGIbranch" ESCAPE="0" -->
         </li>
 
 	<!-- TMPL_IF NAME="reserve_in_future" -->
-- 
1.7.0.4


From colin.campbell at ptfs-europe.com  Sun Jul 18 18:05:55 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Sun, 18 Jul 2010 17:05:55 +0100
Subject: [Koha-patches] [PATCH] Bug 5032 Remove duplicate code
Message-ID: <1279469155-7595-1-git-send-email-colin.campbell@ptfs-europe.com>

Two duplicate calls to GetSerials appear to have been merged in
to no purpose other than to generate warnings
---
 serials/subscription-detail.pl |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index b6538fe..7324d59 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -93,9 +93,6 @@ if ($op eq 'del') {
     }
 }
 my $hasRouting = check_routing($subscriptionid);
-my ($totalissues, at serialslist) = GetSerials($subscriptionid);
-$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
-# the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
 
 my ($user, $sessionID, $flags);
 ($user, $cookie, $sessionID, $flags)
-- 
1.7.1.1


From robin at catalyst.net.nz  Mon Jul 19 04:37:07 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Mon, 19 Jul 2010 14:37:07 +1200
Subject: [Koha-patches] [PATCH] bug 3648: Add a reference to xml_sax to the
	Makefile.PL
Message-ID: <1279507027-32136-1-git-send-email-robin@catalyst.net.nz>

---
 Makefile.PL |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index e1a3be2..213459a 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -313,6 +313,7 @@ my $target_map = {
                                            # that should go in /var/tmp/koha
   './tools'                     => 'INTRANET_CGI_DIR',
   './virtualshelves'            => 'INTRANET_CGI_DIR',
+  './xml_sax.pl'                => 'PERL_MODULE_DIR',
   # ignore files and directories created by the install itself
   './pm_to_blib'                => 'NONE',
   './blib'                      => 'NONE',
-- 
1.7.0.4


From chrisc at catalyst.net.nz  Mon Jul 19 06:24:06 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Mon, 19 Jul 2010 16:24:06 +1200
Subject: [Koha-patches] [PATCH] bug 5007: fixing the syspref for
	IntranetBiblioDefaultView
Message-ID: <1279513446-26069-1-git-send-email-chrisc@catalyst.net.nz>

From: Andrew Chilton <andychilton at gmail.com>

Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
---
 installer/data/mysql/updatedatabase.pl             |    7 +++++++
 .../en/modules/admin/preferences/cataloguing.pref  |    2 +-
 kohaversion.pl                                     |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 68e7cbc..6560aed 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3687,6 +3687,13 @@ if (C4::Context->preference('Version') < TransformToNum($DBversion)){
     SetVersion ($DBversion);
 }
 
+$DBversion = '3.01.00.144';
+if (C4::Context->preference('Version') < TransformToNum($DBversion)){
+    $dbh->do(qq{UPDATE systempreferences SET value='normal' where value='default' and variable='IntranetBiblioDefaultView'});
+    print "Update the 'default' to 'normal' for the IntranetBiblioDefaultView syspref (bug 5007)";
+    SetVersion ($DBversion);
+}
+
 
 =item DropAllForeignKeys($table)
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
index b54f65b..4e06abc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
@@ -98,7 +98,7 @@ Cataloging:
             - By default, display biblio records in
             - pref: IntranetBiblioDefaultView
               choices:
-                  default: normal form.
+                  normal: normal form.
                   marc: MARC form.
                   labeled_marc: Labelled MARC form
                   isbd: ISBD form (see below).
diff --git a/kohaversion.pl b/kohaversion.pl
index 37605eb..26ee160 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -11,7 +11,7 @@ use strict;
 
 sub kohaversion {
 
-    our $VERSION = '3.01.00.143';
+    our $VERSION = '3.01.00.144';
 
     # version needs to be set this way
     # so that it can be picked up by Makefile.PL
-- 
1.7.0.4


From robin at catalyst.net.nz  Mon Jul 19 07:31:35 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Mon, 19 Jul 2010 17:31:35 +1200
Subject: [Koha-patches] [PATCH] Bug 5034 - Updated the debian maintainer
	details
Message-ID: <1279517495-6296-1-git-send-email-robin@catalyst.net.nz>

---
 debian/control |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/control b/debian/control
index 5f107ba..d521772 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: koha
-Maintainer: Lars Wirzenius <lars at catalyst.net.nz>
+Maintainer: Robin Sheat <robin at kallisti.net.nz>
 Section: web
 Priority: optional
 Standards-Version: 3.8.4
-- 
1.7.0.4


From robin at catalyst.net.nz  Mon Jul 19 07:41:05 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Mon, 19 Jul 2010 17:41:05 +1200
Subject: [Koha-patches] [PATCH] Bug 5034 - update the maintainer details,
	correctly
Message-ID: <1279518065-6761-1-git-send-email-robin@catalyst.net.nz>

---
 debian/control |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/control b/debian/control
index 5f107ba..a43d128 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: koha
-Maintainer: Lars Wirzenius <lars at catalyst.net.nz>
+Maintainer: Robin Sheat <robin at catalyst.net.nz>
 Section: web
 Priority: optional
 Standards-Version: 3.8.4
-- 
1.7.0.4


From robin at catalyst.net.nz  Mon Jul 19 07:42:10 2010
From: robin at catalyst.net.nz (Robin Sheat)
Date: Mon, 19 Jul 2010 17:42:10 +1200
Subject: [Koha-patches] [PATCH] Bug 5034 - update the maintainer details,
	correctly
In-Reply-To: <1279518065-6761-1-git-send-email-robin@catalyst.net.nz>
References: <1279518065-6761-1-git-send-email-robin@catalyst.net.nz>
Message-ID: <1279518130.11711.54.camel@zarathud>

The previous one had my personal email, rather than my work one.
Disregard it and use this instead please :)

Op maandag 19-07-2010 om 17:41 uur [tijdzone +1200], schreef Robin
Sheat:
> ---
>  debian/control |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/debian/control b/debian/control
> index 5f107ba..a43d128 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -1,5 +1,5 @@
>  Source: koha
> -Maintainer: Lars Wirzenius <lars at catalyst.net.nz>
> +Maintainer: Robin Sheat <robin at catalyst.net.nz>
>  Section: web
>  Priority: optional
>  Standards-Version: 3.8.4

-- 
Robin Sheat
Catalyst IT Ltd.
? +64 4 803 2204
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Dit berichtdeel is digitaal ondertekend
URL: </pipermail/koha-patches/attachments/20100719/bd5c5fb7/attachment.pgp>

From f.demians at tamil.fr  Tue Jul 20 14:03:35 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Tue, 20 Jul 2010 14:03:35 +0200
Subject: [Koha-patches] [PATCH] Bug 5041 Allow to delete non-repeatable field
Message-ID: <1279627415-10348-1-git-send-email-f.demians@tamil.fr>

Minus links wasn't displayed as it should in order to allow cataloger to
delete (empty all subfields) a non repeatable subfield.
---
 .../prog/en/modules/cataloguing/addbiblio.tmpl     |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
index e722afb..b12dfc5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
@@ -773,8 +773,8 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
             <!-- /TMPL_UNLESS -->
             <!-- TMPL_IF name="repeatable" -->
                 <a href="#" tabindex="1" class="buttonPlus" onclick="CloneField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->'); return false;" title="Repeat this Tag">+</a>
-                <a href="#" tabindex="1" class="buttonMinus" onclick="UnCloneField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->'); return false;" title="Delete this Tag">&#8722;</a>
             <!-- /TMPL_IF -->
+                <a href="#" tabindex="1" class="buttonMinus" onclick="UnCloneField('tag_<!-- TMPL_VAR name="tag"-->_<!-- TMPL_VAR NAME='index'--><!-- TMPL_VAR name="random" -->'); return false;" title="Delete this Tag">&#8722;</a>
             
         </div>
 	
-- 
1.7.1


From nahuel.angelinetti at biblibre.com  Tue Jul 20 16:05:53 2010
From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI)
Date: Tue, 20 Jul 2010 16:05:53 +0200
Subject: [Koha-patches] [PATCH] (bug #5042) rss field and sort by
Message-ID: <1279634753-29734-1-git-send-email-nahuel.angelinetti@biblibre.com>

this add an arg in url to take care of order in rss feeds.
---
 .../opac-tmpl/prog/en/modules/opac-results.tmpl    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index 265d773..f5d6abc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -6,7 +6,7 @@
     You did not specify any search criteria.
 <!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<link rel="alternate" type="application/rss+xml" title="<!-- TMPL_VAR NAME="LibraryName" --> Search RSS Feed" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi"  ESCAPE="HTML" -->&amp;format=rss2" />
+<link rel="alternate" type="application/rss+xml" title="<!-- TMPL_VAR ESCAPE="HTML" NAME="LibraryName" --> Search RSS Feed" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi"  ESCAPE="HTML" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;format=rss2" />
 
 
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
-- 
1.7.0.4


From oleonard at myacpl.org  Tue Jul 20 16:30:09 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 20 Jul 2010 10:30:09 -0400
Subject: [Koha-patches] [PATCH] Fixes Bug 4851 Batch delete shouldn't
	show delete button if no items were found
In-Reply-To: <1279192683-4598-1-git-send-email-ebin.joseph@osslabs.biz>
References: <ebin.joseph@osslabs.biz>
	<1279192683-4598-1-git-send-email-ebin.joseph@osslabs.biz>
Message-ID: <AANLkTilDXYmN-eyxeXM8Ko2h2X2ns2SHDZvzaaC-0T8M@mail.gmail.com>

I found that this patch also hides the delete button if items *are* found.

  -- Owen

-- 
Web Developer
Athens County Public Libraries
http://www.myacpl.org

From colin.campbell at ptfs-europe.com  Tue Jul 20 17:57:15 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Tue, 20 Jul 2010 16:57:15 +0100
Subject: [Koha-patches] [PATCH] Bug 5023 Remove unused Serials Modules
Message-ID: <1279641435-5851-1-git-send-email-colin.campbell@ptfs-europe.com>

Modules possibly added in error
Neither is called elsewhere in the system
---
 C4/Serials/Frequency.pm     |  142 -------------------------------------------
 C4/Serials/NumberPattern.pm |  129 ---------------------------------------
 2 files changed, 0 insertions(+), 271 deletions(-)
 delete mode 100644 C4/Serials/Frequency.pm
 delete mode 100644 C4/Serials/NumberPattern.pm

diff --git a/C4/Serials/Frequency.pm b/C4/Serials/Frequency.pm
deleted file mode 100644
index e4bc341..0000000
--- a/C4/Serials/Frequency.pm
+++ /dev/null
@@ -1,142 +0,0 @@
-package C4::Frequency;
-
-# Copyright 2000-2002 Biblibre SARL
-#
-# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-use strict;
-#use warnings; FIXME - Bug 2505
-use C4::Context;
-use C4::SQLHelper qw<:all>;
-use C4::Debug;
-
-use vars qw($VERSION @ISA @EXPORT);
-
-BEGIN {
-	# set the version for version checking
-	$VERSION = 3.01;
-	require Exporter;
-	@ISA    = qw(Exporter);
-	@EXPORT = qw(
-
-        &GetFrequencies
-        &GetFrequency
-		&new
-		&all
-	    &AddFrequency
-        &ModFrequency
-        &DelFrequency
-
-	);
-}
-
-# -------------------------------------------------------------------
-my %count_issues_a_year=(
-	day=>365,
-	week=>52,
-	month=>12,
-	quarter=>4,
-	year=>1
-);
-
-sub new {
-    my ($class, $opts) = @_;
-    bless $opts => $class;
-}
-
-
-sub AddFrequency {
-    my ($class,$frequency) = @_;
-	return InsertInTable("subscription_frequency",$frequency);
-}
-
-sub GetExpectedissuesayear {
-    my ($class,$unit,$issuesperunit,$unitperissues) = @_;
-	return Int($count_issues_a_year{$unit}/$issuesperunit)*$unitperissues;
-}
-
-# -------------------------------------------------------------------
-sub ModFrequency {
-    my ($class,$frequency) = @_;
-	return UpdateInTable("subscription_frequency",$frequency);
-}
-
-# -------------------------------------------------------------------
-sub DelFrequency {
-	my ($class,$frequency) = @_;
-	return DeleteInTable("subscription_frequency",$frequency);
-}
-
-sub all {
-    my ($class) = @_;
-    my $dbh = C4::Context->dbh;
-    return    map { $class->new($_) }    @{$dbh->selectall_arrayref(
-        # The subscription_frequency table is small enough for
-        # `SELECT *` to be harmless.
-        "SELECT * FROM subscription_frequency ORDER BY description",
-        { Slice => {} },
-    )};
-}
-
-=head3 GetFrequency
-
-=over 4
-
-&GetFrequency($freq_id);
-
-gets frequency where $freq_id is the identifier
-
-=back
-
-=cut
-
-# -------------------------------------------------------------------
-sub GetFrequency {
-    my ($freq_id) = @_;
-	return undef unless $freq_id;
-    my $results= SearchInTable("subscription_frequency",{frequency_id=>$freq_id}, undef, undef,undef, undef, "wide");
-	return undef unless ($results);
-	return $$results[0];
-}
-
-=head3 GetFrequencies
-
-=over 4
-
-&GetFrequencies($filter, $order_by);
-
-gets frequencies restricted on filters
-
-=back
-
-=cut
-
-# -------------------------------------------------------------------
-sub GetFrequencies {
-    my ($filters,$orderby) = @_;
-    return SearchInTable("subscription_frequency",$filters, $orderby, undef,undef, undef, "wide");
-}
-
-END { }    # module clean-up code here (global destructor)
-
-1;
-__END__
-
-=head1 AUTHOR
-
-Koha Development Team <http://koha-community.org/>
-
-=cut
diff --git a/C4/Serials/NumberPattern.pm b/C4/Serials/NumberPattern.pm
deleted file mode 100644
index 0d46545..0000000
--- a/C4/Serials/NumberPattern.pm
+++ /dev/null
@@ -1,129 +0,0 @@
-package C4::Numberpattern;
-
-# Copyright 2000-2002 Biblibre SARL
-#
-# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-use strict;
-#use warnings; FIXME - Bug 2505
-use C4::Context;
-use C4::SQLHelper qw<:all>;
-use C4::Debug;
-
-use vars qw($VERSION @ISA @EXPORT);
-
-BEGIN {
-	# set the version for version checking
-	$VERSION = 3.01;
-	require Exporter;
-	@ISA    = qw(Exporter);
-	@EXPORT = qw(
-
-        &GetNumberpatterns
-        &GetNumberpattern
-		&new
-		&all
-	    &AddNumberpattern
-        &ModNumberpattern
-        &DelNumberpattern
-
-	);
-}
-
-# -------------------------------------------------------------------
-sub new {
-    my ($class, $opts) = @_;
-    bless $opts => $class;
-}
-
-
-sub AddNumberpattern {
-    my ($class,$numberpattern) = @_;
-	return InsertInTable("subscription_numberpattern",$numberpattern);
-}
-
-# -------------------------------------------------------------------
-sub ModNumberpattern {
-    my ($class,$numberpattern) = @_;
-	return UpdateInTable("subscription_numberpattern",$numberpattern);
-}
-
-# -------------------------------------------------------------------
-sub DelNumberpattern {
-	my ($class,$numberpattern) = @_;
-	return DeleteInTable("subscription_numberpattern",$numberpattern);
-}
-
-sub all {
-    my ($class) = @_;
-    my $dbh = C4::Context->dbh;
-    return    map { $class->new($_) }    @{$dbh->selectall_arrayref(
-        # The subscription_numberpattern table is small enough for
-        # `SELECT *` to be harmless.
-        "SELECT * FROM subscription_numberpattern ORDER BY description",
-        { Slice => {} },
-    )};
-}
-
-=head3 GetNumberpattern
-
-=over 4
-
-&GetNumberpattern($freq_id);
-
-gets numberpattern where $freq_id is the identifier
-
-=back
-
-=cut
-
-# -------------------------------------------------------------------
-sub GetNumberpattern {
-    my ($numpattern_id) = @_;
-	return undef unless $num_patternid;
-    my $results= SearchInTable("subscription_numberpattern",{numberpattern_id=>$freq_id}, undef, undef,undef, undef, "wide");
-	return undef unless ($results);
-	return $$results[0];
-}
-
-=head3 GetFrequencies
-
-=over 4
-
-&GetFrequencies($filter, $order_by);
-
-gets frequencies restricted on filters
-
-=back
-
-=cut
-
-# -------------------------------------------------------------------
-sub GetNumberPatterns {
-    my ($filters,$orderby) = @_;
-    return SearchInTable("subscription_numberpattern",$filters, $orderby, undef,undef, undef, "wide");
-}
-
-END { }    # module clean-up code here (global destructor)
-
-1;
-__END__
-
-=head1 AUTHOR
-
-Koha Development Team <http://koha-community.org/>
-
-=cut
-- 
1.7.1.1


From oleonard at myacpl.org  Tue Jul 20 18:00:16 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 20 Jul 2010 12:00:16 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4851 - Batch delete shouldn't
	show delete button if no items were found
Message-ID: <1279641616-5283-1-git-send-email-oleonard@myacpl.org>

 - Adding template flag to indicate valid results (hidden or not)
 - Clarifying warning messages based on various outcomes
---
 .../prog/en/modules/tools/batchMod-del.tmpl        |   22 ++++++++++++-------
 tools/batchMod.pl                                  |    2 +
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
index c6f82b9..441f4c5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
@@ -52,7 +52,9 @@
     <!-- TMPL_UNLESS name="action" -->
 
     <!-- TMPL_IF name="notfoundbarcodes" -->
-	    <div class="dialog alert"><p>Warning, the following barcodes were not found :</p></div>
+	    <div class="dialog alert">
+	    <!-- TMPL_IF NAME="itemresults" --><p>Warning, the following barcodes were not found:</p><!-- TMPL_ELSE --><p>Warning: no barcodes were found</p><!-- /TMPL_IF -->
+		</div>
 	    <table style="margin:auto;">
 		<thead>
 		    <tr>
@@ -66,7 +68,7 @@
 		</tbody>
 	    </table>
 	    <!-- TMPL_UNLESS name="too_many_items" -->
-	    <h4>The following barcodes were found: </h4>
+	    <!-- TMPL_IF name="item_loop" --><h4>The following barcodes were found: </h4><!-- /TMPL_IF -->
 	    <!-- /TMPL_UNLESS -->
 	<!-- /TMPL_IF -->
 
@@ -77,7 +79,7 @@
      <input type="hidden" name="completedJobID" id="completedJobID" value="" />
 
 <!-- TMPL_IF name="item_loop" -->
-	<!-- TMPL_IF NAME="show" --><div id="toolbar"><a id="selectallbutton" href="#">Select All</a> | <a id="clearallbutton" href="#">Clear All</a></div><!-- TMPL_ELSE --><!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="show" --><div id="toolbar"><a id="selectallbutton" href="#">Select All</a> | <a id="clearallbutton" href="#">Clear All</a></div><!-- /TMPL_IF -->
 	<div id="cataloguing_additem_itemlist">
 		<div style="overflow:auto">
 		<table id="itemst">
@@ -111,17 +113,16 @@
 <!-- /TMPL_IF -->
 
 
-
-	<!-- TMPL_IF name="show" -->
+<!-- TMPL_IF name="show" -->
 
 <!-- TMPL_IF name="too_many_items" -->
-    <p>Too many items (<!-- TMPL_VAR NAME="too_many_items" -->): not displaying each one individually.</p>
+    <p>Too many items (<!-- TMPL_VAR NAME="too_many_items" -->) to display individually.</p>
     <!-- TMPL_LOOP name="itemnumbers_hashref" -->
   <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
     <!-- /TMPL_LOOP -->
 <!-- /TMPL_IF -->   
 
-
+<!-- TMPL_IF NAME="itemresults" -->
 		<div id="cataloguing_additem_newitem">
 	     <input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->" />
 	     <p>This will delete <!-- TMPL_IF NAME="too_many_items" -->all the<!-- TMPL_ELSE -->the selected<!-- /TMPL_IF --> items.</p>
@@ -131,10 +132,15 @@
 		    <div id="jobstatus">Job progress: <div id="jobprogress"></div> <span id="jobprogresspercent">0</span>%</div>
 		    <div id="jobfailed"></div>
 		</div>
-		<input type="submit" name="mainformsubmit" value="Delete selected items" onclick="return submitBackgroundJob(this.form);" />
+		<!-- TMPL_IF NAME="too_many_items" --><input type="submit" name="mainformsubmit" value="Delete ALL submitted items" onclick="return submitBackgroundJob(this.form);" /><!-- TMPL_ELSE -->
+		<input type="submit" name="mainformsubmit" value="Delete selected items" onclick="return submitBackgroundJob(this.form);" /><!-- /TMPL_IF -->
+
 		<a href="/cgi-bin/koha/tools/batchMod.pl?del=1" class="cancel">Cancel</a>
 	    </fieldset>
 	</div>
+	<!-- TMPL_ELSE -->
+	<p><a href="/cgi-bin/koha/tools/batchMod.pl?del=1">Return to batch item deletion</a></p>
+	<!-- /TMPL_IF -->
 	<!-- /TMPL_IF -->
     <!-- /TMPL_UNLESS -->
 
diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index f5138d1..1f4b519 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -209,6 +209,8 @@ if ($op eq "show"){
 
     }
 }
+    # Flag to tell the template there are valid results, hidden or not
+    if(scalar(@itemnumbers) > 0){ $template->param("itemresults" => 1); }
     # Only display the items if there are no more than 1000
     if (scalar(@itemnumbers) <= 1000) {
 	$items_display_hashref=BuildItemsData(@itemnumbers);
-- 
1.7.0.4


From oleonard at myacpl.org  Tue Jul 20 20:37:07 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 20 Jul 2010 14:37:07 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4996 - Untranslatable strings in
	budget/fund toolbar
Message-ID: <1279651027-11644-1-git-send-email-oleonard@myacpl.org>

---
 .../prog/en/includes/budgets-admin-toolbar.inc     |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
index c3ec018..e6ccde3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc
@@ -21,7 +21,7 @@
 <!-- TMPL_IF NAME="budget_period_id" -->
 		                var budgets_menu = [
 						{ text: _("New budget"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form" },
-                        { text: _("New fund for '<!-- TMPL_VAR NAME="budget_period_description" -->'"), url: "/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->"
+                        { text: _("New fund for") + " '<!-- TMPL_VAR NAME="budget_period_description" -->'", url: "/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->"
                            <!-- TMPL_IF NAME="budget_period_locked" -->,  disabled:true<!-- /TMPL_IF  -->
                            <!-- TMPL_UNLESS NAME="CAN_user_acquisition_budget_add_del" -->,  disabled:true <!-- /TMPL_UNLESS  -->
                           }
@@ -32,8 +32,8 @@
 
         <!-- TMPL_IF NAME="budget_period_id" -->
                 var periods_menu = [
-                        { text: _("Edit budget '<!-- TMPL_VAR NAME="budget_period_description" -->'"), url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->" },
-                        { text: _("Duplicate budget '<!-- TMPL_VAR NAME="budget_period_description" -->'") }
+                        { text: _("Edit budget") + " '<!-- TMPL_VAR NAME="budget_period_description" -->'", url: "/cgi-bin/koha/admin/aqbudgetperiods.pl?op=add_form&budget_period_id=<!-- TMPL_VAR NAME="budget_period_id" -->" },
+                        { text: _("Duplicate budget") + " '<!-- TMPL_VAR NAME="budget_period_description" -->'" }
                 ]
         <!-- /TMPL_IF -->
 
-- 
1.7.0.4


From chrisc at catalyst.net.nz  Tue Jul 20 21:35:38 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Wed, 21 Jul 2010 07:35:38 +1200
Subject: [Koha-patches] [PATCH] Fix typo in z3950 search in acquisitions
Message-ID: <1279654538-20131-1-git-send-email-chrisc@catalyst.net.nz>

From: Chris Cormack <chrisc at library.org.nz>

Signed-off-by: Chris Cormack <chrisc at catalyst.nz>
---
 acqui/z3950_search.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl
index 1238e16..444c893 100755
--- a/acqui/z3950_search.pl
+++ b/acqui/z3950_search.pl
@@ -97,7 +97,7 @@ foreach my $thisframeworkcode ( keys %$frameworks ) {
     if ( $row{'value'} eq $frameworkcode){
         $row{'active'} = 'true';
     }
-    push @frameworkcodeloop, $row;
+    push @frameworkcodeloop, \%row;
 }
 
 $template->param( frameworkcode => $frameworkcode, 
-- 
1.7.0.4


From chrisc at catalyst.net.nz  Wed Jul 21 04:00:57 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Wed, 21 Jul 2010 14:00:57 +1200
Subject: [Koha-patches] [PATCH] Make the item details link to the item's
	invoice.
Message-ID: <1279677657-18656-1-git-send-email-chrisc@catalyst.net.nz>

From: Robin Sheat <robin at catalyst.net.nz>

The 'accession date' field is now a link to the invoice for that item.

Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
---
 catalogue/moredetail.pl                            |    3 +++
 .../prog/en/modules/catalogue/moredetail.tmpl      |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index d790c41..0ea110f 100755
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -96,9 +96,12 @@ foreach my $item (@items){
     $item->{'copyvol'}                 = $item->{'copynumber'};
 
     my $order = GetOrderFromItemnumber( $item->{'itemnumber'} );
+    my $basket = GetBasket( $order->{'basketno'} );
+    $item->{'supplierid'}              = $basket->{'booksellerid'};
     $item->{'ordernumber'}             = $order->{'ordernumber'};
     $item->{'basketno'}                = $order->{'basketno'};
     $item->{'booksellerinvoicenumber'} = $order->{'booksellerinvoicenumber'};
+    $item->{'datereceived'}            = $order->{'datereceived'};
 
     if ($item->{notforloantext} or $item->{itemlost} or $item->{damaged} or $item->{wthdrawn}) {
         $item->{status_advisory} = 1;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
index 8577193..c7e01b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@ -148,7 +148,7 @@
 
                     Accession Date:</span>
                     <!-- TMPL_IF NAME="basketno" -->
-                    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="dateaccessioned" --></a>
+                    <a href="/cgi-bin/koha/acqui/parcel.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&amp;datereceived=<!-- TMPL_VAR NAME="datereceived" -->"><!-- TMPL_VAR NAME="dateaccessioned" --></a>
                     <!-- TMPL_ELSE -->
                     <!-- TMPL_VAR NAME="dateaccessioned" -->
                     <!-- /TMPL_IF -->
-- 
1.7.0.4


From chrisc at catalyst.net.nz  Wed Jul 21 04:26:53 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Wed, 21 Jul 2010 14:26:53 +1200
Subject: [Koha-patches] [PATCH] bug 5045 - Help works even when the referrer
	is being stripped
Message-ID: <1279679213-25384-1-git-send-email-chrisc@catalyst.net.nz>

From: Robin Sheat <robin at catalyst.net.nz>

This fix puts the URL of the source page as a parameter to help.pl,
which will override the referrer value, if it's provided. This deals
with people sitting behind proxies that strip the referrer information
out.

Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
---
 .../intranet-tmpl/prog/en/includes/header.inc      |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 95ce8dd..95c8109 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -66,6 +66,6 @@
         <!-- TMPL_ELSE -->
             You are not logged in |
         <!-- /TMPL_IF -->
-        <a href="/cgi-bin/koha/help.pl" id="helper" onclick="window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes'); return false;">[ ? ]</a>
+        <a href="/cgi-bin/koha/help.pl" id="helper" onclick="window.open('/cgi-bin/koha/help.pl?url='+escape(document.URL),'Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes'); return false;">[ ? ]</a>
     </div>
 </div>	
-- 
1.7.0.4


From chrisc at catalyst.net.nz  Wed Jul 21 04:58:37 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Wed, 21 Jul 2010 14:58:37 +1200
Subject: [Koha-patches] [PATCH] Bug 5046 - fix the zebra authorities
	configuration
Message-ID: <1279681117-870-1-git-send-email-chrisc@catalyst.net.nz>

From: Robin Sheat <robin at catalyst.net.nz>

Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
---
 debian/templates/zebra-authorities-site.cfg.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/templates/zebra-authorities-site.cfg.in b/debian/templates/zebra-authorities-site.cfg.in
index 301e5e6..01cd347 100644
--- a/debian/templates/zebra-authorities-site.cfg.in
+++ b/debian/templates/zebra-authorities-site.cfg.in
@@ -46,8 +46,8 @@ lockDir: /var/lock/koha/__KOHASITE__/authorities
 perm.anonymous:ar
 perm.kohauser:rw
 passwd: /etc/koha/sites/__KOHASITE__/zebra.passwd
-register: /var/lib/koha/__KOHASITE__/biblios/register:4G
-shadow: /var/lib/koha/__KOHASITE__/biblios/shadow:1G
+register: /var/lib/koha/__KOHASITE__/authorities/register:4G
+shadow: /var/lib/koha/__KOHASITE__/authorities/shadow:1G
 
 # Temp File area for result sets
 setTmpDir: /var/lib/koha/__KOHASITE__/authorities/tmp
-- 
1.7.0.4


From nahuel.angelinetti at biblibre.com  Wed Jul 21 09:34:48 2010
From: nahuel.angelinetti at biblibre.com (Nahuel ANGELINETTI)
Date: Wed, 21 Jul 2010 09:34:48 +0200
Subject: [Koha-patches] [PATCH] [followup](bug #5042) forgotten fix on rss
	icon
Message-ID: <1279697688-5592-1-git-send-email-nahuel.angelinetti@biblibre.com>

this fix the rss image link, that was forgotten in previous patch.
---
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 74c716e..403f0fa 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -142,7 +142,7 @@
 </div>
 <div id="breadcrumbs" class="yui-g">
 <!-- TMPL_IF NAME="searchdesc" --><p><!-- TMPL_IF name="total" --><strong>&ldquo;<!-- TMPL_VAR NAME="query_desc" ESCAPE="HTML"--> <!-- TMPL_VAR NAME="limit_desc" ESCAPE="HTML"-->&rdquo; </strong>returned <!-- TMPL_VAR NAME="total" ESCAPE="HTML"--> results. <!-- TMPL_IF NAME="related" --> (related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->). <!-- /TMPL_IF -->
-<a href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi"  ESCAPE="HTML" -->&amp;format=rss2"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" /></a>
+<a href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi"  ESCAPE="HTML" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;format=rss2"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" /></a>
 <!-- TMPL_ELSE -->
 <strong>No Result found!</strong>
 <p>
-- 
1.7.0.4


From colin.campbell at ptfs-europe.com  Wed Jul 21 10:27:34 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Wed, 21 Jul 2010 09:27:34 +0100
Subject: [Koha-patches] [PATCH] Bug 5047 html option not in -help output
Message-ID: <1279700854-3048-1-git-send-email-colin.campbell@ptfs-europe.com>

Add -html option to list in pod so that it shows up
in output of help
---
 misc/cronjobs/overdue_notices.pl |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl
index 4de6cdd..a1f6e9b 100755
--- a/misc/cronjobs/overdue_notices.pl
+++ b/misc/cronjobs/overdue_notices.pl
@@ -103,6 +103,12 @@ Produces CSV data. if -n (no mail) flag is set, then this CSV data is
 sent to standard out or to a filename if provided. Otherwise, only
 overdues that could not be emailed are sent in CSV format to the admin.
 
+=item B<-html>
+
+Produces html data. if patron does not have a mail address or
+-n (no mail) flag is set, an html file is generated in the specified
+directory. This can be downloaded or futher processed by library staff.
+
 =item B<-itemscontent>
 
 comma separated list of fields that get substituted into templates in
-- 
1.7.1.1


From colin.campbell at ptfs-europe.com  Wed Jul 21 10:55:09 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Wed, 21 Jul 2010 09:55:09 +0100
Subject: [Koha-patches] [PATCH] Bug 5043 Fix merge error in z3950_search.pl
Message-ID: <1279702509-3199-1-git-send-email-colin.campbell@ptfs-europe.com>

Patch overwrote part of earlier fix
causing row to be used as a hash not a hash_ref
reinstate earlier code
---
 acqui/z3950_search.pl |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl
index 444c893..8d436cc 100755
--- a/acqui/z3950_search.pl
+++ b/acqui/z3950_search.pl
@@ -90,14 +90,14 @@ my $DEBUG = 0;    # if set to 1, many debug message are send on syslog.
 my $frameworks = getframeworks;
 my @frameworkcodeloop;
 foreach my $thisframeworkcode ( keys %$frameworks ) {
-    my %row = (
+    my $row = {
         value         => $thisframeworkcode,
         frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
-    );
-    if ( $row{'value'} eq $frameworkcode){
-        $row{'active'} = 'true';
+    };
+    if ( $row->{value} eq $frameworkcode){
+        $row->{active} = 'true';
     }
-    push @frameworkcodeloop, \%row;
+    push @frameworkcodeloop, $row;
 }
 
 $template->param( frameworkcode => $frameworkcode, 
-- 
1.7.1.1


From colin.campbell at ptfs-europe.com  Wed Jul 21 11:29:49 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Wed, 21 Jul 2010 10:29:49 +0100
Subject: [Koha-patches] [PATCH] Bug 5022 Supplements were not saved correctly
Message-ID: <1279704589-3529-1-git-send-email-colin.campbell@ptfs-europe.com>

No subscription id was set
Also entered a default arrived date on the supplement
And removed errors due to bad dates returned from GetSerials
---
 C4/Serials.pm                                      |   19 +++++++++++++++----
 .../prog/en/modules/serials/serials-edit.tmpl      |    8 ++++++--
 serials/serials-edit.pl                            |   16 ++++++++++++----
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/C4/Serials.pm b/C4/Serials.pm
index 032246c..55eb6f7 100644
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -659,8 +659,13 @@ sub GetSerials {
 
     while ( my $line = $sth->fetchrow_hashref ) {
         $line->{ "status" . $line->{status} } = 1;                                         # fills a "statusX" value, used for template status select list
-        $line->{"publisheddate"}              = format_date( $line->{"publisheddate"} );
-        $line->{"planneddate"}                = format_date( $line->{"planneddate"} );
+        for my $datefield ( qw( planneddate publisheddate) ) {
+            if ($line->{$datefield} && $line->{$datefield}!~m/^00/) {
+                $line->{$datefield} = format_date( $line->{$datefield});
+            } else {
+                $line->{$datefield} = q{};
+            }
+        }
         push @serials, $line;
     }
 
@@ -676,8 +681,14 @@ sub GetSerials {
     while ( ( my $line = $sth->fetchrow_hashref ) && $counter < $count ) {
         $counter++;
         $line->{ "status" . $line->{status} } = 1;                                         # fills a "statusX" value, used for template status select list
-        $line->{"planneddate"}                = format_date( $line->{"planneddate"} );
-        $line->{"publisheddate"}              = format_date( $line->{"publisheddate"} );
+        for my $datefield ( qw( planneddate publisheddate) ) {
+            if ($line->{$datefield} && $line->{$datefield}!~m/^00/) {
+                $line->{$datefield} = format_date( $line->{$datefield});
+            } else {
+                $line->{$datefield} = q{};
+            }
+        }
+
         push @serials, $line;
     }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
index 8805654..c2b724b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl
@@ -88,6 +88,10 @@ function changeDate(adate) {
     var elem = document.getElementById("expecteddate");
     elem.value = adate;
 }
+function changeDate2(adate) {
+   var elem = document.getElementById("supexpecteddate");
+    elem.value = adate;
+}
 function CloneSubfield(index){
     var original = document.getElementById(index); //original <div>
     var clone = original.cloneNode(true);
@@ -331,10 +335,10 @@ function CloneSubfield(index){
             <input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size="10" maxlength="15" />
         </td>
         <td>
-            <input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15" />
+            <input type="text" name="planneddate" id="supexpecteddate" value="<!-- TMPL_VAR name="planneddate" -->" size="10" maxlength="15" />
         </td>
         <td>
-            <select name="status" size="1" id="addstatus<!-- TMPL_VAR NAME="serialid" -->">
+            <select name="status" size="1" id="addstatus<!-- TMPL_VAR NAME="serialid" -->" onchange="if (this.value==2 || this.value==7){changeDate2('<!-- TMPL_VAR NAME="arriveddate" -->')} else {changeDate2('<!-- TMPL_VAR NAME="planneddate" -->')}" >
                     <option value="">----</option>
   <!--TMPL_IF name="status1" -->
                     <option value="1" selected="selected">Expected</option>
diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl
index dee624c..6357fc7 100755
--- a/serials/serials-edit.pl
+++ b/serials/serials-edit.pl
@@ -19,7 +19,7 @@
 
 =head1 NAME
 
-serials-recieve.pl
+serials-edit.pl
 
 =head1 Parameters
 
@@ -133,8 +133,14 @@ foreach my $tmpserialid (@serialids) {
         && !$processedserialid{$tmpserialid} )
     {
         my $data = GetSerialInformation($tmpserialid);
-        $data->{publisheddate} = format_date( $data->{publisheddate} );
-        $data->{planneddate}   = format_date( $data->{planneddate} );
+        for my $datefield ( qw( publisheddate planneddate) ) {
+            if ($data->{$datefield} && $data->{$datefield}!~m/^00/) {
+                $data->{$datefield} = format_date( $data->{$datefield} );
+            }
+            else {
+                $data->{$datefield} = q{};
+            }
+        }
         $data->{arriveddate}=$today->output('syspref');
         $data->{'editdisable'} = (
             (
@@ -173,6 +179,8 @@ foreach my $subscriptionid (@subscriptionids) {
         $cell->{'itemid'}         = "NNEW";
         $cell->{'serialid'}       = "NEW";
         $cell->{'issuesatonce'}   = 1;
+        $cell->{arriveddate}=$today->output('syspref');
+
         push @newserialloop, $cell;
         push @subscriptionloop,
           {
@@ -198,7 +206,7 @@ if ( $op and $op eq 'serialchangestatus' ) {
                 ### FIXME if NewIssue is modified to use subscription biblionumber, then biblionumber would not be useful.
                 $newserial = NewIssue(
                     $serialseqs[$i],
-                    $subscriptionids[$i],
+                    $subscriptionids[0],
                     $serialdatalist[0]->{'biblionumber'},
                     $status[$i],
                     format_date_in_iso( $planneddates[$i] ),
-- 
1.7.1.1


From nengard at bywatersolutions.com  Wed Jul 21 01:38:14 2010
From: nengard at bywatersolutions.com (Nicole Engard)
Date: Tue, 20 Jul 2010 19:38:14 -0400
Subject: [Koha-patches] [PATCH] add missing help file for merging records
Message-ID: <1279669094-12022-1-git-send-email-nengard@bywatersolutions.com>

---
 .../prog/en/modules/help/cataloguing/merge.tmpl    |   23 ++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tmpl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tmpl
new file mode 100644
index 0000000..74357a0
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tmpl
@@ -0,0 +1,23 @@
+<!-- TMPL_INCLUDE NAME="help-top.inc" -->
+
+<h1>Merging Items</h1>
+
+<p style="color: rgb(153, 0, 0);">Important: Merging will only work with two items that use the same bibliographic framework.</p>
+
+<p>The easiest way to merge together duplicate bibliographic records is to add them to a list and use the Merge Tool from there.</p>
+
+<p>From the list, check the two items you want to merge. If you choose more than or fewer than 2, you will be presented with an error.</p>
+
+<p>Once you have selected the records you want to merge, click the 'Merge selected items' button. You will be asked which of the two records you would like to keep as your primary record and which will be deleted after the merge.</p>
+
+<p>You will be presented with the MARC for both of the records (each accessible by tabs labeled with the bib numbers for those records). By default the entire first record will be selected, uncheck the fields you don't want in the final (destination) record and then move on to the second tab to choose which fields should be in the final (destination) record.</p>
+
+<p>Should you try to add a field that is not repeatable two times (like choosing the 245 field from both record #1 and #2) you will be presented with an error</p>
+
+<p>Most importantly you want to make sure that all of the items from the two records are attached to the new record. To do this you want to make sure that all 952 files are selected before completing the merge.</p>
+
+<p>Once you have completed your selections click the 'merge' button. The primary record will now show the data you chose for it, and the second record will be deleted.</p>
+
+<p style="color: rgb(153, 0, 0);">Important: It is important to rebuild your zebra index immediately after merging records. If a search is performed for a record which has been deleted Koha will present the patrons with an error in the OPAC.</p>
+
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
-- 
1.5.6.5


From nengard at bywatersolutions.com  Wed Jul 21 01:51:36 2010
From: nengard at bywatersolutions.com (Nicole Engard)
Date: Tue, 20 Jul 2010 19:51:36 -0400
Subject: [Koha-patches] [PATCH] update patron categories help file
Message-ID: <1279669896-12099-1-git-send-email-nengard@bywatersolutions.com>

---
 .../prog/en/modules/help/admin/categorie.tmpl      |  106 +++++++++++++++-----
 1 files changed, 79 insertions(+), 27 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl
index 3acbc24..dd44d7e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tmpl
@@ -2,32 +2,84 @@
 
 <h1>Patron Categories</h1>
 
-<p>This is where you define the types of users of your library and how they will be handled.</p>
-
-<h2>Categories, Descriptions and Types</h2>
-<p>Start by assigning a Category Code and a Description to each patron category. Each Category can be one of five types:</p>
-	<ul>
-		<li>Adult Patrons: can be linked as &quot;guarantors&quot; to other patrons who are their dependents.  This is the default patron type.</li>
-		<li>Child Patrons: a patron category that has a &quot;guarantor&quot;.</li>
-		<li>Organizational Patrons: can be used for institutional members, e.g. other libraries that borrow from you, in which case Koha expects slightly different information about the institution.</li>
-		<li>Professional Patrons: can also be associated with a guarantor (usually an organization).</li>
-		<li>Staff Members: A member of the library staff.</li>
-		<li>Statistical Patrons: checking out to this patron type creates a statistical (local use) record but does not actually circulate materials.</li>
-	</ul>
-	
-<h3>Note on Permissions</h3>
-<p>Patrons in any category type may be assigned permissions in the staff interface.  The Staff patron type has additional security features over the other types.</p>
-
-<h2>Enrollment Period (months)</h2>
-<p>Enrollment period is a number indicating the length in months of a patron enrollment. If enrollments never expire, set this to an impossibly high number ( &gt;= 99).</p>
-
-<h2>Upper Age Limit and Age Required</h2>
-<p>Upper Age Limit and Age Required set the age parameters for this type of user. If you issue children's cards to users between the ages of 2 and 18, for example, then Age Required would be &quot;2&quot; and Upper Age Limit would be &quot;18.&quot; If there is no upper age limit, set this value to 999 (the highest allowed).</p>
-
-<h2>Enrollment Fee and Reserve Fee</h2>
-<p>Enrollment Fee and Reserve Fee (if any) should be entered either as whole numbers or with (up to) six decimal places, with no currency notation (e.g. &quot;1.250000&quot; instead of &quot;$1.25&quot;).</p>
-
-<h2>Overdue Notice Required</h2>
-<p>Overdue Notice Required lets you bypass generating overdue notices for this user type.</p>
+<p>Patron categories allow you to organize your patrons into different roles, age groups, and patron types.</p>
+
+<p>Patrons are assigned to one of six main categories:</p>
+
+<ul>
+<li>Adult
+<ul>
+<li>Most common patron type, usually used for a general 'Patron' category.</li>
+</ul></li>
+<li>Child
+<ul>
+<li>Children patrons can have a guardian to be attached to them.</li>
+</ul>
+</li>
+<li>Staff
+<ul>
+<li>Patrons within the staff category will have access to the staff client.</li>
+</ul>
+</li>
+<li>Organizational
+<ul>
+<li>Organizational patrons are organizations. Organizations can be used as guarantors for Professional patrons.</li>
+</ul>
+</li>
+<li>Professional
+<ul>
+<li>Professional patrons can be linked to Organizational patrons</li>
+</ul>
+</li>
+<li>Statistical
+<ul>
+<li>This patron type is used strictly for statistical purposes, such as in house use of items.
+</li>
+</ul>
+</li>
+</ul>
+
+<h3>Adding a patron category</h3>
+
+<p>To add a new patron category click 'New Category' at the top of the page</p>
+
+<ul>
+<li>The 'Category Code' is an identifier for your new code.
+<ul>
+<li style="color: rgb(153, 0, 0);">Important: The category code is limited to 10 characters (numbers and letters)</li>
+</ul>
+</li>
+<li>Enter a plain text version of the category in the 'Description' field.</li>
+<li>Enrollment period should be filled in (in months) if you have a limited enrollment period for your patrons (eg. Student cards expire after 9 months or until a specific date)
+<ul>
+<li style="color: rgb(153, 0, 0);">Important: You cannot enter both a month limit and a date until. Choose to enter either one or the other.</li>
+</ul>
+</li>
+<li>Some patron categories can have a minimum age requirement associated with them, enter this age in the 'Age required'</li>
+<li>Patron categories can also have a maximum age associated with them (such as children), enter this age in the 'Upperage limit'</li>
+<li>If you charge a membership fee for your patrons (such as those who live in another region) you can enter that in the 'Enrollment fee' field.
+<ul>
+<li style="color: rgb(153, 0, 0);">Important: Only enter numbers and decimals in this field</li>
+</ul>
+</li>
+<li>If you want your patron to receive overdue notices, set the 'Overdue notice required' to 'Yes'</li>
+<li>If you charge patrons for placing holds on items, enter the fee amount in the 'Hold fee' field.
+<ul>
+<li style="color: rgb(153, 0, 0);">Important: Only enter numbers and decimals in this field</li>
+</ul>
+</li>
+<li>In the 'Category type' field choose one of the six main parent categories</li>
+<li>Finally you can assign advanced messaging preferences by default to a patron category
+<ul>
+<li><span style="color: rgb(153, 0, 0);">Important: Requires that you have EnhancedMessagingPreferences enabled</span>
+<ul>
+<li><em>Get there:</em> More &gt; Administration &gt; Global system preferences &gt; Patrons &gt; EnhancedMessagingPreferences</li>
+</ul>
+</li>
+<li style="color: rgb(153, 0, 0);">Important: These can be changed for individual patrons, this setting is just a default to make it easier to set up messages for an entire category</li>
+</ul>
+</li>
+</ul>
+
 
 <!-- TMPL_INCLUDE NAME="help-bottom.inc" -->
\ No newline at end of file
-- 
1.5.6.5


From oleonard at myacpl.org  Wed Jul 21 20:40:25 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 21 Jul 2010 14:40:25 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 5048,
	Error in menu/submenu for select language in intranet
Message-ID: <1279737625-23875-1-git-send-email-oleonard@myacpl.org>

Patch for HEAD. This issue was apparently solved quite a while
ago in the OPAC. This patch copies that solution over to the staff client.
---
 .../prog/en/includes/intranet-bottom.inc           |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js |   55 ++++++++++----------
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
index 78334b2..839c176 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
@@ -7,7 +7,7 @@
         <!-- TMPL_LOOP NAME="languages_loop" -->
             <!-- TMPL_IF NAME="group_enabled" -->
             <!-- TMPL_IF NAME="plural" -->
-            <li class="more"><a id="showlang" href="#"><!-- TMPL_VAR NAME="native_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a><div id="sublangs">
+            <li class="more"><a class="sublangs" id="show<!-- TMPL_VAR NAME="rfc4646_subtag" -->" href="#"><!-- TMPL_VAR NAME="native_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a><div id="sub<!-- TMPL_VAR NAME="rfc4646_subtag" -->">
             <div class="bd"><ul>
             <!-- TMPL_LOOP NAME="sublanguages_loop" -->
 		<!-- TMPL_IF NAME="enabled" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
index c2e6fba..047bfa0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
@@ -43,35 +43,34 @@ function _(s) { return s } // dummy function for gettext
                 YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionoMoremenu);
             });
 
+// build Change Language menus
 YAHOO.util.Event.onContentReady("changelanguage", function () {
-                var oMenu = new YAHOO.widget.Menu("sublangs", { zindex: 2 });
-
-	            function positionoMenu() {
-                    oMenu.align("bl", "tl");
-                }
-
-                oMenu.subscribe("beforeShow", function () {
-                    if (this.getRoot() == this) {
-						positionoMenu();
-                    }
-                });
-
-                oMenu.render();
-
-				oMenu.cfg.setProperty("context", ["showlang", "bl", "tl"]);
-
-				function onYahooClick(p_oEvent) {
-                    // Position and display the menu        
-                    positionoMenu();
-                    oMenu.show();
-                    // Stop propagation and prevent the default "click" behavior
-                    YAHOO.util.Event.stopEvent(p_oEvent);
-                }
-
-				YAHOO.util.Event.addListener("showlang", "click", onYahooClick);
-
-				YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionoMenu);
-            });
+	$(".sublangs").each(function(){
+		var menuid = $(this).attr("id");
+		var menuid = menuid.replace("show","");
+
+		var oMenu = new YAHOO.widget.Menu("sub"+menuid, { zindex: 2 });
+		function positionoMenu() {
+			oMenu.align("bl", "tl");
+		}
+		oMenu.subscribe("beforeShow", function () {
+		if (this.getRoot() == this) {
+			positionoMenu();
+		}
+		});
+		oMenu.render();
+		oMenu.cfg.setProperty("context", ["show"+menuid, "bl", "tl"]);
+		function onYahooClick(p_oEvent) {
+			// Position and display the menu
+			positionoMenu();
+			oMenu.show();
+			// Stop propagation and prevent the default "click" behavior
+			YAHOO.util.Event.stopEvent(p_oEvent);
+		}
+		YAHOO.util.Event.addListener("show"+menuid, "click", onYahooClick);
+		YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionoMenu);
+	});
+});
 			
 // http://jennifermadden.com/javascript/stringEnterKeyDetector.html
 function checkEnter(e){ //e is event object passed from function invocation
-- 
1.7.0.4


From oleonard at myacpl.org  Wed Jul 21 21:28:10 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 21 Jul 2010 15:28:10 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 5048,
	Error in menu/submenu for select language in intranet
Message-ID: <1279740490-29458-1-git-send-email-oleonard@myacpl.org>

Patch for 3.0.x. This issue was apparently solved quite a while
ago in the OPAC. This patch copies that solution over to the staff client.
---
 .../prog/en/includes/intranet-bottom.inc           |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js |   55 ++++++++++----------
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
index 78334b2..839c176 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
@@ -7,7 +7,7 @@
         <!-- TMPL_LOOP NAME="languages_loop" -->
             <!-- TMPL_IF NAME="group_enabled" -->
             <!-- TMPL_IF NAME="plural" -->
-            <li class="more"><a id="showlang" href="#"><!-- TMPL_VAR NAME="native_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a><div id="sublangs">
+            <li class="more"><a class="sublangs" id="show<!-- TMPL_VAR NAME="rfc4646_subtag" -->" href="#"><!-- TMPL_VAR NAME="native_description" --> (<!-- TMPL_VAR NAME="rfc4646_subtag" -->)</a><div id="sub<!-- TMPL_VAR NAME="rfc4646_subtag" -->">
             <div class="bd"><ul>
             <!-- TMPL_LOOP NAME="sublanguages_loop" -->
 		<!-- TMPL_IF NAME="enabled" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
index 7810bef..390d0ac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
@@ -41,35 +41,34 @@ function _(s) { return s } // dummy function for gettext
                 YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionoMoremenu);
             });
 
+// build Change Language menus
 YAHOO.util.Event.onContentReady("changelanguage", function () {
-                var oMenu = new YAHOO.widget.Menu("sublangs", { zindex: 2 });
-
-	            function positionoMenu() {
-                    oMenu.align("bl", "tl");
-                }
-
-                oMenu.subscribe("beforeShow", function () {
-                    if (this.getRoot() == this) {
-						positionoMenu();
-                    }
-                });
-
-                oMenu.render();
-
-				oMenu.cfg.setProperty("context", ["showlang", "bl", "tl"]);
-
-				function onYahooClick(p_oEvent) {
-                    // Position and display the menu        
-                    positionoMenu();
-                    oMenu.show();
-                    // Stop propagation and prevent the default "click" behavior
-                    YAHOO.util.Event.stopEvent(p_oEvent);
-                }
-
-				YAHOO.util.Event.addListener("showlang", "click", onYahooClick);
-
-				YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionoMenu);
-            });
+	$(".sublangs").each(function(){
+		var menuid = $(this).attr("id");
+		var menuid = menuid.replace("show","");
+
+		var oMenu = new YAHOO.widget.Menu("sub"+menuid, { zindex: 2 });
+		function positionoMenu() {
+			oMenu.align("bl", "tl");
+		}
+		oMenu.subscribe("beforeShow", function () {
+		if (this.getRoot() == this) {
+			positionoMenu();
+		}
+		});
+		oMenu.render();
+		oMenu.cfg.setProperty("context", ["show"+menuid, "bl", "tl"]);
+		function onYahooClick(p_oEvent) {
+			// Position and display the menu
+			positionoMenu();
+			oMenu.show();
+			// Stop propagation and prevent the default "click" behavior
+			YAHOO.util.Event.stopEvent(p_oEvent);
+		}
+		YAHOO.util.Event.addListener("show"+menuid, "click", onYahooClick);
+		YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionoMenu);
+	});
+});
 			
 // http://jennifermadden.com/javascript/stringEnterKeyDetector.html
 function checkEnter(e){ //e is event object passed from function invocation
-- 
1.7.0.4


From chrisc at catalyst.net.nz  Thu Jul 22 05:37:51 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Thu, 22 Jul 2010 15:37:51 +1200
Subject: [Koha-patches] [PATCH] Bug 5054 - allow the resulting .deb location
	to be specified
Message-ID: <1279769871-4388-1-git-send-email-chrisc@catalyst.net.nz>

From: Robin Sheat <robin at catalyst.net.nz>

Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
---
 debian/build-git-snapshot |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot
index 4b63141..99475a6 100755
--- a/debian/build-git-snapshot
+++ b/debian/build-git-snapshot
@@ -46,7 +46,7 @@ reset_debian_changelog() {
 build_package() {
     git archive --format=tar --prefix="koha-$1/" HEAD | 
         gzip -9 > "../koha_$1.tar.gz"
-    pdebuild
+    pdebuild $2
 }
 
 if ! everything_is_commited
@@ -55,6 +55,10 @@ then
 fi
 
 version="$(newversion)"
+if [ -n "$1" ]
+then
+    pdebuildopts="--buildresult $1"
+fi
 adjust_debian_changelog "$version"
-build_package "$version"
+build_package "$version" "$pdebuildopts"
 reset_debian_changelog
-- 
1.7.0.4


From chris at bigballofwax.co.nz  Thu Jul 22 09:06:16 2010
From: chris at bigballofwax.co.nz (Chris Cormack)
Date: Thu, 22 Jul 2010 19:06:16 +1200
Subject: [Koha-patches] [PATCH] If patronimages are enabled,
	show them in the patron search results
Message-ID: <1279782376-25553-1-git-send-email-chris@bigballofwax.co.nz>

---
 .../prog/en/modules/members/member.tmpl            |   11 +++++++++++
 members/member.pl                                  |   20 +++++++++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index fef7b69..058d265 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -32,6 +32,9 @@
 							<table id="memberresultst">
 							<thead>
 							<tr>
+							<!-- TMPL_IF NAME="patronimages" -->
+							<th>Photo</th>
+							<!-- /TMPL_IF -->
 							<th>Card</th>
 							<th>Name</th>
 							<th>Cat</th>
@@ -54,6 +57,14 @@
 							<tr>
 							<!-- /TMPL_UNLESS -->
 							<!-- /TMPL_IF -->
+							<!-- TMPL_IF NAME="patronimages" -->
+							<!-- TMPL_IF NAME="picture" -->
+							<td><img src="/cgi-bin/koha/members/patronimage.pl?crdnum=<!-- TMPL_VAR NAME="cardnumber" -->" id="patronimage" alt="<!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)" border="0" style="max-width : 100px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:100px;" /></td>
+							<!-- TMPL_ELSE -->
+							<td><img src="/intranet-tmpl/prog/img/patron-blank.png" alt="<!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></td>
+							<!-- /TMPL_IF -->
+							<!-- /TMPL_IF -->
+							
 							<td><!-- TMPL_VAR NAME="cardnumber" --></td>
 							<td style="white-space: nowrap;"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> <br /> <!-- TMPL_VAR NAME="address" --><!-- TMPL_IF NAME="address2" --><br /><!-- TMPL_VAR NAME="address2" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="city" --><br /><!-- TMPL_VAR NAME=city --><!-- /TMPL_IF --><!-- TMPL_IF NAME="zipcode" -->  <!-- TMPL_VAR NAME="zipcode" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="country" -->, <!-- TMPL_VAR NAME="country" --><!-- /TMPL_IF --></td>
 							<td><!-- TMPL_VAR NAME="category_description" --> (<!-- TMPL_VAR name="category_type" -->)</td>
diff --git a/members/member.pl b/members/member.pl
index dde29eb..81c7888 100755
--- a/members/member.pl
+++ b/members/member.pl
@@ -101,20 +101,26 @@ if ($results){
 my @resultsdata;
 my $to=($count>$to?$to:$count);
 my $index=$from;
+my $images = C4::Context->preference("patronimages");
 foreach my $borrower(@$results[$from..$to-1]){
   #find out stats
   my ($od,$issue,$fines)=GetMemberIssuesAndFines($$borrower{'borrowernumber'});
 
   $$borrower{'dateexpiry'}= C4::Dates->new($$borrower{'dateexpiry'},'iso')->output('syspref');
-
-  my %row = (
-    count => $index++,
+  my $picture;
+    my $dberror;
+    if ($images){
+	($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'});
+    }
+    my %row = (
+        count => $index++,
 	%$borrower,
 	%{$categories_dislay{$$borrower{categorycode}}},
-    overdues => $od,
-    issues => $issue,
-    odissue => "$od/$issue",
-    fines =>  sprintf("%.2f",$fines),
+	overdues => $od,
+	issues => $issue,
+        odissue => "$od/$issue",
+        fines =>  sprintf("%.2f",$fines),
+        picture => $picture
     );
   push(@resultsdata, \%row);
 }
-- 
1.6.3.3


From magnus at enger.priv.no  Thu Jul 22 11:15:58 2010
From: magnus at enger.priv.no (Magnus Enger)
Date: Thu, 22 Jul 2010 11:15:58 +0200
Subject: [Koha-patches] Bug 5055 - Use standard file paths in crontab.example
Message-ID: <AANLkTikvRDi8XXZDHoi14pegHD_rNcVNd7kYo9a2Og9F@mail.gmail.com>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Bug-5055-Use-standard-file-paths-in-crontab.example.patch
Type: application/octet-stream
Size: 1914 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20100722/ec2062c2/attachment.obj>

From oleonard at myacpl.org  Thu Jul 22 20:26:03 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 22 Jul 2010 14:26:03 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 5030 - Improve handling of
	duplicate patrons
Message-ID: <1279823163-27518-1-git-send-email-oleonard@myacpl.org>

- Making duplicate patron warning dialog simpler but more explicit
- Pointing duplicate patron preview window to new brief version
  of moremember.pl to display more patron details than the previous
  version.
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |   17 +++-
 .../prog/en/modules/members/borrowers_details.tmpl |   63 -------------
 .../prog/en/modules/members/memberentrygen.tmpl    |   25 ++---
 .../prog/en/modules/members/moremember-brief.tmpl  |   97 ++++++++++++++++++++
 koha-tmpl/intranet-tmpl/prog/img/pop-up-link.png   |  Bin 0 -> 205 bytes
 members/borrowers_details.pl                       |   75 ---------------
 members/moremember.pl                              |    3 +
 7 files changed, 125 insertions(+), 155 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/pop-up-link.png
 delete mode 100755 members/borrowers_details.pl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 13ac2c7..914042e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -21,6 +21,11 @@ a.overdue,.overdue {
 	color : #cc0000;
 }
 
+a.popup {
+	background : transparent url("../../img/pop-up-link.png") center right no-repeat;
+	padding-right : 15px;
+}
+
 body {
 	text-align : left;
   	padding:0 0 2.5em 0;
@@ -1128,11 +1133,21 @@ td input.approve {
 	color:black;
 	padding: .4em .4em .4em 34px;
 }
- 
+
 .dialog input.edit {
 	background: #fff url(../../img/toolbar-edit.gif) no-repeat 4px center;
 	color:black;
+	max-width : 13em;
+	padding: .4em .4em .4em 34px;
+	white-space: normal;
+}
+
+.dialog input.new {
+	background: #fff url(../../img/toolbar-new.gif) no-repeat 4px center;
+	color:black;
+	max-width : 13em;
 	padding: .4em .4em .4em 34px;
+	white-space: normal;
 }
 
 .dialog input.print {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
deleted file mode 100644
index 763cf66..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
+++ /dev/null
@@ -1,63 +0,0 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Patron Details</title>
-<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
-
-<div id="doc" class="yui-t7">
-   <div id="bd">
-
-	<h1>Patron Details</h1>
-	
-	<form name="form" method="post" action="/cgi-bin/members/borrowers_details.pl">
-	<!-- TMPL_IF NAME="Institution"-->	
-		
-		<p>
-		
-			<label for="description">Patron category</label>		
-			<input  type="text" id="description" name="description" size="20" value="<!-- TMPL_VAR NAME="description" -->" />
-		</p>
-		<p>
-			
-			<label for="surname">Organization name</label>
-			<input style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
-		</p>
-		
-	<!-- TMPL_ELSE -->	
-
-		<p>
-			<label for="description">Patron category</label>
-			<input  type="text" name="description" id="description" size="20" value="<!-- TMPL_VAR NAME="description" -->" />
-			</p>
-		<p>
-			<label for="title">Title</label>
-			<input  type="text" name="title" id="title" size="20" value="<!-- TMPL_VAR NAME="title" -->" />
-			
-		</p>
-		<p>
-			<label for="surname">Surname</label>
-			<input  style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
-		</p>
-			
-		<p>	
-			
-			<label for="firstname">Firstname</label>
-			<input  style="text-transform:capitalize;" type="text" id="firstname" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" />
-		</p>
-		<p>
-			<label for="dateofbirth">Date of birth </label>
-			<input  type="text" name="dateofbirth" id="dateofbirth" size="20" value="<!-- TMPL_VAR NAME="dateofbirth" -->" />
-		</p>		
-		
-		
-			
-		
-	<!-- /TMPL_IF -->
-	<p>
-		<a href="#" onclick="window.close()">Close Window</a>
-	</p>
-	
-	</form>
-
-</div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index b21d35a..007dbd7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -83,22 +83,15 @@
 	<!-- /TMPL_IF -->
   
 	<!-- TMPL_IF NAME="check_member" -->
-		<p>
-		<form name="form_double" action="/cgi-bin/koha/members/memberentry.pl" method="post">
 			<div class="dialog alert">
-				<h3>Duplicate suspected</h3>
-				<a href="javascript:Dopop('borrowers_details.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->');" >Detail</a>
-				Duplicate ?
-				<a href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;borrowernumber=<!--TMPL_VAR NAME="check_member"-->&amp;category_type=<!--TMPL_VAR NAME="check_categorytype"-->">Yes</a>
-				&nbsp;&nbsp;&nbsp; No, it is not
-				<!-- TMPL_IF NAME="checked"-->
-					<input type="checkbox" checked="checked" name="answernodouble" >
-				<!-- TMPL_ELSE -->
-					<input type="checkbox" name="answernodouble" />
-				<!-- /TMPL_IF -->
+				<h3>Duplicate patron record?</h3>
+				<p><a class="popup" href="javascript:Dopop('moremember.pl?print=brief&amp;borrowernumber=<!--TMPL_VAR NAME="check_member"-->');" >View existing record</a></p>
+				<form action="/cgi-bin/koha/members/memberentry.pl" method="get"><input type="hidden" name="op" value="modify" /><input type="hidden" name="borrowernumber" value="<!--TMPL_VAR NAME="check_member"-->" /><input type="hidden" name="category_type" value="<!--TMPL_VAR NAME="check_categorytype"-->" /><input class="edit" type="submit" value="It is a duplicate. Edit existing record" /></form>
+
+				<form name="form_double" action="/cgi-bin/koha/members/memberentry.pl" method="post">
+				<input type="hidden" name="nodouble" value="1" />
+				<input class="new" type="submit" value="Not a duplicate. Save as new record" />
 			</div>
-		</form>
-		</p>
 	<!--/TMPL_IF-->
 
 	<!-- TMPL_IF Name="debug" -->
@@ -144,7 +137,8 @@
 	<!-- /TMPL_IF -->
 	
   
-<form name="form" id="entryform"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
+<!-- TMPL_UNLESS NAME="check_member" --><form name="form" id="entryform"  action="/cgi-bin/koha/members/memberentry.pl" method="post">
+<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" /> <!-- /TMPL_UNLESS -->
 <!--    field always hidden in different form (1,2,3) -->
 <input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
 <input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->" />
@@ -153,7 +147,6 @@
 <input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
 <input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
 <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 <!--TMPL_IF Name="step"--><input type="hidden" name="step"  value="<!-- TMPL_VAR NAME="step" -->" /><!--/TMPL_IF-->
 <!-- TMPL_IF NAME="opadd" --><input type="hidden" name="op" value="insert" /><!-- TMPL_ELSE --><input type="hidden" name="op" value="save" /><!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tmpl
new file mode 100644
index 0000000..9dd5ed3
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tmpl
@@ -0,0 +1,97 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha &rsaquo; Check duplicate patron</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+	<style type="text/css">
+		#custom-doc { width:44.23em;*width:43.12em;min-width:491px; margin:auto; text-align:left; } 
+	</style>
+</head>
+<body style="padding:.5em;">
+<div id="custom-doc" class="yui-t7">
+   <div id="bd">
+	<h3><!-- TMPL_UNLESS NAME="I" -->
+   <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h3>
+<div class="yui-g">
+<div class="yui-u first">
+	<div id="patron-information" style="padding: .5em;">
+
+     <!-- TMPL_UNLESS NAME="I" --><!-- TMPL_IF NAME="othernames" -->&ldquo;<!-- TMPL_VAR NAME="othernames" -->&rdquo;<!-- /TMPL_IF -->
+
+	<p class="address"><!-- TMPL_VAR NAME="streetnumber" -->
+        <!--TMPL_IF NAME="roaddetails"-->
+         <!-- TMPL_VAR NAME="roaddetails" -->,
+        <!-- /TMPL_IF -->
+        <!-- TMPL_VAR NAME="address" --><br />
+        <!-- TMPL_IF NAME="address2" --><!-- TMPL_VAR NAME="address2"--><br /><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="city" --><!-- TMPL_VAR NAME="city" --><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="zipcode" --><!-- TMPL_VAR NAME="zipcode" --><br /><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="country" --><!-- TMPL_VAR NAME="country" --><!-- /TMPL_IF --></p>
+
+	<div class="rows">
+		<ol>
+        <!-- TMPL_IF NAME="I" -->
+            <!-- TMPL_IF NAME="phonepro" --><li><span class="label">Organization phone: </span><!-- TMPL_VAR NAME="phonepro" --></li><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="emailpro" --><li><span class="label">Organization email: </span><!-- TMPL_VAR NAME="emailpro" --></li><!-- /TMPL_IF -->
+        <!-- TMPL_ELSE -->
+            <!-- TMPL_IF NAME="phone"    --><li><span class="label">Home: </span><!-- TMPL_VAR NAME="phone" --></li><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="mobile"   --><li><span class="label">Mobile: </span><!-- TMPL_VAR NAME="mobile" --></li><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="phonepro" --><li><span class="label">Work: </span><!-- TMPL_VAR NAME="phonepro" --></li><!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+
+    <!-- TMPL_IF NAME="P"-->
+        <!-- TMPL_IF NAME="phone"  --><li><span class="label">Professional phone: </span><!-- TMPL_VAR NAME="phone" --></li><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="mobile" --><li><span class="label">Professional mobile: </span><!-- TMPL_VAR NAME="mobile" --></li><!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="fax" --><li><span class="label">Fax: </span><!-- TMPL_VAR NAME="fax" --></li><!-- /TMPL_IF -->
+    <!-- TMPL_UNLESS NAME="I"-->
+        <!-- TMPL_IF Name="email" --><li><span class="label">Email (home):</span><a href="mailto:<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="email" --></a></li><!-- /TMPL_IF -->
+        <!-- TMPL_IF Name="emailpro" --><li><span class="label">Email (work): </span><a href="mailto:<!-- TMPL_VAR NAME="emailpro" -->"><!-- TMPL_VAR NAME="emailpro" --></a></li><!--/TMPL_IF-->
+    <!-- /TMPL_UNLESS -->
+    <li><span class="label">Initials: </span><!-- TMPL_VAR NAME="initials" --></li>
+    <li><span class="label">Date of birth:</span><!-- TMPL_VAR NAME="dateofbirth" --></li>
+    <li><span class="label">Sex:</span><!-- TMPL_VAR NAME="sex" --></li><!-- /TMPL_UNLESS -->
+    <!-- TMPL_IF NAME="printethnicityline" -->
+    <li><span class="label">Ethnicity:</span><!-- TMPL_VAR NAME="ethnicity" --></li>
+    <li><span class="label">Ethnicity notes: </span><!-- TMPL_VAR NAME="ethnotes" --></li>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="isguarantee" -->
+        <!-- TMPL_IF NAME="guaranteeloop" -->
+            <li><span class="label">Guarantees:</span><ul><!-- TMPL_LOOP NAME="guaranteeloop" --><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="name" -->  </a></li><!-- /tmpl_loop --></ul></li>
+        <!-- /TMPL_IF -->
+    <!-- TMPL_ELSE -->
+        <!-- TMPL_IF name="guarantorborrowernumber" -->
+            <li><span class="label">Guarantor:</span><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorsurname" -->, <!-- TMPL_VAR NAME="guarantorfirstname" --></a></li>
+        <!-- /TMPL_IF -->
+    <!-- /TMPL_IF  -->
+	</ol>
+	</div>
+	</div>
+	</div>
+	<div class="yui-u">
+	<div id="patron-library-details">
+	<h3>Library use</h3>
+	<div class="rows">
+	<ol>
+    <li><span class="label">Card number: </span><!-- TMPL_VAR NAME="cardnumber" --></li>
+	<li><span class="label">Borrowernumber: </span> <!-- TMPL_VAR NAME="borrowernumber" --></li>
+    <li><span class="label">Category: </span><!-- TMPL_VAR NAME="description" --> (<!-- TMPL_VAR NAME="categorycode" -->)</li>
+    <li><span class="label">Registration date: </span><!-- TMPL_VAR NAME="dateenrolled" --></li>
+    <li><span class="label">Expiration date: </span>
+    <!-- TMPL_IF NAME="reregistration" -->
+            <strong class="reregistrinfo"><!-- TMPL_VAR NAME="dateexpiry" --></span>
+    <!-- TMPL_ELSE -->
+            <!-- TMPL_VAR NAME="dateexpiry" -->
+    <!-- /TMPL_IF -->
+    </li>
+    <li><span class="label">Library: </span><!-- TMPL_VAR NAME="branchname" --></li>
+
+    <!-- TMPL_IF NAME="sort1" --><li><span class="label">Sort field 1:</span><!-- TMPL_VAR NAME="lib1" --></li><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="sort2" --><li><span class="label">Sort field 2:</span><!-- TMPL_VAR NAME="lib2" --></li><!-- /TMPL_IF -->
+	</ol>
+	</div>
+	</div>
+	<fieldset class="action"><input type="button" class="submit" value="Close window" onclick="window.close();" /></fieldset>
+	</div>
+	</div>
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/img/pop-up-link.png b/koha-tmpl/intranet-tmpl/prog/img/pop-up-link.png
new file mode 100644
index 0000000000000000000000000000000000000000..77ffc75e040d8c27f8ba21b010c19a47a1b15792
GIT binary patch
literal 205
zcmeAS at N?(olHy`uVBq!ia0vp^+(699!3-oX?^2ToQY`6?zK#qG>ra at ocD)4hB}-f*
zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrH1%u?6^qxH2%D`Tzg_Os8|nKoO>r
zAiv=M3{STkcma9#o-U3d6}OTSQc_YHm>L+87&b~CY+zJqm~fMUk!3RTMn)!%BMl((
tOdC+TNt+?5fx#(_nMGiei9-V;1J4x(>!kFQJwT%vJYD@<);T3K0Ra1$I)nfK

literal 0
HcmV?d00001

diff --git a/members/borrowers_details.pl b/members/borrowers_details.pl
deleted file mode 100755
index c861ad4..0000000
--- a/members/borrowers_details.pl
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/perl
-# NOTE: This file uses standard 8-space tabs
-#       DO NOT SET TAB SIZE TO 4
-
-
-#script to set up screen for modification of borrower details
-#written 20/12/99 by chris at katipo.co.nz
-
-
-# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-use strict;
-#use warnings; FIXME - Bug 2505
-use CGI;
-use C4::Auth;
-use C4::Context;
-use C4::Output;
-use C4::Members;
-use C4::Koha;
-use C4::Dates qw(format_date);
-use C4::Input;
-use C4::Log;
-my $input = new CGI;
-my $dbh = C4::Context->dbh;
-my %data;
-
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/borrowers_details.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {borrowers => 1},
-			     debug => 1,
-			     });
-
-my $data;
-my $categorycode=$input->param('categorycode');
-my $borrowernumber=$input->param('borrowernumber');
-my $description=$input->param('description');
-my $category_type=$input->param('category_type');
-
-$data=GetMember('borrowernumber' => $borrowernumber);
-
-$template->param(		borrowernumber  => $borrowernumber,#register number
-				#transform value  in capital or capital for first letter of the word
- 				firstname       => ucfirst($data->{'firstname'}),
- 				surname         => uc($data->{'surname'}),
- 				categorycode 	=> $data->{'categorycode'},
-				title 		=> $data->{'title'},
-				category_type	=> $data->{'category_type'},
- 				"title_".$data->{'title'} 	    => " SELECTED ",			
- 				dateofbirth	=> format_date($data->{'dateofbirth'}),
- 				description	=> $data->{'description'}
-		);
-$template->param(Institution => 1) if ($category_type eq "I");
-output_html_with_http_headers $input, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 8
-# End:
diff --git a/members/moremember.pl b/members/moremember.pl
index 34a3e09..104670b 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -89,6 +89,9 @@ if ($print eq "page") {
     $template_name = "members/moremember-receipt.tmpl";
     $quickslip = 1;
     $flagsrequired =  { circulate => "circulate_remaining_permissions" };
+} elsif ($print eq "brief") {
+    $template_name = "members/moremember-brief.tmpl";
+    $flagsrequired = { borrowers => 1 };
 } else {
     $template_name = "members/moremember.tmpl";
     $flagsrequired = { borrowers => 1 };
-- 
1.7.0.4


From oleonard at myacpl.org  Fri Jul 23 21:01:14 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri, 23 Jul 2010 15:01:14 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 2170,
	Adding 'edititems' user-permission
Message-ID: <1279911674-29190-1-git-send-email-oleonard@myacpl.org>

This patch follows up on the addition of the 'edititems'
permission by adding a check of the new permission to places
in the interface which link to the edit item screen.

The catalogue toolbar had to be extensively re-worked in
order to ensure that the "New" and "Edit" menus would appear
(or not) whether or not edit_catalogue, edit_items, or
create_subscription permissions are on.
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |    6 +-
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |  173 +++++++++++---------
 .../prog/en/modules/catalogue/moredetail.tmpl      |    2 +-
 .../prog/en/modules/cataloguing/addbooks.tmpl      |   16 +--
 .../prog/en/modules/tools/batchMod-del.tmpl        |    2 +-
 .../prog/en/modules/tools/batchMod-edit.tmpl       |    2 +-
 6 files changed, 112 insertions(+), 89 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 13ac2c7..1e1a502 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -432,6 +432,9 @@ ul.toolbar {
 	padding-left : 0;
 }
 
+ul.toolbar button {
+	padding-bottom : 2px;
+}
 .yui-menu-button  {
 	
 }
@@ -916,7 +919,8 @@ fieldset.rows .inputnote {
 	background-repeat : no-repeat;
 }
 
-#placehold a {
+#placehold a,
+#placehold button {
 	padding-left : 34px;
 	background-image: url("../../img/toolbar-hold.gif");
 	background-position : center left;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index eda7985..8d4e02e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -25,6 +25,7 @@
 	}
 	function printBiblio() {window.open('/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Print_Biblio','width=700,height=500,toolbar=false,scrollbars=yes');
 	}
+<!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" -->
 function confirm_deletion() {
 		var count = <!-- TMPL_VAR NAME="count" -->;
         var is_confirmed;
@@ -44,6 +45,8 @@ function confirm_deletion() {
 		return false;
 	}
 }
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->
 function confirm_items_deletion() {
         var count = <!-- TMPL_VAR NAME="count" -->;
         if(count > 0){
@@ -54,125 +57,147 @@ function confirm_items_deletion() {
             }
 		}
 }
+<!-- /TMPL_IF -->
 	// prepare DOM for YUI Toolbar
 
 	 $(document).ready(function() {
-	    $("#edititems").parent().remove();
-	    $("#duplicatebiblio").parent().remove();
+	    <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->$("#edititems").parent().remove();
+		$("#newitem").parent().remove();<!-- /TMPL_IF -->
+	    <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" -->$("#duplicatebiblio").parent().remove();
 		$("#deletebiblio").parent().remove();
-		$("#newitem").parent().remove();
-		$("#newsub").parent().remove();
-	    $("#editmenuc").empty();
-		$("#newmenuc").empty();
-		$("#addtoshelfc").empty();
-		$("#printbiblioc").empty();
+		$("#z3950searchc").empty();<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="CAN_user_serials_create_subscription" -->$("#newsub").parent().remove();<!-- /TMPL_IF -->
+	    $("#newbiblio").parent().remove();
+		$("#editbiblio").parent().remove();
+		$("#addtoshelf").parent().remove();
+		$("#printbiblio").parent().remove();
+		$("#placehold").parent().remove();
 		$("#export").remove();
-		$("#addtoshelfc").before("<li id=\"savemenuc\"><\/li>");
-		$("#z3950searchc").empty();
-	    yuiToolbar();
 	 });
 
-	// YUI Toolbar Functions
-
-	function yuiToolbar() {
+	YAHOO.util.Event.onContentReady("cattoolbar", function () {
+		//	Menu for new record, new item, new subscription
 		var newmenu = [
-			{text: _("New Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl" },
-			{text: _("New Item"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#additema" },
-			{text: _("New Subscription"), url: "/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=<!-- TMPL_VAR NAME="biblionumber" -->"},
+			<!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" -->{text: _("New Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl" },<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->{text: _("New Item"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#additema" },<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="CAN_user_serials_create_subscription" -->
+			{text: _("New Subscription"), url: "/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=<!-- TMPL_VAR NAME="biblionumber" -->"},<!-- /TMPL_IF -->
 		];
-	
+		if(newmenu.length){
+			new YAHOO.widget.Button({
+				type: "menu",
+				label: _("New"),
+				id: "newmenuc",
+				name: "newmenubutton",
+				menu: newmenu,
+				container: this
+			 });
+		 }
 	    var editmenu = [
-	        { text: _("Edit Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=&amp;op=" },
-	        { text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
-	        { text: _("Attach Item"), url: "/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
-	        { text: _("Edit as New (Duplicate)"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=&amp;op=duplicate" },
-			{ text: _("Delete Record"), onclick: {fn: confirm_deletion }<!-- TMPL_IF NAME="count" -->,id:'disabled'<!-- /TMPL_IF --> },
-            { text: _("Delete all Items"), onclick: {fn: confirm_items_deletion } }
+	        <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" -->{ text: _("Edit Record"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=&amp;op=" },<!-- /TMPL_IF -->
+	        <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->{ text: _("Edit Items"), url: "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },<!-- /TMPL_IF -->
+	        <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->{ text: _("Attach Item"), url: "/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },<!-- /TMPL_IF -->
+	        <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" -->{ text: _("Edit as New (Duplicate)"), url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=&amp;op=duplicate" },<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" -->{ text: _("Delete Record"), onclick: {fn: confirm_deletion }<!-- TMPL_IF NAME="count" -->,id:'disabled'<!-- /TMPL_IF --> },<!-- /TMPL_IF -->
+	        <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->{ text: _("Delete all Items"), onclick: {fn: confirm_items_deletion } }<!-- /TMPL_IF -->
 	    ];
-		
+		if(editmenu.length){
+			new YAHOO.widget.Button({
+				type: "menu",
+				label: _("Edit"),
+				id: "editmenuc",
+				name: "editmenubutton",
+				menu: editmenu,
+				container: this
+			 });
+		}
 		var savemenu = [
-		{ text: _("MODS (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=mods&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
-		{ text: _("Dublin Core (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=dc&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
-		{ text: _("MARCXML"), url: "/cgi-bin/koha/catalogue/export.pl?format=marcxml&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
-		{ text: _("MARC (non-Unicode/MARC-8)"), url: "/cgi-bin/koha/catalogue/export.pl?format=marc8&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
-		{ text: _("MARC (Unicode/UTF-8)"), url: "/cgi-bin/koha/catalogue/export.pl?format=utf8&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" }
-		];
-
-		var addtomenu = [
-		{ text: _("Cart"), onclick: { fn: addToCart } },
-		{ text: _("List"),  onclick: { fn: addToShelf } }
+			{ text: _("MODS (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=mods&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
+			{ text: _("Dublin Core (XML)"), url: "/cgi-bin/koha/catalogue/export.pl?format=dc&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
+			{ text: _("MARCXML"), url: "/cgi-bin/koha/catalogue/export.pl?format=marcxml&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
+			{ text: _("MARC (non-Unicode/MARC-8)"), url: "/cgi-bin/koha/catalogue/export.pl?format=marc8&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
+			{ text: _("MARC (Unicode/UTF-8)"), url: "/cgi-bin/koha/catalogue/export.pl?format=utf8&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" }
 		];
 
 	    new YAHOO.widget.Button({
 	        type: "menu",
 	        label: _("Save"),
+	        id: "savemenuc",
 	        name: "savemenubutton",
 	        menu: savemenu,
-	        container: "savemenuc"
-	    });
-
-		new YAHOO.widget.Button({
-	        type: "menu",
-	        label: _("Edit"),
-	        name: "editmenubutton",
-	        menu: editmenu,
-	        container: "editmenuc"
+	        container: this
 	    });
 
-		new YAHOO.widget.Button({
-	        type: "menu",
-	        label: _("New"),
-	        name: "newmenubutton",
-	        menu: newmenu,
-	        container: "newmenuc"
-	    });
+	    var addtomenu = [
+			{ text: _("Cart"), onclick: { fn: addToCart } },
+			{ text: _("List"),  onclick: { fn: addToShelf } }
+		];
 
 		new YAHOO.widget.Button({
 	        type: "menu",
 	        label: _("Add to"),
 	        name: "addtomenubutton",
 	        menu: addtomenu,
-	        container: "addtoshelfc"
+	        container: this
 	    });
 
 		new YAHOO.widget.Button({
-			id: "z3950search", 
+	        id: "printbiblio",
+	        type: "button",
+	        label: _("Print"),
+	        container: this,
+			onclick: {fn: printBiblio }
+		});
+
+	    new YAHOO.widget.Button({
+			id: "placehold",
+			type: "link",
+			label: _("Place hold"),
+			container: this,
+			href: "/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"
+	     });
+	    <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" -->
+		new YAHOO.widget.Button({
+			id: "z3950search",
 			type: "button", 
-			label: _("Z39.50 Search"), 
-			container: "z3950searchc",
+			label: _("Z39.50 Search"),
+			container: this,
 			onclick: {fn:function(){PopupZ3950()}}
 		});
-
-		var printbiblioButton = new YAHOO.widget.Button({
-                                            id: "printbiblio", 
-                                            type: "button", 
-                                            label: _("Print"), 
-                                            container: "printbiblioc",
-											onclick: {fn: printBiblio }
-                                        });
-
-	    var newbiblioButton = new YAHOO.widget.Button("newbiblio");
-	    var placeholdButton = new YAHOO.widget.Button("placehold");
-		
-	}
-
+		<!-- /TMPL_IF -->
+	});
 	//]]>
 	</script>
 	
 <form method="post" name="f" id="f" action="/cgi-bin/koha/cataloguing/addbiblio.pl" onsubmit="return Check();">
 
-<ul class="toolbar">
+<ul class="toolbar" id="cattoolbar">
+
 	<!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" -->
-	<li id="newmenuc"><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New Record</a></li>
+	<li><a id="newbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New Record</a></li>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->
 	<li><a id="newitem" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">New Item</a></li>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="CAN_user_serials_create_subscription" -->
 	<li><a id="newsub" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=<!-- TMPL_VAR NAME="biblionumber" -->">New Subscription</a></li>
-	<li id="editmenuc"><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">Edit Record</a></li>
+	<!-- /TMPL_IF -->
+
+	<!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" -->
+	<li><a id="editbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">Edit Record</a></li>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->
 	<li><a id="edititems" href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit Items</a></li>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" -->
 	<li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate">Duplicate Record</a></li>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" -->
 	<li><a id="deletebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Delete</a></li>
 	<!-- /TMPL_IF -->	
-	<li id="addtoshelfc"><a id="addtoshelf" href="/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Add to shelf</a></li>
-	<li id="printbiblioc"><a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Print</a></li>
+
+	<li><a id="addtoshelf" href="/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Add to shelf</a></li>
+	<li><a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Print</a></li>
 	<!-- TMPL_IF NAME="CAN_user_reserveforothers" -->
 	<!-- TMPL_UNLESS NAME="norequests" --><li><a id="placehold" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li><!-- /TMPL_UNLESS -->
 	<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
index 8577193..ee5e3b7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@ -42,7 +42,7 @@
     <!-- TMPL_LOOP NAME="ITEM_DATA" -->
     <div class="yui-g">
         <h3 id="item<!-- TMPL_VAR NAME="itemnumber" -->">Barcode <!-- TMPL_VAR NAME="barcode" -->  <!-- TMPL_IF name="notforloantext" --><!-- TMPL_VAR name="notforloantext" --> <!-- /TMPL_IF --></h3>
-        <div class="listgroup"><h4>Item Information <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" --><!-- TMPL_UNLESS name="nomod" --><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">[Edit Items]</a><!-- /TMPL_IF --><!-- /TMPL_UNLESS --></h4>
+        <div class="listgroup"><h4>Item Information <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" --><!-- TMPL_UNLESS name="nomod" --><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">[Edit Items]</a><!-- /TMPL_IF --><!-- /TMPL_UNLESS --></h4>
             <ol class="bibliodetails">
             <li><span class="label">Home Library:</span> <!-- TMPL_VAR NAME="homebranchname" -->&nbsp;</li>
 	    <!-- TMPL_IF NAME="item-level_itypes" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
index 2c217b3..bad3787 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
@@ -36,9 +36,9 @@
         <tr>
             <th>Title</th>
             <th>Location</th>
-            <th>preview</th>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
+            <th>Preview</th>
+            <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue" --><th>&nbsp;</th><!-- TMPL_ELSE --><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" --><th>&nbsp;</th><!-- /TMPL_IF -->
         </tr>
     <!-- TMPL_LOOP NAME="resultsloop" -->
         <!-- TMPL_IF name="even" -->
@@ -98,14 +98,8 @@
                 </td>
 				<td> <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=<!-- TMPL_VAR NAME="biblionumber" -->" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=<!-- TMPL_VAR NAME="biblionumber" -->" title="MARC" rel="gb_page_center[600,500]">Card</a>
                 </td>
-                <td><!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue"--><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit biblio</a>
-					<!-- TMPL_ELSE --><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="disabled" onclick="return false;">Edit biblio</a>
-					<!-- /TMPL_IF -->
-
-                </td>
-                <td>
-                    <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Add holdings</a>
-                </td>
+                <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_catalogue"--><td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit biblio</a></td><!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" --><td><a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Add holdings</a></td><!-- /TMPL_IF -->
             </tr>
     <!-- /TMPL_LOOP -->
     </table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
index c6f82b9..7134b93 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tmpl
@@ -156,7 +156,7 @@
 		    <!-- TMPL_LOOP name="not_deleted_loop" -->
 			<tr>
 			    <td><!-- TMPL_VAR name="itemnumber" --></td>
-			    <td><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR name="barcode" --></a></td>
+			    <td><!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" --><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR name="barcode" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="barcode" --><!-- /TMPL_IF --></td>
 			    <td><!-- TMPL_IF name="book_on_loan" -->Item is checked out<!-- TMPL_ELSIF name="book_reserved" -->Item has a waiting hold<!-- /TMPL_IF --></td>
 			</tr>
 		    <!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl
index 7793f04..19fb453 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tmpl
@@ -102,7 +102,7 @@
     <ul>
     <!-- TMPL_LOOP NAME="simple_items_display" -->
   <li>
-      <a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a>
+      <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" --><a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="barcode" --><!-- /TMPL_IF -->
   </li>
     <!-- /TMPL_LOOP -->
     </ul>
-- 
1.7.0.4


From paul.poulain at biblibre.com  Sat Jul 24 06:17:22 2010
From: paul.poulain at biblibre.com (Paul Poulain)
Date: Sat, 24 Jul 2010 06:17:22 +0200
Subject: [Koha-patches] [PATCH] Fix for Bug 2170,
	Adding 'edititems' user-permission
In-Reply-To: <1279911674-29190-1-git-send-email-oleonard@myacpl.org>
References: <1279911674-29190-1-git-send-email-oleonard@myacpl.org>
Message-ID: <4C4A6952.1000006@biblibre.com>

Le 23/07/2010 21:01, Owen Leonard a ?crit :
> This patch follows up on the addition of the 'edititems'
> permission by adding a check of the new permission to places
> in the interface which link to the edit item screen.
>
> diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
> index 13ac2c7..1e1a502 100644
> --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
> +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
> @@ -432,6 +432,9 @@ ul.toolbar {
>  	padding-left : 0;
>  }
>  
> +ul.toolbar button {
> +	padding-bottom : 2px;
> +}
>  .yui-menu-button  {
>  	
>  }
> @@ -916,7 +919,8 @@ fieldset.rows .inputnote {
>  	background-repeat : no-repeat;
>  }
>  
> -#placehold a {
> +#placehold a,
> +#placehold button {
>  	padding-left : 34px;
>  	background-image: url("../../img/toolbar-hold.gif");
>  	background-position : center left;
>   
mmm... not sure this part of the patch is related to the comment of the
patch

-- 
Paul POULAIN
http://www.biblibre.com
Expert en Logiciels Libres pour l'info-doc
Tel : (33) 4 91 81 35 08


From oleonard at myacpl.org  Sat Jul 24 18:37:03 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Sat, 24 Jul 2010 12:37:03 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 2170,
	Adding 'edititems' 	user-permission
In-Reply-To: <4C4A6952.1000006@biblibre.com>
References: <1279911674-29190-1-git-send-email-oleonard@myacpl.org>
	<4C4A6952.1000006@biblibre.com>
Message-ID: <AANLkTinXuCFbhZF7qKaMpbH9mBveA3A93wwZaENbHw9F@mail.gmail.com>

> mmm... not sure this part of the patch is related to the comment of the
> patch

It is, because the addition of the edititem preference required a
complete reorganization of the catalog toolbar, necessitating changes
in the HTML structure of some of the toolbar buttons. The CSS changes
match the markup changes.

  -- Owen

On Sat, Jul 24, 2010 at 12:17 AM, Paul Poulain
<paul.poulain at biblibre.com> wrote:
> Le 23/07/2010 21:01, Owen Leonard a ?crit :
>> This patch follows up on the addition of the 'edititems'
>> permission by adding a check of the new permission to places
>> in the interface which link to the edit item screen.
>>
>> diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
>> index 13ac2c7..1e1a502 100644
>> --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
>> +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
>> @@ -432,6 +432,9 @@ ul.toolbar {
>> ? ? ? padding-left : 0;
>> ?}
>>
>> +ul.toolbar button {
>> + ? ? padding-bottom : 2px;
>> +}
>> ?.yui-menu-button ?{
>>
>> ?}
>> @@ -916,7 +919,8 @@ fieldset.rows .inputnote {
>> ? ? ? background-repeat : no-repeat;
>> ?}
>>
>> -#placehold a {
>> +#placehold a,
>> +#placehold button {
>> ? ? ? padding-left : 34px;
>> ? ? ? background-image: url("../../img/toolbar-hold.gif");
>> ? ? ? background-position : center left;
>>
> mmm... not sure this part of the patch is related to the comment of the
> patch

From chrisc at catalyst.net.nz  Mon Jul 26 00:13:35 2010
From: chrisc at catalyst.net.nz (Chris Cormack)
Date: Mon, 26 Jul 2010 10:13:35 +1200
Subject: [Koha-patches] [PATCH] Squashed commit of the following:
Message-ID: <1280096015-30914-1-git-send-email-chrisc@catalyst.net.nz>

commit d6a7c8f1fdebe4e9693651efbafa53ae582c4830
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Jul 26 10:06:37 2010 +1200

    Silencing more warns

commit cc0c8262973536c870593bcf9f33dcd8e871f9b5
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Jul 26 10:04:10 2010 +1200

    Silencing noisy warns in reserve/request.pl
---
 reserve/request.pl |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/reserve/request.pl b/reserve/request.pl
index 859a65b..a24d276 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -91,22 +91,20 @@ my $warnings;
 my $messages;
 
 my $date = C4::Dates->today('iso');
-my $action = $input->param('action');
+my $action = $input->param('action') || '';
 
 if ( $action eq 'move' ) {
   my $where = $input->param('where');
-  my $borrowernumber = $input->param('borrowernumber');
-  my $biblionumber = $input->param('biblionumber');
-                     
+  my $borrowernumber = $input->param('borrowernumber') || '';
+  my $biblionumber = $input->param('biblionumber') || '';                     
   AlterPriority( $where, $borrowernumber, $biblionumber );
-
 } elsif ( $action eq 'cancel' ) {
-  my $borrowernumber = $input->param('borrowernumber');
-  my $biblionumber = $input->param('biblionumber');
+  my $borrowernumber = $input->param('borrowernumber') || '';
+  my $biblionumber = $input->param('biblionumber') || '';
   CancelReserve( $biblionumber, '', $borrowernumber );
 } elsif ( $action eq 'setLowestPriority' ) {
-  my $borrowernumber = $input->param('borrowernumber');
-  my $biblionumber   = $input->param('biblionumber');
+  my $borrowernumber = $input->param('borrowernumber') || '';
+  my $biblionumber   = $input->param('biblionumber') || '';
   ToggleLowestPriority( $borrowernumber, $biblionumber );
 }
 
@@ -320,12 +318,11 @@ foreach my $biblionumber (@biblionumbers) {
         my $num_available = 0;
         my $num_override  = 0;
         
-        $biblioitem->{description} =
-          $itemtypes->{ $biblioitem->{itemtype} }{description};
+        $biblioitem->{description} = $itemtypes->{ $biblioitem->{itemtype} }{description} if $biblioitem->{itemtype};
         $biblioloopiter{description} = $biblioitem->{description};
         $biblioloopiter{itypename} = $biblioitem->{description};
         $biblioloopiter{imageurl} =
-          getitemtypeimagelocation('intranet', $itemtypes->{$biblioitem->{itemtype}}{imageurl});
+          getitemtypeimagelocation('intranet', $itemtypes->{$biblioitem->{itemtype}}{imageurl} ) if $biblioitem->{itemtype};
         
         foreach my $itemnumber ( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} } )    {
             my $item = $iteminfos_of->{$itemnumber};
-- 
1.7.0.4


From katrin.fischer at bsz-bw.de  Mon Jul 26 13:49:37 2010
From: katrin.fischer at bsz-bw.de (Katrin Fischer)
Date: Mon, 26 Jul 2010 13:49:37 +0200
Subject: [Koha-patches] [PATCH] BUG 5058: small layout correction of vendor
	form
Message-ID: <1280144977-9053-1-git-send-email-katrin.fischer@bsz-bw.de>

From: Katrin Fischer <Katrin.Fischer.bsz-bw.de>

---
 .../prog/en/modules/acqui/supplier.tmpl            |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
index 83b8631..5528a8d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -135,8 +135,8 @@ if (f.company.value == "") {
             </ol>
             <ol>
             <li><label for="discount">Discount</label>
-                <input type="text" size="6" id="discount" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %</li>
-            <!-- TMPL_IF NAME="GST" --><li><label for="gstrate">Tax rate</label><input type="text" name="gstrate" id="gstrate" size="5" value="<!-- TMPL_VAR name="gstrate" -->"/>%</li><!-- /TMPL_IF -->
+                <input type="text" size="5" id="discount" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %</li>
+            <!-- TMPL_IF NAME="GST" --><li><label for="gstrate">Tax rate</label><input type="text" name="gstrate" id="gstrate" size="5" value="<!-- TMPL_VAR name="gstrate" -->"/> %</li><!-- /TMPL_IF -->
             <li><label for="notes">Notes</label>
                 <textarea cols="40" rows="4" id="notes" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea></li></ol>			
             <!-- TMPL_UNLESS NAME="GST" -->
-- 
1.6.3.3



From katrin.fischer at bsz-bw.de  Mon Jul 26 13:45:30 2010
From: katrin.fischer at bsz-bw.de (Katrin Fischer)
Date: Mon, 26 Jul 2010 13:45:30 +0200
Subject: [Koha-patches] [PATCH] Bug 5059: Inconsistent use of ordering price
	and list price in vendor form
Message-ID: <1280144730-13719-1-git-send-email-katrin.fischer@bsz-bw.de>

From: Katrin Fischer <Katrin.Fischer at bsz-bw.de>

Changes Ordering price to List price and make spelling more consistent.
---
 .../prog/en/modules/acqui/supplier.tmpl            |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
index 83b8631..9d1ae18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -57,7 +57,7 @@ if (f.company.value == "") {
         </fieldset>
         <fieldset class="rows">
             <legend>Contact details</legend>
-        <ol> <li><label for="company_contact_name">Contact Name</label>
+        <ol> <li><label for="company_contact_name">Contact name</label>
                 <input type="text" size="40" id="company_contact_name" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->" /></li>
             <li><label for="company_contact_position">Position</label>
                 <input type="text" size="40" id="company_contact_position" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->" /></li>
@@ -86,7 +86,7 @@ if (f.company.value == "") {
                     <!-- /TMPL_IF --></li>
             </ol>
             <ol>
-            <li><label for="list_currency">List Prices are</label>
+            <li><label for="list_currency">List prices are</label>
                     <select name="list_currency" id="list_currency">
                     <!-- TMPL_LOOP NAME="loop_currency" -->
                         <option value="<!-- TMPL_VAR  NAME="currency" -->"
@@ -95,7 +95,7 @@ if (f.company.value == "") {
                     <!-- /TMPL_LOOP -->
                     </select>
             </li>
-            <li><label for="invoice_currency">Invoice Prices are</label>
+            <li><label for="invoice_currency">Invoice prices are</label>
                     <select name="invoice_currency" id="invoice_currency">
                     <!-- TMPL_LOOP NAME="loop_currency" -->
                         <option value="<!-- TMPL_VAR  NAME="currency" -->"
@@ -115,7 +115,7 @@ if (f.company.value == "") {
                     <label for="gstno">No</label> <input type="radio" name="gst" id="gstno" value="0" checked="checked" />
                 <!-- /TMPL_IF --></li><!-- /TMPL_IF -->
             
-            <!-- TMPL_IF NAME="GST" --><li><label for="list_gstyes" class="radio">Ordering prices:</label>
+            <!-- TMPL_IF NAME="GST" --><li><label for="list_gstyes" class="radio">List prices:</label>
                 <!-- TMPL_IF name="listincgst" -->
                     <label for="list_gstyes">Include tax</label> <input type="radio" id="list_gstyes" name="list_gst" value="1" checked="checked" />
                     <label for="list_gstno">Don't include tax</label> <input type="radio" id="list_gstno" name="list_gst" value="0" />
@@ -187,8 +187,8 @@ if (f.company.value == "") {
                     <!-- TMPL_ELSE -->
                         Inactive
                     <!-- /TMPL_IF --></p>
-            <p><strong>List Prices are: </strong><!--TMPL_VAR Name="listprice"--></p>
-            <p><strong>Invoice Prices are: </strong><!--TMPL_VAR Name="invoiceprice"--></p>
+            <p><strong>List prices are: </strong><!--TMPL_VAR Name="listprice"--></p>
+            <p><strong>Invoice prices are: </strong><!--TMPL_VAR Name="invoiceprice"--></p>
             <!-- TMPL_IF NAME="GST" --><p><strong>Tax Number Registered: </strong>
                     <!-- TMPL_IF name="gstreg" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p>
             <p><strong>List Item Price Includes Tax: </strong>
-- 
1.6.3.3



From f.demians at tamil.fr  Mon Jul 26 16:37:03 2010
From: f.demians at tamil.fr (=?iso-8859-1?Q?Fr=E9d=E9ric?= Demians)
Date: Mon, 26 Jul 2010 16:37:03 +0200
Subject: [Koha-patches] Request to Pull
Message-ID: <20100726143703.GA23826@ns207124.ovh.net>

The following changes since commit ec3913e1aabe28bc5dd43c3af401a7e2bf80f677:

  Bug 3756 Don't display as local AutoSelfCheckID syspref and others (2010-07-26 16:18:37 +0200)

are available in the git repository at:
  git://git.tamil.fr/git/koha origin/new/bug3756_reenable_local_sysprefs


From colin.campbell at ptfs-europe.com  Mon Jul 26 17:56:04 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Mon, 26 Jul 2010 16:56:04 +0100
Subject: [Koha-patches] [PATCH] Bug5063:  C4::Bookseller Changes
Message-ID: <1280159764-4743-1-git-send-email-colin.campbell@ptfs-europe.com>

Merge unfao changes to C4::Bookseller
Enable warnings in Bookseller.pm
Some cleanups in Bookseller code
Do not export everything by default
Display vendors more rationally
    Was displaying by id make it name as the searchstring is for all
    embedded substrings
Have removed "if mysql" logic as we want to deal with this by
    abstracting the DB interaction and it makes cleaner code until then

Sponsered by UN FAO, Rome
---
 C4/Bookseller.pm               |  172 ++++++++++++++++------------------------
 acqui/basket.pl                |    2 +-
 acqui/booksellers.pl           |    2 +-
 acqui/lateorders.pl            |    4 +-
 acqui/neworderbiblio.pl        |    2 +-
 acqui/neworderempty.pl         |    2 +-
 acqui/newordersuggestion.pl    |    2 +-
 acqui/orderreceive.pl          |    2 +-
 acqui/parcel.pl                |    2 +-
 acqui/parcels.pl               |    2 +-
 acqui/supplier.pl              |    2 +-
 acqui/updatesupplier.pl        |    3 +-
 serials/acqui-search-result.pl |    2 +-
 serials/claims.pl              |    2 +-
 t/db_dependent/Acquisition.t   |    2 +-
 t/lib/KohaTest.pm              |    2 +-
 16 files changed, 84 insertions(+), 121 deletions(-)

diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm
index 8d60938..8b5c3d0 100644
--- a/C4/Bookseller.pm
+++ b/C4/Bookseller.pm
@@ -1,6 +1,7 @@
 package C4::Bookseller;
 
 # Copyright 2000-2002 Katipo Communications
+# Copyright 2010 PTFS Europe
 #
 # This file is part of Koha.
 #
@@ -18,23 +19,18 @@ package C4::Bookseller;
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
-#use warnings; FIXME - Bug 2505
-
-use vars qw($VERSION @ISA @EXPORT);
-
-BEGIN {
-	# set the version for version checking
-	$VERSION = 3.01;
-    require Exporter;
-	@ISA    = qw(Exporter);
-	@EXPORT = qw(
-		&GetBookSeller &GetBooksellersWithLateOrders &GetBookSellerFromId
-		&ModBookseller
-		&DelBookseller
-		&AddBookseller
-	);
-}
+use warnings;
+
+use base qw( Exporter );
 
+# set the version for version checking
+our $VERSION   = 4.01;
+our @EXPORT_OK = qw(
+  GetBookSeller GetBooksellersWithLateOrders GetBookSellerFromId
+  ModBookseller
+  DelBookseller
+  AddBookseller
+);
 
 =head1 NAME
 
@@ -54,92 +50,67 @@ a bookseller.
 
 =head2 GetBookSeller
 
- at results = &GetBookSeller($searchstring);
+ at results = GetBookSeller($searchstring);
 
 Looks up a book seller. C<$searchstring> may be either a book seller
 ID, or a string to look for in the book seller's name.
 
-C<@results> is an array of references-to-hash, whose keys are the fields of of the
+C<@results> is an array of hash_refs whose keys are the fields of of the
 aqbooksellers table in the Koha database.
 
 =cut
 
-# FIXME: This function is badly named.  It should be something like 
-# SearchBookSellersByName.  It is NOT a singular return value.
+sub GetBookSeller {
+    my $searchstring = shift;
+    $searchstring = q{%} . $searchstring . q{%};
+    my $query =
+'select aqbooksellers.*, count(*) as basketcount from aqbooksellers left join aqbasket '
+      . 'on aqbasket.booksellerid = aqbooksellers.id where name lIke ? group by aqbooksellers.id order by name';
+
+    my $dbh           = C4::Context->dbh;
+    my $sth           = $dbh->prepare($query);
+    $sth->execute($searchstring);
+    my $resultset_ref = $sth->fetchall_arrayref( {} );
+    return @{$resultset_ref};
+}
 
-sub GetBookSeller($) {
-    my ($searchstring) = @_;
+sub GetBookSellerFromId {
+    my $id = shift or return;
     my $dbh = C4::Context->dbh;
-    my $query = "SELECT * FROM aqbooksellers WHERE name LIKE ?";
-    my $sth =$dbh->prepare($query);
-    $sth->execute( "%$searchstring%" );
-    my @results;
-    # count how many baskets this bookseller has.
-    # if it has none, the bookseller can be deleted
-    my $sth2 = $dbh->prepare("SELECT count(*) FROM aqbasket WHERE booksellerid=?");
-    while ( my $data = $sth->fetchrow_hashref ) {
-        $sth2->execute($data->{id});
-        $data->{basketcount} = $sth2->fetchrow();
-        push( @results, $data );
+    my $vendor =
+      $dbh->selectrow_hashref( 'SELECT * FROM aqbooksellers WHERE id = ?',
+        {}, $id );
+    if ($vendor) {
+        ( $vendor->{basketcount} ) = $dbh->selectrow_array(
+            'SELECT count(*) FROM aqbasket where booksellerid = ?',
+            {}, $id );
     }
-    $sth->finish;
-    return  @results ;
+    return $vendor;
 }
 
-
-sub GetBookSellerFromId($) {
-	my $id = shift or return;
-	my $dbh = C4::Context->dbh();
-	my $query = "SELECT * FROM aqbooksellers WHERE id = ?";
-	my $sth =$dbh->prepare($query);
-	$sth->execute( $id );
-	if (my $data = $sth->fetchrow_hashref()){
-		my $sth2 = $dbh->prepare("SELECT count(*) FROM aqbasket WHERE booksellerid=?");
-		$sth2->execute($id);
-		$data->{basketcount}=$sth2->fetchrow();
-		return $data;
-	}
-	return;
-}
 #-----------------------------------------------------------------#
 
 =head2 GetBooksellersWithLateOrders
 
-%results = &GetBooksellersWithLateOrders;
+%results = GetBooksellersWithLateOrders($delay);
 
 Searches for suppliers with late orders.
 
 =cut
 
 sub GetBooksellersWithLateOrders {
-    my ($delay,$branch) = @_; 	# FIXME: Branch argument unused.
+    my $delay = shift;
     my $dbh   = C4::Context->dbh;
 
-# FIXME NOT quite sure that this operation is valid for DBMs different from Mysql, HOPING so
-# should be tested with other DBMs
-
-    my $strsth;
-    my $dbdriver = C4::Context->config("db_scheme") || "mysql";
-    if ( $dbdriver eq "mysql" ) {
-        $strsth = "
-            SELECT DISTINCT aqbasket.booksellerid, aqbooksellers.name
-            FROM aqorders LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
-            LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
-            WHERE (closedate < DATE_SUB(CURDATE( ),INTERVAL $delay DAY)
-                AND (datereceived = '' OR datereceived IS NULL))
-        ";
-    }
-    else {
-        $strsth = "
-            SELECT DISTINCT aqbasket.booksellerid, aqbooksellers.name
-            FROM aqorders LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
-            LEFT JOIN aqbooksellers ON aqbasket.aqbooksellerid = aqbooksellers.id
-            WHERE (closedate < (CURDATE( )-(INTERVAL $delay DAY)))
-                AND (datereceived = '' OR datereceived IS NULL))
-        ";
-    }
+    # TODO delay should be verified
+    my $query_string =
+      "SELECT DISTINCT aqbasket.booksellerid, aqbooksellers.name
+    FROM aqorders LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
+    LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
+    WHERE (closedate < DATE_SUB(CURDATE( ),INTERVAL $delay DAY)
+    AND (datereceived = '' OR datereceived IS NULL))";
 
-    my $sth = $dbh->prepare($strsth);
+    my $sth = $dbh->prepare($query_string);
     $sth->execute;
     my %supplierlist;
     while ( my ( $id, $name ) = $sth->fetchrow ) {
@@ -165,8 +136,8 @@ Returns the ID of the newly-created bookseller.
 
 sub AddBookseller {
     my ($data) = @_;
-    my $dbh = C4::Context->dbh;
-    my $query = "
+    my $dbh    = C4::Context->dbh;
+    my $query  = q|
         INSERT INTO aqbooksellers
             (
                 name,      address1,      address2,   address3,      address4,
@@ -176,8 +147,8 @@ sub AddBookseller {
                 listincgst,invoiceincgst,   discount,
                 notes
             )
-        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-    ";
+        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) |
+      ;
     my $sth = $dbh->prepare($query);
     $sth->execute(
         $data->{'name'},         $data->{'address1'},
@@ -195,21 +166,14 @@ sub AddBookseller {
     );
 
     # return the id of this new supplier
-    # FIXME: no protection against simultaneous addition: max(id) might be wrong!
-    $query = "
-        SELECT max(id)
-        FROM   aqbooksellers
-    ";
-    $sth = $dbh->prepare($query);
-    $sth->execute;
-    return scalar($sth->fetchrow);
+    return $dbh->{'mysql_insertid'};
 }
 
 #-----------------------------------------------------------------#
 
 =head2 ModBookseller
 
-&ModBookseller($bookseller);
+ModBookseller($bookseller);
 
 Updates the information for a given bookseller. C<$bookseller> is a
 reference-to-hash whose keys are the fields of the aqbooksellers table
@@ -225,17 +189,15 @@ C<&ModBookseller> with the result.
 sub ModBookseller {
     my ($data) = @_;
     my $dbh    = C4::Context->dbh;
-    my $query = "
-        UPDATE aqbooksellers
+    my $query  = 'UPDATE aqbooksellers
         SET name=?,address1=?,address2=?,address3=?,address4=?,
             postal=?,phone=?,fax=?,url=?,contact=?,contpos=?,
             contphone=?,contfax=?,contaltphone=?,contemail=?,
             contnotes=?,active=?,listprice=?, invoiceprice=?,
             gstreg=?,listincgst=?,invoiceincgst=?,
-            discount=?, notes=?, gstrate=?
-        WHERE id=?
-    ";
-    my $sth    = $dbh->prepare($query);
+            discount=?,notes=?,gstrate=?
+        WHERE id=?';
+    my $sth = $dbh->prepare($query);
     $sth->execute(
         $data->{'name'},         $data->{'address1'},
         $data->{'address2'},     $data->{'address3'},
@@ -248,27 +210,27 @@ sub ModBookseller {
         $data->{'active'},       $data->{'listprice'},
         $data->{'invoiceprice'}, $data->{'gstreg'},
         $data->{'listincgst'},   $data->{'invoiceincgst'},
-        $data->{'discount'},
-        $data->{'notes'},        $data->{'gstrate'},
-        $data->{'id'}
+        $data->{'discount'},     $data->{'notes'},
+        $data->{'gstrate'},      $data->{'id'}
     );
-    $sth->finish;
+    return;
 }
 
 =head2 DelBookseller
 
-&DelBookseller($booksellerid);
+DelBookseller($booksellerid);
 
-delete the supplier identified by $booksellerid
-This sub can be called only if the supplier has no order.
+delete the supplier record identified by $booksellerid
+This sub assumes it is called only if the supplier has no order.
 
 =cut
 
 sub DelBookseller {
-    my ($id) = @_;
-    my $dbh=C4::Context->dbh;
-    my $sth=$dbh->prepare("DELETE FROM aqbooksellers WHERE id=?");
+    my $id  = shift;
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare('DELETE FROM aqbooksellers WHERE id=?');
     $sth->execute($id);
+    return;
 }
 
 1;
diff --git a/acqui/basket.pl b/acqui/basket.pl
index 005fcb9..28ae83d 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -29,7 +29,7 @@ use CGI;
 use C4::Acquisition;
 use C4::Budgets;
 
-use C4::Bookseller;
+use C4::Bookseller qw( GetBookSellerFromId);
 use C4::Dates qw/format_date/;
 use C4::Debug;
 
diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 7641e68..0918f5d 100755
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -62,7 +62,7 @@ use CGI;
 
 use C4::Acquisition;
 use C4::Dates qw/format_date/;
-use C4::Bookseller;
+use C4::Bookseller qw/ GetBookSellerFromId GetBookSeller /;
 use C4::Members qw/GetMember/;
 
 my $query = new CGI;
diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index e948d2f..810f665 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -45,7 +45,7 @@ To know on which branch this script have to display late order.
 use strict;
 use warnings;
 use CGI;
-use C4::Bookseller;
+use C4::Bookseller qw( GetBooksellersWithLateOrders );
 use C4::Auth;
 use C4::Koha;
 use C4::Output;
@@ -76,7 +76,7 @@ unless ($delay =~ /^\d{1,3}$/) {
 	$delay = 30;	#default value for delay
 }
 
-my %supplierlist = GetBooksellersWithLateOrders($delay,$branch);
+my %supplierlist = GetBooksellersWithLateOrders($delay);
 my (@sloopy);	# supplier loop
 foreach (keys %supplierlist){
 	push @sloopy, (($supplierid and $supplierid eq $_ )            ? 
diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl
index 2333f89..9e63492 100755
--- a/acqui/neworderbiblio.pl
+++ b/acqui/neworderbiblio.pl
@@ -60,7 +60,7 @@ use strict;
 
 use C4::Search;
 use CGI;
-use C4::Bookseller;
+use C4::Bookseller qw/ GetBookSellerFromId /;
 use C4::Biblio;
 use C4::Auth;
 use C4::Output;
diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index a580ae7..f64cffe 100755
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -76,7 +76,7 @@ use C4::Budgets;
 use C4::Input;
 use C4::Dates;
 
-use C4::Bookseller;		# GetBookSellerFromId
+use C4::Bookseller  qw/ GetBookSellerFromId /;
 use C4::Acquisition;
 use C4::Suggestions;	# GetSuggestion
 use C4::Biblio;			# GetBiblioData
diff --git a/acqui/newordersuggestion.pl b/acqui/newordersuggestion.pl
index 156dab8..b65e4ea 100755
--- a/acqui/newordersuggestion.pl
+++ b/acqui/newordersuggestion.pl
@@ -93,7 +93,7 @@ use CGI;
 use C4::Auth;    # get_template_and_user
 use C4::Output;
 use C4::Suggestions;
-use C4::Bookseller;
+use C4::Bookseller qw/ GetBookSellerFromId /;
 use C4::Biblio;
 
 my $input = new CGI;
diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index a1e6fce..5e365f3 100755
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -65,7 +65,7 @@ use C4::Acquisition;
 use C4::Auth;
 use C4::Output;
 use C4::Dates qw/format_date/;
-use C4::Bookseller;
+use C4::Bookseller qw/ GetBookSellerFromId /;
 use C4::Members;
 use C4::Branch;    # GetBranches
 use C4::Items;
diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index 675b07d..7b9782a 100755
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -57,7 +57,7 @@ use strict;
 use C4::Auth;
 use C4::Acquisition;
 use C4::Budgets;
-use C4::Bookseller;
+use C4::Bookseller qw/ GetBookSellerFromId /;
 use C4::Biblio;
 use C4::Items;
 use CGI;
diff --git a/acqui/parcels.pl b/acqui/parcels.pl
index 33792b4..1e8d44e 100755
--- a/acqui/parcels.pl
+++ b/acqui/parcels.pl
@@ -74,7 +74,7 @@ use C4::Output;
 
 use C4::Dates qw/format_date/;
 use C4::Acquisition;
-use C4::Bookseller;
+use C4::Bookseller qw/ GetBookSellerFromId /;
 
 my $input          = CGI->new;
 my $supplierid     = $input->param('supplierid');
diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index 6c49a90..5505c52 100755
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -47,7 +47,7 @@ use C4::Output;
 use C4::Dates qw/format_date /;
 use CGI;
 
-use C4::Bookseller;
+use C4::Bookseller qw( GetBookSellerFromId DelBookseller );
 use C4::Budgets;
 
 my $query    = CGI->new;
diff --git a/acqui/updatesupplier.pl b/acqui/updatesupplier.pl
index e324a29..3f20796 100755
--- a/acqui/updatesupplier.pl
+++ b/acqui/updatesupplier.pl
@@ -48,7 +48,8 @@ use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Context;
 use C4::Auth;
-use C4::Bookseller;
+
+use C4::Bookseller qw( ModBookseller AddBookseller );
 use C4::Biblio;
 use C4::Output;
 use CGI;
diff --git a/serials/acqui-search-result.pl b/serials/acqui-search-result.pl
index e671e96..5839cd4 100755
--- a/serials/acqui-search-result.pl
+++ b/serials/acqui-search-result.pl
@@ -47,7 +47,7 @@ use C4::Output;
 use CGI;
 use C4::Acquisition;
 use C4::Dates qw/format_date/;
-use C4::Bookseller;
+use C4::Bookseller qw( GetBookSeller );
 
 my $query=new CGI;
 my ($template, $loggedinuser, $cookie)
diff --git a/serials/claims.pl b/serials/claims.pl
index b723136..888df33 100755
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -22,7 +22,7 @@ use C4::Auth;
 use C4::Serials;
 use C4::Acquisition;
 use C4::Output;
-use C4::Bookseller;
+use C4::Bookseller qw( GetBookSeller );
 use C4::Context;
 use C4::Letters;
 my $input = CGI->new;
diff --git a/t/db_dependent/Acquisition.t b/t/db_dependent/Acquisition.t
index 241f442..1d4f36a 100755
--- a/t/db_dependent/Acquisition.t
+++ b/t/db_dependent/Acquisition.t
@@ -7,7 +7,7 @@ use strict;
 use warnings;
 use Data::Dumper;
 
-use C4::Bookseller;
+use C4::Bookseller qw( GetBookSellerFromId );
 
 use Test::More tests => 37;
 
diff --git a/t/lib/KohaTest.pm b/t/lib/KohaTest.pm
index 323b55a..1282e38 100644
--- a/t/lib/KohaTest.pm
+++ b/t/lib/KohaTest.pm
@@ -10,7 +10,7 @@ plan skip_all => "Test::Class required for performing database tests" if $@;
 
 use C4::Auth;
 use C4::Biblio;
-use C4::Bookseller;
+use C4::Bookseller qw( AddBookseller );
 use C4::Context;
 use C4::Items;
 use C4::Members;
-- 
1.7.1.1


From oleonard at myacpl.org  Mon Jul 26 18:35:56 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 26 Jul 2010 12:35:56 -0400
Subject: [Koha-patches] [PATCH] Further fixes for Bug 3211,
	cataloging value plugin forms should be valid XHTML
Message-ID: <1280162157-30606-1-git-send-email-oleonard@myacpl.org>

- Adding page heading
- Adding "Cancel" link to close popup
- Correctly marking up <label> <input> pairs
- Correctly escaping JavaScript blocks
- General markup corrections
---
 .../cataloguing/value_builder/labs_theses.tmpl     |   21 +-
 .../modules/cataloguing/value_builder/macles.tmpl  |   11 +-
 .../value_builder/marc21_field_006.tmpl            |    2 +-
 .../value_builder/marc21_field_007.tmpl            |    2 +-
 .../value_builder/marc21_field_008.tmpl            |    4 +-
 .../marc21_field_008_authorities.tmpl              |    4 +-
 .../cataloguing/value_builder/marc21_leader.tmpl   |    2 +-
 .../value_builder/marc21_leader_authorities.tmpl   |    7 +-
 .../value_builder/marc21_leader_book.tmpl          |    2 +-
 .../value_builder/marc21_leader_computerfile.tmpl  |    6 +-
 .../value_builder/unimarc_field_100.tmpl           |  150 ++--
 .../value_builder/unimarc_field_105.tmpl           |  102 ++--
 .../value_builder/unimarc_field_106.tmpl           |   34 +-
 .../value_builder/unimarc_field_110.tmpl           |   70 +-
 .../value_builder/unimarc_field_115a.tmpl          |  540 +++++++-------
 .../value_builder/unimarc_field_115b.tmpl          |  243 +++---
 .../value_builder/unimarc_field_116.tmpl           |  564 +++++++-------
 .../value_builder/unimarc_field_117.tmpl           |  303 ++++----
 .../value_builder/unimarc_field_120.tmpl           |  430 ++++++------
 .../value_builder/unimarc_field_121a.tmpl          |  171 +++--
 .../value_builder/unimarc_field_121b.tmpl          |  163 ++--
 .../value_builder/unimarc_field_122.tmpl           |   58 +-
 .../value_builder/unimarc_field_123a.tmpl          |   37 +-
 .../value_builder/unimarc_field_123d.tmpl          |   55 +-
 .../value_builder/unimarc_field_123e.tmpl          |   55 +-
 .../value_builder/unimarc_field_123f.tmpl          |   81 +--
 .../value_builder/unimarc_field_123g.tmpl          |   58 +-
 .../value_builder/unimarc_field_124a.tmpl          |   33 +-
 .../value_builder/unimarc_field_124b.tmpl          |   49 +-
 .../value_builder/unimarc_field_124c.tmpl          |   71 +-
 .../value_builder/unimarc_field_124d.tmpl          |   33 +-
 .../value_builder/unimarc_field_124e.tmpl          |   33 +-
 .../value_builder/unimarc_field_124f.tmpl          |   63 +-
 .../value_builder/unimarc_field_124g.tmpl          |   47 +-
 .../value_builder/unimarc_field_125a.tmpl          |   75 +-
 .../value_builder/unimarc_field_125b.tmpl          |   71 +-
 .../value_builder/unimarc_field_126a.tmpl          |  451 ++++++------
 .../value_builder/unimarc_field_126b.tmpl          |   93 ++--
 .../value_builder/unimarc_field_127.tmpl           |   53 +-
 .../value_builder/unimarc_field_128a.tmpl          |  167 ++--
 .../value_builder/unimarc_field_128b.tmpl          |  209 +++---
 .../value_builder/unimarc_field_128c.tmpl          |  203 +++---
 .../value_builder/unimarc_field_130.tmpl           |  168 ++---
 .../value_builder/unimarc_field_135a.tmpl          |   44 +-
 .../value_builder/unimarc_field_140.tmpl           |  793 ++++++++++----------
 .../value_builder/unimarc_field_141.tmpl           |   65 +-
 .../value_builder/unimarc_field_210c.tmpl          |   99 ++--
 .../value_builder/unimarc_field_225a.tmpl          |   26 +-
 .../value_builder/unimarc_field_4XX.tmpl           |   71 +-
 .../value_builder/unimarc_field_686a.tmpl          |   10 +-
 .../value_builder/unimarc_field_700-4.tmpl         |   27 +-
 .../cataloguing/value_builder/unimarc_leader.tmpl  |   46 +-
 52 files changed, 3057 insertions(+), 3118 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl
index 5312bff..10d2ba9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/labs_theses.tmpl
@@ -1,14 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<head>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>KOHA:_Labs Thesis Selection plugin</title>
-
-<script language="JavaScript" type="text/javascript">
-<!-- Hide from old browsers
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript">
+//<![CDATA[
 function openWindow(targeturl, windowname) {
 	newwin =
 window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
@@ -16,7 +10,7 @@ window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
 function Help() {
 	newin=window.open("/cgi-bin/koha/help.pl","KohaHelp",'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" />
@@ -35,7 +29,7 @@ a.catalogue:hover {
 </style>
 </head>
 
-<body>
+<body style="padding:1em;">
 <div id="mainbloc">
 	<h1>Laboratory Search</h1>
 	
@@ -125,5 +119,4 @@ a.catalogue:hover {
 	</div>
 <!-- /TMPL_IF -->
 </div>
-</body>
-</html>
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl
index 52b6bdc..161a041 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tmpl
@@ -1,7 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<html>
 <head>
 <title>Gestion_des_index_MACLES</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
@@ -18,14 +17,14 @@
 <body  class="yui-skin-sam" onload="Activate(0);load_macles();" >
 
 <h1>Gestion des index MACLES</h1>
-<form name="f_pop">
+<form name="f_pop" action="">
 
 <div id="macles" class="toptabs numbered">
-    <ul>
+    <!-- TMPL_IF name="BIGLOOP" --><ul>
     <!--TMPL_LOOP name="BIGLOOP" -->
         <li><a href="#tab<!-- TMPL_VAR name="number" -->XX"><!-- TMPL_VAR name="number"--></a></li>
     <!--/TMPL_LOOP -->
-    </ul>
+    </ul><!-- /TMPL_IF -->
     <!-- RESET PAGINATION -->
     <!-- TMPL_LOOP name="BIGLOOP" -->
     <!-- TMPL_IF name="number" -->
@@ -89,7 +88,8 @@
     <!-- /TMPL_LOOP -->
 </div>
 </form>
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
+//<![CDATA[
 function Activate(numlayer)
 {
 	for (var i=0; i <= 9 ; i++ ) {
@@ -243,6 +243,7 @@ function load_macles()
   } 
   return false;
 }
+//]]>
 </script>
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl
index 3661879..5615786 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body style="padding:1em;">
 <h3>006 Fixed-length data elements--Additional material characteristics--General information</h3>
-<form name="f_pop" onsubmit="report()">
+<form name="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_field_006.pl" />
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tmpl
index d1e6269..73ed2de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_007.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body style="padding:1em;" onload="RedrawChoices('<!-- TMPL_VAR NAME="f0" -->');">
 <h3>007 Physical description fixed field--General information</h3>
-<form id="f_pop" onsubmit="report()">
+<form id="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_field_007.pl" />
 <p><label for="MatTypeList">Material Type: </label>
       <select name="MatTypeList" id="MatTypeList" onchange="RedrawChoices(this.options[selectedIndex].value);">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl
index 3dd60fb..e3ca98a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body style="padding:1em;">
 <h3> 008 Fixed-length data elements--General information</h3>
-<form name="f_pop" onsubmit="report()">
+<form name="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_field_008.pl" />
 <table>
 	<tr>
@@ -656,4 +656,4 @@ function report() {
 	//]]>
 </script>
 
-<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl
index 4ef947a..7fa53dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_008_authorities.tmpl
@@ -4,13 +4,13 @@
 </head>
 <body style="padding:1em;">
 <h3> 008 Fixed-length data elements</h3>
-<form name="f_pop" onsubmit="report()">
+<form name="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_field_008_authorities.pl" />
+<input name="f1" value="<!-- TMPL_VAR name="f1" -->" type="hidden" />
 <table>
 	<tr>
 		<td>00-05- Date entered on file</td>
 		<td><!-- TMPL_VAR name="f1" --></td>
-        <input name="f1" value="<!-- TMPL_VAR name="f1" -->" type="hidden" />
 	</tr>
 	<tr>
 		<td><label for="f6">06- Direct or indirect geographic subdivision</label></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
index c01bd22..352cbe5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body style="padding:1em;">
-<form name="f_pop" onsubmit="report()">
+<form name="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_leader.pl" />
 <h3>000 - Leader</h3>
 <table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl
index b6ec8b0..020c25e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_authorities.tmpl
@@ -4,7 +4,7 @@
 </head>
 <body style="padding:1em;">
 <h3>000 - Leader</h3>
-<form name="f_pop" onsubmit="report()">
+<form name="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_leader_authorities.pl" />
 <table>
 	<tr>
@@ -57,7 +57,7 @@
 	<tr>
 		<td><label for="f6">6- Type of record</label></td>
 		<td>
-            <input name="f6" value="z" type="hidden" />
+            <input name="f6" id="f6" value="z" type="hidden" />
             z- Authority data
 		</td>
 	</tr>
@@ -86,6 +86,7 @@
 	<tr>
 		<td>10-16 indicator/subfields/size</td>
 		<td>(auto-filled)</td>
+	</tr>
 	<tr>
 		<td><label for="f17">17- Encoding level</label></td>
 		<td>
@@ -112,7 +113,7 @@
 	<tr>
 		<td>20-24 entry map &amp; lengths</td>
 		<td>(auto-filled)</td>
-	<tr>
+	</tr>
 
 </table>
 <fieldset class="action"><input type="submit" value="OK" /> <a href="#" class="cancel close">Cancel</a></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl
index fa6d38a..6b368ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tmpl
@@ -3,7 +3,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body style="padding:1em;">
-<form name="f_pop" onsubmit="report()">
+<form name="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_leader_book.pl" />
 <table>
 	<tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl
index c745d89..28af802 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_computerfile.tmpl
@@ -3,7 +3,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body style="padding:1em;">
-<form name="f_pop" onsubmit="report()">
+<h3>000 - Leader</h3>
+<form name="f_pop" onsubmit="report()" action="">
 <input type="hidden" name="plugin_name" value="marc21_leader_computerfile.pl" />
 <table>
 	<tr>
@@ -196,6 +197,7 @@
 	<tr>
 		<td>10-16 indicator/subfields/size</td>
 		<td>(auto-filled)</td>
+	</tr>
 	<tr>
 		<td><label for="f17">17- Encoding</label></td>
 		<td>
@@ -302,7 +304,7 @@
 	<tr>
 		<td>20-24 entry map &amp; lengths</td>
 		<td>(auto-filled)</td>
-	<tr>
+	</tr>
 
 </table>
 <fieldset class="action"><input type="submit" value="OK" /> <a href="#" class="cancel close">Cancel</a></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl
index f91dae5..e031214 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_100.tmpl
@@ -1,22 +1,19 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 100 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 100 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 100 builder</h3>
+<form name="f_pop" action="">
 <table>
     <tr>
-        <td>Date entered on file</td>
-        <td><input type="text" name="f1" maxlength="8" size="9" value="<!-- TMPL_VAR name="f1" -->"></td>
+        <td><label for="f1">Date entered on file</label></td>
+        <td><input type="text" name="f1" id="f1" maxlength="8" size="9" value="<!-- TMPL_VAR name="f1" -->" /></td>
     </tr>
     <tr>
-        <td>Type of Publication Date: Publication Dates 1 and 2</td>
+        <td><label for="f2">Type of Publication Date: Publication Dates 1 and 2</label></td>
         <td>
-            <select name="f2" size="1">
+            <select name="f2" id="f2" size="1">
             <!-- TMPL_IF name="f2 " -->
                 <option value=" " selected="selected">Non required value</option>
             <!-- TMPL_ELSE -->
@@ -50,8 +47,7 @@
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f2f" -->
-                <option value="f"
-                selected="selected">f - monograph, date of
+                <option value="f" selected="selected">f - monograph, date of
                 publication uncertain</option>
             <!-- TMPL_ELSE -->
                 <option value="f">f - monograph, date of
@@ -59,8 +55,7 @@
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f2g" -->
-                <option value="g"
-                selected="selected">g - monograph whose publication continues for more than a
+                <option value="g" selected="selected">g - monograph whose publication continues for more than a
 year</option>
             <!-- TMPL_ELSE -->
                 <option value="g">g - monograph whose publication continues for more than a
@@ -68,22 +63,20 @@ year</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f2h" -->
-                <option value="h"
-                selected="selected">h - monograph with both actual and copyright/privilege date</option>
+                <option value="h" selected="selected">h - monograph with both actual and copyright/privilege date</option>
             <!-- TMPL_ELSE -->
                 <option value="h">h - monograph with both actual and copyright/privilege date</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f2i" -->
-                <option value="i"
-                selected="selected">i - monograph with both release/issue date and production date</option>
+                <option value="i" selected="selected">i - monograph with both release/issue date and production date</option>
             <!-- TMPL_ELSE -->
                 <option value="i">i - monograph with both release/issue date and production date</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f2j" -->
                 <option value="j"
-                selected="selected">j - document with detailed date of publication</option>
+ selected="selected">j - document with detailed date of publication</option>
             <!-- TMPL_ELSE -->
                 <option value="j">j - document with detailed date of publication</option>
             <!-- /TMPL_IF -->
@@ -98,17 +91,17 @@ year</option>
         </td>
     </tr>
     <tr>
-        <td>Publication Date 1</td>
-        <td><input id="pubdate1" type="text" name="f3" maxlength="4" size="5" value="<!-- TMPL_VAR name="f3" -->" /></td>
+        <td><label for="f3">Publication Date 1</label></td>
+        <td><input type="text" name="f3" id="f3" maxlength="4" size="5" value="<!-- TMPL_VAR name="f3" -->" /></td>
     </tr>
     <tr>
-    <td>Publication Date 2</td>
-    <td><input id="pubdate2" type="text" name="f4" maxlength="4" size="5" value="<!-- TMPL_VAR name="f4" -->" /></td>
+    <td><label for="f4">Publication Date 2</label></td>
+    <td><input type="text" name="f4" id="f4" maxlength="4" size="5" value="<!-- TMPL_VAR name="f4" -->" /></td>
     </tr>
     <tr>
-        <td>Target Audience Code</td>
+        <td><label for="f5">Target Audience Code</label></td>
         <td>
-            <select name="f5" size="1">
+            <select name="f5" id="f5" size="1">
             <!-- TMPL_IF name="f5|" -->
                 <option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -122,7 +115,7 @@ year</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f5b" -->
                 <option value="b"
-    selected="selected">b- pre-primary, ages 0-5</option>
+ selected="selected">b- pre-primary, ages 0-5</option>
             <!-- TMPL_ELSE -->
                 <option value="b">b- pre-primary, ages 0-5</option>
             <!-- /TMPL_IF -->
@@ -144,21 +137,21 @@ year</option>
     
             <!-- TMPL_IF name="f5k" -->
                 <option value="k"
-                selected="selected">k- adult, serious</option>
+ selected="selected">k- adult, serious</option>
             <!-- TMPL_ELSE -->
                 <option value="k">k- adult, serious</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f5m" -->
                 <option value="m"
-                selected="selected">m- adult, general</option>
+ selected="selected">m- adult, general</option>
             <!-- TMPL_ELSE -->
                 <option value="m">m- adult, general</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f5u" -->
                 <option value="u"
-                selected="selected">u- unknown</option>
+ selected="selected">u- unknown</option>
             <!-- TMPL_ELSE -->
                 <option value="u">u- unknown</option>
             <!-- /TMPL_IF -->
@@ -166,9 +159,9 @@ year</option>
         </td>
     </tr>
     <tr>
-        <td>Target Audience Code 2</td>
+        <td><label for="f6">Target Audience Code 2</label></td>
         <td>
-            <select name="f6" size="1">
+            <select name="f6" id="f6" size="1">
             
             <!-- TMPL_IF name="f6|" -->
             	<option value="|" selected="selected">|- Filling character</option>
@@ -182,7 +175,7 @@ year</option>
                 <option value="a">a- juvenile, general</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f6b" -->
-                <option value="b"  selected="selected">b- pre-primary, ages 0-5</option>
+                <option value="b" selected="selected">b- pre-primary, ages 0-5</option>
             <!-- TMPL_ELSE -->
                 <option value="b">b- pre-primary, ages 0-5</option>
             <!-- /TMPL_IF -->
@@ -204,21 +197,21 @@ year</option>
     
             <!-- TMPL_IF name="f6k" -->
                 <option value="k"
-                selected="selected">k- adult, serious</option>
+ selected="selected">k- adult, serious</option>
             <!-- TMPL_ELSE -->
                 <option value="k">k- adult, serious</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f6m" -->
                 <option value="m"
-                selected="selected">m- adult, general</option>
+ selected="selected">m- adult, general</option>
             <!-- TMPL_ELSE -->
                 <option value="m">m- adult, general</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f6u" -->
                 <option value="u"
-                selected="selected">u- unknown</option>
+ selected="selected">u- unknown</option>
             <!-- TMPL_ELSE -->
                 <option value="u">u- unknown</option>
             <!-- /TMPL_IF -->
@@ -226,9 +219,9 @@ year</option>
         </td>
     </tr>
     <tr>
-        <td>Target Audience Code 3</td>
+        <td><label for="f7">Target Audience Code 3</label></td>
         <td>
-            <select name="f7" size="1">
+            <select name="f7" id="f7" size="1">
             <!-- TMPL_IF name="f7|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -242,7 +235,7 @@ year</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f7b" -->
                 <option value="b"
-    selected="selected">b- pre-primary, ages 0-5</option>
+ selected="selected">b- pre-primary, ages 0-5</option>
             <!-- TMPL_ELSE -->
                 <option value="b">b- pre-primary, ages 0-5</option>
             <!-- /TMPL_IF -->
@@ -264,21 +257,21 @@ year</option>
     
             <!-- TMPL_IF name="f7k" -->
                 <option value="k"
-                selected="selected">k- adult, serious</option>
+ selected="selected">k- adult, serious</option>
             <!-- TMPL_ELSE -->
                 <option value="k">k- adult, serious</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f7m" -->
                 <option value="m"
-                selected="selected">m- adult, general</option>
+ selected="selected">m- adult, general</option>
             <!-- TMPL_ELSE -->
                 <option value="m">m- adult, general</option>
             <!-- /TMPL_IF -->
     
             <!-- TMPL_IF name="f7u" -->
                 <option value="u"
-                selected="selected">u- unknown</option>
+ selected="selected">u- unknown</option>
             <!-- TMPL_ELSE -->
                 <option value="u">u- unknown</option>
             <!-- /TMPL_IF -->
@@ -286,9 +279,9 @@ year</option>
         </td>
     </tr>
     <tr>
-        <td>Government Publication</td>
+        <td><label for="f8">Government Publication</label></td>
         <td>
-            <select name="f8" size="1">
+            <select name="f8" id="f8" size="1">
             
             <!-- TMPL_IF name="f8u" -->
             	<option value="u" selected="selected">u- unknown</option>
@@ -312,13 +305,13 @@ year</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8d" -->
                 <option value="d"
-                selected="selected">d- local(municipal, etc.)</option>
+ selected="selected">d- local(municipal, etc.)</option>
             <!-- TMPL_ELSE -->
                 <option value="d">d- local(municipal, etc.)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8e" -->
                 <option value="e"
-                selected="selected">e- multi-local (interstate departments, etc. below the national
+ selected="selected">e- multi-local (interstate departments, etc. below the national
 level)</option>
             <!-- TMPL_ELSE -->
                 <option value="e">e- multi-local (interstate departments, etc. below the national
@@ -327,39 +320,39 @@ level)</option>
     
             <!-- TMPL_IF name="f8f" -->
                 <option value="f"
-                selected="selected">f- intergovernmental</option>
+ selected="selected">f- intergovernmental</option>
             <!-- TMPL_ELSE -->
                 <option value="f">f- intergovernmental</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f8g" -->
                 <option value="g"
-                selected="selected">g- government in exile or clandestine</option>
+ selected="selected">g- government in exile or clandestine</option>
             <!-- TMPL_ELSE -->
                 <option value="g">g- government in exile or clandestine</option>
             <!-- /TMPL_IF -->
 
             <!-- TMPL_IF name="f8h" -->
                 <option value="h"
-                selected="selected">h- level not determined</option>
+ selected="selected">h- level not determined</option>
             <!-- TMPL_ELSE -->
                 <option value="h">h- level not determined</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8u" -->
                 <option value="u"
-                selected="selected">u- unknown</option>
+ selected="selected">u- unknown</option>
             <!-- TMPL_ELSE -->
                 <option value="u">u- unknown</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8y" -->
                 <option value="y"
-                selected="selected">y- not a government publication</option>
+ selected="selected">y- not a government publication</option>
             <!-- TMPL_ELSE -->
                 <option value="y">y- not a government publication</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f8z" -->
                 <option value="z"
-                selected="selected">z- Other</option>
+ selected="selected">z- Other</option>
             <!-- TMPL_ELSE -->
                 <option value="z">z- Other</option>
             <!-- /TMPL_IF -->
@@ -368,9 +361,9 @@ level)</option>
     </tr>
 
     <tr>
-        <td>Modified Record Code</td>
+        <td><label for="f9">Modified Record Code</label></td>
         <td>
-            <select name="f9" size="1">
+            <select name="f9" id="f9" size="1">
             
             <!-- TMPL_IF name="f90" -->
                 <option value="0" selected="selected">0- unmodified record</option>
@@ -388,14 +381,14 @@ level)</option>
 
 
     <tr>
-    <td>Language of Cataloguing (Mandatory)</td>
-    <td><input type="text" name="f10" maxlength="3" size="4" value="<!-- TMPL_VAR name="f10" -->" /></td>
+    <td><label for="f10">Language of Cataloguing (Mandatory)</label></td>
+    <td><input type="text" name="f10" id="f10" maxlength="3" size="4" value="<!-- TMPL_VAR name="f10" -->" /></td>
     </tr>
 
     <tr>
-        <td>Transliteration Code</td>
+        <td><label for="f11">Transliteration Code</label></td>
         <td>
-            <select name="f11" size="1">
+            <select name="f11" id="f11" size="1">
             
             <!-- TMPL_IF name="f11a" -->
                 <option value="a" selected="selected">a- ISO transliteration scheme</option>
@@ -409,7 +402,7 @@ level)</option>
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f11c" -->
                 <option value="c"
-        selected="selected">c- multiple transliterations: ISO or other schemes</option>
+ selected="selected">c- multiple transliterations: ISO or other schemes</option>
             <!-- TMPL_ELSE -->
                 <option value="c">c- multiple transliterations: ISO or other schemes</option>
             <!-- /TMPL_IF -->
@@ -422,9 +415,9 @@ level)</option>
         </td>
     </tr>
     <tr>
-    <td>Character Sets (Mandatory) 1 </td>
+    <td><label for="f12">Character Sets (Mandatory) 1</label></td>
         <td>
-            <select name="f12" size="1">
+            <select name="f12" id="f12" size="1">
             
             <!-- TMPL_IF name="f1201" -->
                 <option value="01" selected="selected">01- ISO 646, IRV version (basic Latin set)</option>
@@ -477,7 +470,7 @@ level)</option>
             <!-- /TMPL_IF -->
             
              <!-- TMPL_IF name="f1211" -->
-                <option value="11"  selected="selected">11- ISO 5426-2 (Latin characters used in minor European
+                <option value="11" selected="selected">11- ISO 5426-2 (Latin characters used in minor European
 languages and obsolete typography)
 </option>
             <!-- TMPL_ELSE -->
@@ -497,11 +490,11 @@ languages and obsolete typography)
 
     </tr>
     <tr>
-    <td>Character Sets (Mandatory) 2</td>
+    <td><label for="f13">Character Sets (Mandatory) 2</label></td>
         <td>
-            <select name="f13" size="1">
+            <select name="f13" id="f13" size="1">
             
-            <!-- TMPL_IF name="f13  " -->
+            <!-- TMPL_IF name="f13" -->
                     <option value="  " selected="selected">non required value</option>
             <!-- TMPL_ELSE -->
                     <option value="  ">non required value</option>
@@ -519,7 +512,7 @@ languages and obsolete typography)
             <!-- /TMPL_IF -->
             <!-- TMPL_IF name="f1303" -->
                 <option value="03"
-        selected="selected">03- ISO 5426 (extended Latin set)</option>
+ selected="selected">03- ISO 5426 (extended Latin set)</option>
             <!-- TMPL_ELSE -->
                 <option value="03">03- ISO 5426 (extended Latin set)</option>
             <!-- /TMPL_IF -->
@@ -558,7 +551,7 @@ languages and obsolete typography)
             <!-- /TMPL_IF -->
             
              <!-- TMPL_IF name="f1311" -->
-                <option value="11"  selected="selected">11- ISO 5426-2 (Latin characters used in minor European
+                <option value="11" selected="selected">11- ISO 5426-2 (Latin characters used in minor European
 languages and obsolete typography)</option>
             <!-- TMPL_ELSE -->
                 <option value="11">11- ISO 5426-2 (Latin characters used in minor European
@@ -575,16 +568,16 @@ languages and obsolete typography)</option>
     </tr>
 
     <tr>
-        <td>Additional Character Sets</td>
+        <td><label for="f14">Additional Character Sets</label></td>
         <td>
-            <input type="text" name="f14" maxlength="4" size="5" value="<!-- TMPL_VAR name="f14" -->" />
+            <input type="text" name="f14" id="f14" maxlength="4" size="5" value="<!-- TMPL_VAR name="f14" -->" />
         </td>
     </tr>
 
     <tr>
-    <td>Script of Title</td>
+    <td><label for="f15">Script of Title</label></td>
     <td>
-    <select name="f15" size="1">
+    <select name="f15" id="f15" size="1">
             <!-- TMPL_IF name="f15 " -->
                     <option value=" " selected="selected">Non required value</option>
             <!-- TMPL_ELSE -->
@@ -681,12 +674,11 @@ languages and obsolete typography)</option>
             </select>
     </td>
     </tr>
-    
-    <tr><td colspan="2"><input type="button" value="OK"  onclick="report();" /></td></tr>
 </table>
+<p><input type="button" value="OK"  onclick="report();" /> <a href="#" class="cancel close">Cancel</a> </p>
 </form>
-<script type="text/javascript" language="javascript">
-
+<script type="text/javascript">
+//<![CDATA[
 //     GetPublicationDate(); // running directly.
 // 
 //     /**
@@ -748,6 +740,6 @@ languages and obsolete typography)</option>
         self.close();
         return false;
     }
+//]]>
 </script>
-</body>
-</html>
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl
index 8d3fe39..60e0825 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_105.tmpl
@@ -1,18 +1,15 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 105 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 105 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 105 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Illustration codes 1:</td>
+		<td><label for="f1">Illustration codes 1:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
             	           <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -108,9 +105,9 @@
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
-		<td>Illustration codes 2:</td>
+		<td><label for="f2">Illustration codes 2:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -203,10 +200,11 @@
 				<option value="y">y - no illustrations</option>
 			<!-- /TMPL_IF -->
 			</select>
-		</td></tr><tr>
-		<td>Illustration codes 3:</td>
+		</td></tr>
+		<tr>
+		<td><label for="f3">Illustration codes 3:</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -300,9 +298,9 @@
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
-		<td>Illustration codes 4:</td>
+		<td><label for="f4">Illustration codes 4:</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -397,9 +395,9 @@
 			</select>
 		</td>
 	</tr>
-	<tr>		<td>Form of contents codes 1:</td>
+	<tr>		<td><label for="f5">Form of contents codes 1:</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
                         <!-- TMPL_IF name="f5|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -535,9 +533,9 @@
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
-		<td>Form of contents codes 2:</td>
+		<td><label for="f6">Form of contents codes 2:</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -672,9 +670,10 @@
 				<option value="z">z - other</option>
 			<!-- /TMPL_IF -->
 			</select>
-		</td></tr><tr>		<td>Form of contents codes 3:</td>
+		</td></tr>
+		<tr>		<td><label for="f7">Form of contents codes 3:</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -809,9 +808,9 @@
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
-                  <td>Form of contents codes 4:</td>
+                  <td><label for="f8">Form of contents codes 4:</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
                         <!-- TMPL_IF name="f8|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -947,77 +946,83 @@
 		</td>
 </tr>
   <tr>
-        <td>Conference or meeting code :</td>
+        <td><label for="f9">Conference or meeting code:</label></td>
                 <td>
-                <select name="f9" size="1">
+                <select name="f9" id="f9" size="1">
                	<!-- TMPL_IF name="f1|" -->
             		<option value="|" selected="selected">|- Filling character</option>
 	            <!-- TMPL_ELSE -->
     	        	<option value="|">|- Filling character</option>
         	    <!-- /TMPL_IF -->
         	    
-	            <!-- TMPL_IF name="f90" -->
+	            <!-- TMPL_IF name="f90" id="f90" -->
     	            <option value="0" selected="selected">0- not a conference publication</option>
         	    <!-- TMPL_ELSE -->
                     <option value="0">0- not a conference publication</option>
                 <!-- /TMPL_IF -->
                 
-                <!-- TMPL_IF name="f91" -->
+                <!-- TMPL_IF name="f91" id="f91" -->
                     <option value="1" selected="selected">1- conference publication</option>
                 <!-- TMPL_ELSE -->
                     <option value="1">1- conference publication</option>
                 <!-- /TMPL_IF -->
+                </select>
+                </td>
         </tr>
         
 	    <tr>
 	    
-        <td>Festschrift indicator</td>
+        <td><label for="f10">Festschrift indicator:</label></td>
                 <td>
-                <select name="f10" size="1">
+                <select name="f10" id="f10" size="1">
                 <!-- TMPL_IF name="f10|" -->
                     <option value="|" selected="selected">|- Filling character</option>
                 <!-- TMPL_ELSE -->
                     <option value="|">|- Filling character</option>
                 <!-- /TMPL_IF -->
                         
-                <!-- TMPL_IF name="f100" -->
+                <!-- TMPL_IF name="f100" id="f100" -->
                         <option value="0" selected="selected">0 - not a festschrift</option>
                 <!-- TMPL_ELSE -->
                         <option	value="0">0 - not a festschrift</option>
                 <!-- /TMPL_IF -->
                 
-                <!-- TMPL_IF name="f101" -->
+                <!-- TMPL_IF name="f101" id="f101" -->
                         <option value="1" selected="selected">1 - festschrift</option>
                 <!-- TMPL_ELSE -->
                         <option value="1">1 - festschrift</option>
                 <!-- /TMPL_IF -->
+                </select>
+                </td>
         </tr>
   <tr>
-        <td>Index indicator</td>
+        <td><label for="f11">Index indicator</label></td>
                 <td>
-                        <select name="f11" size="1">
+                        <select name="f11" id="f11" size="1">
                         <!-- TMPL_IF name="f11|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
                         
-                        <!-- TMPL_IF name="f110" -->
+                        <!-- TMPL_IF name="f110" id="f110" -->
                                 <option value="0" selected="selected">0 - no index</option>
                         <!-- TMPL_ELSE -->
                                 <option	value="0">0 - no index</option>
                         <!-- /TMPL_IF -->
                         
-                        <!-- TMPL_IF name="f111" -->
+                        <!-- TMPL_IF name="f111" id="f111" -->
                                 <option value="1" selected="selected">1 - index present</option>
                         <!-- TMPL_ELSE -->
                                 <option value="1">1 - index present</option>
                         <!-- /TMPL_IF -->
+                        </select>
+                </td>
         </tr>
   <tr>
-        <td>Literature code</td>
+        <td><label for="f12">Literature code</label></td>
                 <td>
-                        <select name="f12" size="1">
+                        <select name="f12" id="f12" size="1">
                         <!-- TMPL_IF name="f12|" -->
                         <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -1080,12 +1085,14 @@
                         <!-- TMPL_ELSE -->
                        <option value="z">z - multiple or other literary forms</option>
                         <!-- /TMPL_IF -->
+                        </select>
+                </td>
         </tr>
 
   <tr>
-        <td>Biography code</td>
+        <td><label for="f13">Biography code</label></td>
                 <td>
-                        <select name="f13" size="1">
+                        <select name="f13" id="f13" size="1">
                         
                         <!-- TMPL_IF name="f13|" -->
                         <option value="|" selected="selected">|- Filling character</option>
@@ -1120,12 +1127,14 @@
                         <!-- TMPL_ELSE -->
                                 <option value="d">d - contains biographical information</option>
                         <!-- /TMPL_IF -->
+                        </select>
+                </td>
         </tr>
-
-	<tr><td colspan="2"><input type="button" value="OK"  onclick="report();" /></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK"  onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -1134,6 +1143,7 @@
             window.close();
             return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tmpl
index 9f564a4..370979d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_106.tmpl
@@ -1,18 +1,15 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 106 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 106 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 106 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Form of item: Coded Data: Medium Designator (Not repeatable)</td>
+		<td><label for="f1">Form of item: Coded Data: Medium Designator (Not repeatable)</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
             
 			<!-- TMPL_IF name="f1r" -->
 				<option value="r" selected="selected">regular print</option>
@@ -83,12 +80,12 @@ supplement)</option>
 			</select>
 		</td>
 	</tr>
-	
-	<tr><td colspan="2"><input type="button" value="OK"  onclick="report();" /></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK"  onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script>
-	function report() {
+<script type="text/javascript">
+//<![CDATA[
+function report() {
         var doc   = opener.document; 
         var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
     
@@ -96,6 +93,9 @@ supplement)</option>
         self.close();
         return false;
 	}
+
+//]]>
 </script>
-</body>
-</html>
+
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tmpl
index ecf42ea..c47d3b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_110.tmpl
@@ -1,18 +1,15 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 110 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 110 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 110 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Type of continuing resource designator</td>
+		<td><label for="f1">Type of continuing resource designator</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -45,9 +42,9 @@
 	</tr>
 
 	<tr>
-		<td>Frequency of issue</td>
+		<td><label for="f2">Frequency of issue</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -155,9 +152,9 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Regularity</td>
+		<td><label for="f3">Regularity</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -192,9 +189,9 @@
 	</tr>
 
 	<tr>
-		<td>Type of material code</td>
+		<td><label for="f4">Type of material code</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -327,26 +324,26 @@
 
         </tr>
    <tr>
-                <td>Nature of contents code</td>
-                <td><input type="text" name="f5" maxlength="3" size="4" value="<!-- TMPL_VAR name="f5" -->"></td>
+                <td><label for="f5">Nature of contents code</label></td>
+                <td><input type="text" name="f5" id="f5" maxlength="3" size="4" value="<!-- TMPL_VAR name="f5" -->" /></td>
 
 	</tr>
 	<tr>
-		<td>Conference publication indicator</td>
+		<td><label for="f6">Conference publication indicator</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
                         
-			<!-- TMPL_IF name="f60" -->
+			<!-- TMPL_IF name="f60" id="f60" -->
 				<option value="0" selected="selected">not a conference publication</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">not a conference publication</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f61" -->
+			<!-- TMPL_IF name="f61" id="f61" -->
 				<option value="1" selected="selected">conference publication</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">conference publication</option>
@@ -354,10 +351,10 @@
 				</select>
 		</td>
 	</tr>
-
-			<td>Title-page availability code</td>
+	<tr>
+			<td><label for="f7">Title-page availability code</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -439,9 +436,9 @@
 	</tr>
 
 	<tr>
-		<td>Index availability code</td>
+		<td><label for="f8">Index availability code</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
@@ -569,21 +566,21 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Cumulative index availability code</td>
+		<td><label for="f9">Cumulative index availability code</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
 			<!-- TMPL_IF name="f9|" -->
                             <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
             
-			<!-- TMPL_IF name="f90" -->
+			<!-- TMPL_IF name="f90" id="f90" -->
 				<option value="0" selected="selected">no cumulative index or table of contents</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">no cumulative index or table of contents</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f91" -->
+			<!-- TMPL_IF name="f91" id="f91" -->
 				<option value="1" selected="selected">cumulative index or table of contents available</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">cumulative index or table of contents available</option>
@@ -591,11 +588,11 @@
 				</select>
 		</td>
 	</tr>
-
-	<tr><td colspan="2"><input type="button" value="OK"  onclick="report();" /></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
     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);
@@ -605,6 +602,7 @@
         self.close();
         return false;
     }
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tmpl
index 8f4078a..955b998 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115a.tmpl
@@ -1,36 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 115a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 115a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 115a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Type of material</td>
+		<td><label for="f1">Type of material</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>motion picture</option>
+				<option value="a" selected="selected">motion picture</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">motion picture</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>visual projection</option>
+				<option value="b" selected="selected">visual projection</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">visual projection</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>videorecording</option>
+				<option value="c" selected="selected">videorecording</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">videorecording</option>
 	
@@ -41,50 +38,50 @@
 	</tr>
 
    <tr>
-                <td>Lenght</td>
-                <td><input type="text" name="f2" maxlength=3 size=4 value="<!-- TMPL_VAR name="f2" -->"></td>
+			    <td><label for="f2">Length</label></td>
+			    <td><input type="text" name="f2" id="f2" maxlength="3" size="4" value="<!-- TMPL_VAR name="f2" -->" /></td>
 
 	</tr>
 
 
 	<tr>
-		<td>Colour indicator</td>
+		<td><label for="f3">Colour indicator</label></td>
 		<td>
-	<select name="f3" size="1">
+	<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f1|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>black and white</option>
+				<option value="a" selected="selected">black and white</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">black and white</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>colour</option>
+				<option value="b" selected="selected">colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">colour</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3c" -->
-				<option value="c" SELECTED>combination of black and white and colour</option>
+				<option value="c" selected="selected">combination of black and white and colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">combination of black and white and colour</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3z" -->
-				<option value="z" SELECTED>other (sepia, tinted, etc.)</option>
+				<option value="z" selected="selected">other (sepia, tinted, etc.)</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other (sepia, tinted, etc.)</option>
 	
@@ -95,35 +92,35 @@
 	</tr>
 
 	<tr>
-		<td>Sound indicator</td>
+		<td><label for="f4">Sound indicator</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
-                	<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>sound on medium</option>
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
+			    	<!-- TMPL_IF name="f4a" -->
+				<option value="a" selected="selected">sound on medium</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">sound on medium</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>soundtrack separate</option>
+				<option value="b" selected="selected">soundtrack separate</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">soundtrack separate</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4y" -->
-				<option value="y" SELECTED>no sound</option>
+				<option value="y" selected="selected">no sound</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no sound</option>
 
@@ -134,229 +131,229 @@
 
 
 	<tr>
-		<td>Media for sound</td>
+		<td><label for="f5">Media for sound</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 			<!-- TMPL_IF name="f5|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>optical sound track on motion picture film</option>
+				<option value="a" selected="selected">optical sound track on motion picture film</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">optical sound track on motion picture film</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5b" -->
-				<option value="b" SELECTED>magnetic sound track on motion picture film</option>
+				<option value="b" selected="selected">magnetic sound track on motion picture film</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">magnetic sound track on motion picture film</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>magnetic audio tape in cartridge</option>
+				<option value="c" selected="selected">magnetic audio tape in cartridge</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">magnetic audio tape in cartridge</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" SELECTED>sound disc</option>
+				<option value="d" selected="selected">sound disc</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">sound disc</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5g" -->
-				<option value="g" SELECTED>optical and magnetic sound track on motion picture film</option>
+				<option value="g" selected="selected">optical and magnetic sound track on motion picture film</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">optical and magnetic sound track on motion picture film</option>
 
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f5h" -->
-				<option value="h" SELECTED>videotape</option>
+				<option value="h" selected="selected">videotape</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">videotape</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5i" -->
-				<option value="i" SELECTED>videodisc</option>
+				<option value="i" selected="selected">videodisc</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">videodisc</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5e" -->
-				<option value="e" SELECTED>magnetic audio tape on reel</option>
+				<option value="e" selected="selected">magnetic audio tape on reel</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">magnetic audio tape on reel</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5f" -->
-				<option value="f" SELECTED>magnetic audio tape in cassette</option>
+				<option value="f" selected="selected">magnetic audio tape in cassette</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">magnetic audio tape in cassette</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5x" -->
-				<option value="x" SELECTED>no sound</option>
+				<option value="x" selected="selected">no sound</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">no sound</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
-        </tr>
+		</tr>
 
 	<tr>
-		<td>Width or dimensions</td>
+		<td><label for="f6">Width or dimensions</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>Motion pictures and filmstrips => 8 mm</option>
+				<option value="a" selected="selected">Motion pictures and filmstrips => 8 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Motion pictures and filmstrips => 8mm</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6b" -->
-				<option value="b" SELECTED>Motion pictures and filmstrips => Super 8 mm</option>
+				<option value="b" selected="selected">Motion pictures and filmstrips => Super 8 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Motion pictures and filmstrips => Super 8 mm</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6c" -->
-				<option value="c" SELECTED>Motion pictures and filmstrips => 9.5 mm</option>
+				<option value="c" selected="selected">Motion pictures and filmstrips => 9.5 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Motion pictures and filmstrips => 9.5 mm</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6d" -->
-				<option value="d" SELECTED>Motion pictures and filmstrips => 16 mm</option>
+				<option value="d" selected="selected">Motion pictures and filmstrips => 16 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Motion pictures and filmstrips => 16 mm</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6e" -->
-				<option value="e" SELECTED>Motion pictures and filmstrips => 28 mm</option>
+				<option value="e" selected="selected">Motion pictures and filmstrips => 28 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Motion pictures and filmstrips => 28 mm</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6f" -->
-				<option value="f" SELECTED>Motion pictures and filmstrips => 35 mm</option>
+				<option value="f" selected="selected">Motion pictures and filmstrips => 35 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Motion pictures and filmstrips => 35 mm</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6g" -->
-				<option value="g" SELECTED>Motion pictures and filmstrips => 70 mm</option>
+				<option value="g" selected="selected">Motion pictures and filmstrips => 70 mm</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Motion pictures and filmstrips => 70 mm</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6k" -->
-				<option value="k" SELECTED>Slides 21???4 x 21???4 in. (5.5*5.5 cm)</option>
+				<option value="k" selected="selected">Slides 21???4 x 21???4 in. (5.5*5.5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Slides 21???4 x 21???4 in. (5.5*5.5 cm)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6l" -->
-				<option value="l" SELECTED>Slides 2 x 2in. (5*5 cm)</option>
+				<option value="l" selected="selected">Slides 2 x 2in. (5*5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">Slides 2 x 2in. (5*5 cm)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6m" -->
-				<option value="m" SELECTED>Videotapes 1/4 in. (2 cm)</option>
+				<option value="m" selected="selected">Videotapes 1/4 in. (2 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Videotapes 1/4 in. (2 cm)</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f6n" -->
-				<option value="n" SELECTED>Videotapes 1/4 in. (1/2 cm)</option>
+				<option value="n" selected="selected">Videotapes 1/4 in. (1/2 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">Videotapes 1/4 in. (1/2 cm)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6o" -->
-				<option value="o" SELECTED>Videotapes 1/2 in. (1 cm 1/3) </option>
+				<option value="o" selected="selected">Videotapes 1/2 in. (1 cm 1/3) </option>
 			<!-- TMPL_ELSE -->
 				<option value="o">Videotapes 1/2 in. (1 cm 1/3)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6p" -->
-				<option value="p" SELECTED>Videotapes 1 in. (2 cm 1/2)</option>
+				<option value="p" selected="selected">Videotapes 1 in. (2 cm 1/2)</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">Videotapes 1 in. (2 cm 1/2)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6q" -->
-				<option value="q" SELECTED>Videotapes 2 in. (5 cm)</option>
+				<option value="q" selected="selected">Videotapes 2 in. (5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="q">Videotapes 2 in. (5 cm)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6r" -->
-				<option value="r" SELECTED>Transparencies 8 * 10 in. (20 * 25 cm)</option>
+				<option value="r" selected="selected">Transparencies 8 * 10 in. (20 * 25 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">Transparencies 8 * 10 in. (20 * 25 cm)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6s" -->
-				<option value="s" SELECTED>Transparencies 4 * 5 in. (10 * 12.5 cm)</option>
+				<option value="s" selected="selected">Transparencies 4 * 5 in. (10 * 12.5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">Transparencies 4 * 5 in. (10 * 12.5 cm)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6t" -->
-				<option value="t" SELECTED>Transparencies 5 * 7 in. (12.5 * 17.5 cm)</option>
+				<option value="t" selected="selected">Transparencies 5 * 7 in. (12.5 * 17.5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="t">Transparencies 5 * 7 in. (12.5 * 17.5 cm)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6u" -->
-				<option value="u" SELECTED>Transparencies 7 * 7 in. (17.5 * 17.5 cm)</option>
+				<option value="u" selected="selected">Transparencies 7 * 7 in. (17.5 * 17.5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">Transparencies 7 * 7 in. (17.5 * 17.5 cm)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6v" -->
-				<option value="v" SELECTED>Transparencies 8 * 8 in. (20 * 20 cm)</option>
+				<option value="v" selected="selected">Transparencies 8 * 8 in. (20 * 20 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">Transparencies 8 * 8 in. (20 * 20 cm)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6w" -->
-				<option value="w" SELECTED>Transparencies 9 * 9 in. (22.5 * 22.5 cm)</option>
+				<option value="w" selected="selected">Transparencies 9 * 9 in. (22.5 * 22.5 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="w">Transparencies 8 * 10 in. (20 * 25 cm)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6x" -->
-				<option value="x" SELECTED>Transparencies 10 * 10 in. (25 * 25 cm)</option>
+				<option value="x" selected="selected">Transparencies 10 * 10 in. (25 * 25 cm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">Transparencies 10 * 10 in. (25 * 25 cm)</option>
 			<!-- /TMPL_IF -->
@@ -365,91 +362,91 @@
         </tr>
 
 	<tr>
-		<td>Form of release - visual projection, motion picture</td>
+		<td><label for="f7">Form of release - visual projection, motion picture</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>film reel</option>
+				<option value="a" selected="selected">film reel</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">film reel</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" SELECTED>film cartridge</option>
+				<option value="b" selected="selected">film cartridge</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">film cartridge</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>film cassette</option>
+				<option value="c" selected="selected">film cassette</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">film cassette</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>other film type/option>
+				<option value="d" selected="selected">other film type/option>
 			<!-- TMPL_ELSE -->
 				<option value="d">other film type</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7g" -->
-				<option value="g" SELECTED>filmstrip cartridge</option>
+				<option value="g" selected="selected">filmstrip cartridge</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">filmstrip cartridge</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7h" -->
-				<option value="h" SELECTED>filmslip</option>
+				<option value="h" selected="selected">filmslip</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">filmslip</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7i" -->
-				<option value="i" SELECTED>other filmstrip type</option>
+				<option value="i" selected="selected">other filmstrip type</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">other filmstrip type</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7j" -->
-				<option value="j" SELECTED>film strip roll</option>
+				<option value="j" selected="selected">film strip roll</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">film strip roll</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7k" -->
-				<option value="k" SELECTED>slide, slide set, stereograph</option>
+				<option value="k" selected="selected">slide, slide set, stereograph</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">slide, slide set, stereograph</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7l" -->
-				<option value="l" SELECTED>transparency</option>
+				<option value="l" selected="selected">transparency</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">transparency</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>not a motion picture or visual projection</option>
+				<option value="x" selected="selected">not a motion picture or visual projection</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not a motion picture or visual projection</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7z" -->
-				<option value="z" SELECTED>other forms of release</option>
+				<option value="z" selected="selected">other forms of release</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other forms of release</option>
 			<!-- /TMPL_IF -->
@@ -458,49 +455,49 @@
         </tr>
 
 	<tr>
-		<td>Technique - videorecording, motion picture</td>
+		<td><label for="f8">Technique - videorecording, motion picture</label></td>
 		<td>
-		<select name="f8" size="1">
+		<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8a" -->
-				<option value="a" SELECTED>animation</option>
+				<option value="a" selected="selected">animation</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">animation</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8b" -->
-				<option value="b" SELECTED>live action</option>
+				<option value="b" selected="selected">live action</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">live action</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8c" -->
-				<option value="c" SELECTED>animation and live action</option>
+				<option value="c" selected="selected">animation and live action</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">animation and live action</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8u" -->
-				<option value="u" SELECTED>unspecified/unknown</option>
+				<option value="u" selected="selected">unspecified/unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unspecified/unknown</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8x" -->
-				<option value="x" SELECTED>not a motion picture or video recording</option>
+				<option value="x" selected="selected">not a motion picture or video recording</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not a motion picture or video recording</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 
@@ -512,59 +509,59 @@
         </tr>
 
 	<tr>
-		<td>Presentation format - motion picture</td>
+		<td><label for="f9">Presentation format - motion picture</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
 			<!-- TMPL_IF name="f9|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9a" -->
-				<option value="a" SELECTED>standard sound aperture (reduced format)</option>
+				<option value="a" selected="selected">standard sound aperture (reduced format)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">standard sound aperture (reduced format)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9b" -->
-				<option value="b" SELECTED>non-anamorphic (wide screen)</option>
+				<option value="b" selected="selected">non-anamorphic (wide screen)</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">non-anamorphic (wide screen)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9c" -->
-				<option value="c" SELECTED>3D</option>
+				<option value="c" selected="selected">3D</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">3D</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9d" -->
-				<option value="d" SELECTED>anamorphic (wide screen)</option>
+				<option value="d" selected="selected">anamorphic (wide screen)</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">anamorphic (wide screen)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9e" -->
-				<option value="e" SELECTED>standard silent aperture</option>
+				<option value="e" selected="selected">standard silent aperture</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">standard silent aperture</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9f" -->
-				<option value="f" SELECTED>other wide screen format</option>
+				<option value="f" selected="selected">other wide screen format</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">other wide screen format</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9x" -->
-				<option value="x" SELECTED>not a motion picture</option>
+				<option value="x" selected="selected">not a motion picture</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not a motion picture</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
@@ -574,135 +571,137 @@
         </tr>
 
 	<tr>
-		<td>Accompanying material 1</td>
+		<td><label for="f10">Accompanying material 1</label></td>
 		<td>
-			<select name="f10" size="1">
+			<select name="f10" id="f10" size="1">
 			<!-- TMPL_IF name="f10|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10a" -->
-				<option value="a" SELECTED>stills</option>
+				<option value="a" selected="selected">stills</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">stills</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10b" -->
-				<option value="b" SELECTED>script material</option>
+				<option value="b" selected="selected">script material</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">script material</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10c" -->
-				<option value="c" SELECTED>posters</option>
+				<option value="c" selected="selected">posters</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">posters</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10d" -->
-				<option value="d" SELECTED>programmes and pressbooks</option>
+				<option value="d" selected="selected">programmes and pressbooks</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">programmes and pressbooks</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10e" -->
-				<option value="e" SELECTED>lobby cards</option>
+				<option value="e" selected="selected">lobby cards</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">lobby cards</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10f" -->
-				<option value="f" SELECTED>instructional materials</option>
+				<option value="f" selected="selected">instructional materials</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">instructional materials</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10g" -->
-				<option value="g" SELECTED>score or other music format</option>
+				<option value="g" selected="selected">score or other music format</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">score or other music format</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10h" -->
-				<option value="h" SELECTED>set or costume designs</option>
+				<option value="h" selected="selected">set or costume designs</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">set or costume designs</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10z" -->
-				<option value="z" SELECTED>other accompanying material</option>
+				<option value="z" selected="selected">other accompanying material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying material</option>
 			<!-- /TMPL_IF -->
 
 				</select>
 		</td>
-		<td>Accompanying material 2</td>
+		</tr>
+		<tr>
+		<td><label for="f11">Accompanying material 2</label></td>
 		<td>
-			<select name="f11" size="1">
+			<select name="f11" id="f11" size="1">
 			<!-- TMPL_IF name="f11|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
-            
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF name="f11a" -->
-				<option value="a" SELECTED>stills</option>
+				<option value="a" selected="selected">stills</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">stills</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11b" -->
-				<option value="b" SELECTED>script material</option>
+				<option value="b" selected="selected">script material</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">script material</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11c" -->
-				<option value="c" SELECTED>posters</option>
+				<option value="c" selected="selected">posters</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">posters</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11d" -->
-				<option value="d" SELECTED>programmes and pressbooks</option>
+				<option value="d" selected="selected">programmes and pressbooks</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">programmes and pressbooks</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11e" -->
-				<option value="e" SELECTED>lobby cards</option>
+				<option value="e" selected="selected">lobby cards</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">lobby cards</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11f" -->
-				<option value="f" SELECTED>instructional materials</option>
+				<option value="f" selected="selected">instructional materials</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">instructional materials</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11g" -->
-				<option value="g" SELECTED>score or other music format</option>
+				<option value="g" selected="selected">score or other music format</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">score or other music format</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11h" -->
-				<option value="h" SELECTED>set or costume designs</option>
+				<option value="h" selected="selected">set or costume designs</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">set or costume designs</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11z" -->
-				<option value="z" SELECTED>other accompanying material</option>
+				<option value="z" selected="selected">other accompanying material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying material</option>
 
@@ -713,116 +712,118 @@
         </tr>
 
 	<tr>
-		<td>Accompanying material 3</td>
+		<td><label for="f12">Accompanying material 3</label></td>
 		<td>
-			<select name="f12" size="1">
+			<select name="f12" id="f12" size="1">
 			<!-- TMPL_IF name="f12|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12a" -->
-				<option value="a" SELECTED>stills</option>
+				<option value="a" selected="selected">stills</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">stills</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12b" -->
-				<option value="b" SELECTED>script material</option>
+				<option value="b" selected="selected">script material</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">script material</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12c" -->
-				<option value="c" SELECTED>posters</option>
+				<option value="c" selected="selected">posters</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">posters</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12d" -->
-				<option value="d" SELECTED>programmes and pressbooks</option>
+				<option value="d" selected="selected">programmes and pressbooks</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">programmes and pressbooks</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12e" -->
-				<option value="e" SELECTED>lobby cards</option>
+				<option value="e" selected="selected">lobby cards</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">lobby cards</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12f" -->
-				<option value="f" SELECTED>instructional materials</option>
+				<option value="f" selected="selected">instructional materials</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">instructional materials</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12g" -->
-				<option value="g" SELECTED>score or other music format</option>
+				<option value="g" selected="selected">score or other music format</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">score or other music format</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f12h" -->
-				<option value="h" SELECTED>set or costume designs</option>
+				<option value="h" selected="selected">set or costume designs</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">set or costume designs</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12z" -->
-				<option value="z" SELECTED>other accompanying material</option>
+				<option value="z" selected="selected">other accompanying material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying material</option>
 			<!-- /TMPL_IF -->
 
 				</select>
 		</td>
-		<td>Accompanying material 4</td>
+		</tr>
+		<tr>
+		<td><label for="f13">Accompanying material 4</label></td>
 		<td>
-			<select name="f13" size="1">
+			<select name="f13" id="f13" size="1">
 			<!-- TMPL_IF name="f13|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f13a" -->
-				<option value="a" SELECTED>stills</option>
+				<option value="a" selected="selected">stills</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">stills</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f13b" -->
-				<option value="b" SELECTED>script material</option>
+				<option value="b" selected="selected">script material</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">script material</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f13c" -->
-				<option value="c" SELECTED>posters</option>
+				<option value="c" selected="selected">posters</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">posters</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f13d" -->
-				<option value="d" SELECTED>programmes and pressbooks</option>
+				<option value="d" selected="selected">programmes and pressbooks</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">programmes and pressbooks</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f13e" -->
-				<option value="e" SELECTED>lobby cards</option>
+				<option value="e" selected="selected">lobby cards</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">lobby cards</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f13f" -->
-				<option value="f" SELECTED>instructional materials</option>
+				<option value="f" selected="selected">instructional materials</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">instructional materials</option>
 
@@ -830,7 +831,7 @@
 
 
 			<!-- TMPL_IF name="f13g" -->
-				<option value="g" SELECTED>score or other music format</option>
+				<option value="g" selected="selected">score or other music format</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">score or other music format</option>
 
@@ -838,13 +839,13 @@
 
 
 			<!-- TMPL_IF name="f13h" -->
-				<option value="h" SELECTED>set or costume designs</option>
+				<option value="h" selected="selected">set or costume designs</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">set or costume designs</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13z" -->
-				<option value="z" SELECTED>other accompanying material</option>
+				<option value="z" selected="selected">other accompanying material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying material</option>
 
@@ -855,201 +856,201 @@
 
         </tr>
 
-<tr>		<td>Form of release - videorecording</td>
+<tr>		<td><label for="f14">Form of release - videorecording</label></td>
 		<td>
-			<select name="f14" size="1">
+			<select name="f14" id="f14" size="1">
 			<!-- TMPL_IF name="f14|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14a" -->
-				<option value="a" SELECTED>videocartridge</option>
+				<option value="a" selected="selected">videocartridge</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">videocartridge</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14b" -->
-				<option value="b" SELECTED>videodisc</option>
+				<option value="b" selected="selected">videodisc</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">videodisc</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14c" -->
-				<option value="c" SELECTED>videocassette</option>
+				<option value="c" selected="selected">videocassette</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">videocassette</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14d" -->
-				<option value="d" SELECTED>videoreel</option>
+				<option value="d" selected="selected">videoreel</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">videoreel</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14e" -->
-				<option value="e" SELECTED>electronic videorecording (EVR)</option>
+				<option value="e" selected="selected">electronic videorecording (EVR)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">electronic videorecording (EVR)</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14x" -->
-				<option value="x" SELECTED>not a videorecording</option>
+				<option value="x" selected="selected">not a videorecording</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not a videorecording</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14z" -->
-				<option value="z" SELECTED>other videotype</option>
+				<option value="z" selected="selected">other videotype</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other videotype</option>
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
 </tr>	
-<tr>		<td>Presentation format - videorecording</td>
+<tr>		<td><label for="f15">Presentation format - videorecording</label></td>
 		<td>
-			<select name="f15" size="1">
+			<select name="f15" id="f15" size="1">
 			<!-- TMPL_IF name="f15|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15a" -->
-				<option value="a" SELECTED>Beta</option>
+				<option value="a" selected="selected">Beta</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">Beta</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15b" -->
-				<option value="b" SELECTED>VHS</option>
+				<option value="b" selected="selected">VHS</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">VHS</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15c" -->
-				<option value="c" SELECTED>U-matic</option>
+				<option value="c" selected="selected">U-matic</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">U-matic</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15d" -->
-				<option value="d" SELECTED>EIAJ (reel)</option>
+				<option value="d" selected="selected">EIAJ (reel)</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">EIAJ (reel)</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15e" -->
-				<option value="e" SELECTED>Type C (reel)</option>
+				<option value="e" selected="selected">Type C (reel)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Type C (reel)</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15f" -->
-				<option value="f" SELECTED>Quadruplex (reel)</option>
+				<option value="f" selected="selected">Quadruplex (reel)</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Quadruplex (reel)</option>
 			<!-- /TMPL_IF -->
 
 
 			<!-- TMPL_IF name="f15g" -->
-				<option value="g" SELECTED>Laser optical (Reflective) videodisc</option>
+				<option value="g" selected="selected">Laser optical (Reflective) videodisc</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Laser optical (Reflective) videodisc</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15h" -->
-				<option value="h" SELECTED>CED (capacitance electronic disk) videodisc</option>
+				<option value="h" selected="selected">CED (capacitance electronic disk) videodisc</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">CED (capacitance electronic disk) videodisc</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15i" -->
-				<option value="i" SELECTED>V2000 (videocassette)</option>
+				<option value="i" selected="selected">V2000 (videocassette)</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">V2000 (videocassette)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15j" -->
-				<option value="j" SELECTED>Video8 (videocassette)</option>
+				<option value="j" selected="selected">Video8 (videocassette)</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">Video8 (videocassette)</option>
 				
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15k" -->
-				<option value="k" SELECTED>DVD-Video</option>
+				<option value="k" selected="selected">DVD-Video</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">DVD-Video</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15x" -->
-				<option value="x" SELECTED>not a videorecording</option>
+				<option value="x" selected="selected">not a videorecording</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not a videorecording</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
 </tr>	
-<tr>		<td>Base of emulsion material - visual projection</td>
+<tr>		<td><label for="f16">Base of emulsion material - visual projection</label></td>
 		<td>
-			<select name="f16" size="1">
+			<select name="f16" id="f16" size="1">
 				<!-- TMPL_IF name="f16|" -->
-            		<option value="|" SELECTED>|- Filling character</option>
-	            <!-- TMPL_ELSE -->
+					<option value="|" selected="selected">|- Filling character</option>
+				<!-- TMPL_ELSE -->
     	        	<option value="|">|- Filling character</option>
         	    <!-- /TMPL_IF -->
 
 				<!-- TMPL_IF name="f16a" -->
-					<option value="a" SELECTED>safety film</option>
+					<option value="a" selected="selected">safety film</option>
 				<!-- TMPL_ELSE -->
 					<option value="a">safety film</option>
 				<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f16b" -->
-				<option value="b" SELECTED>film base other than safety film</option>
+				<option value="b" selected="selected">film base other than safety film</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">film base other than safety film</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f16c" -->
-				<option value="c" SELECTED>synthetics (plastic, vinyl, etc.)</option>
+				<option value="c" selected="selected">synthetics (plastic, vinyl, etc.)</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">synthetics (plastic, vinyl, etc.)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f16u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f16v" -->
-				<option value="v" SELECTED>mixed collection (containing more than one type of base)</option>
+				<option value="v" selected="selected">mixed collection (containing more than one type of base)</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed collection (containing more than one type of base)</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f16x" -->
-				<option value="x" SELECTED>not a visual projection</option>
+				<option value="x" selected="selected">not a visual projection</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not a visual projection</option>
 
@@ -1057,7 +1058,7 @@
 
 
 			<!-- TMPL_IF name="f16z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 
@@ -1065,50 +1066,50 @@
 				</select>
 		</td>
 </tr>	
-<tr>		<td>Secondary support material - visual projection</td>
+<tr>		<td><label for="f17">Secondary support material - visual projection</label></td>
 		<td>
-			<select name="f17" size="1">
+			<select name="f17" id="f17" size="1">
 			<!-- TMPL_IF name="f17|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f17a" -->
-				<option value="a" SELECTED>cardboard</option>
+				<option value="a" selected="selected">cardboard</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">cardboard</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f17b" -->
-				<option value="b" SELECTED>glass</option>
+				<option value="b" selected="selected">glass</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">glass</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f17c" -->
-				<option value="c" SELECTED>synthetics (plastic, vinyl, etc.)</option>
+				<option value="c" selected="selected">synthetics (plastic, vinyl, etc.)</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">synthetics (plastic, vinyl, etc.)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f17d" -->
-				<option value="d" SELECTED>metall</option>
+				<option value="d" selected="selected">metall</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">metal</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f17e" -->
-				<option value="e" SELECTED>metal and glass</option>
+				<option value="e" selected="selected">metal and glass</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">metal and glass</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f17f" -->
-				<option value="f" SELECTED>synthetics (plastic, vinyl, etc.) and glass</option>
+				<option value="f" selected="selected">synthetics (plastic, vinyl, etc.) and glass</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">synthetics (plastic, vinyl, etc.) and glass</option>
 
@@ -1116,25 +1117,25 @@
 
 
 			<!-- TMPL_IF name="f17u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17x" -->
-				<option value="x" SELECTED>not a visual projection</option>
+				<option value="x" selected="selected">not a visual projection</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not a visual projection</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17y" -->
-				<option value="y" SELECTED>not present (no secondary support)</option>
+				<option value="y" selected="selected">not present (no secondary support)</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">not present (no secondary support)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 
@@ -1142,42 +1143,42 @@
 				</select>
 		</td>
 </tr>	
-<tr>		<td>Broadcast standard - videorecording</td>
+<tr>		<td><label for="f18">Broadcast standard - videorecording</label></td>
 		<td>
-			<select name="f18" size="1">
+			<select name="f18" id="f18" size="1">
 			<!-- TMPL_IF name="f18|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
-            <!-- TMPL_ELSE -->
-            	<option value="|">|- Filling character</option>
-            <!-- /TMPL_IF -->
+				<option value="|" selected="selected">|- Filling character</option>
+			<!-- TMPL_ELSE -->
+				<option value="|">|- Filling character</option>
+			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f18a" -->
-				<option value="a" SELECTED>405</option>
+				<option value="a" selected="selected">405</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">405</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f18b" -->
-				<option value="b" SELECTED>525 (e.g. NSTC)</option>
+				<option value="b" selected="selected">525 (e.g. NSTC)</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">525 (e.g. NSTC)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f18c" -->
-				<option value="c" SELECTED>625 PAL</option>
+				<option value="c" selected="selected">625 PAL</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">625 PAL</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f18d" -->
-				<option value="d" SELECTED>625 SECAM</option>
+				<option value="d" selected="selected">625 SECAM</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">625 SECAM</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f18g" -->
-				<option value="g" SELECTED>1125</option>
+				<option value="g" selected="selected">1125</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">1125</option>
 
@@ -1185,11 +1186,11 @@
 				</select>
 		</td>
 </tr>	
-	
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
         document.f_pop.f2.value=document.f_pop.f2.value+'   ';
         document.f_pop.f2.value=document.f_pop.f2.value.substring(0,3);
@@ -1201,6 +1202,7 @@
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tmpl
index 76da3e9..fe89686 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_115b.tmpl
@@ -1,59 +1,56 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 115b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 115b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 115b builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Generation</td>
+		<td><label for="f1">Generation</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>original</option>
+				<option value="a" selected="selected">original</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">original</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>master</option>
+				<option value="b" selected="selected">master</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">master</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>duplicate</option>
+				<option value="c" selected="selected">duplicate</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">duplicate</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>reference print/viewing copy</option>
+				<option value="d" selected="selected">reference print/viewing copy</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">reference print/viewing copy</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 	
@@ -63,69 +60,69 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Production elements</td>
+		<td><label for="f2">Production elements</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>workprint</option>
+				<option value="a" selected="selected">workprint</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">workprint</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>trims</option>
+				<option value="b" selected="selected">trims</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">trims</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>outtakes</option>
+				<option value="c" selected="selected">outtakes</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">outtakes</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>rushes</option>
+				<option value="d" selected="selected">rushes</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">rushes</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>mixing tracks</option>
+				<option value="e" selected="selected">mixing tracks</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">mixing tracks</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2g" -->
-				<option value="g" SELECTED>title bands/intertitle rolls</option>
+				<option value="g" selected="selected">title bands/intertitle rolls</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">title bands/intertitle rolls</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2h" -->
-				<option value="h" SELECTED>production rolls</option>
+				<option value="h" selected="selected">production rolls</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">production rolls</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 	
@@ -136,143 +133,143 @@
 	</tr>
 
 	<tr>
-		<td>Refined categories of colour for moving pictures</td>
+		<td><label for="f3">Refined categories of colour for moving pictures</label></td>
 		<td>
-	<select name="f3" size="1">
+	<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>3 layer colour</option>
+				<option value="a" selected="selected">3 layer colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">3 layer colour</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>2 colour, single strip</option>
+				<option value="b" selected="selected">2 colour, single strip</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">2 colour, single strip</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3c" -->
-				<option value="c" SELECTED>undetermined 2 colour</option>
+				<option value="c" selected="selected">undetermined 2 colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">undetermined 2 colour</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3d" -->
-				<option value="d" SELECTED>undetermined 3 colour</option>
+				<option value="d" selected="selected">undetermined 3 colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">undetermined 3 colour</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3e" -->
-				<option value="e" SELECTED>3 strip colour</option>
+				<option value="e" selected="selected">3 strip colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">3 strip colour</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3f" -->
-				<option value="f" SELECTED>2 strip colour</option>
+				<option value="f" selected="selected">2 strip colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">2 strip colour</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3g" -->
-				<option value="g" SELECTED>red strip</option>
+				<option value="g" selected="selected">red strip</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">red strip</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3h" -->
-				<option value="h" SELECTED>blue or green strip</option>
+				<option value="h" selected="selected">blue or green strip</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">blue or green strip</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3i" -->
-				<option value="i" SELECTED>cyan strip</option>
+				<option value="i" selected="selected">cyan strip</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">cyan strip</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3j" -->
-				<option value="j" SELECTED>magenta strip</option>
+				<option value="j" selected="selected">magenta strip</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">magenta strip</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3k" -->
-				<option value="k" SELECTED>yellow strip</option>
+				<option value="k" selected="selected">yellow strip</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">yellow strip</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3l" -->
-				<option value="l" SELECTED>SEN 2</option>
+				<option value="l" selected="selected">SEN 2</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">SEN 2</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3m" -->
-				<option value="m" SELECTED>SEN 3</option>
+				<option value="m" selected="selected">SEN 3</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">SEN 3</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3n" -->
-				<option value="n" SELECTED>sepia tone</option>
+				<option value="n" selected="selected">sepia tone</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">sepia tone</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3o" -->
-				<option value="o" SELECTED>other tone</option>
+				<option value="o" selected="selected">other tone</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">other tone</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3p" -->
-				<option value="p" SELECTED>tint</option>
+				<option value="p" selected="selected">tint</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">tint</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3q" -->
-				<option value="q" SELECTED>tinted and toned</option>
+				<option value="q" selected="selected">tinted and toned</option>
 			<!-- TMPL_ELSE -->
 				<option value="q">tinted and toned</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3r" -->
-				<option value="r" SELECTED>stencil colour</option>
+				<option value="r" selected="selected">stencil colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">stencil colour</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3s" -->
-				<option value="s" SELECTED>handcoloured</option>
+				<option value="s" selected="selected">handcoloured</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">handcoloured</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3x" -->
-				<option value="x" SELECTED>not applicable (item not a colour film)</option>
+				<option value="x" selected="selected">not applicable (item not a colour film)</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable (item not a colour film)</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
@@ -282,42 +279,42 @@
 
 
 	<tr>
-		<td>Film emulsion (polarity)</td>
+		<td><label for="f4">Film emulsion (polarity)</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>positive</option>
+				<option value="a" selected="selected">positive</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">positive</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>negative</option>
+				<option value="b" selected="selected">negative</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">negative</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
@@ -326,55 +323,55 @@
 	</tr>
 
 	<tr>
-		<td>Film base</td>
+		<td><label for="f5">Film base</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 			<!-- TMPL_IF name="f5|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>safety (triacetate)</option>
+				<option value="a" selected="selected">safety (triacetate)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">safety (triacetate)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5b" -->
-				<option value="b" SELECTED>nitrate</option>
+				<option value="b" selected="selected">nitrate</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">nitrate</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>safety (diacetate)</option>
+				<option value="c" selected="selected">safety (diacetate)</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">safety (diacetate)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" SELECTED>polyester base (e.g. ester)</option>
+				<option value="d" selected="selected">polyester base (e.g. ester)</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">polyester base (e.g. ester)</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5v" -->
-				<option value="v" SELECTED>mixed base (nitrate and safety)</option>
+				<option value="v" selected="selected">mixed base (nitrate and safety)</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed base (nitrate and safety)</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 
@@ -384,50 +381,50 @@
         </tr>
 
 	<tr>
-		<td>Kind of sound for moving images</td>
+		<td><label for="f6">Kind of sound for moving images</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>monaural</option>
+				<option value="a" selected="selected">monaural</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">monaural</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6b" -->
-				<option value="b" SELECTED>stereophonic</option>
+				<option value="b" selected="selected">stereophonic</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">stereophonic</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6c" -->
-				<option value="c" SELECTED>multichannel, surround or quadraphonic</option>
+				<option value="c" selected="selected">multichannel, surround or quadraphonic</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">multichannel, surround or quadraphonic</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6v" -->
-				<option value="v" SELECTED>mixed</option>
+				<option value="v" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6x" -->
-				<option value="x" SELECTED>not applicable (item is silent)</option>
+				<option value="x" selected="selected">not applicable (item is silent)</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable (item is silent)</option>
 
@@ -435,7 +432,7 @@
 
 
 			<!-- TMPL_IF name="f6z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 
@@ -448,57 +445,57 @@
 
 
 	<tr>
-		<td>Kind of film stock or print</td>
+		<td><label for="f7">Kind of film stock or print</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>imbibition dye transfer</option>
+				<option value="a" selected="selected">imbibition dye transfer</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">imbibition dye transfer</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" SELECTED>three layer stock</option>
+				<option value="b" selected="selected">three layer stock</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">three layer stock</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>three layer stock (low fade)</option>
+				<option value="c" selected="selected">three layer stock (low fade)</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">three layer stock (low fade)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>duplitised stock</option>
+				<option value="d" selected="selected">duplitised stock</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">duplitised stock</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>not applicable (not a colour film)</option>
+				<option value="x" selected="selected">not applicable (not a colour film)</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable (not a colour film)</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 
@@ -509,80 +506,80 @@
         </tr>
 
 	<tr>
-		<td>Deterioration stage</td>
+		<td><label for="f8">Deterioration stage</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8b" -->
-				<option value="b" SELECTED>nitrate - suspicious odour</option>
+				<option value="b" selected="selected">nitrate - suspicious odour</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">nitrate - suspicious odour</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8c" -->
-				<option value="c" SELECTED>nitrate - pungent odour</option>
+				<option value="c" selected="selected">nitrate - pungent odour</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">nitrate - pungent odour</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8d" -->
-				<option value="d" SELECTED>nitrate - brownish, discoloration, fading, dusty</option>
+				<option value="d" selected="selected">nitrate - brownish, discoloration, fading, dusty</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">nitrate - brownish, discoloration, fading, dusty</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8e" -->
-				<option value="e" SELECTED>nitrate - sticky</option>
+				<option value="e" selected="selected">nitrate - sticky</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">nitrate - sticky</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8f" -->
-				<option value="f" SELECTED>nitrate - frothy, bubbles, blisters</option>
+				<option value="f" selected="selected">nitrate - frothy, bubbles, blisters</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">nitrate - frothy, bubbles, blisters</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8g" -->
-				<option value="g" SELECTED>nitrate - congealed</option>
+				<option value="g" selected="selected">nitrate - congealed</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">nitrate - congealed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8h" -->
-				<option value="h" SELECTED>nitrate - powder</option>
+				<option value="h" selected="selected">nitrate - powder</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">nitrate - powder</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8k" -->
-				<option value="k" SELECTED>nonnitrate - detectable deterioration (e.g. diacetate odour)</option>
+				<option value="k" selected="selected">nonnitrate - detectable deterioration (e.g. diacetate odour)</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">nonnitrate - detectable deterioration (e.g. diacetate odour)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8l" -->
-				<option value="l" SELECTED>nonnitrate - advanced deterioration</option>
+				<option value="l" selected="selected">nonnitrate - advanced deterioration</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">nonnitrate - advanced deterioration</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8m" -->
-				<option value="m" SELECTED>nonnitrate - disaster</option>
+				<option value="m" selected="selected">nonnitrate - disaster</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">nonnitrate - disaster</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8y" -->
-				<option value="y" SELECTED>no deterioration</option>
+				<option value="y" selected="selected">no deterioration</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no deterioration</option>
 
@@ -593,36 +590,36 @@
         </tr>
 
 	<tr>
-		<td>Completeness</td>
+		<td><label for="f9">Completeness</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
 			<!-- TMPL_IF name="f9|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9a" -->
-				<option value="a" SELECTED>incomplete</option>
+				<option value="a" selected="selected">incomplete</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">incomplete</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9b" -->
-				<option value="b" SELECTED>complete</option>
+				<option value="b" selected="selected">complete</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">complete</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 
@@ -633,14 +630,13 @@
 
    		<tr>
                 <td>Film inspection date</td>
-                <td>Year <input type="text" name="f10" maxlength=4 size=5 value="<!-- TMPL_VAR name="f10" -->"></td>
-                <td>Month <input type="text" name="f11" maxlength=2 size=3 value="<!-- TMPL_VAR name="f11" -->"></td>
+                <td><label for="f10">Year</label> <input type="text" name="f10" id="f10" maxlength="4" size="5" value="<!-- TMPL_VAR name="f10" -->" /> <label for="f11">Month</label> <input type="text" name="f11" id="f11" maxlength="2" size="3" value="<!-- TMPL_VAR name="f11" -->" /></td>
         </tr>
-	
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
-</table>
+	</table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             document.f_pop.f10.value=document.f_pop.f10.value+'    ';
             document.f_pop.f10.value=document.f_pop.f10.value.substring(0,4);
@@ -653,6 +649,7 @@
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tmpl
index 7662976..6b03b5c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_116.tmpl
@@ -1,84 +1,81 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 116 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 116 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 116 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Specific material designation</td>
+		<td><label for="f1">Specific material designation</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>a- collage</option>
+				<option value="a" selected="selected">a- collage</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">a- collage</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>b- drawing</option>
+				<option value="b" selected="selected">b- drawing</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">b- drawing</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>c- painting</option>
+				<option value="c" selected="selected">c- painting</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">c- painting</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>d- photomechanical reproduction</option>
+				<option value="d" selected="selected">d- photomechanical reproduction</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">d- photomechanical reproduction</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>e- photonegative</option>
+				<option value="e" selected="selected">e- photonegative</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">e- photonegative</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>f- photoprint</option>
+				<option value="f" selected="selected">f- photoprint</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">f- photoprint</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>h- picture</option>
+				<option value="h" selected="selected">h- picture</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">h- picture</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1i" -->
-				<option value="i" SELECTED>i- print</option>
+				<option value="i" selected="selected">i- print</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">i- print</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f1k" -->
-				<option value="k" SELECTED>k- technical drawing</option>
+				<option value="k" selected="selected">k- technical drawing</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">k- technical drawing</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1m" -->
-				<option value="m" SELECTED>m- master</option>
+				<option value="m" selected="selected">m- master</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">m- master</option>
 			<!-- /TMPL_IF -->			
 			
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>z- other non-projected graphic type</option>
+				<option value="z" selected="selected">z- other non-projected graphic type</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">z- other non-projected graphic type</option>
 	
@@ -88,111 +85,111 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Primary support material</td>
+		<td><label for="f2">Primary support material</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>canvas</option>
+				<option value="a" selected="selected">canvas</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">canvas</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>bristol board</option>
+				<option value="b" selected="selected">bristol board</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">bristol board</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>cardboard/illustration board</option>
+				<option value="c" selected="selected">cardboard/illustration board</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">cardboard/illustration board</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>glass</option>
+				<option value="d" selected="selected">glass</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">glass</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2j" -->
-				<option value="j" SELECTED>plaster</option>
+				<option value="j" selected="selected">plaster</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">plaster</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2k" -->
-				<option value="k" SELECTED>hardboard</option>
+				<option value="k" selected="selected">hardboard</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">hardboard</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2l" -->
-				<option value="l" SELECTED>porcelain</option>
+				<option value="l" selected="selected">porcelain</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">porcelain</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2m" -->
-				<option value="m" SELECTED>stone</option>
+				<option value="m" selected="selected">stone</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">stone</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2n" -->
-				<option value="n" SELECTED>wood</option>
+				<option value="n" selected="selected">wood</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">wood</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2v" -->
-				<option value="v" SELECTED>mixed collection</option>
+				<option value="v" selected="selected">mixed collection</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed collection</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>synthetics (plastic, vinyl, etc.)</option>
+				<option value="e" selected="selected">synthetics (plastic, vinyl, etc.)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">synthetics (plastic, vinyl, etc.)</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2f" -->
-				<option value="f" SELECTED>skins (leather, parchment, vellum, etc.)</option>
+				<option value="f" selected="selected">skins (leather, parchment, vellum, etc.)</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">skins (leather, parchment, vellum, etc.)</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2g" -->
-				<option value="g" SELECTED>textiles (including man-made fibres)</option>
+				<option value="g" selected="selected">textiles (including man-made fibres)</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">textiles (including man-made fibres)</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2h" -->
-				<option value="h" SELECTED>metal</option>
+				<option value="h" selected="selected">metal</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">metal</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2i" -->
-				<option value="i" SELECTED>paper</option>
+				<option value="i" selected="selected">paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">paper</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 	
@@ -205,17 +202,17 @@
 
 
 	<tr>
-		<td>Secondary support material</td>
+		<td><label for="f3">Secondary support material</label></td>
 		<td>
-	<select name="f3" size="1">
+	<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3y" -->
-				<option value="y" SELECTED>no secondary support</option>
+				<option value="y" selected="selected">no secondary support</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no secondary support</option>
 			<!-- /TMPL_IF -->
@@ -225,60 +222,60 @@
 
 
 	<tr>
-		<td>Colour</td>
+		<td><label for="f4">Colour</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>one-colour, monochrome</option>
+				<option value="a" selected="selected">one-colour, monochrome</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">one-colour, monochrome</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>black-and-white</option>
+				<option value="b" selected="selected">black-and-white</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">black-and-white</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4c" -->
-				<option value="c" SELECTED>multicoloured</option>
+				<option value="c" selected="selected">multicoloured</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">multicoloured</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4d" -->
-				<option value="d" SELECTED>hand coloured</option>
+				<option value="d" selected="selected">hand coloured</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">hand coloured</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4v" -->
-				<option value="v" SELECTED>mixed</option>
+				<option value="v" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
@@ -287,194 +284,194 @@
 	</tr>
 
 	<tr>
-		<td>Techniques (Drawings, Paintings) 1</td>
+		<td><label for="f5">Techniques (Drawings, Paintings) 1</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 			<!-- TMPL_IF name="f5|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f5  " -->
-                                <option value="  " SELECTED>non required value</option>
+                                <option value="  " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                                 <option value="  ">non required value</option>
                         <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5aa" -->
-				<option value="aa" SELECTED>pencil</option>
+				<option value="aa" selected="selected">pencil</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">pencil</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5ab" -->
-				<option value="ab" SELECTED>graphite</option>
+				<option value="ab" selected="selected">graphite</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">graphite</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5ac" -->
-				<option value="ac" SELECTED>colour pencil</option>
+				<option value="ac" selected="selected">colour pencil</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">colour pencil</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5ad" -->
-				<option value="ad" SELECTED>India ink</option>
+				<option value="ad" selected="selected">India ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">India ink</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5ae" -->
-				<option value="ae" SELECTED>lavierung India ink</option>
+				<option value="ae" selected="selected">lavierung India ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">lavierung India ink</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5af" -->
-				<option value="af" SELECTED>coal</option>
+				<option value="af" selected="selected">coal</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">coal</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5ag" -->
-				<option value="ag" SELECTED>chalk</option>
+				<option value="ag" selected="selected">chalk</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">chalk</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5ah" -->
-				<option value="ah" SELECTED>black chalk</option>
+				<option value="ah" selected="selected">black chalk</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">black chalk</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5ai" -->
-				<option value="ai" SELECTED>sanguine</option>
+				<option value="ai" selected="selected">sanguine</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">sanguine</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5aj" -->
-				<option value="aj" SELECTED>water colour</option>
+				<option value="aj" selected="selected">water colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">water colour</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5ak" -->
-				<option value="ak" SELECTED>tempera</option>
+				<option value="ak" selected="selected">tempera</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">tempera</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5al" -->
-				<option value="al" SELECTED>gouache</option>
+				<option value="al" selected="selected">gouache</option>
 			<!-- TMPL_ELSE -->
 				<option value="al">gouache</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5am" -->
-				<option value="am" SELECTED>pastel</option>
+				<option value="am" selected="selected">pastel</option>
 			<!-- TMPL_ELSE -->
 				<option value="am">pastel</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5an" -->
-				<option value="an" SELECTED>oil</option>
+				<option value="an" selected="selected">oil</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">oil</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5xx" -->
-				<option value="xx" SELECTED>not applicable</option>
+				<option value="xx" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5ba" -->
-				<option value="ba" SELECTED>felt-tip pen</option>
+				<option value="ba" selected="selected">felt-tip pen</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">felt-tip pen</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bb" -->
-				<option value="bb" SELECTED>stain</option>
+				<option value="bb" selected="selected">stain</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">stain</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bc" -->
-				<option value="bc" SELECTED>crayon</option>
+				<option value="bc" selected="selected">crayon</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">crayon</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bd" -->
-				<option value="bd" SELECTED>sepia</option>
+				<option value="bd" selected="selected">sepia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">sepia</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5be" -->
-				<option value="be" SELECTED>writing ink</option>
+				<option value="be" selected="selected">writing ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">writing ink</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bf" -->
-				<option value="bf" SELECTED>casein</option>
+				<option value="bf" selected="selected">casein</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">casein</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bg" -->
-				<option value="bg" SELECTED>golding</option>
+				<option value="bg" selected="selected">golding</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">golding</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bh" -->
-				<option value="bh" SELECTED>encaustic</option>
+				<option value="bh" selected="selected">encaustic</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">encaustic</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bi" -->
-				<option value="bi" SELECTED>acrylics</option>
+				<option value="bi" selected="selected">acrylics</option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">acrylics</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bj" -->
-				<option value="bj" SELECTED>collage</option>
+				<option value="bj" selected="selected">collage</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">collage</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bk" -->
-				<option value="bk" SELECTED>silver point</option>
+				<option value="bk" selected="selected">silver point</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">silver point</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5bl" -->
-				<option value="bl" SELECTED>air brush</option>
+				<option value="bl" selected="selected">air brush</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">air brush</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 
@@ -484,198 +481,198 @@
 		</td>
         </tr>
 	<tr>
-		<td>Techniques (Drawings, Paintings) 2</td>
+		<td><label for="f6">Techniques (Drawings, Paintings) 2</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6aa" -->
-				<option value="aa" SELECTED>pencil</option>
+				<option value="aa" selected="selected">pencil</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">pencil</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6ab" -->
-				<option value="ab" SELECTED>graphite</option>
+				<option value="ab" selected="selected">graphite</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">graphite</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6ac" -->
-				<option value="ac" SELECTED>colour pencil</option>
+				<option value="ac" selected="selected">colour pencil</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">colour pencil</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6ad" -->
-				<option value="ad" SELECTED>India ink</option>
+				<option value="ad" selected="selected">India ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">India ink</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6ae" -->
-				<option value="ae" SELECTED>lavierung India ink</option>
+				<option value="ae" selected="selected">lavierung India ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">lavierung India ink</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6af" -->
-				<option value="af" SELECTED>coal</option>
+				<option value="af" selected="selected">coal</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">coal</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6ag" -->
-				<option value="ag" SELECTED>chalk</option>
+				<option value="ag" selected="selected">chalk</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">chalk</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6ah" -->
-				<option value="ah" SELECTED>black chalk</option>
+				<option value="ah" selected="selected">black chalk</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">black chalk</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6ai" -->
-				<option value="ai" SELECTED>sanguine</option>
+				<option value="ai" selected="selected">sanguine</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">sanguine</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6aj" -->
-				<option value="aj" SELECTED>water colour</option>
+				<option value="aj" selected="selected">water colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">water colour</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6ak" -->
-				<option value="ak" SELECTED>tempera</option>
+				<option value="ak" selected="selected">tempera</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">tempera</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6al" -->
-				<option value="al" SELECTED>gouache</option>
+				<option value="al" selected="selected">gouache</option>
 			<!-- TMPL_ELSE -->
 				<option value="al">gouache</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6am" -->
-				<option value="am" SELECTED>pastel</option>
+				<option value="am" selected="selected">pastel</option>
 			<!-- TMPL_ELSE -->
 				<option value="am">pastel</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6an" -->
-				<option value="an" SELECTED>oil</option>
+				<option value="an" selected="selected">oil</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">oil</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6xx" -->
-				<option value="xx" SELECTED>not applicable</option>
+				<option value="xx" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6ba" -->
-				<option value="ba" SELECTED>felt-tip pen</option>
+				<option value="ba" selected="selected">felt-tip pen</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">felt-tip pen</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bb" -->
-				<option value="bb" SELECTED>stain</option>
+				<option value="bb" selected="selected">stain</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">stain</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bc" -->
-				<option value="bc" SELECTED>crayon</option>
+				<option value="bc" selected="selected">crayon</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">crayon</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bd" -->
-				<option value="bd" SELECTED>sepia</option>
+				<option value="bd" selected="selected">sepia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">sepia</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6be" -->
-				<option value="be" SELECTED>writing ink</option>
+				<option value="be" selected="selected">writing ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">writing ink</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bf" -->
-				<option value="bf" SELECTED>casein</option>
+				<option value="bf" selected="selected">casein</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">casein</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bg" -->
-				<option value="bg" SELECTED>golding</option>
+				<option value="bg" selected="selected">golding</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">golding</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bh" -->
-				<option value="bh" SELECTED>encaustic</option>
+				<option value="bh" selected="selected">encaustic</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">encaustic</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bi" -->
-				<option value="bi" SELECTED>acrylics</option>
+				<option value="bi" selected="selected">acrylics</option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">acrylics</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bj" -->
-				<option value="bj" SELECTED>collage</option>
+				<option value="bj" selected="selected">collage</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">collage</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bk" -->
-				<option value="bk" SELECTED>silver point</option>
+				<option value="bk" selected="selected">silver point</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">silver point</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6bl" -->
-				<option value="bl" SELECTED>air brush</option>
+				<option value="bl" selected="selected">air brush</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">air brush</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 
@@ -685,199 +682,199 @@
 		</td>
         </tr>
 	<tr>
-		<td>Techniques (Drawings, Paintings) 3</td>
+		<td><label for="f7">Techniques (Drawings, Paintings) 3</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7aa" -->
-				<option value="aa" SELECTED>pencil</option>
+				<option value="aa" selected="selected">pencil</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">pencil</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7ab" -->
-				<option value="ab" SELECTED>graphite</option>
+				<option value="ab" selected="selected">graphite</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">graphite</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7ac" -->
-				<option value="ac" SELECTED>colour pencil</option>
+				<option value="ac" selected="selected">colour pencil</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">colour pencil</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7ad" -->
-				<option value="ad" SELECTED>India ink</option>
+				<option value="ad" selected="selected">India ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">India ink</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7ae" -->
-				<option value="ae" SELECTED>lavierung India ink</option>
+				<option value="ae" selected="selected">lavierung India ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">lavierung India ink</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7af" -->
-				<option value="af" SELECTED>coal</option>
+				<option value="af" selected="selected">coal</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">coal</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7ag" -->
-				<option value="ag" SELECTED>chalk</option>
+				<option value="ag" selected="selected">chalk</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">chalk</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7ah" -->
-				<option value="ah" SELECTED>black chalk</option>
+				<option value="ah" selected="selected">black chalk</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">black chalk</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7ai" -->
-				<option value="ai" SELECTED>sanguine</option>
+				<option value="ai" selected="selected">sanguine</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">sanguine</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7aj" -->
-				<option value="aj" SELECTED>water colour</option>
+				<option value="aj" selected="selected">water colour</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">water colour</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7ak" -->
-				<option value="ak" SELECTED>tempera</option>
+				<option value="ak" selected="selected">tempera</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">tempera</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7al" -->
-				<option value="al" SELECTED>gouache</option>
+				<option value="al" selected="selected">gouache</option>
 			<!-- TMPL_ELSE -->
 				<option value="al">gouache</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7am" -->
-				<option value="am" SELECTED>pastel</option>
+				<option value="am" selected="selected">pastel</option>
 			<!-- TMPL_ELSE -->
 				<option value="am">pastel</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7an" -->
-				<option value="an" SELECTED>oil</option>
+				<option value="an" selected="selected">oil</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">oil</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7xx" -->
-				<option value="xx" SELECTED>not applicable</option>
+				<option value="xx" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7ba" -->
-				<option value="ba" SELECTED>felt-tip pen</option>
+				<option value="ba" selected="selected">felt-tip pen</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">felt-tip pen</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bb" -->
-				<option value="bb" SELECTED>stain</option>
+				<option value="bb" selected="selected">stain</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">stain</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bc" -->
-				<option value="bc" SELECTED>crayon</option>
+				<option value="bc" selected="selected">crayon</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">crayon</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bd" -->
-				<option value="bd" SELECTED>sepia</option>
+				<option value="bd" selected="selected">sepia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">sepia</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7be" -->
-				<option value="be" SELECTED>writing ink</option>
+				<option value="be" selected="selected">writing ink</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">writing ink</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bf" -->
-				<option value="bf" SELECTED>casein</option>
+				<option value="bf" selected="selected">casein</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">casein</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bg" -->
-				<option value="bg" SELECTED>golding</option>
+				<option value="bg" selected="selected">golding</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">golding</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bh" -->
-				<option value="bh" SELECTED>encaustic</option>
+				<option value="bh" selected="selected">encaustic</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">encaustic</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bi" -->
-				<option value="bi" SELECTED>acrylics</option>
+				<option value="bi" selected="selected">acrylics</option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">acrylics</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bj" -->
-				<option value="bj" SELECTED>collage</option>
+				<option value="bj" selected="selected">collage</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">collage</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bk" -->
-				<option value="bk" SELECTED>silver point</option>
+				<option value="bk" selected="selected">silver point</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">silver point</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7bl" -->
-				<option value="bl" SELECTED>air brush</option>
+				<option value="bl" selected="selected">air brush</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">air brush</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 
@@ -889,190 +886,190 @@
         </tr>
 
 	<tr>
-		<td>Technique (Prints) 1</td>
+		<td><label for="f8">Technique (Prints) 1</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f8  " -->
-                                <option value="  " SELECTED>non required value</option>
+                                <option value="  " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                                 <option value="  ">non required value</option>
                         <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ba" -->
-				<option value="ba" SELECTED>woodcut</option>
+				<option value="ba" selected="selected">woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">woodcut</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bb" -->
-				<option value="bb" SELECTED>chiaroscuro woodcut</option>
+				<option value="bb" selected="selected">chiaroscuro woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">chiaroscuro woodcut</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bc" -->
-				<option value="bc" SELECTED>white-line woodcut</option>
+				<option value="bc" selected="selected">white-line woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">white-line woodcut</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bd" -->
-				<option value="bd" SELECTED>camaiu</option>
+				<option value="bd" selected="selected">camaiu</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">camaiu</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8be" -->
-				<option value="be" SELECTED>heliogravure</option>
+				<option value="be" selected="selected">heliogravure</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">heliogravure</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bf" -->
-				<option value="bf" SELECTED>chromolithography</option>
+				<option value="bf" selected="selected">chromolithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">chromolithography</option>
 			<!-- /TMPL_IF -->
 
 
 			<!-- TMPL_IF name="f8bg" -->
-				<option value="bg" SELECTED>lino-cut</option>
+				<option value="bg" selected="selected">lino-cut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">lino-cut</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bh" -->
-				<option value="bh" SELECTED>etching</option>
+				<option value="bh" selected="selected">etching</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">etching</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bi" -->
-				<option value="bi" SELECTED>lithography</option>
+				<option value="bi" selected="selected">lithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">lithography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bj" -->
-				<option value="bj" SELECTED>photolithography</option>
+				<option value="bj" selected="selected">photolithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">photolithography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bk" -->
-				<option value="bk" SELECTED>zincography</option>
+				<option value="bk" selected="selected">zincography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">zincography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bl" -->
-				<option value="bl" SELECTED>algraphy</option>
+				<option value="bl" selected="selected">algraphy</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">algraphy</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bm" -->
-				<option value="bm" SELECTED>aquatint</option>
+				<option value="bm" selected="selected">aquatint</option>
 			<!-- TMPL_ELSE -->
 				<option value="bm">aquatint</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bn" -->
-				<option value="bn" SELECTED>reservage (sugar aquatint)</option>
+				<option value="bn" selected="selected">reservage (sugar aquatint)</option>
 			<!-- TMPL_ELSE -->
 				<option value="bn">reservage (sugar aquatint)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ca" -->
-				<option value="ca" SELECTED>vernis-mou (soft ground etching or tracing)</option>
+				<option value="ca" selected="selected">vernis-mou (soft ground etching or tracing)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">vernis-mou (soft ground etching or tracing)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8cb" -->
-				<option value="cb" SELECTED>engraving</option>
+				<option value="cb" selected="selected">engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="cb">engraving</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8cc" -->
-				<option value="cc" SELECTED>engraving in the crayon manner</option>
+				<option value="cc" selected="selected">engraving in the crayon manner</option>
 			<!-- TMPL_ELSE -->
 				<option value="cc">engraving in the crayon manner</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8cd" -->
-				<option value="cd" SELECTED>Burin</option>
+				<option value="cd" selected="selected">Burin</option>
 			<!-- TMPL_ELSE -->
 				<option value="cd">Burin</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ce" -->
-				<option value="ce" SELECTED>drypoint</option>
+				<option value="ce" selected="selected">drypoint</option>
 			<!-- TMPL_ELSE -->
 				<option value="ce">drypoint</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8cf" -->
-				<option value="cf" SELECTED>mezzotinta (mezzotint)</option>
+				<option value="cf" selected="selected">mezzotinta (mezzotint)</option>
 			<!-- TMPL_ELSE -->
 				<option value="cf">Mezzoteinte</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8cg" -->
-				<option value="cg" SELECTED>monotype</option>
+				<option value="cg" selected="selected">monotype</option>
 			<!-- TMPL_ELSE -->
 				<option value="cg">monotype</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ch" -->
-				<option value="ch" SELECTED>silkscreen</option>
+				<option value="ch" selected="selected">silkscreen</option>
 			<!-- TMPL_ELSE -->
 				<option value="ch">silkscreen</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ci" -->
-				<option value="ci" SELECTED>steel engraving</option>
+				<option value="ci" selected="selected">steel engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="ci">steel engraving</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8cj" -->
-				<option value="cj" SELECTED>computer graphics</option>
+				<option value="cj" selected="selected">computer graphics</option>
 			<!-- TMPL_ELSE -->
 				<option value="cj">computer graphics</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ck" -->
-				<option value="ck" SELECTED>photocopying</option>
+				<option value="ck" selected="selected">photocopying</option>
 			<!-- TMPL_ELSE -->
 				<option value="ck">photocopying</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8xx" -->
-				<option value="xx" SELECTED>not applicable</option>
+				<option value="xx" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
@@ -1082,194 +1079,194 @@
 
         </tr>
 	<tr>
-		<td>Technique (Prints) 2</td>
+		<td><label for="f9">Technique (Prints) 2</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
 			<!-- TMPL_IF name="f9|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f9  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ba" -->
-				<option value="ba" SELECTED>woodcut</option>
+				<option value="ba" selected="selected">woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">woodcut</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bb" -->
-				<option value="bb" SELECTED>chiaroscuro woodcut</option>
+				<option value="bb" selected="selected">chiaroscuro woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">chiaroscuro woodcut</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bc" -->
-				<option value="bc" SELECTED>white-line woodcut</option>
+				<option value="bc" selected="selected">white-line woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">white-line woodcut</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bd" -->
-				<option value="bd" SELECTED>camaiu</option>
+				<option value="bd" selected="selected">camaiu</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">camaiu</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9be" -->
-				<option value="be" SELECTED>heliogravure</option>
+				<option value="be" selected="selected">heliogravure</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">heliogravure</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bf" -->
-				<option value="bf" SELECTED>chromolithography</option>
+				<option value="bf" selected="selected">chromolithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">chromolithography</option>
 
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bg" -->
-				<option value="bg" SELECTED>lino-cut</option>
+				<option value="bg" selected="selected">lino-cut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">lino-cut</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9bh" -->
-				<option value="bh" SELECTED>etching</option>
+				<option value="bh" selected="selected">etching</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">etching</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9bi" -->
-				<option value="bi" SELECTED>lithography/option>
+				<option value="bi" selected="selected">lithography/option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">lithography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9bj" -->
-				<option value="bj" SELECTED>photolithography</option>
+				<option value="bj" selected="selected">photolithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">photolithography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9bk" -->
-				<option value="bk" SELECTED>zincography</option>
+				<option value="bk" selected="selected">zincography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">zincography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9bl" -->
-				<option value="bl" SELECTED>algraphy</option>
+				<option value="bl" selected="selected">algraphy</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">algraphy</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9bm" -->
-				<option value="bm" SELECTED>aquatint</option>
+				<option value="bm" selected="selected">aquatint</option>
 			<!-- TMPL_ELSE -->
 				<option value="bm">aquatint</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9bn" -->
-				<option value="bn" SELECTED>reservage (sugar aquatint)</option>
+				<option value="bn" selected="selected">reservage (sugar aquatint)</option>
 			<!-- TMPL_ELSE -->
 				<option value="bn">reservage (sugar aquatint)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ca" -->
-				<option value="ca" SELECTED>vernis-mou (soft ground etching or tracing)</option>
+				<option value="ca" selected="selected">vernis-mou (soft ground etching or tracing)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">vernis-mou (soft ground etching or tracing)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9cb" -->
-				<option value="cb" SELECTED>engraving</option>
+				<option value="cb" selected="selected">engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="cb">engraving</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9cc" -->
-				<option value="cc" SELECTED>engraving in the crayon manner</option>
+				<option value="cc" selected="selected">engraving in the crayon manner</option>
 			<!-- TMPL_ELSE -->
 				<option value="cc">engraving in the crayon manner</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9cd" -->
-				<option value="cd" SELECTED>Burin</option>
+				<option value="cd" selected="selected">Burin</option>
 			<!-- TMPL_ELSE -->
 				<option value="cd">Burin</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ce" -->
-				<option value="ce" SELECTED>drypoint</option>
+				<option value="ce" selected="selected">drypoint</option>
 			<!-- TMPL_ELSE -->
 				<option value="ce">drypoint</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9cf" -->
-				<option value="cf" SELECTED>mezzotinta (mezzotint)</option>
+				<option value="cf" selected="selected">mezzotinta (mezzotint)</option>
 			<!-- TMPL_ELSE -->
 				<option value="cf">Mezzoteinte</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9cg" -->
-				<option value="cg" SELECTED>monotype</option>
+				<option value="cg" selected="selected">monotype</option>
 			<!-- TMPL_ELSE -->
 				<option value="cg">monotype</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ch" -->
-				<option value="ch" SELECTED>silkscreen</option>
+				<option value="ch" selected="selected">silkscreen</option>
 			<!-- TMPL_ELSE -->
 				<option value="ch">silkscreen</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ci" -->
-				<option value="ci" SELECTED>steel engraving</option>
+				<option value="ci" selected="selected">steel engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="ci">steel engraving</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9cj" -->
-				<option value="cj" SELECTED>computer graphics</option>
+				<option value="cj" selected="selected">computer graphics</option>
 			<!-- TMPL_ELSE -->
 				<option value="cj">computer graphics</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ck" -->
-				<option value="ck" SELECTED>photocopying</option>
+				<option value="ck" selected="selected">photocopying</option>
 			<!-- TMPL_ELSE -->
 				<option value="ck">photocopying</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9xx" -->
-				<option value="xx" SELECTED>not applicable</option>
+				<option value="xx" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
@@ -1278,191 +1275,191 @@
 		</td>
         </tr>
 	<tr>
-		<td>Technique (Prints) 3</td>
+		<td><label for="f10">Technique (Prints) 3</label></td>
 		<td>
-			<select name="f10" size="1">
+			<select name="f10" id="f10" size="1">
 			<!-- TMPL_IF name="f10|" -->
-            	<option value="|" SELECTED>|- Filling character</option>
+            	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Filling character</option>
             <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f10  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ba" -->
-				<option value="ba" SELECTED>woodcut</option>
+				<option value="ba" selected="selected">woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">woodcut</option>
 	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bb" -->
-				<option value="bb" SELECTED>chiaroscuro woodcut</option>
+				<option value="bb" selected="selected">chiaroscuro woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">chiaroscuro woodcut</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bc" -->
-				<option value="bc" SELECTED>white-line woodcut</option>
+				<option value="bc" selected="selected">white-line woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">white-line woodcut</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bd" -->
-				<option value="bd" SELECTED>camaiu</option>
+				<option value="bd" selected="selected">camaiu</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">camaiu</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10be" -->
-				<option value="be" SELECTED>heliogravure</option>
+				<option value="be" selected="selected">heliogravure</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">heliogravure</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bf" -->
-				<option value="bf" SELECTED>chromolithography</option>
+				<option value="bf" selected="selected">chromolithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">chromolithography</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bg" -->
-				<option value="bg" SELECTED>lino-cut</option>
+				<option value="bg" selected="selected">lino-cut</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">lino-cut</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bh" -->
-				<option value="bh" SELECTED>etching</option>
+				<option value="bh" selected="selected">etching</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">etching</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bi" -->
-				<option value="bi" SELECTED>lithography/option>
+				<option value="bi" selected="selected">lithography/option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">lithography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bj" -->
-				<option value="bj" SELECTED>photolithography</option>
+				<option value="bj" selected="selected">photolithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">photolithography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bk" -->
-				<option value="bk" SELECTED>zincography</option>
+				<option value="bk" selected="selected">zincography</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">zincography</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bl" -->
-				<option value="bl" SELECTED>algraphy</option>
+				<option value="bl" selected="selected">algraphy</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">algraphy</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bm" -->
-				<option value="bm" SELECTED>aquatint</option>
+				<option value="bm" selected="selected">aquatint</option>
 			<!-- TMPL_ELSE -->
 				<option value="bm">aquatint</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bn" -->
-				<option value="bn" SELECTED>reservage (sugar aquatint)</option>
+				<option value="bn" selected="selected">reservage (sugar aquatint)</option>
 			<!-- TMPL_ELSE -->
 				<option value="bn">reservage (sugar aquatint)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ca" -->
-				<option value="ca" SELECTED>vernis-mou (soft ground etching or tracing)</option>
+				<option value="ca" selected="selected">vernis-mou (soft ground etching or tracing)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">vernis-mou (soft ground etching or tracing)</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10cb" -->
-				<option value="cb" SELECTED>engraving</option>
+				<option value="cb" selected="selected">engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="cb">engraving</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10cc" -->
-				<option value="cc" SELECTED>engraving in the crayon manner</option>
+				<option value="cc" selected="selected">engraving in the crayon manner</option>
 			<!-- TMPL_ELSE -->
 				<option value="cc">engraving in the crayon manner</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10cd" -->
-				<option value="cd" SELECTED>burin engraving</option>
+				<option value="cd" selected="selected">burin engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="cd">burin engraving</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ce" -->
-				<option value="ce" SELECTED>drypoint</option>
+				<option value="ce" selected="selected">drypoint</option>
 			<!-- TMPL_ELSE -->
 				<option value="ce">drypoint</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10cf" -->
-				<option value="cf" SELECTED>mezzotinta (mezzotint)</option>
+				<option value="cf" selected="selected">mezzotinta (mezzotint)</option>
 			<!-- TMPL_ELSE -->
 				<option value="cf">Mezzoteinte</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10cg" -->
-				<option value="cg" SELECTED>monotype</option>
+				<option value="cg" selected="selected">monotype</option>
 			<!-- TMPL_ELSE -->
 				<option value="cg">monotype</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ch" -->
-				<option value="ch" SELECTED>silkscreen</option>
+				<option value="ch" selected="selected">silkscreen</option>
 			<!-- TMPL_ELSE -->
 				<option value="ch">silkscreen</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ci" -->
-				<option value="ci" SELECTED>steel engraving</option>
+				<option value="ci" selected="selected">steel engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="ci">steel engraving</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10cj" -->
-				<option value="cj" SELECTED>computer graphics</option>
+				<option value="cj" selected="selected">computer graphics</option>
 			<!-- TMPL_ELSE -->
 				<option value="cj">computer graphics</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ck" -->
-				<option value="ck" SELECTED>photocopying</option>
+				<option value="ck" selected="selected">photocopying</option>
 			<!-- TMPL_ELSE -->
 				<option value="ck">photocopying</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10xx" -->
-				<option value="xx" SELECTED>not applicable</option>
+				<option value="xx" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">not applicable</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
@@ -1472,113 +1469,113 @@
         </tr>
 
 	<tr>
-		<td>Functional Designation</td>
+		<td><label for="f11">Functional Designation</label></td>
 		<td>
-			<select name="f11" size="1">
+			<select name="f11" id="f11" size="1">
 			<!-- TMPL_IF name="f11|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
                         
 			<!-- TMPL_IF name="f11aa" -->
-				<option value="aa" SELECTED>aa- architectural drawing</option>
+				<option value="aa" selected="selected">aa- architectural drawing</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">aa- architectural drawing</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11ab" -->
-				<option value="ab" SELECTED>ab- item cover</option>
+				<option value="ab" selected="selected">ab- item cover</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">ab- item cover</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11ac" -->
-				<option value="ac" SELECTED>ac- sticker</option>
+				<option value="ac" selected="selected">ac- sticker</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">ac- sticker</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11ad" -->
-				<option value="ad" SELECTED>ad- poster</option>
+				<option value="ad" selected="selected">ad- poster</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">ad- poster</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11ae" -->
-				<option value="ae" SELECTED>ae- postcard</option>
+				<option value="ae" selected="selected">ae- postcard</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">ae- postcard</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11af" -->
-				<option value="af" SELECTED>af- greetings card</option>
+				<option value="af" selected="selected">af- greetings card</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">af- greetings card</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11ag" -->
-				<option value="ag" SELECTED>ag- chart</option>
+				<option value="ag" selected="selected">ag- chart</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">ag- chart</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11ah" -->
-				<option value="ah" SELECTED>ah- playing cards</option>
+				<option value="ah" selected="selected">ah- playing cards</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">ah- playing cards</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11ai" -->
-				<option value="ai" SELECTED>ai- flash card</option>
+				<option value="ai" selected="selected">ai- flash card</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">ai- flash card</option>
 			<!-- /TMPL_IF -->
 		
 			<!-- TMPL_IF name="f11aj" -->
-				<option value="aj" SELECTED>aj- ephemera</option>
+				<option value="aj" selected="selected">aj- ephemera</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">aj- ephemera</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11an" -->
-				<option value="an" SELECTED>an- calendar</option>
+				<option value="an" selected="selected">an- calendar</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">an- calendar</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11as" -->
-				<option value="as" SELECTED>as- place card</option>
+				<option value="as" selected="selected">as- place card</option>
 			<!-- TMPL_ELSE -->
 				<option value="as">as- place card</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11au" -->
-				<option value="au" SELECTED>au- santino</option>
+				<option value="au" selected="selected">au- santino</option>
 			<!-- TMPL_ELSE -->
 				<option value="au">au- santino</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11uu" -->
-				<option value="uu" SELECTED>uu- unknown</option>
+				<option value="uu" selected="selected">uu- unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">uu- unknown</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11vv" -->
-				<option value="vv" SELECTED>vv- mixed</option>
+				<option value="vv" selected="selected">vv- mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">vv- mixed</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11xx" -->
-				<option value="xx" SELECTED>xx- not applicable</option>
+				<option value="xx" selected="selected">xx- not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">xx- not applicable</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f11zz" -->
-				<option value="zz" SELECTED>zz- other</option>
+				<option value="zz" selected="selected">zz- other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">zz- other</option>
 			<!-- /TMPL_IF -->
@@ -1586,11 +1583,11 @@
 				</select>
 		</td>
         </tr>
-	
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
 	    var doc   = opener.document; 
         var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -1598,6 +1595,7 @@
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tmpl
index 00c93e9..6d6f590 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_117.tmpl
@@ -1,216 +1,213 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 117 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 117 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 117 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Specific Material Designation</td>
+		<td><label for="f1">Specific Material Designation</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
-            	           <option value="|" SELECTED>|- Filling character</option>
+            	           <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f1aa" -->
-				<option value="aa" SELECTED>study kit</option>
+				<option value="aa" selected="selected">study kit</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">study kit</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ab" -->
-				<option value="ab" SELECTED>laboratory and construction kits</option>
+				<option value="ab" selected="selected">laboratory and construction kits</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">laboratory and construction kits</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ac" -->
-				<option value="ac" SELECTED>specimens (biological etc.)</option>
+				<option value="ac" selected="selected">specimens (biological etc.)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">specimens (biological etc.)</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ad" -->
-				<option value="ad" SELECTED>fauna</option>
+				<option value="ad" selected="selected">fauna</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">fauna</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ae" -->
-				<option value="ae" SELECTED>flora</option>
+				<option value="ae" selected="selected">flora</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">flora</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1af" -->
-				<option value="af" SELECTED>minerals</option>
+				<option value="af" selected="selected">minerals</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">minerals</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ag" -->
-				<option value="ag" SELECTED>microscope slides</option>
+				<option value="ag" selected="selected">microscope slides</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">microscope slides</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ah" -->
-				<option value="ah" SELECTED>jigsaws</option>
+				<option value="ah" selected="selected">jigsaws</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">jigsaws</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ai" -->
-				<option value="ai" SELECTED>tools and equipment</option>
+				<option value="ai" selected="selected">tools and equipment</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">tools and equipment</option>	
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1aj" -->
-				<option value="aj" SELECTED>arms</option>
+				<option value="aj" selected="selected">arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">arms</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ak" -->
-				<option value="ak" SELECTED>containers</option>
+				<option value="ak" selected="selected">containers</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">containers</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1al" -->
-				<option value="al" SELECTED>furniture</option>
+				<option value="al" selected="selected">furniture</option>
 			<!-- TMPL_ELSE -->
 				<option value="al">furniture</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1be" -->
-				<option value="be" SELECTED>industrial production</option>
+				<option value="be" selected="selected">industrial production</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">industrial production</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bf" -->
-				<option value="bf" SELECTED>machines</option>
+				<option value="bf" selected="selected">machines</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">machines</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bg" -->
-				<option value="bg" SELECTED>coins</option>
+				<option value="bg" selected="selected">coins</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">coins</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bh" -->
-				<option value="bh" SELECTED>medals</option>
+				<option value="bh" selected="selected">medals</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">medals</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bi" -->
-				<option value="bi" SELECTED>jewellery</option>
+				<option value="bi" selected="selected">jewellery</option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">jewellery</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1am" -->
-				<option value="am" SELECTED>transport</option>
+				<option value="am" selected="selected">transport</option>
 			<!-- TMPL_ELSE -->
 				<option value="am">transport</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1an" -->
-				<option value="an" SELECTED>textiles</option>
+				<option value="an" selected="selected">textiles</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">textiles</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ao" -->
-				<option value="ao" SELECTED>clothes</option>
+				<option value="ao" selected="selected">clothes</option>
 			<!-- TMPL_ELSE -->
 				<option value="ao">clothes</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ap" -->
-				<option value="ap" SELECTED>games and recreation</option>
+				<option value="ap" selected="selected">games and recreation</option>
 			<!-- TMPL_ELSE -->
 				<option value="ap">games and recreation</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1aq" -->
-				<option value="aq" SELECTED>toys</option>
+				<option value="aq" selected="selected">toys</option>
 			<!-- TMPL_ELSE -->
 				<option value="aq">toys</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ar" -->
-				<option value="ar" SELECTED>dolls</option>
+				<option value="ar" selected="selected">dolls</option>
 			<!-- TMPL_ELSE -->
 				<option value="ar">dolls</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1as" -->
-				<option value="as" SELECTED>models</option>
+				<option value="as" selected="selected">models</option>
 			<!-- TMPL_ELSE -->
 				<option value="as">models</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1at" -->
-				<option value="at" SELECTED>models for making</option>
+				<option value="at" selected="selected">models for making</option>
 			<!-- TMPL_ELSE -->
 				<option value="at">models for making</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ba" -->
-				<option value="ba" SELECTED>dioramas</option>
+				<option value="ba" selected="selected">dioramas</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">dioramas</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bb" -->
-				<option value="bb" SELECTED>replicas</option>
+				<option value="bb" selected="selected">replicas</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">replicas</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bc" -->
-				<option value="bc" SELECTED>sculptures</option>
+				<option value="bc" selected="selected">sculptures</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">sculptures</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bd" -->
-				<option value="bd" SELECTED>design objects</option>
+				<option value="bd" selected="selected">design objects</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">design objects</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bj" -->
-				<option value="bj" SELECTED>artefacts</option>
+				<option value="bj" selected="selected">artefacts</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">artefacts</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 	
@@ -220,176 +217,176 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Material 1</td>
+		<td><label for="f2">Material 1</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f2  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2aa" -->
-				<option value="aa" SELECTED>terra-cotta</option>
+				<option value="aa" selected="selected">terra-cotta</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">terra-cotta</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ab" -->
-				<option value="ab" SELECTED>wax</option>
+				<option value="ab" selected="selected">wax</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">wax</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ac" -->
-				<option value="ac" SELECTED>clay</option>
+				<option value="ac" selected="selected">clay</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">clay</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ad" -->
-				<option value="ad" SELECTED>majolica</option>
+				<option value="ad" selected="selected">majolica</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">majolica</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ae" -->
-				<option value="ae" SELECTED>porcelain</option>
+				<option value="ae" selected="selected">porcelain</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">porcelain</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2af" -->
-				<option value="af" SELECTED>ceramic</option>
+				<option value="af" selected="selected">ceramic</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">ceramic</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ag" -->
-				<option value="ag" SELECTED>plaster</option>
+				<option value="ag" selected="selected">plaster</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">plaster</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ah" -->
-				<option value="ah" SELECTED>glass</option>
+				<option value="ah" selected="selected">glass</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">glass</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ba" -->
-				<option value="ba" SELECTED>wood</option>
+				<option value="ba" selected="selected">wood</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">wood</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ca" -->
-				<option value="ca" SELECTED>ivory</option>
+				<option value="ca" selected="selected">ivory</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">ivory</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2da" -->
-				<option value="da" SELECTED>stone</option>
+				<option value="da" selected="selected">stone</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">stone</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2db" -->
-				<option value="db" SELECTED>precious stones</option>
+				<option value="db" selected="selected">precious stones</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">precious stones</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2dc" -->
-				<option value="dc" SELECTED>marble</option>
+				<option value="dc" selected="selected">marble</option>
 			<!-- TMPL_ELSE -->
 				<option value="dc">marble</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2dd" -->
-				<option value="dd" SELECTED>basalt</option>
+				<option value="dd" selected="selected">basalt</option>
 			<!-- TMPL_ELSE -->
 				<option value="dd">basalt</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2df" -->
-				<option value="df" SELECTED>porphyry</option>
+				<option value="df" selected="selected">porphyry</option>
 			<!-- TMPL_ELSE -->
 				<option value="df">porphyry</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ea" -->
-				<option value="ea" SELECTED>paper</option>
+				<option value="ea" selected="selected">paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">paper</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2eb" -->
-				<option value="eb" SELECTED>cardboard</option>
+				<option value="eb" selected="selected">cardboard</option>
 			<!-- TMPL_ELSE -->
 				<option value="eb">cardboard</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2fa" -->
-				<option value="fa" SELECTED>precious metals</option>
+				<option value="fa" selected="selected">precious metals</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">precious metals</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2fb" -->
-				<option value="fb" SELECTED>metal</option>
+				<option value="fb" selected="selected">metal</option>
 			<!-- TMPL_ELSE -->
 				<option value="fb">metal</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2fc" -->
-				<option value="fc" SELECTED>bronze</option>
+				<option value="fc" selected="selected">bronze</option>
 			<!-- TMPL_ELSE -->
 				<option value="fc">bronze</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2fd" -->
-				<option value="fd" SELECTED>copper</option>
+				<option value="fd" selected="selected">copper</option>
 			<!-- TMPL_ELSE -->
 				<option value="fd">copper</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ga" -->
-				<option value="ga" SELECTED>synthetics</option>
+				<option value="ga" selected="selected">synthetics</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">synthetics</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ha" -->
-				<option value="ha" SELECTED>textile</option>
+				<option value="ha" selected="selected">textile</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">textile</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2ia" -->
-				<option value="ia" SELECTED>plastic</option>
+				<option value="ia" selected="selected">plastic</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">plastic</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 	
@@ -399,177 +396,177 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Material 2</td>
+		<td><label for="f3">Material 2</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
             
 			<!-- TMPL_IF name="f3  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3aa" -->
-				<option value="aa" SELECTED>terra-cotta</option>
+				<option value="aa" selected="selected">terra-cotta</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">terra-cotta</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ab" -->
-				<option value="ab" SELECTED>wax</option>
+				<option value="ab" selected="selected">wax</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">wax</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ac" -->
-				<option value="ac" SELECTED>clay</option>
+				<option value="ac" selected="selected">clay</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">clay</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ad" -->
-				<option value="ad" SELECTED>majolica</option>
+				<option value="ad" selected="selected">majolica</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">majolica</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ae" -->
-				<option value="ae" SELECTED>porcelain</option>
+				<option value="ae" selected="selected">porcelain</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">porcelain</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3af" -->
-				<option value="af" SELECTED>ceramic</option>
+				<option value="af" selected="selected">ceramic</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">ceramic</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ag" -->
-				<option value="ag" SELECTED>plaster</option>
+				<option value="ag" selected="selected">plaster</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">plaster</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ah" -->
-				<option value="ah" SELECTED>glass</option>
+				<option value="ah" selected="selected">glass</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">glass</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ba" -->
-				<option value="ba" SELECTED>wood</option>
+				<option value="ba" selected="selected">wood</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">wood</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ca" -->
-				<option value="ca" SELECTED>ivory</option>
+				<option value="ca" selected="selected">ivory</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">ivory</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3da" -->
-				<option value="da" SELECTED>stone</option>
+				<option value="da" selected="selected">stone</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">stone</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3db" -->
-				<option value="db" SELECTED>precious stones</option>
+				<option value="db" selected="selected">precious stones</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">precious stones</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3dc" -->
-				<option value="dc" SELECTED>marble</option>
+				<option value="dc" selected="selected">marble</option>
 			<!-- TMPL_ELSE -->
 				<option value="dc">marble</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3dd" -->
-				<option value="dd" SELECTED>basalt</option>
+				<option value="dd" selected="selected">basalt</option>
 			<!-- TMPL_ELSE -->
 				<option value="dd">basalt</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3df" -->
-				<option value="df" SELECTED>porphyry</option>
+				<option value="df" selected="selected">porphyry</option>
 			<!-- TMPL_ELSE -->
 				<option value="df">porphyry</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ea" -->
-				<option value="ea" SELECTED>paper</option>
+				<option value="ea" selected="selected">paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">paper</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3eb" -->
-				<option value="eb" SELECTED>cardboard</option>
+				<option value="eb" selected="selected">cardboard</option>
 			<!-- TMPL_ELSE -->
 				<option value="eb">cardboard</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3fa" -->
-				<option value="fa" SELECTED>precious metals</option>
+				<option value="fa" selected="selected">precious metals</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">precious metals</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3fb" -->
-				<option value="fb" SELECTED>metal</option>
+				<option value="fb" selected="selected">metal</option>
 			<!-- TMPL_ELSE -->
 				<option value="fb">metal</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3fc" -->
-				<option value="fc" SELECTED>bronze</option>
+				<option value="fc" selected="selected">bronze</option>
 			<!-- TMPL_ELSE -->
 				<option value="fc">bronze</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3fd" -->
-				<option value="fd" SELECTED>copper</option>
+				<option value="fd" selected="selected">copper</option>
 			<!-- TMPL_ELSE -->
 				<option value="fd">copper</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ga" -->
-				<option value="ga" SELECTED>synthetics</option>
+				<option value="ga" selected="selected">synthetics</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">synthetics</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ha" -->
-				<option value="ha" SELECTED>textile</option>
+				<option value="ha" selected="selected">textile</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">textile</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3ia" -->
-				<option value="ia" SELECTED>plastic</option>
+				<option value="ia" selected="selected">plastic</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">plastic</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 	
@@ -579,175 +576,175 @@
 		</td>
 	</tr>
 	<tr>
-		<td>Material 3</td>
+		<td><label for="f4">Material 3</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f4  " -->
-                                <option value="  " SELECTED>non required value</option>
+                                <option value="  " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                                 <option value="  ">non required value</option>
                         <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4aa" -->
-				<option value="aa" SELECTED>terra-cotta</option>
+				<option value="aa" selected="selected">terra-cotta</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">terra-cotta</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ab" -->
-				<option value="ab" SELECTED>wax</option>
+				<option value="ab" selected="selected">wax</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">wax</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ac" -->
-				<option value="ac" SELECTED>clay</option>
+				<option value="ac" selected="selected">clay</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">clay</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ad" -->
-				<option value="ad" SELECTED>majolica</option>
+				<option value="ad" selected="selected">majolica</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">majolica</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ae" -->
-				<option value="ae" SELECTED>porcelain</option>
+				<option value="ae" selected="selected">porcelain</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">porcelain</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4af" -->
-				<option value="af" SELECTED>ceramic</option>
+				<option value="af" selected="selected">ceramic</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">ceramic</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ag" -->
-				<option value="ag" SELECTED>plaster</option>
+				<option value="ag" selected="selected">plaster</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">plaster</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ah" -->
-				<option value="ah" SELECTED>glass</option>
+				<option value="ah" selected="selected">glass</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">glass</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ba" -->
-				<option value="ba" SELECTED>wood</option>
+				<option value="ba" selected="selected">wood</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">wood</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ca" -->
-				<option value="ca" SELECTED>ivory</option>
+				<option value="ca" selected="selected">ivory</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">ivory</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4da" -->
-				<option value="da" SELECTED>stone</option>
+				<option value="da" selected="selected">stone</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">stone</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4db" -->
-				<option value="db" SELECTED>precious stones</option>
+				<option value="db" selected="selected">precious stones</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">precious stones</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4dc" -->
-				<option value="dc" SELECTED>marble</option>
+				<option value="dc" selected="selected">marble</option>
 			<!-- TMPL_ELSE -->
 				<option value="dc">marble</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4dd" -->
-				<option value="dd" SELECTED>basalt</option>
+				<option value="dd" selected="selected">basalt</option>
 			<!-- TMPL_ELSE -->
 				<option value="dd">basalt</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4df" -->
-				<option value="df" SELECTED>porphyry</option>
+				<option value="df" selected="selected">porphyry</option>
 			<!-- TMPL_ELSE -->
 				<option value="df">porphyry</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ea" -->
-				<option value="ea" SELECTED>paper</option>
+				<option value="ea" selected="selected">paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">paper</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4eb" -->
-				<option value="eb" SELECTED>cardboard</option>
+				<option value="eb" selected="selected">cardboard</option>
 			<!-- TMPL_ELSE -->
 				<option value="eb">cardboard</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4fa" -->
-				<option value="fa" SELECTED>precious metals</option>
+				<option value="fa" selected="selected">precious metals</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">precious metals</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4fb" -->
-				<option value="fb" SELECTED>metal</option>
+				<option value="fb" selected="selected">metal</option>
 			<!-- TMPL_ELSE -->
 				<option value="fb">metal</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4fc" -->
-				<option value="fc" SELECTED>bronze</option>
+				<option value="fc" selected="selected">bronze</option>
 			<!-- TMPL_ELSE -->
 				<option value="fc">bronze</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4fd" -->
-				<option value="fd" SELECTED>copper</option>
+				<option value="fd" selected="selected">copper</option>
 			<!-- TMPL_ELSE -->
 				<option value="fd">copper</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ga" -->
-				<option value="ga" SELECTED>synthetics</option>
+				<option value="ga" selected="selected">synthetics</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">synthetics</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ha" -->
-				<option value="ha" SELECTED>textile</option>
+				<option value="ha" selected="selected">textile</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">textile</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ia" -->
-				<option value="ia" SELECTED>plastic</option>
+				<option value="ia" selected="selected">plastic</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">plastic</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4vv" -->
-				<option value="vv" SELECTED>mixed</option>
+				<option value="vv" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="vv">mixed</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
@@ -757,62 +754,63 @@
 	</tr>
 
 	<tr>
-		<td>Colour</td>
+		<td><label for="f5">Color</label></td>
 		<td>
-	<select name="f5" size="1">
+	<select name="f5" id="f5" size="1">
                         <!-- TMPL_IF name="f5|" -->
-                            <option value="|" SELECTED>|- Filling character</option>
+                            <option value="|" selected="selected">|- Filling character</option>
                         <!-- TMPL_ELSE -->
                             <option value="|">|- Filling character</option>
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>one-colour, monochrome</option>
+				<option value="a" selected="selected">one-colour, monochrome</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">one-colour, monochrome</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5b" -->
-				<option value="b" SELECTED>black-and-white</option>
+				<option value="b" selected="selected">black-and-white</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">black-and-white</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>multicoloured</option>
+				<option value="c" selected="selected">multicoloured</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">multicoloured</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" SELECTED>hand coloured</option>
+				<option value="d" selected="selected">hand coloured</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">hand coloured</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5v" -->
-				<option value="v" SELECTED>mixed</option>
+				<option value="v" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 				</select>
 		</td>
 	</tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
 	    var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -820,6 +818,7 @@
 	    self.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tmpl
index ba33d95..997402a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_120.tmpl
@@ -1,141 +1,138 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 120 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 120 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 120 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Colour indicator</td>
+		<td><label for="f1">Color indicator</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>one colour</option>
+				<option value="a" selected="selected">one color</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">one colour</option>
+				<option value="a">one color</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>multi-colour</option>
+				<option value="b" selected="selected">multi-color</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">multi-colour</option>
+				<option value="b">multi-color</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Index indicator</td>
+		<td><label for="f2">Index indicator</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>index or name list on cartographic item itself</option>
+				<option value="a" selected="selected">index or name list on cartographic item itself</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">index or name list on cartographic item itself</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>   index or name list accompanying cartographic item in booklet...</option>
+				<option value="b" selected="selected">   index or name list accompanying cartographic item in booklet...</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">   index or name list accompanying cartographic item in booklet...</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>index or name list present but location not specified</option>
+				<option value="c" selected="selected">index or name list present but location not specified</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">index or name list present but location not specified</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2y" -->
-				<option value="y" SELECTED>no index or name lis</option>
+				<option value="y" selected="selected">no index or name lis</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no index or name lis</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Narrative text indicator</td>
+		<td><label for="f3">Narrative text indicator</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>text on cartographic item itself</option>
+				<option value="a" selected="selected">text on cartographic item itself</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">text on cartographic item itself</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>text accompanying cartographic item in booklet, pamphlet...</option>
+				<option value="b" selected="selected">text accompanying cartographic item in booklet, pamphlet...</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">text accompanying cartographic item in booklet, pamphlet...</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3y" -->
-				<option value="y" SELECTED>no narrative tex</option>
+				<option value="y" selected="selected">no narrative tex</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no narrative tex</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Relief codes 1:</td>
+		<td><label for="f4">Relief codes 1:</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>contours</option>
+				<option value="a" selected="selected">contours</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">contours</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>continuous tone shaded relief</option>
+				<option value="b" selected="selected">continuous tone shaded relief</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">continuous tone shaded relief</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4c" -->
-				<option value="c" SELECTED>hypsometric tints - layer method</option>
+				<option value="c" selected="selected">hypsometric tints - layer method</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">hypsometric tints - layer method</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4d" -->
-				<option value="d" SELECTED>hachures</option>
+				<option value="d" selected="selected">hachures</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">hachures</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4e" -->
-				<option value="e" SELECTED>bathymetry - soundings</option>
+				<option value="e" selected="selected">bathymetry - soundings</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">bathymetry - soundings</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4f" -->
-				<option value="f" SELECTED>form lines</option>
+				<option value="f" selected="selected">form lines</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">form lines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4g" -->
-				<option value="g" SELECTED>spot heights</option>
+				<option value="g" selected="selected">spot heights</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">spot heights</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4h" -->
-				<option value="h" SELECTED>other methods in colour</option>
+				<option value="h" selected="selected">other methods in color</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">other methods in colour</option>
+				<option value="h">other methods in color</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4i" -->
-				<option value="i" SELECTED>pictorially</option>
+				<option value="i" selected="selected">pictorially</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">pictorially</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4j" -->
-				<option value="j" SELECTED>landforms</option>
+				<option value="j" selected="selected">landforms</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">landforms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4k" -->
-				<option value="k" SELECTED>bathymetry - isolines</option>
+				<option value="k" selected="selected">bathymetry - isolines</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">bathymetry - isolines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
@@ -148,71 +145,71 @@
 			</select>
 		</td>
 	</tr><tr>
-		<td>Relief codes 2:</td>
+		<td><label for="f5">Relief codes 2:</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>contours</option>
+				<option value="a" selected="selected">contours</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">contours</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5b" -->
-				<option value="b" SELECTED>continuous tone shaded relief</option>
+				<option value="b" selected="selected">continuous tone shaded relief</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">continuous tone shaded relief</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>hypsometric tints - layer method</option>
+				<option value="c" selected="selected">hypsometric tints - layer method</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">hypsometric tints - layer method</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" SELECTED>hachures</option>
+				<option value="d" selected="selected">hachures</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">hachures</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5e" -->
-				<option value="e" SELECTED>bathymetry - soundings</option>
+				<option value="e" selected="selected">bathymetry - soundings</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">bathymetry - soundings</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5f" -->
-				<option value="f" SELECTED>form lines</option>
+				<option value="f" selected="selected">form lines</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">form lines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5g" -->
-				<option value="g" SELECTED>spot heights</option>
+				<option value="g" selected="selected">spot heights</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">spot heights</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5h" -->
-				<option value="h" SELECTED>other methods in colour</option>
+				<option value="h" selected="selected">other methods in color</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">other methods in colour</option>
+				<option value="h">other methods in color</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5i" -->
-				<option value="i" SELECTED>pictorially</option>
+				<option value="i" selected="selected">pictorially</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">pictorially</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5j" -->
-				<option value="j" SELECTED>landforms</option>
+				<option value="j" selected="selected">landforms</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">landforms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5k" -->
-				<option value="k" SELECTED>bathymetry - isolines</option>
+				<option value="k" selected="selected">bathymetry - isolines</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">bathymetry - isolines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
@@ -225,73 +222,73 @@
 			</select>
 		</td>
 	</tr><tr>
-		<td>Relief codes 3:</td>
+		<td><label for="f6">Relief codes 3:</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
                         
                         <!-- TMPL_IF name="f6 " -->
-                                <option value=" " SELECTED>non required value</option>
+                                <option value=" " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                                 <option value=" ">non required value</option>
                         <!-- /TMPL_IF -->
                         
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>contours</option>
+				<option value="a" selected="selected">contours</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">contours</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6b" -->
-				<option value="b" SELECTED>continuous tone shaded relief</option>
+				<option value="b" selected="selected">continuous tone shaded relief</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">continuous tone shaded relief</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6c" -->
-				<option value="c" SELECTED>hypsometric tints - layer method</option>
+				<option value="c" selected="selected">hypsometric tints - layer method</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">hypsometric tints - layer method</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6d" -->
-				<option value="d" SELECTED>hachures</option>
+				<option value="d" selected="selected">hachures</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">hachures</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6e" -->
-				<option value="e" SELECTED>bathymetry - soundings</option>
+				<option value="e" selected="selected">bathymetry - soundings</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">bathymetry - soundings</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6f" -->
-				<option value="f" SELECTED>form lines</option>
+				<option value="f" selected="selected">form lines</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">form lines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6g" -->
-				<option value="g" SELECTED>spot heights</option>
+				<option value="g" selected="selected">spot heights</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">spot heights</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6h" -->
-				<option value="h" SELECTED>other methods in colour</option>
+				<option value="h" selected="selected">other methods in color</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">other methods in colour</option>
+				<option value="h">other methods in color</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6i" -->
-				<option value="i" SELECTED>pictorially</option>
+				<option value="i" selected="selected">pictorially</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">pictorially</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6j" -->
-				<option value="j" SELECTED>landforms</option>
+				<option value="j" selected="selected">landforms</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">landforms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6k" -->
-				<option value="k" SELECTED>bathymetry - isolines</option>
+				<option value="k" selected="selected">bathymetry - isolines</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">bathymetry - isolines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
@@ -304,72 +301,72 @@
 			</select>
 		</td>
 	</tr><tr>
-		<td>Relief codes 4:</td>
+		<td><label for="f7">Relief codes 4:</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
                         <!-- TMPL_IF name="f7 " -->
-                                <option value=" " SELECTED>non required value</option>
+                                <option value=" " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                                 <option value=" ">non required value</option>
                         <!-- /TMPL_IF -->
                         
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>contours</option>
+				<option value="a" selected="selected">contours</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">contours</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" SELECTED>continuous tone shaded relief</option>
+				<option value="b" selected="selected">continuous tone shaded relief</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">continuous tone shaded relief</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>hypsometric tints - layer method</option>
+				<option value="c" selected="selected">hypsometric tints - layer method</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">hypsometric tints - layer method</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>hachures</option>
+				<option value="d" selected="selected">hachures</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">hachures</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7e" -->
-				<option value="e" SELECTED>bathymetry - soundings</option>
+				<option value="e" selected="selected">bathymetry - soundings</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">bathymetry - soundings</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7f" -->
-				<option value="f" SELECTED>form lines</option>
+				<option value="f" selected="selected">form lines</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">form lines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7g" -->
-				<option value="g" SELECTED>spot heights</option>
+				<option value="g" selected="selected">spot heights</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">spot heights</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7h" -->
-				<option value="h" SELECTED>other methods in colour</option>
+				<option value="h" selected="selected">other methods in color</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">other methods in colour</option>
+				<option value="h">other methods in color</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7i" -->
-				<option value="i" SELECTED>pictorially</option>
+				<option value="i" selected="selected">pictorially</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">pictorially</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7j" -->
-				<option value="j" SELECTED>landforms</option>
+				<option value="j" selected="selected">landforms</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">landforms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7k" -->
-				<option value="k" SELECTED>bathymetry - isolines</option>
+				<option value="k" selected="selected">bathymetry - isolines</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">bathymetry - isolines</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
@@ -382,57 +379,57 @@
 			</select>
 		</td>
 	</tr>
-	<tr>		<td>Map projection</td>
+	<tr>		<td><label for="f8">Map projection</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 
 			<!-- TMPL_IF name="f8aa" -->
-				<option value="aa" SELECTED>Aitoff</option>
+				<option value="aa" selected="selected">Aitoff</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">Aitoff</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8bb" -->
-				<option value="bb" SELECTED>gnomonic</option>
+				<option value="bb" selected="selected">gnomonic</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">gnomonic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ac" -->
-				<option value="ac" SELECTED>Lambert's azimuthal equal area</option>
+				<option value="ac" selected="selected">Lambert's azimuthal equal area</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">Lambert's azimuthal equal area</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ad" -->
-				<option value="ad" SELECTED>orthographic</option>
+				<option value="ad" selected="selected">orthographic</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">orthographic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ae" -->
-				<option value="ae" SELECTED>azimuthal equidistant</option>
+				<option value="ae" selected="selected">azimuthal equidistant</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">azimuthal equidistant</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8af" -->
-				<option value="af" SELECTED>stereographic</option>
+				<option value="af" selected="selected">stereographic</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">stereographic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ag" -->
-				<option value="ag" SELECTED>azimuthal equal area</option>
+				<option value="ag" selected="selected">azimuthal equal area</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">azimuthal equal area</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8au" -->
-				<option value="au" SELECTED>azimuthal, specific type unknown</option>
+				<option value="au" selected="selected">azimuthal, specific type unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="au">azimuthal, specific type unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8az" -->
-				<option value="az" SELECTED>azimuthal, other known specific type</option>
+				<option value="az" selected="selected">azimuthal, other known specific type</option>
 			<!-- TMPL_ELSE -->
 				<option value="az">azimuthal, other known specific type</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ba" -->
-				<option value="ba" SELECTED>Gall</option>
+				<option value="ba" selected="selected">Gall</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">Gall</option>
 			<!-- /TMPL_IF -->
@@ -443,7 +440,7 @@
 				<option value="bb">Goode's homolographic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ca" -->
-				<option value="ca" SELECTED>Albers equal area</option>
+				<option value="ca" selected="selected">Albers equal area</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">Albers equal area</option>
 			<!-- /TMPL_IF -->
@@ -455,25 +452,25 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8cc" -->
-				<option value="cc" SELECTED>Lambert's conformal conict</option>
+				<option value="cc" selected="selected">Lambert's conformal conict</option>
 			<!-- TMPL_ELSE -->
 				<option value="cc">Lambert's conformal conic</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8cd" -->
-				<option value="cd" SELECTED>conic (simple)</option>
+				<option value="cd" selected="selected">conic (simple)</option>
 			<!-- TMPL_ELSE -->
 				<option value="cd">conic (simple)</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8ce" -->
-				<option value="ce" SELECTED>Miller's bipolar oblique conformal conic</option>
+				<option value="ce" selected="selected">Miller's bipolar oblique conformal conic</option>
 			<!-- TMPL_ELSE -->
 				<option value="ce">Miller's bipolar oblique conformal conic</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8cf" -->
-				<option value="cf" SELECTED>De Lisle</option>
+				<option value="cf" selected="selected">De Lisle</option>
 			<!-- TMPL_ELSE -->
 				<option value="cf">De Lisle</option>
 			<!-- /TMPL_IF -->
@@ -485,102 +482,102 @@
 				<option value="cg">projection of the International Map of the World</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8ch" -->
-				<option value="ch" SELECTED>Tissot's conformal conic</option>
+				<option value="ch" selected="selected">Tissot's conformal conic</option>
 			<!-- TMPL_ELSE -->
 				<option value="ch">Tissot's conformal conic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8cp" -->
-				<option value="cp" SELECTED>polyconic</option>
+				<option value="cp" selected="selected">polyconic</option>
 			<!-- TMPL_ELSE -->
 				<option value="cp">polyconic</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8cu" -->
-				<option value="cu" SELECTED>conic, specific type unknown</option>
+				<option value="cu" selected="selected">conic, specific type unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="cu">conic, specific type unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8cz" -->
-				<option value="cz" SELECTED>conic, other known specific type</option>
+				<option value="cz" selected="selected">conic, other known specific type</option>
 			<!-- TMPL_ELSE -->
 				<option value="cz">conic, other known specific type</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8da" -->
-				<option value="da" SELECTED>armadillo</option>
+				<option value="da" selected="selected">armadillo</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">armadillo</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8db" -->
-				<option value="db" SELECTED>butterfly</option>
+				<option value="db" selected="selected">butterfly</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">butterfly</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bc" -->
-				<option value="bc" SELECTED>Lambert's cylindrical equal area</option>
+				<option value="bc" selected="selected">Lambert's cylindrical equal area</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">Lambert's cylindrical equal area</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bd" -->
-				<option value="bd" SELECTED>Mercator</option>
+				<option value="bd" selected="selected">Mercator</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">Mercator</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8be" -->
-				<option value="be" SELECTED>Miller</option>
+				<option value="be" selected="selected">Miller</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">Miller</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bf" -->
-				<option value="bf" SELECTED>Mollweide</option>
+				<option value="bf" selected="selected">Mollweide</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">Mollweide</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bg" -->
-				<option value="bg" SELECTED>sinusoidal</option>
+				<option value="bg" selected="selected">sinusoidal</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">sinusoidal</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bh" -->
-				<option value="bh" SELECTED>transverse Mercator</option>
+				<option value="bh" selected="selected">transverse Mercator</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">transverse Mercator</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bi" -->
-				<option value="bi" SELECTED>Gauss</option>
+				<option value="bi" selected="selected">Gauss</option>
 			<!-- TMPL_ELSE -->
 				<option value="bi">Gauss</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bj" -->
-				<option value="bj" SELECTED>Plate Carree</option>
+				<option value="bj" selected="selected">Plate Carree</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">Plate Carree</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bk" -->
-				<option value="bk" SELECTED>Cassini's</option>
+				<option value="bk" selected="selected">Cassini's</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">Cassini's</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bl" -->
-				<option value="bl" SELECTED>Laborde</option>
+				<option value="bl" selected="selected">Laborde</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">Laborde</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8bm" -->
-				<option value="bm" SELECTED>Oblique Mercator</option>
+				<option value="bm" selected="selected">Oblique Mercator</option>
 			<!-- TMPL_ELSE -->
 				<option value="bm">Oblique Mercator</option>
 			<!-- /TMPL_IF -->
@@ -600,72 +597,72 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8dc" -->
-				<option value="dc" SELECTED>Eckert</option>
+				<option value="dc" selected="selected">Eckert</option>
 			<!-- TMPL_ELSE -->
 				<option value="dc">Eckert</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8dd" -->
-				<option value="dd" SELECTED>Goode's homolosine</option>
+				<option value="dd" selected="selected">Goode's homolosine</option>
 			<!-- TMPL_ELSE -->
 				<option value="dd">Goode's homolosine</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8de" -->
-				<option value="de" SELECTED>Miller's bipolar</option>
+				<option value="de" selected="selected">Miller's bipolar</option>
 			<!-- TMPL_ELSE -->
 				<option value="de">Miller's bipolar</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8df" -->
-				<option value="df" SELECTED>Van der Griten</option>
+				<option value="df" selected="selected">Van der Griten</option>
 			<!-- TMPL_ELSE -->
 				<option value="df">Van der Griten</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8dg" -->
-				<option value="dg" SELECTED>dimaxion</option>
+				<option value="dg" selected="selected">dimaxion</option>
 			<!-- TMPL_ELSE -->
 				<option value="dg">dimaxion</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8dh" -->
-				<option value="dh" SELECTED>cordiform</option>
+				<option value="dh" selected="selected">cordiform</option>
 			<!-- TMPL_ELSE -->
 				<option value="dh">cordiform</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8di" -->
-				<option value="di" SELECTED>polyhedric</option>
+				<option value="di" selected="selected">polyhedric</option>
 			<!-- TMPL_ELSE -->
 				<option value="di">polyhedric</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8uu" -->
-				<option value="uu" SELECTED>type of projection unknown</option>
+				<option value="uu" selected="selected">type of projection unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">type of projection unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8xx" -->
-				<option value="xx" SELECTED>not applicable</option>
+				<option value="xx" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="xx">not applicable</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8zz" -->
-				<option value="zz" SELECTED>other known type</option>
+				<option value="zz" selected="selected">other known type</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other known type</option>
 			<!-- /TMPL_IF -->
 
 			</select>
 
-		</td></tr><tr><td>Prime meridian 1:</td>
+		</td></tr><tr><td><label for="f9">Prime meridian 1:</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
 			<!-- TMPL_IF name="f9  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
@@ -677,57 +674,57 @@
 				<option value="aa">Greenwich, United Kingdom</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ab" -->
-				<option value="ab" SELECTED>Amsterdam, Netherlands</option>
+				<option value="ab" selected="selected">Amsterdam, Netherlands</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">Amsterdam, Netherlands</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ac" -->
-				<option value="ac" SELECTED>Athens, Greece</option>
+				<option value="ac" selected="selected">Athens, Greece</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">Athens, Greece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ad" -->
-				<option value="ad" SELECTED>Batavia (Djakarta), Indonesia</option>
+				<option value="ad" selected="selected">Batavia (Djakarta), Indonesia</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">Batavia (Djakarta), Indonesia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ae" -->
-				<option value="ae" SELECTED>Berne, Switzerland</option>
+				<option value="ae" selected="selected">Berne, Switzerland</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">Berne, Switzerland</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9af" -->
-				<option value="af" SELECTED>Bogota, Colombia</option>
+				<option value="af" selected="selected">Bogota, Colombia</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">Bogota, Colombia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ag" -->
-				<option value="ag" SELECTED>Bombay, India</option>
+				<option value="ag" selected="selected">Bombay, India</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">Bombay, India</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ah" -->
-				<option value="ah" SELECTED>Brussels, Belgium</option>
+				<option value="ah" selected="selected">Brussels, Belgium</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">Brussels, Belgium</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ai" -->
-				<option value="ai" SELECTED>Cadiz, Spain</option>
+				<option value="ai" selected="selected">Cadiz, Spain</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">Cadiz, Spain</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9aj" -->
-				<option value="aj" SELECTED>Capetown, South Africa</option>
+				<option value="aj" selected="selected">Capetown, South Africa</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">Capetown, South Africa</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ak" -->
-				<option value="ak" SELECTED>Caracas, Venezuela</option>
+				<option value="ak" selected="selected">Caracas, Venezuela</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">Caracas, Venezuela</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9al" -->
-				<option value="al" SELECTED>Copenhagen, Denmark</option>
+				<option value="al" selected="selected">Copenhagen, Denmark</option>
 			<!-- TMPL_ELSE -->
 				<option value="al">Copenhagen, Denmark</option>
 			<!-- /TMPL_IF -->
@@ -738,19 +735,19 @@
 				<option value="am">Cordoba, Argentina</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9an" -->
-				<option value="an" SELECTED>Ferro, Canary Islands</option>
+				<option value="an" selected="selected">Ferro, Canary Islands</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">Ferro, Canary Islands</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9ao" -->
-				<option value="ao" SELECTED>Helsinki, Finland</option>
+				<option value="ao" selected="selected">Helsinki, Finland</option>
 			<!-- TMPL_ELSE -->
 				<option value="ao">Helsinki, Finland</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9ap" -->
-				<option value="ap" SELECTED>Istanbul, Turkey</option>
+				<option value="ap" selected="selected">Istanbul, Turkey</option>
 			<!-- TMPL_ELSE -->
 				<option value="ap">Istanbul, Turkey</option>
 			<!-- /TMPL_IF -->
@@ -762,65 +759,65 @@
 				<option value="aq">Julianehaab, Greenland</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9ar" -->
-				<option value="ar" SELECTED>Lisbon, Portugal</option>
+				<option value="ar" selected="selected">Lisbon, Portugal</option>
 			<!-- TMPL_ELSE -->
 				<option value="ar">Lisbon, Portugal</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9as" -->
-				<option value="as" SELECTED>London, United Kingdom</option>
+				<option value="as" selected="selected">London, United Kingdom</option>
 			<!-- TMPL_ELSE -->
 				<option value="as">London, United Kingdom</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9at" -->
-				<option value="at" SELECTED>Madras, India</option>
+				<option value="at" selected="selected">Madras, India</option>
 			<!-- TMPL_ELSE -->
 				<option value="at">Madras, India</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9ba" -->
-				<option value="ba" SELECTED>Madrid, Spain</option>
+				<option value="ba" selected="selected">Madrid, Spain</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">Madrid, Spain</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bb" -->
-				<option value="bb" SELECTED>Mexico City, Mexico</option>
+				<option value="bb" selected="selected">Mexico City, Mexico</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">Mexico City, Mexico</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bc" -->
-				<option value="bc" SELECTED>Moscow, Russia</option>
+				<option value="bc" selected="selected">Moscow, Russia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">Moscow, Russia</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bd" -->
-				<option value="bd" SELECTED>Munich, Germany</option>
+				<option value="bd" selected="selected">Munich, Germany</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">Munich, Germany</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9be" -->
-				<option value="be" SELECTED>Naples, Italy</option>
+				<option value="be" selected="selected">Naples, Italy</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">Naples, Italy</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bf" -->
-				<option value="bf" SELECTED>Oslo (Christiania), Norway</option>
+				<option value="bf" selected="selected">Oslo (Christiania), Norway</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">Oslo (Christiania), Norway</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bg" -->
-				<option value="bg" SELECTED>Paris, France</option>
+				<option value="bg" selected="selected">Paris, France</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">Paris, France</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bh" -->
-				<option value="bh" SELECTED>Peking, People's Republic of China</option>
+				<option value="bh" selected="selected">Peking, People's Republic of China</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">Peking, People's Republic of China</option>
 			<!-- /TMPL_IF -->
@@ -833,79 +830,79 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bj" -->
-				<option value="bj" SELECTED>Pulkova (Leningrad), Russia</option>
+				<option value="bj" selected="selected">Pulkova (Leningrad), Russia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">Pulkova (Leningrad), Russia</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bk" -->
-				<option value="bk" SELECTED>Rio de Janeiro, Brazil</option>
+				<option value="bk" selected="selected">Rio de Janeiro, Brazil</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">Rio de Janeiro, Brazil</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bl" -->
-				<option value="bl" SELECTED>Rome, Italy</option>
+				<option value="bl" selected="selected">Rome, Italy</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">Rome, Italy</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bm" -->
-				<option value="bm" SELECTED>Santiago, Chile</option>
+				<option value="bm" selected="selected">Santiago, Chile</option>
 			<!-- TMPL_ELSE -->
 				<option value="bm">Santiago, Chile</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bn" -->
-				<option value="bn" SELECTED>Stockholm, Sweden</option>
+				<option value="bn" selected="selected">Stockholm, Sweden</option>
 			<!-- TMPL_ELSE -->
 				<option value="bn">Stockholm, Sweden</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bo" -->
-				<option value="bo" SELECTED>Sydney, Australia</option>
+				<option value="bo" selected="selected">Sydney, Australia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bo">Sydney, Australia</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bp" -->
-				<option value="bp" SELECTED>Tirana, Albania</option>
+				<option value="bp" selected="selected">Tirana, Albania</option>
 			<!-- TMPL_ELSE -->
 				<option value="bp">Tirana, Albania</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9bq" -->
-				<option value="bq" SELECTED>Tokyo, Japan</option>
+				<option value="bq" selected="selected">Tokyo, Japan</option>
 			<!-- TMPL_ELSE -->
 				<option value="bq">Tokyo, Japan</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9br" -->
-				<option value="br" SELECTED>Washington, DC, USA</option>
+				<option value="br" selected="selected">Washington, DC, USA</option>
 			<!-- TMPL_ELSE -->
 				<option value="br">Washington, DC, USA</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
 
 			</select>
 
-		</td></tr><tr>		<td>Prime meridian 2:</td>
+		</td></tr><tr>		<td><label for="f10">Prime meridian 2:</label></td>
 		<td>
-			<select name="f10" size="1">
+			<select name="f10" id="f10" size="1">
             
 			<!-- TMPL_IF name="f10  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
@@ -917,57 +914,57 @@
 				<option value="aa">Greenwich, United Kingdom</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ab" -->
-				<option value="ab" SELECTED>Amsterdam, Netherlands</option>
+				<option value="ab" selected="selected">Amsterdam, Netherlands</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">Amsterdam, Netherlands</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ac" -->
-				<option value="ac" SELECTED>Athens, Greece</option>
+				<option value="ac" selected="selected">Athens, Greece</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">Athens, Greece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ad" -->
-				<option value="ad" SELECTED>Batavia (Djakarta), Indonesia</option>
+				<option value="ad" selected="selected">Batavia (Djakarta), Indonesia</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">Batavia (Djakarta), Indonesia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ae" -->
-				<option value="ae" SELECTED>Berne, Switzerland</option>
+				<option value="ae" selected="selected">Berne, Switzerland</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">Berne, Switzerland</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10af" -->
-				<option value="af" SELECTED>Bogota, Colombia</option>
+				<option value="af" selected="selected">Bogota, Colombia</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">Bogota, Colombia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ag" -->
-				<option value="ag" SELECTED>Bombay, India</option>
+				<option value="ag" selected="selected">Bombay, India</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">Bombay, India</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ah" -->
-				<option value="ah" SELECTED>Brussels, Belgium</option>
+				<option value="ah" selected="selected">Brussels, Belgium</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">Brussels, Belgium</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ai" -->
-				<option value="ai" SELECTED>Cadiz, Spain</option>
+				<option value="ai" selected="selected">Cadiz, Spain</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">Cadiz, Spain</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10aj" -->
-				<option value="aj" SELECTED>Capetown, South Africa</option>
+				<option value="aj" selected="selected">Capetown, South Africa</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">Capetown, South Africa</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ak" -->
-				<option value="ak" SELECTED>Caracas, Venezuela</option>
+				<option value="ak" selected="selected">Caracas, Venezuela</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">Caracas, Venezuela</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10al" -->
-				<option value="al" SELECTED>Copenhagen, Denmark</option>
+				<option value="al" selected="selected">Copenhagen, Denmark</option>
 			<!-- TMPL_ELSE -->
 				<option value="al">Copenhagen, Denmark</option>
 			<!-- /TMPL_IF -->
@@ -978,19 +975,19 @@
 				<option value="am">Cordoba, Argentina</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10an" -->
-				<option value="an" SELECTED>Ferro, Canary Islands</option>
+				<option value="an" selected="selected">Ferro, Canary Islands</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">Ferro, Canary Islands</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10ao" -->
-				<option value="ao" SELECTED>Helsinki, Finland</option>
+				<option value="ao" selected="selected">Helsinki, Finland</option>
 			<!-- TMPL_ELSE -->
 				<option value="ao">Helsinki, Finland</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10ap" -->
-				<option value="ap" SELECTED>Istanbul, Turkey</option>
+				<option value="ap" selected="selected">Istanbul, Turkey</option>
 			<!-- TMPL_ELSE -->
 				<option value="ap">Istanbul, Turkey</option>
 			<!-- /TMPL_IF -->
@@ -1002,65 +999,65 @@
 				<option value="aq">Julianehaab, Greenland</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ar" -->
-				<option value="ar" SELECTED>Lisbon, Portugal</option>
+				<option value="ar" selected="selected">Lisbon, Portugal</option>
 			<!-- TMPL_ELSE -->
 				<option value="ar">Lisbon, Portugal</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10as" -->
-				<option value="as" SELECTED>London, United Kingdom</option>
+				<option value="as" selected="selected">London, United Kingdom</option>
 			<!-- TMPL_ELSE -->
 				<option value="as">London, United Kingdom</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10at" -->
-				<option value="at" SELECTED>Madras, India</option>
+				<option value="at" selected="selected">Madras, India</option>
 			<!-- TMPL_ELSE -->
 				<option value="at">Madras, India</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10ba" -->
-				<option value="ba" SELECTED>Madrid, Spain</option>
+				<option value="ba" selected="selected">Madrid, Spain</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">Madrid, Spain</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bb" -->
-				<option value="bb" SELECTED>Mexico City, Mexico</option>
+				<option value="bb" selected="selected">Mexico City, Mexico</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">Mexico City, Mexico</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bc" -->
-				<option value="bc" SELECTED>Moscow, Russia</option>
+				<option value="bc" selected="selected">Moscow, Russia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">Moscow, Russia</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bd" -->
-				<option value="bd" SELECTED>Munich, Germany</option>
+				<option value="bd" selected="selected">Munich, Germany</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">Munich, Germany</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10be" -->
-				<option value="be" SELECTED>Naples, Italy</option>
+				<option value="be" selected="selected">Naples, Italy</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">Naples, Italy</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bf" -->
-				<option value="bf" SELECTED>Oslo (Christiania), Norway</option>
+				<option value="bf" selected="selected">Oslo (Christiania), Norway</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">Oslo (Christiania), Norway</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bg" -->
-				<option value="bg" SELECTED>Paris, France</option>
+				<option value="bg" selected="selected">Paris, France</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg">Paris, France</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bh" -->
-				<option value="bh" SELECTED>Peking, People's Republic of China</option>
+				<option value="bh" selected="selected">Peking, People's Republic of China</option>
 			<!-- TMPL_ELSE -->
 				<option value="bh">Peking, People's Republic of China</option>
 			<!-- /TMPL_IF -->
@@ -1073,77 +1070,77 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bj" -->
-				<option value="bj" SELECTED>Pulkova (Leningrad), Russia</option>
+				<option value="bj" selected="selected">Pulkova (Leningrad), Russia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bj">Pulkova (Leningrad), Russia</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bk" -->
-				<option value="bk" SELECTED>Rio de Janeiro, Brazil</option>
+				<option value="bk" selected="selected">Rio de Janeiro, Brazil</option>
 			<!-- TMPL_ELSE -->
 				<option value="bk">Rio de Janeiro, Brazil</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bl" -->
-				<option value="bl" SELECTED>Rome, Italy</option>
+				<option value="bl" selected="selected">Rome, Italy</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl">Rome, Italy</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bm" -->
-				<option value="bm" SELECTED>Santiago, Chile</option>
+				<option value="bm" selected="selected">Santiago, Chile</option>
 			<!-- TMPL_ELSE -->
 				<option value="bm">Santiago, Chile</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bn" -->
-				<option value="bn" SELECTED>Stockholm, Sweden</option>
+				<option value="bn" selected="selected">Stockholm, Sweden</option>
 			<!-- TMPL_ELSE -->
 				<option value="bn">Stockholm, Sweden</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bo" -->
-				<option value="bo" SELECTED>Sydney, Australia</option>
+				<option value="bo" selected="selected">Sydney, Australia</option>
 			<!-- TMPL_ELSE -->
 				<option value="bo">Sydney, Australia</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bp" -->
-				<option value="bp" SELECTED>Tirana, Albania</option>
+				<option value="bp" selected="selected">Tirana, Albania</option>
 			<!-- TMPL_ELSE -->
 				<option value="bp">Tirana, Albania</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10bq" -->
-				<option value="bq" SELECTED>Tokyo, Japan</option>
+				<option value="bq" selected="selected">Tokyo, Japan</option>
 			<!-- TMPL_ELSE -->
 				<option value="bq">Tokyo, Japan</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10br" -->
-				<option value="br" SELECTED>Washington, DC, USA</option>
+				<option value="br" selected="selected">Washington, DC, USA</option>
 			<!-- TMPL_ELSE -->
 				<option value="br">Washington, DC, USA</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10uu" -->
-				<option value="uu" SELECTED>unknown</option>
+				<option value="uu" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="uu">unknown</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
 	    var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -1151,6 +1148,7 @@
 	    self.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tmpl
index aa27595..40f62f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121a.tmpl
@@ -1,293 +1,294 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 121a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 121a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 121a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Physical dimension</td>
+		<td><label for="f1">Physical dimension</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>2-dimensional</option>
+				<option value="a" selected="selected">2-dimensional</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">2-dimensional</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>2-dimensional</option>
+				<option value="b" selected="selected">2-dimensional</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">2-dimensional</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Primary cartographic image 1:</td>
+		<td><label for="f2">Primary cartographic image 1:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
             
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>manually and plotted</option>
+				<option value="a" selected="selected">manually and plotted</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">manually and plotted</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>photographically</option>
+				<option value="b" selected="selected">photographically</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">photographically</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>by computer</option>
+				<option value="c" selected="selected">by computer</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">by computer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>by active remote sensing techniqu</option>
+				<option value="d" selected="selected">by active remote sensing techniqu</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">by active remote sensing techniqu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>by passive remote sensing techniques</option>
+				<option value="e" selected="selected">by passive remote sensing techniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">by passive remote sensing techniques</option>
 			<!-- /TMPL_IF -->
 			</select>
-		</td><td>Primary cartographic image 2:</td>
+		</td>
+		</tr>
+		<tr>
+		<td><label for="f3">Primary cartographic image 2:</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
                         <!-- TMPL_IF name="f3 " -->
-                                <option value=" " SELECTED>non required value</option>
+                                <option value=" " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                                 <option value=" ">non required value</option>
                         <!-- /TMPL_IF -->
                         
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>manually and plotted</option>
+				<option value="a" selected="selected">manually and plotted</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">manually and plotted</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>photographically</option>
+				<option value="b" selected="selected">photographically</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">photographically</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3c" -->
-				<option value="c" SELECTED>by computer</option>
+				<option value="c" selected="selected">by computer</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">by computer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3d" -->
-				<option value="d" SELECTED>by active remote sensing techniques</option>
+				<option value="d" selected="selected">by active remote sensing techniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">by active remote sensing techniques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3e" -->
-				<option value="e" SELECTED>by passive remote sensing techniques</option>
+				<option value="e" selected="selected">by passive remote sensing techniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">by passive remote sensing techniques</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Physical medium</td>
+		<td><label for="f4">Physical medium</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4aa" -->
-				<option value="aa" SELECTED>paper</option>
+				<option value="aa" selected="selected">paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ab" -->
-				<option value="ab" SELECTED>wood</option>
+				<option value="ab" selected="selected">wood</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">wood</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ac" -->
-				<option value="ac" SELECTED>stone</option>
+				<option value="ac" selected="selected">stone</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">stone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ad" -->
-				<option value="ad" SELECTED>metal</option>
+				<option value="ad" selected="selected">metal</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">metal</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ae" -->
-				<option value="ae" SELECTED>synthetics (e.g. plastics, vinyl)</option>
+				<option value="ae" selected="selected">synthetics (e.g. plastics, vinyl)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">synthetics (e.g. plastics, vinyl)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4af" -->
-				<option value="af" SELECTED>skin (e.g. parchment, vellum)</option>
+				<option value="af" selected="selected">skin (e.g. parchment, vellum)</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">skin (e.g. parchment, vellum)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ag" -->
-				<option value="ag" SELECTED>     textile including manmade fibre textiles (e.g. silk, cloth, nylon)</option>
+				<option value="ag" selected="selected">     textile including manmade fibre textiles (e.g. silk, cloth, nylon)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">     textile including manmade fibre textiles (e.g. silk, cloth, nylon)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ah" -->
-				<option value="ah" SELECTED>magnetic storage medium - computer compatible</option>
+				<option value="ah" selected="selected">magnetic storage medium - computer compatible</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">magnetic storage medium - computer compatible</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ai" -->
-				<option value="ai" SELECTED>magnetic storage medium - not computer compatible</option>
+				<option value="ai" selected="selected">magnetic storage medium - not computer compatible</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">magnetic storage medium - not computer compatible</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4aj" -->
-				<option value="aj" SELECTED>tracing paper</option>
+				<option value="aj" selected="selected">tracing paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">tracing paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ak" -->
-				<option value="ak" SELECTED>cardboard</option>
+				<option value="ak" selected="selected">cardboard</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">cardboard</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ap" -->
-				<option value="ap" SELECTED>plaster</option>
+				<option value="ap" selected="selected">plaster</option>
 			<!-- TMPL_ELSE -->
 				<option value="ap">plaster</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4au" -->
-				<option value="au" SELECTED>unknown</option>
+				<option value="au" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="au">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4az" -->
-				<option value="az" SELECTED>other non photographic medium</option>
+				<option value="az" selected="selected">other non photographic medium</option>
 			<!-- TMPL_ELSE -->
 				<option value="az">other non photographic medium</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4ba" -->
-				<option value="ba" SELECTED> transparent or opaque flexible base positive</option>
+				<option value="ba" selected="selected"> transparent or opaque flexible base positive</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba"> transparent or opaque flexible base positive</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4bb" -->
-				<option value="bb" SELECTED>transparent or opaque flexible base negative</option>
+				<option value="bb" selected="selected">transparent or opaque flexible base negative</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">transparent or opaque flexible base negative</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4bc" -->
-				<option value="bc" SELECTED>transparent or opaque non-flexible base positive</option>
+				<option value="bc" selected="selected">transparent or opaque non-flexible base positive</option>
 			<!-- TMPL_ELSE -->
 				<option value="bc">transparent or opaque non-flexible base positive</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4bd" -->
-				<option value="bd" SELECTED>transparent or opaque non-flexible base negative</option>
+				<option value="bd" selected="selected">transparent or opaque non-flexible base negative</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">transparent or opaque non-flexible base negative</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4bz" -->
-				<option value="bz" SELECTED>other photographic medium</option>
+				<option value="bz" selected="selected">other photographic medium</option>
 			<!-- TMPL_ELSE -->
 				<option value="bz">other photographic medium</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Creation technique</td>
+		<td><label for="f5">Creation technique</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>manuscript</option>
+				<option value="a" selected="selected">manuscript</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">manuscript</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5b" -->
-				<option value="b" SELECTED>printing</option>
+				<option value="b" selected="selected">printing</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">printing</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>photocopying</option>
+				<option value="c" selected="selected">photocopying</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">photocopying</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" SELECTED>microphotography</option>
+				<option value="d" selected="selected">microphotography</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">microphotography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5y" -->
-				<option value="y" SELECTED>the cartographic item is not a final produc</option>
+				<option value="y" selected="selected">the cartographic item is not a final produc</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">the cartographic item is not a final produc</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
 	</tr><tr>
-		<td>Form of reproduction</td>
+		<td><label for="f6">Form of reproduction</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>by hand</option>
+				<option value="a" selected="selected">by hand</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">by hand</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6b" -->
-				<option value="b" SELECTED>printed</option>
+				<option value="b" selected="selected">printed</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">printed</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6c" -->
-				<option value="c" SELECTED>photography</option>
+				<option value="c" selected="selected">photography</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">photography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6d" -->
-				<option value="d" SELECTED>transfer line print</option>
+				<option value="d" selected="selected">transfer line print</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">transfer line print</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6y" -->
-				<option value="y" SELECTED>not a reproduction</option>
+				<option value="y" selected="selected">not a reproduction</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">not a reproduction</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td>
 	</tr><tr>
-		<td>Geodetic adjustment</td>
+		<td><label for="f7">Geodetic adjustment</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>a- no adjustment</option>
+				<option value="a" selected="selected">a- no adjustment</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">a- no adjustment</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" SELECTED>b- adjusted but without grid system</option>
+				<option value="b" selected="selected">b- adjusted but without grid system</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">b- adjusted but without grid system</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>c- adjusted with grid system</option>
+				<option value="c" selected="selected">c- adjusted with grid system</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">c- adjusted with grid system</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>x- not applicable</option>
+				<option value="x" selected="selected">x- not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">x- not applicable</option>
 			<!-- /TMPL_IF -->
@@ -295,46 +296,47 @@
 		</td>
 	</tr>
 <tr>
-		<td>Physical form of publication</td>
+		<td><label for="f8">Physical form of publication</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8a" -->
-				<option value="a" SELECTED>single</option>
+				<option value="a" selected="selected">single</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">single</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8b" -->
-				<option value="b" SELECTED>in parts</option>
+				<option value="b" selected="selected">in parts</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">in parts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8c" -->
-				<option value="c" SELECTED>atlas including loose-leaf published atlas</option>
+				<option value="c" selected="selected">atlas including loose-leaf published atlas</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">atlas including loose-leaf published atlas</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8d" -->
-				<option value="d" SELECTED>as a separate supplement to a journal, monograph, etc.</option>
+				<option value="d" selected="selected">as a separate supplement to a journal, monograph, etc.</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">as a separate supplement to a journal, monograph, etc.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8e" -->
-				<option value="e" SELECTED>bound into a journal, monograph, etc.</option>
+				<option value="e" selected="selected">bound into a journal, monograph, etc.</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">bound into a journal, monograph, etc.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
 	</tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script>
+<script type="text/javascript">
+//<![CDATA[
 	function report() {
 
             var doc   = opener.document; 
@@ -344,6 +346,7 @@
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tmpl
index 54bd4d4..b5e51d0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_121b.tmpl
@@ -1,253 +1,251 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 121b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 121b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 121b builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Altitude of Sensor</td>
+		<td><label for="f1">Altitude of Sensor</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>terrestrial</option>
+				<option value="a" selected="selected">terrestrial</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">terrestrial</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>aerial</option>
+				<option value="b" selected="selected">aerial</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">aerial</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>space</option>
+				<option value="c" selected="selected">space</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">space</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Attitude of sensor</td>
+		<td><label for="f2">Attitude of sensor</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
                         
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>low oblique</option>
+				<option value="a" selected="selected">low oblique</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">low oblique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>high oblique</option>
+				<option value="b" selected="selected">high oblique</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">high oblique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>vertical</option>
+				<option value="c" selected="selected">vertical</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">vertical</option>
 			<!-- /TMPL_IF -->
-		</td></tr><tr>		<td>Spectral bands : 01 to 99 = number of bands, xx = not applicable</td>
-		   <td><input type="text" name="f3" maxlength=2 size=3
-		   value="<!-- TMPL_VAR name="f3" -->">
+			</select>
+		</td></tr>
+		<tr>		<td><label for="f3">Spectral bands : 01 to 99 = number of bands, xx = not applicable</label></td>
+		   <td><input type="text" name="f3" id="f3" maxlength="2" size="3" value="<!-- TMPL_VAR name="f3" -->" />
 		</td></tr>
 <tr>
-		<td>Quality of image</td>
+		<td><label for="f4">Quality of image</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>poor</option>
+				<option value="a" selected="selected">poor</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">poor</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>fair</option>
+				<option value="b" selected="selected">fair</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">fair</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4c" -->
-				<option value="c" SELECTED>good</option>
+				<option value="c" selected="selected">good</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">good</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4d" -->
-				<option value="d" SELECTED>very good</option>
+				<option value="d" selected="selected">very good</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">very good</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
-		<td>Cloud cover</td>
+		<td><label for="f5">Cloud cover</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 
-			<!-- TMPL_IF name="f51" -->
-				<option value="1" SELECTED>1/8</option>
+			<!-- TMPL_IF name="f51" id="f51" -->
+				<option value="1" selected="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_IF name="f52" id="f52" -->
+				<option value="2" selected="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_IF name="f53" id="f53" -->
+				<option value="3" selected="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_IF name="f54" id="f54" -->
+				<option value="4" selected="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_IF name="f55" id="f55" -->
+				<option value="5" selected="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_IF name="f56" id="f56" -->
+				<option value="6" selected="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_IF name="f57" id="f57" -->
+				<option value="7" selected="selected">7/8</option>
 			<!-- TMPL_ELSE -->
 				<option value="7">7/8</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f58" -->
-				<option value="8" SELECTED>completely covered by clouds</option>
+			<!-- TMPL_IF name="f58" id="f58" -->
+				<option value="8" selected="selected">completely covered by clouds</option>
 			<!-- TMPL_ELSE -->
 				<option value="8">completely covered by clouds</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr><tr>
 
-		       <td>Mean value of ground resolution</td>
+		       <td><label for="f6">Mean value of ground resolution</label></td>
                 <td>
-                        <select name="f6" size="1">
+                        <select name="f6" id="f6" size="1">
                         <!-- TMPL_IF name="f6-" -->
-                                <option value="-" SELECTED>less than 1 centimetre</option>
+                                <option value="-" selected="selected">less than 1 centimetre</option>
                         <!-- TMPL_ELSE -->
                                 <option value="-">less than 1 centimetre</option>
                         <!-- /TMPL_IF -->
                         
-                        <!-- TMPL_IF name="f61" -->
-                                <option value="1" SELECTED>1</option>
+                        <!-- TMPL_IF name="f61" id="f61" -->
+                                <option value="1" selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="1">1</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f62" -->
+                        <!-- TMPL_IF name="f62" id="f62" -->
                                 <option value="2"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="2">2</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f63" -->
+                        <!-- TMPL_IF name="f63" id="f63" -->
                                 <option value="3"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="3">3</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f64" -->
+                        <!-- TMPL_IF name="f64" id="f64" -->
                                 <option value="4"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="4">4</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f51" -->
+                        <!-- TMPL_IF name="f51" id="f51" -->
                                 <option value="5"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="5">5</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f66" -->
+                        <!-- TMPL_IF name="f66" id="f66" -->
                                 <option value="6"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="6">6</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f71" -->
+                        <!-- TMPL_IF name="f71" id="f71" -->
                                 <option value="7"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="7">7</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f68" -->
+                        <!-- TMPL_IF name="f68" id="f68" -->
                                 <option value="8"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="8">8</option>
                         <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="f69" -->
+                        <!-- TMPL_IF name="f69" id="f69" -->
                                 <option value="9"
-                SELECTED>1</option>
+                selected="selected">1</option>
                         <!-- TMPL_ELSE -->
                                 <option value="9">9</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f6+" -->
                                 <option value="+"
-                SELECTED>greater than 9 kilometres</option>
+                selected="selected">greater than 9 kilometres</option>
                         <!-- TMPL_ELSE -->
                                 <option value="+">greater than 9 kilometres</option>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_IF name="f6x" -->
                                 <option value="x"
-                SELECTED>not applicable</option>
+                selected="selected">not applicable</option>
                         <!-- TMPL_ELSE -->
                                 <option value="x">not applicable</option>
                         <!-- /TMPL_IF -->
                         </select>
                 
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>Centimetres</option>
+				<option value="c" selected="selected">Centimetres</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">Centimetres</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7i" -->
-				<option value="i" SELECTED>Decimetres</option>
+				<option value="i" selected="selected">Decimetres</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">Decimetres</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7m" -->
-				<option value="m" SELECTED>Metres</option>
+				<option value="m" selected="selected">Metres</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">Metres</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>Decametres</option>
+				<option value="d" selected="selected">Decametres</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">Decametres</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7h" -->
-				<option value="h" SELECTED>Hectametres</option>
+				<option value="h" selected="selected">Hectametres</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">Hectametres</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7k" -->
-				<option value="k" SELECTED>Kilometres</option>
+				<option value="k" selected="selected">Kilometres</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">Kilometres</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
 	</tr>
-
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script>
+<script type="text/javascript">
+//<![CDATA[
 	function report() {
 
 document.f_pop.f3.value=document.f_pop.f3.value+'  ';
@@ -263,6 +261,7 @@ document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tmpl
index 9e0f32f..67d00eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_122.tmpl
@@ -1,25 +1,22 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 122 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 122 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 122 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Era identifier</td>
-		<td>
-		<select name="f1" size="1">
+		<td><label for="f1">Era identifier</label></td>
+		<td colspan="7">
+		<select name="f1" id="f1" size="1">
                     <!-- TMPL_IF name="f1c" -->
-                            <option value="c" SELECTED>   date falls before the year 1 in the Gregorian calendar, i.e. B.C.</option>
+                            <option value="c" selected="selected">   date falls before the year 1 in the Gregorian calendar, i.e. B.C.</option>
                     <!-- TMPL_ELSE -->
                             <option value="c">   date falls before the year 1 in the Gregorian calendar, i.e. B.C.</option>
                     <!-- /TMPL_IF -->
                     <!-- TMPL_IF name="f1d" -->
-                            <option value="d" SELECTED>date falls after the year 1 in the Gregorian calendar, i.e. A.D.</option>
+                            <option value="d" selected="selected">date falls after the year 1 in the Gregorian calendar, i.e. A.D.</option>
                     <!-- TMPL_ELSE -->
                             <option value="d">date falls after the year 1 in the Gregorian calendar, i.e. A.D.</option>
                     <!-- /TMPL_IF -->
@@ -28,30 +25,22 @@
 		</td>
                 </tr>
                 <tr>
-                <td>Year</td>
-		   <td><input type="text" name="f2" maxlength=4 size=5
-		   value="<!-- TMPL_VAR name="f2" -->">
+                <td><label for="f2">Year</label></td>
+		   <td><input type="text" name="f2" id="f2" maxlength="4" size="5" value="<!-- TMPL_VAR name="f2" -->" />
 		</td>
 
-		<td>Month</td>
-		         <td><input type="text" name="f3" maxlength=2
-		         size=3
-                   value="<!-- TMPL_VAR name="f3" -->"></td>
-		<td>Day</td>
-		         <td><input type="text" name="f4" maxlength=2
-		         size=3
-                   value="<!-- TMPL_VAR name="f4" -->"></td>
-
-		<td>Time</td>
-		         <td><input type="text" name="f5" maxlength=2
-		         size=3
-                   value="<!-- TMPL_VAR name="f5" -->"></td>
+		<td><label for="f3">Month</label></td>
+		         <td><input type="text" name="f3" id="f3" maxlength="2" size="3" value="<!-- TMPL_VAR name="f3" -->" /></td>
+		<td><label for="f4">Day</label></td>
+		         <td><input type="text" name="f4" id="f4" maxlength="2" size="3" value="<!-- TMPL_VAR name="f4" -->" /></td>
+		<td><label for="f5">Time</label></td>
+		         <td><input type="text" name="f5" id="f5" maxlength="2" size="3" value="<!-- TMPL_VAR name="f5" -->" /></td>
 		</tr>
-
-	<tr><td colspan=2><input type="button" value="OK"  onclick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
     function report() {
         document.f_pop.f2.value=document.f_pop.f2.value+'    ';
         document.f_pop.f3.value=document.f_pop.f3.value+'  ';
@@ -69,6 +58,7 @@
         window.close();
         return false;
 }
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tmpl
index 9a15cf2..999ba63 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123a.tmpl
@@ -1,47 +1,46 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 123a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 123a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 123a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Type of Scale:</td>
+		<td><label for="f1">Type of Scale:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>linear scale</option>
+				<option value="a" selected="selected">linear scale</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">linear scale</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>angular scale</option>
+				<option value="b" selected="selected">angular scale</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">angular scale</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other type of scale (e.g., time scale, quantitative statistical scale)</option>
+				<option value="z" selected="selected">other type of scale (e.g., time scale, quantitative statistical scale)</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other type of scale (e.g., time scale, quantitative statistical scale)</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-
-	<tr><td colspan=2><input type="button" value="OK"  onclick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
-	function report() {
+//<![CDATA[
+function report() {
 	    var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
             field.value =  document.f_pop.f1.value;
 	    self.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tmpl
index 49b0462..45d95e3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123d.tmpl
@@ -1,63 +1,53 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 123d builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 123d builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 123d builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Hemisphere:</td>
+		<td><label for="f1">Hemisphere:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 
 			<!-- TMPL_IF name="f1w" -->
-				<option value="w" SELECTED>west</option>
+				<option value="w" selected="selected">west</option>
 			<!-- TMPL_ELSE -->
 				<option value="w">west</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>east</option>
+				<option value="e" selected="selected">east</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">east</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1n" -->
-				<option value="n" SELECTED>north</option>
+				<option value="n" selected="selected">north</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">north</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1s" -->
-				<option value="s" SELECTED>south</option>
+				<option value="s" selected="selected">south</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">south</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 
-<tr>          <td>Degree (complete with 0):</td>
-                         <td><input type="text" name="f2" maxlength=3
-                         size=4
-                   value="<!-- TMPL_VAR name="f2" -->"></td>
+<tr>          <td><label for="f2">Degree (complete with 0):</label></td>
+                         <td><input type="text" name="f2" id="f2" maxlength="3" size="4" value="<!-- TMPL_VAR name="f2" -->" /></td>
 </tr>
-<tr>          <td>Minute (complete with 0):</td>
-                         <td><input type="text" name="f3" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f3" -->"></td>
+<tr>          <td><label for="f3">Minute (complete with 0):</label></td>
+                         <td><input type="text" name="f3" id="f3" maxlength="2" size="3" value="<!-- TMPL_VAR name="f3" -->" /></td>
 </tr>
-<tr>          <td>Second (complete with 0):</td>
-                         <td><input type="text" name="f4" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f4" -->"></td>
+<tr>          <td><label for="f4">Second (complete with 0):</label></td>
+                         <td><input type="text" name="f4" id="f4" maxlength="2" size="3" value="<!-- TMPL_VAR name="f4" -->" /></td>
 </tr>
-
-
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             document.f_pop.f2.value=document.f_pop.f2.value+'   ';
             document.f_pop.f3.value=document.f_pop.f3.value+'  ';
@@ -73,6 +63,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tmpl
index ea3cfce..d37f979 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123e.tmpl
@@ -1,63 +1,53 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 123e builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 123e builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 123e builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Hemisphere:</td>
+		<td><label for="f1">Hemisphere:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
             
 			<!-- TMPL_IF name="f1w" -->
-				<option value="w" SELECTED>west</option>
+				<option value="w" selected="selected">west</option>
 			<!-- TMPL_ELSE -->
 				<option value="w">west</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>east</option>
+				<option value="e" selected="selected">east</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">east</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1n" -->
-				<option value="n" SELECTED>north</option>
+				<option value="n" selected="selected">north</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">north</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1s" -->
-				<option value="s" SELECTED>south</option>
+				<option value="s" selected="selected">south</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">south</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 
-<tr>          <td>Degree (complete with 0):</td>
-                         <td><input type="text" name="f2" maxlength=3
-                         size=4
-                   value="<!-- TMPL_VAR name="f2" -->"></td>
+<tr>          <td><label for="f2">Degree (complete with 0):</label></td>
+                         <td><input type="text" name="f2" id="f2" maxlength="3" size="4" value="<!-- TMPL_VAR name="f2" -->" /></td>
 </tr>
-<tr>          <td>Minute (complete with 0):</td>
-                         <td><input type="text" name="f3" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f3" -->"></td>
+<tr>          <td><label for="f3">Minute (complete with 0):</label></td>
+                         <td><input type="text" name="f3" id="f3" maxlength="2" size="3" value="<!-- TMPL_VAR name="f3" -->" /></td>
 </tr>
-<tr>          <td>Second (complete with 0):</td>
-                         <td><input type="text" name="f4" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f4" -->"></td>
+<tr>          <td><label for="f4">Second (complete with 0):</label></td>
+                         <td><input type="text" name="f4" id="f4" maxlength="2" size="3" value="<!-- TMPL_VAR name="f4" -->" /></td>
 </tr>
-
-
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             document.f_pop.f2.value=document.f_pop.f2.value+'   ';
             document.f_pop.f3.value=document.f_pop.f3.value+'  ';
@@ -73,6 +63,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tmpl
index 6a8dd21..cdb03b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123f.tmpl
@@ -1,74 +1,69 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 123f builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 123f builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 123f builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Hemisphere:</td>
+		<td><label for="f1">Hemisphere:</label></td>
 		<td>
-			<select name="f1" size="1">            
+			<select name="f1" id="f1" size="1">
+            
 			<!-- TMPL_IF name="f1w" -->
-				<option value="w" SELECTED>west</option>
+				<option value="w" selected="selected">west</option>
 			<!-- TMPL_ELSE -->
 				<option value="w">west</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>east</option>
+				<option value="e" selected="selected">east</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">east</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1n" -->
-				<option value="n" SELECTED>north</option>
+				<option value="n" selected="selected">north</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">north</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1s" -->
-				<option value="s" SELECTED>south</option>
+				<option value="s" selected="selected">south</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">south</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 
-<tr>          <td>Degree (complete with 0):</td>
-                         <td><input type="text" name="f2" maxlength=3
-                         size=4
-                   value="<!-- TMPL_VAR name="f2" -->"></td>
+<tr>          <td><label for="f2">Degree (complete with 0):</label></td>
+                         <td><input type="text" name="f2" id="f2" maxlength="3" size="4" value="<!-- TMPL_VAR name="f2" -->" /></td>
 </tr>
-<tr>          <td>Minute (complete with 0):</td>
-                         <td><input type="text" name="f3" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f3" -->"></td>
+<tr>          <td><label for="f3">Minute (complete with 0):</label></td>
+                         <td><input type="text" name="f3" id="f3" maxlength="2" size="3" value="<!-- TMPL_VAR name="f3" -->" /></td>
 </tr>
-<tr>          <td>Second (complete with 0):</td>
-                         <td><input type="text" name="f4" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f4" -->"></td>
+<tr>          <td><label for="f4">Second (complete with 0):</label></td>
+                         <td><input type="text" name="f4" id="f4" maxlength="2" size="3" value="<!-- TMPL_VAR name="f4" -->" /></td>
 </tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
-    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);
+//<![CDATA[
+	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);
 
-        var doc   = opener.document; 
-        var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
-        field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
-        window.close();
-        return false;
-    }
+            var doc   = opener.document; 
+            var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
+            field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
+	    window.close();
+	    return false;
+	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tmpl
index e824432..7cc1c0a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_123g.tmpl
@@ -1,63 +1,53 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_constructeur champ 123g</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 123g builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 123g builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Hemisphere:</td>
+		<td><label for="f1">Hemisphere:</label></td>
 		<td>
-			<select name="f1" size="1">
-
+			<select name="f1" id="f1" size="1">
+            
 			<!-- TMPL_IF name="f1w" -->
-				<option value="w" SELECTED>west</option>
+				<option value="w" selected="selected">west</option>
 			<!-- TMPL_ELSE -->
 				<option value="w">west</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>east</option>
+				<option value="e" selected="selected">east</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">east</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1n" -->
-				<option value="n" SELECTED>north</option>
+				<option value="n" selected="selected">north</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">north</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1s" -->
-				<option value="s" SELECTED>south</option>
+				<option value="s" selected="selected">south</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">south</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 
-<tr>          <td>Degree (complete with 0):</td>
-                         <td><input type="text" name="f2" maxlength=3
-                         size=4
-                   value="<!-- TMPL_VAR name="f2" -->"></td>
+<tr>          <td><label for="f2">Degree (complete with 0):</label></td>
+                         <td><input type="text" name="f2" id="f2" maxlength="3" size="4" value="<!-- TMPL_VAR name="f2" -->" /></td>
 </tr>
-<tr>          <td>Minute (complete with 0):</td>
-                         <td><input type="text" name="f3" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f3" -->"></td>
+<tr>          <td><label for="f3">Minute (complete with 0):</label></td>
+                         <td><input type="text" name="f3" id="f3" maxlength="2" size="3" value="<!-- TMPL_VAR name="f3" -->" /></td>
 </tr>
-<tr>          <td>Second (complete with 0):</td>
-                         <td><input type="text" name="f4" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f4" -->"></td>
+<tr>          <td><label for="f4">Second (complete with 0):</label></td>
+                         <td><input type="text" name="f4" id="f4" maxlength="2" size="3" value="<!-- TMPL_VAR name="f4" -->" /></td>
 </tr>
-
-
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             document.f_pop.f2.value=document.f_pop.f2.value+'   ';
             document.f_pop.f3.value=document.f_pop.f3.value+'  ';
@@ -68,10 +58,12 @@
 
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
+        
             field.value =  document.f_pop.f1.value+document.f_pop.f2.value+document.f_pop.f3.value+document.f_pop.f4.value;
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tmpl
index 2f2d54a..99cac1e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124a.tmpl
@@ -1,39 +1,37 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 124a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 124a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 124a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Character of Image:</td>
+		<td><label for="f1">Character of Image:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>non-photographic image</option>
+				<option value="a" selected="selected">non-photographic image</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">non-photographic image</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>photographic image</option>
+				<option value="b" selected="selected">photographic image</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">photographic image</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>remote sensing image</option>
+				<option value="c" selected="selected">remote sensing image</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">remote sensing image</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -42,6 +40,7 @@
 	    self.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tmpl
index 2438388..5497d56 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124b.tmpl
@@ -1,80 +1,78 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 124b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 124b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 124b builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Form of Cartographic Item:</td>
+		<td><label for="f1">Form of Cartographic Item:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
             
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>atlas</option>
+				<option value="a" selected="selected">atlas</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">atlas</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>diagram</option>
+				<option value="b" selected="selected">diagram</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">diagram</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>globe</option>
+				<option value="c" selected="selected">globe</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">globe</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>map</option>
+				<option value="d" selected="selected">map</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>model</option>
+				<option value="e" selected="selected">model</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">model</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>profile</option>
+				<option value="f" selected="selected">profile</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">profile</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>remote sensing image</option>
+				<option value="g" selected="selected">remote sensing image</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">remote sensing image</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>section</option>
+				<option value="h" selected="selected">section</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">section</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1i" -->
-				<option value="i" SELECTED>view</option>
+				<option value="i" selected="selected">view</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">view</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1j" -->
-				<option value="j" SELECTED>plan</option>
+				<option value="j" selected="selected">plan</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">plan</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -83,6 +81,7 @@
 	    self.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tmpl
index 92ea74c..256f1d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124c.tmpl
@@ -1,135 +1,133 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 124c builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 124c builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 124c builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>  Presentation Technique for Photographic or Non-Photographic Image:</td>
+		<td><label for="f1">  Presentation Technique for Photographic or Non-Photographic Image:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 
 			<!-- TMPL_IF name="f1aa" -->
-				<option value="aa" SELECTED>anaglyphic</option>
+				<option value="aa" selected="selected">anaglyphic</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">anaglyphic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ab" -->
-				<option value="ab" SELECTED>polarized</option>
+				<option value="ab" selected="selected">polarized</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">polarized</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ac" -->
-				<option value="ac" SELECTED>planimetric</option>
+				<option value="ac" selected="selected">planimetric</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">planimetric</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ad" -->
-				<option value="ad" SELECTED>diagram map</option>
+				<option value="ad" selected="selected">diagram map</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">diagram map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ae" -->
-				<option value="ae" SELECTED>flowline map, flow map</option>
+				<option value="ae" selected="selected">flowline map, flow map</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">flowline map, flow map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1af" -->
-				<option value="af" SELECTED>dot map</option>
+				<option value="af" selected="selected">dot map</option>
 			<!-- TMPL_ELSE -->
 				<option value="af">dot map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ag" -->
-				<option value="ag" SELECTED>diagrammatric map</option>
+				<option value="ag" selected="selected">diagrammatric map</option>
 			<!-- TMPL_ELSE -->
 				<option value="ag">diagrammatric map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ah" -->
-				<option value="ah" SELECTED>choropleth</option>
+				<option value="ah" selected="selected">choropleth</option>
 			<!-- TMPL_ELSE -->
 				<option value="ah">choropleth</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ai" -->
-				<option value="ai" SELECTED>chorochromatic</option>
+				<option value="ai" selected="selected">chorochromatic</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai">chorochromatic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1aj" -->
-				<option value="aj" SELECTED>dasymetric</option>
+				<option value="aj" selected="selected">dasymetric</option>
 			<!-- TMPL_ELSE -->
 				<option value="aj">dasymetric</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ak" -->
-				<option value="ak" SELECTED>isopleth</option>
+				<option value="ak" selected="selected">isopleth</option>
 			<!-- TMPL_ELSE -->
 				<option value="ak">isopleth</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1am" -->
-				<option value="am" SELECTED>anamorphic</option>
+				<option value="am" selected="selected">anamorphic</option>
 			<!-- TMPL_ELSE -->
 				<option value="am">anamorphic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1an" -->
-				<option value="an" SELECTED>pictorial map</option>
+				<option value="an" selected="selected">pictorial map</option>
 			<!-- TMPL_ELSE -->
 				<option value="an">pictorial map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ao" -->
-				<option value="ao" SELECTED>spatial model on two dimensional surface</option>
+				<option value="ao" selected="selected">spatial model on two dimensional surface</option>
 			<!-- TMPL_ELSE -->
 				<option value="ao">spatial model on two dimensional surface</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ap" -->
-				<option value="ap" SELECTED>mental or cognitive map</option>
+				<option value="ap" selected="selected">mental or cognitive map</option>
 			<!-- TMPL_ELSE -->
 				<option value="ap">mental or cognitive map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1aq" -->
-				<option value="aq" SELECTED>views with horizon showing</option>
+				<option value="aq" selected="selected">views with horizon showing</option>
 			<!-- TMPL_ELSE -->
 				<option value="aq">views with horizon showing</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ar" -->
-				<option value="ar" SELECTED>views without horizon showing</option>
+				<option value="ar" selected="selected">views without horizon showing</option>
 			<!-- TMPL_ELSE -->
 				<option value="ar">views without horizon showing</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1as" -->
-				<option value="as" SELECTED>map view</option>
+				<option value="as" selected="selected">map view</option>
 			<!-- TMPL_ELSE -->
 				<option value="as">map view</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1da" -->
-				<option value="da" SELECTED>picto map</option>
+				<option value="da" selected="selected">picto map</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">picto map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1db" -->
-				<option value="db" SELECTED>random dot map</option>
+				<option value="db" selected="selected">random dot map</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">random dot map</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1dc" -->
-				<option value="dc" SELECTED>screened</option>
+				<option value="dc" selected="selected">screened</option>
 			<!-- TMPL_ELSE -->
 				<option value="dc">screened</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1dd" -->
-				<option value="dd" SELECTED>not screened</option>
+				<option value="dd" selected="selected">not screened</option>
 			<!-- TMPL_ELSE -->
 				<option value="dd">not screened</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -137,6 +135,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tmpl
index db96601..735d37b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124d.tmpl
@@ -1,39 +1,37 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 124d builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 124d builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 124d builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Position of Platform for Photographic or Remote Sensing Image:</td>
+		<td><label for="f1">Position of Platform for Photographic or Remote Sensing Image:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>terrestrial</option>
+				<option value="a" selected="selected">terrestrial</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">terrestrial</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>aerial</option>
+				<option value="b" selected="selected">aerial</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">aerial</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>space</option>
+				<option value="c" selected="selected">space</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">space</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -41,6 +39,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tmpl
index 6762425..dd966cf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124e.tmpl
@@ -1,40 +1,38 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 124e builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 124e builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 124e builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Category of Satellite for Remote Sensing Image:</td>
+		<td><label for="f1">Category of Satellite for Remote Sensing Image:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>meteorological</option>
+				<option value="a" selected="selected">meteorological</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">meteorological</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>earth resources</option>
+				<option value="b" selected="selected">earth resources</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">earth resources</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>space observing</option>
+				<option value="c" selected="selected">space observing</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">space observing</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onclick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
 	    var doc     = opener.document; 
             var field   = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -42,6 +40,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tmpl
index aba2bf3..50e2e53 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124f.tmpl
@@ -1,114 +1,112 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 124f builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 124f builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 124f builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Name of Satellite for Remote Sensing Image:</td>
+		<td><label for="f1">Name of Satellite for Remote Sensing Image:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1aa" -->
-				<option value="aa" SELECTED>Tiros</option>
+				<option value="aa" selected="selected">Tiros</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">Tiros</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ab" -->
-				<option value="ab" SELECTED>ATS</option>
+				<option value="ab" selected="selected">ATS</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">ATS</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ac" -->
-				<option value="ac" SELECTED>NOAA</option>
+				<option value="ac" selected="selected">NOAA</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">NOAA</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ad" -->
-				<option value="ad" SELECTED>Nimbus</option>
+				<option value="ad" selected="selected">Nimbus</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">Nimbus</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ae" -->
-				<option value="ae" SELECTED>METEOSAT</option>
+				<option value="ae" selected="selected">METEOSAT</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">METEOSAT</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ma" -->
-				<option value="ma" SELECTED>Explorer I</option>
+				<option value="ma" selected="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>
+				<option value="mb" selected="selected">Explorer II</option>
 			<!-- TMPL_ELSE -->
 				<option value="mb">Explorer II</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ga" -->
-				<option value="ga" SELECTED>ERTS</option>
+				<option value="ga" selected="selected">ERTS</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">ERTS</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gb" -->
-				<option value="gb" SELECTED>Landsat I</option>
+				<option value="gb" selected="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>
+				<option value="gc" selected="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>
+				<option value="gd" selected="selected">Landsat III</option>
 			<!-- TMPL_ELSE -->
 				<option value="gd">Landsat III</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ge" -->
-				<option value="ge" SELECTED>Seasat</option>
+				<option value="ge" selected="selected">Seasat</option>
 			<!-- TMPL_ELSE -->
 				<option value="ge">Seasat</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gf" -->
-				<option value="gf" SELECTED>Skylab</option>
+				<option value="gf" selected="selected">Skylab</option>
 			<!-- TMPL_ELSE -->
 				<option value="gf">Skylab</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gg" -->
-				<option value="gg" SELECTED>Spacelab</option>
+				<option value="gg" selected="selected">Spacelab</option>
 			<!-- TMPL_ELSE -->
 				<option value="gg">Spacelab</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gk" -->
-				<option value="gk" SELECTED>Spot 1</option>
+				<option value="gk" selected="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>
+				<option value="gl" selected="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>
+				<option value="gm" selected="selected">Spot 3</option>
 			<!-- TMPL_ELSE -->
 				<option value="gm">Spot 3</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gz" -->
-				<option value="gz" SELECTED>other</option>
+				<option value="gz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="gz">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -116,6 +114,7 @@
 	    self.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tmpl
index fbb3a7b..2d8e9af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_124g.tmpl
@@ -1,75 +1,73 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 124g builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 124g builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 124g builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Recording Technique for Remote Sensing Image:</td>
+		<td><label for="f1">Recording Technique for Remote Sensing Image:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 
 			<!-- TMPL_IF name="f1aa" -->
-				<option value="aa" SELECTED>video recording</option>
+				<option value="aa" selected="selected">video recording</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">video recording</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ab" -->
-				<option value="ab" SELECTED>false colour photography</option>
+				<option value="ab" selected="selected">false colour photography</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">false colour photography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ac" -->
-				<option value="ac" SELECTED>multispectral photography</option>
+				<option value="ac" selected="selected">multispectral photography</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">multispectral photography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ad" -->
-				<option value="ad" SELECTED>multispectral scanning</option>
+				<option value="ad" selected="selected">multispectral scanning</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">multispectral scanning</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1av" -->
-				<option value="av" SELECTED>combination of various light emission techniques</option>
+				<option value="av" selected="selected">combination of various light emission techniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="av">combination of various light emission techniques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1da" -->
-				<option value="da" SELECTED>infrared line scanning</option>
+				<option value="da" selected="selected">infrared line scanning</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">infrared line scanning</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1dv" -->
-				<option value="dv" SELECTED>combination of various thermal infrared scanning</option>
+				<option value="dv" selected="selected">combination of various thermal infrared scanning</option>
 			<!-- TMPL_ELSE -->
 				<option value="dv">combination of various thermal infrared scanning</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ga" -->
-				<option value="ga" SELECTED>Sidelooking Airbone Radar</option>
+				<option value="ga" selected="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>
+				<option value="gb" selected="selected">Synthetic Aperture Radar</option>
 			<!-- TMPL_ELSE -->
 				<option value="gb">Synthetic Aperture Radar</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gc" -->
-				<option value="gc" SELECTED>passive microwave mapping</option>
+				<option value="gc" selected="selected">passive microwave mapping</option>
 			<!-- TMPL_ELSE -->
 				<option value="gc">passive microwave mapping</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -77,6 +75,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tmpl
index 1321972..edd78af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125a.tmpl
@@ -1,142 +1,140 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 125a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 125a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 125a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Type of Score:</td>
+		<td><label for="f1">Type of Score:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>full score, graphic score</option>
+				<option value="a" selected="selected">full score, graphic score</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">full score, graphic score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>score (miniature or study size)</option>
+				<option value="b" selected="selected">score (miniature or study size)</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">score (miniature or study size)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>vocal score, accompaniment reduced for keyboard</option>
+				<option value="c" selected="selected">vocal score, accompaniment reduced for keyboard</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">vocal score, accompaniment reduced for keyboard</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>voice score, chorus score, accompaniment has been dropped</option>
+				<option value="d" selected="selected">voice score, chorus score, accompaniment has been dropped</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">voice score, chorus score, accompaniment has been dropped</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>condensed score, pianoconductor score</option>
+				<option value="e" selected="selected">condensed score, pianoconductor score</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">condensed score, pianoconductor score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>graphic score</option>
+				<option value="f" selected="selected">graphic score</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">graphic score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>close score (e.g. hymnals)</option>
+				<option value="g" selected="selected">close score (e.g. hymnals)</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">close score (e.g. hymnals)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>tablature</option>
+				<option value="h" selected="selected">tablature</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">tablature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1i" -->
-				<option value="i" SELECTED>choir-book</option>
+				<option value="i" selected="selected">choir-book</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">choir-book</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1j" -->
-				<option value="j" SELECTED>compressed score</option>
+				<option value="j" selected="selected">compressed score</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">compressed score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1k" -->
-				<option value="k" SELECTED>pseudo-score</option>
+				<option value="k" selected="selected">pseudo-score</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">pseudo-score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1l" -->
-				<option value="l" SELECTED>solo part</option>
+				<option value="l" selected="selected">solo part</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">solo part</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1m" -->
-				<option value="m" SELECTED>multiple formats</option>
+				<option value="m" selected="selected">multiple formats</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">multiple formats</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1x" -->
-				<option value="x" SELECTED>not applicable, not a score</option>
+				<option value="x" selected="selected">not applicable, not a score</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable, not a score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Parts Indicator:</td>
+		<td><label for="f2">Parts Indicator:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>parts exist (vocal and instrumental)</option>
+				<option value="a" selected="selected">parts exist (vocal and instrumental)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">parts exist (vocal and instrumental)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>instrumental parts</option>
+				<option value="b" selected="selected">instrumental parts</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">instrumental parts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>vocal parts</option>
+				<option value="c" selected="selected">vocal parts</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">vocal parts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2y" -->
-				<option value="y" SELECTED>parts not present</option>
+				<option value="y" selected="selected">parts not present</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">parts not present</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -144,7 +142,8 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
 
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tmpl
index c3188b4..520a13d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_125b.tmpl
@@ -1,134 +1,132 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 125b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 125b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 125b builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Literary Text Indicator:</td>
+		<td><label for="f1">Literary Text Indicator:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>poetry</option>
+				<option value="a" selected="selected">poetry</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">poetry</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>drama</option>
+				<option value="b" selected="selected">drama</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">drama</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>fiction</option>
+				<option value="c" selected="selected">fiction</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">fiction</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>history</option>
+				<option value="d" selected="selected">history</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">history</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>lectures, speeches</option>
+				<option value="e" selected="selected">lectures, speeches</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">lectures, speeches</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>instructions</option>
+				<option value="f" selected="selected">instructions</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">instructions</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>sounds</option>
+				<option value="g" selected="selected">sounds</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">sounds</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>autobiography</option>
+				<option value="h" selected="selected">autobiography</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">autobiography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1i" -->
-				<option value="i" SELECTED>biography</option>
+				<option value="i" selected="selected">biography</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">biography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1j" -->
-				<option value="j" SELECTED>essays</option>
+				<option value="j" selected="selected">essays</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">essays</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1k" -->
-				<option value="k" SELECTED>reporting</option>
+				<option value="k" selected="selected">reporting</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">reporting</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1l" -->
-				<option value="l" SELECTED>memoirs</option>
+				<option value="l" selected="selected">memoirs</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">memoirs</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1m" -->
-				<option value="m" SELECTED>rehearsals</option>
+				<option value="m" selected="selected">rehearsals</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">rehearsals</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1n" -->
-				<option value="n" SELECTED>interviews</option>
+				<option value="n" selected="selected">interviews</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">interviews</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1o" -->
-				<option value="o" SELECTED>advertising texts</option>
+				<option value="o" selected="selected">advertising texts</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">advertising texts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1p" -->
-				<option value="p" SELECTED>instruction (language)</option>
+				<option value="p" selected="selected">instruction (language)</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">instruction (language)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1q" -->
-				<option value="q" SELECTED>conference proceedings</option>
+				<option value="q" selected="selected">conference proceedings</option>
 			<!-- TMPL_ELSE -->
 				<option value="q">conference proceedings</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1r" -->
-				<option value="r" SELECTED>comedy</option>
+				<option value="r" selected="selected">comedy</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">comedy</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1s" -->
-				<option value="s" SELECTED>folktales</option>
+				<option value="s" selected="selected">folktales</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">folktales</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1t" -->
-				<option value="t" SELECTED>sacred texts</option>
+				<option value="t" selected="selected">sacred texts</option>
 			<!-- TMPL_ELSE -->
 				<option value="t">sacred texts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other types of literary text</option>
+				<option value="z" selected="selected">other types of literary text</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other types of literary text</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -137,6 +135,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tmpl
index dd57f32..5ab4812 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126a.tmpl
@@ -1,1035 +1,1033 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 126a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 126a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 126a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Form of release:</td>
+		<td><label for="f1">Form of release:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>disc</option>
+				<option value="a" selected="selected">disc</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">disc</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>tape (open reel)</option>
+				<option value="b" selected="selected">tape (open reel)</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">tape (open reel)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>tape (cassette)</option>
+				<option value="c" selected="selected">tape (cassette)</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">tape (cassette)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>tape (cartridge)</option>
+				<option value="d" selected="selected">tape (cartridge)</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">tape (cartridge)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>wire recording</option>
+				<option value="e" selected="selected">wire recording</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">wire recording</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>cylinder</option>
+				<option value="f" selected="selected">cylinder</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">cylinder</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>roll</option>
+				<option value="g" selected="selected">roll</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">roll</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>film (sound film)</option>
+				<option value="h" selected="selected">film (sound film)</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">film (sound film)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Speed:</td>
+		<td><label for="f2">Speed:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>16 2/3 rpm</option>
+				<option value="a" selected="selected">16 2/3 rpm</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">16 2/3 rpm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>33 1/3 rpm</option>
+				<option value="b" selected="selected">33 1/3 rpm</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">33 1/3 rpm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>45 rpm</option>
+				<option value="c" selected="selected">45 rpm</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">45 rpm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>78 rpm</option>
+				<option value="d" selected="selected">78 rpm</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">78 rpm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>8 rpm</option>
+				<option value="e" selected="selected">8 rpm</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">8 rpm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2g" -->
-				<option value="g" SELECTED>1.4 m/sec(compact discs)</option>
+				<option value="g" selected="selected">1.4 m/sec(compact discs)</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">1.4 m/sec(compact discs)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2h" -->
-				<option value="h" SELECTED>120 rpm</option>
+				<option value="h" selected="selected">120 rpm</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">120 rpm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2i" -->
-				<option value="i" SELECTED>160 rpm</option>
+				<option value="i" selected="selected">160 rpm</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">160 rpm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2k" -->
-				<option value="k" SELECTED>1 7/8 in. per second</option>
+				<option value="k" selected="selected">1 7/8 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">1 7/8 in. per second</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2l" -->
-				<option value="l" SELECTED>15/16 in. per second</option>
+				<option value="l" selected="selected">15/16 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">15/16 in. per second</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2m" -->
-				<option value="m" SELECTED>3 3/4 in. per second</option>
+				<option value="m" selected="selected">3 3/4 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">3 3/4 in. per second</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2n" -->
-				<option value="n" SELECTED>7 1/2 in. per second</option>
+				<option value="n" selected="selected">7 1/2 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">7 1/2 in. per second</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2o" -->
-				<option value="o" SELECTED>15 in. per second</option>
+				<option value="o" selected="selected">15 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">15 in. per second</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2p" -->
-				<option value="p" SELECTED>30 in. per second</option>
+				<option value="p" selected="selected">30 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="p">30 in. per second</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2q" -->
-				<option value="q" SELECTED>8/10 in. per second</option>
+				<option value="q" selected="selected">8/10 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="q">8/10 in. per second</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2r" -->
-				<option value="r" SELECTED>4/10 in. per second</option>
+				<option value="r" selected="selected">4/10 in. per second</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">4/10 in. per second</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Kind of sound:</td>
+		<td><label for="f3">Kind of sound:</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>monoaural</option>
+				<option value="a" selected="selected">monoaural</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">monoaural</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>stereophonic</option>
+				<option value="b" selected="selected">stereophonic</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">stereophonic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3c" -->
-				<option value="c" SELECTED>quadraphonic</option>
+				<option value="c" selected="selected">quadraphonic</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">quadraphonic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Groove width:</td>
+		<td><label for="f4">Groove width:</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>coarse/standard</option>
+				<option value="a" selected="selected">coarse/standard</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">coarse/standard</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>microgroove/fine</option>
+				<option value="b" selected="selected">microgroove/fine</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">microgroove/fine</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Dimensions (sound recordings):</td>
+		<td><label for="f5">Dimensions (sound recordings):</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>7.62cm or 3 in.</option>
+				<option value="a" selected="selected">7.62cm or 3 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">7.62cm or 3 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5b" -->
-				<option value="b" SELECTED>12.7 cm or 5 in.</option>
+				<option value="b" selected="selected">12.7 cm or 5 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">12.7 cm or 5 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>17.78 cm or 7 in.</option>
+				<option value="c" selected="selected">17.78 cm or 7 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">17.78 cm or 7 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" SELECTED>25.4 cm or 10 in.</option>
+				<option value="d" selected="selected">25.4 cm or 10 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">25.4 cm or 10 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5e" -->
-				<option value="e" SELECTED>30,48 cm or 12 in.</option>
+				<option value="e" selected="selected">30,48 cm or 12 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">30,48 cm or 12 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5f" -->
-				<option value="f" SELECTED>40.64 cm or 16 in.</option>
+				<option value="f" selected="selected">40.64 cm or 16 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">40.64 cm or 16 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5g" -->
-				<option value="g" SELECTED>35.56 cm or 14 in.</option>
+				<option value="g" selected="selected">35.56 cm or 14 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">35.56 cm or 14 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5h" -->
-				<option value="h" SELECTED>12 cm or 4 in. 3/4</option>
+				<option value="h" selected="selected">12 cm or 4 in. 3/4</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">12 cm or 4 in. 3/4</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5j" -->
-				<option value="j" SELECTED>10 cm x 6.3 cm or 3 in. 7/8 x 2 in. 1/2</option>
+				<option value="j" selected="selected">10 cm x 6.3 cm or 3 in. 7/8 x 2 in. 1/2</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">10 cm x 6.3 cm or 3 in. 7/8 x 2 in. 1/2</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5o" -->
-				<option value="o" SELECTED>13.2 cm x 9.7 cm or 5 in. 1/4 x 3 in. 7/8</option>
+				<option value="o" selected="selected">13.2 cm x 9.7 cm or 5 in. 1/4 x 3 in. 7/8</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">13.2 cm x 9.7 cm or 5 in. 1/4 x 3 in. 7/8</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5s" -->
-				<option value="s" SELECTED>5.7 cm x 10 cm or 2 in. 1/4 x 4 in., cylinder</option>
+				<option value="s" selected="selected">5.7 cm x 10 cm or 2 in. 1/4 x 4 in., cylinder</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">5.7 cm x 10 cm or 2 in. 1/4 x 4 in., cylinder</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Tape width:</td>
+		<td><label for="f6">Tape width:</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>1/4 in.</option>
+				<option value="a" selected="selected">1/4 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">1/4 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6b" -->
-				<option value="b" SELECTED>1/2 in.</option>
+				<option value="b" selected="selected">1/2 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">1/2 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6c" -->
-				<option value="c" SELECTED>1 in.</option>
+				<option value="c" selected="selected">1 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">1 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6d" -->
-				<option value="d" SELECTED>1/8 in.</option>
+				<option value="d" selected="selected">1/8 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">1/8 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6e" -->
-				<option value="e" SELECTED>2 in.</option>
+				<option value="e" selected="selected">2 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">2 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6f" -->
-				<option value="f" SELECTED>1/3 in. (8 mm)</option>
+				<option value="f" selected="selected">1/3 in. (8 mm)</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">1/3 in. (8 mm)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6x" -->
-				<option value="x" SELECTED>recording not a tape</option>
+				<option value="x" selected="selected">recording not a tape</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">recording not a tape</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Tape configuration:</td>
+		<td><label for="f7">Tape configuration:</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>full track</option>
+				<option value="a" selected="selected">full track</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">full track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" SELECTED>half track</option>
+				<option value="b" selected="selected">half track</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">half track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>quarter track</option>
+				<option value="c" selected="selected">quarter track</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">quarter track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>eight track</option>
+				<option value="d" selected="selected">eight track</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">eight track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7e" -->
-				<option value="e" SELECTED>twelve track</option>
+				<option value="e" selected="selected">twelve track</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">twelve track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7f" -->
-				<option value="f" SELECTED>sixteen track</option>
+				<option value="f" selected="selected">sixteen track</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">sixteen track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7g" -->
-				<option value="g" SELECTED>twentyfour track</option>
+				<option value="g" selected="selected">twentyfour track</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">twentyfour track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7h" -->
-				<option value="h" SELECTED>six track</option>
+				<option value="h" selected="selected">six track</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">six track</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>recording not a tape</option>
+				<option value="x" selected="selected">recording not a tape</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">recording not a tape</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Accompanying textual material 1:</td>
+		<td><label for="f8">Accompanying textual material 1:</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8a" -->
-				<option value="a" SELECTED>discography</option>
+				<option value="a" selected="selected">discography</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">discography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8b" -->
-				<option value="b" SELECTED>bibliography</option>
+				<option value="b" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8c" -->
-				<option value="c" SELECTED>thematic index</option>
+				<option value="c" selected="selected">thematic index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">thematic index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8d" -->
-				<option value="d" SELECTED>libretto or text</option>
+				<option value="d" selected="selected">libretto or text</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">libretto or text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8e" -->
-				<option value="e" SELECTED>biography of composer</option>
+				<option value="e" selected="selected">biography of composer</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">biography of composer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8f" -->
-				<option value="f" SELECTED>biography of performer or history of ensemble</option>
+				<option value="f" selected="selected">biography of performer or history of ensemble</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">biography of performer or history of ensemble</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8g" -->
-				<option value="g" SELECTED>technical or historical information on instruments</option>
+				<option value="g" selected="selected">technical or historical information on instruments</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">technical or historical information on instruments</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8h" -->
-				<option value="h" SELECTED>technical information on music</option>
+				<option value="h" selected="selected">technical information on music</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">technical information on music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8i" -->
-				<option value="i" SELECTED>historical information about music</option>
+				<option value="i" selected="selected">historical information about music</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">historical information about music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8j" -->
-				<option value="j" SELECTED>other historical information</option>
+				<option value="j" selected="selected">other historical information</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">other historical information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8k" -->
-				<option value="k" SELECTED>ethnological information</option>
+				<option value="k" selected="selected">ethnological information</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">ethnological information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8l" -->
-				<option value="l" SELECTED>biography of arranger or transcriber</option>
+				<option value="l" selected="selected">biography of arranger or transcriber</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">biography of arranger or transcriber</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8r" -->
-				<option value="r" SELECTED>instructional material</option>
+				<option value="r" selected="selected">instructional material</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">instructional material</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8s" -->
-				<option value="s" SELECTED>score</option>
+				<option value="s" selected="selected">score</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8z" -->
-				<option value="z" SELECTED>other accompanying textual material</option>
+				<option value="z" selected="selected">other accompanying textual material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying textual material</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Accompanying textual material 2:</td>
+		<td><label for="f9">Accompanying textual material 2:</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
 			
 			<!-- TMPL_IF name="f9 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9a" -->
-				<option value="a" SELECTED>discography</option>
+				<option value="a" selected="selected">discography</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">discography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9b" -->
-				<option value="b" SELECTED>bibliography</option>
+				<option value="b" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9c" -->
-				<option value="c" SELECTED>thematic index</option>
+				<option value="c" selected="selected">thematic index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">thematic index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9d" -->
-				<option value="d" SELECTED>libretto or text</option>
+				<option value="d" selected="selected">libretto or text</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">libretto or text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9e" -->
-				<option value="e" SELECTED>biography of composer</option>
+				<option value="e" selected="selected">biography of composer</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">biography of composer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9f" -->
-				<option value="f" SELECTED>biography of performer or history of ensemble</option>
+				<option value="f" selected="selected">biography of performer or history of ensemble</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">biography of performer or history of ensemble</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9g" -->
-				<option value="g" SELECTED>technical or historical information on instruments</option>
+				<option value="g" selected="selected">technical or historical information on instruments</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">technical or historical information on instruments</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9h" -->
-				<option value="h" SELECTED>technical information on music</option>
+				<option value="h" selected="selected">technical information on music</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">technical information on music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9i" -->
-				<option value="i" SELECTED>historical information about music</option>
+				<option value="i" selected="selected">historical information about music</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">historical information about music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9j" -->
-				<option value="j" SELECTED>other historical information</option>
+				<option value="j" selected="selected">other historical information</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">other historical information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9k" -->
-				<option value="k" SELECTED>ethnological information</option>
+				<option value="k" selected="selected">ethnological information</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">ethnological information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9l" -->
-				<option value="l" SELECTED>biography of arranger or transcriber</option>
+				<option value="l" selected="selected">biography of arranger or transcriber</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">biography of arranger or transcriber</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9r" -->
-				<option value="r" SELECTED>instructional material</option>
+				<option value="r" selected="selected">instructional material</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">instructional material</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9s" -->
-				<option value="s" SELECTED>score</option>
+				<option value="s" selected="selected">score</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9z" -->
-				<option value="z" SELECTED>other accompanying textual material</option>
+				<option value="z" selected="selected">other accompanying textual material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying textual material</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Accompanying textual material 3:</td>
+		<td><label for="f10">Accompanying textual material 3:</label></td>
 		<td>
-			<select name="f10" size="1">
+			<select name="f10" id="f10" size="1">
 			
 			<!-- TMPL_IF name="f10 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10a" -->
-				<option value="a" SELECTED>discography</option>
+				<option value="a" selected="selected">discography</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">discography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10b" -->
-				<option value="b" SELECTED>bibliography</option>
+				<option value="b" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10c" -->
-				<option value="c" SELECTED>thematic index</option>
+				<option value="c" selected="selected">thematic index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">thematic index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10d" -->
-				<option value="d" SELECTED>libretto or text</option>
+				<option value="d" selected="selected">libretto or text</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">libretto or text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10e" -->
-				<option value="e" SELECTED>biography of composer</option>
+				<option value="e" selected="selected">biography of composer</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">biography of composer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10f" -->
-				<option value="f" SELECTED>biography of performer or history of ensemble</option>
+				<option value="f" selected="selected">biography of performer or history of ensemble</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">biography of performer or history of ensemble</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10g" -->
-				<option value="g" SELECTED>technical or historical information on instruments</option>
+				<option value="g" selected="selected">technical or historical information on instruments</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">technical or historical information on instruments</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10h" -->
-				<option value="h" SELECTED>technical information on music</option>
+				<option value="h" selected="selected">technical information on music</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">technical information on music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10i" -->
-				<option value="i" SELECTED>historical information about music</option>
+				<option value="i" selected="selected">historical information about music</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">historical information about music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10j" -->
-				<option value="j" SELECTED>other historical information</option>
+				<option value="j" selected="selected">other historical information</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">other historical information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10k" -->
-				<option value="k" SELECTED>ethnological information</option>
+				<option value="k" selected="selected">ethnological information</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">ethnological information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10l" -->
-				<option value="l" SELECTED>biography of arranger or transcriber</option>
+				<option value="l" selected="selected">biography of arranger or transcriber</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">biography of arranger or transcriber</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10r" -->
-				<option value="r" SELECTED>instructional material</option>
+				<option value="r" selected="selected">instructional material</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">instructional material</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10s" -->
-				<option value="s" SELECTED>score</option>
+				<option value="s" selected="selected">score</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10z" -->
-				<option value="z" SELECTED>other accompanying textual material</option>
+				<option value="z" selected="selected">other accompanying textual material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying textual material</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Accompanying textual material 4:</td>
+		<td><label for="f11">Accompanying textual material 4:</label></td>
 		<td>
-			<select name="f11" size="1">
+			<select name="f11" id="f11" size="1">
 			
 			<!-- TMPL_IF name="f11 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11a" -->
-				<option value="a" SELECTED>discography</option>
+				<option value="a" selected="selected">discography</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">discography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11b" -->
-				<option value="b" SELECTED>bibliography</option>
+				<option value="b" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11c" -->
-				<option value="c" SELECTED>thematic index</option>
+				<option value="c" selected="selected">thematic index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">thematic index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11d" -->
-				<option value="d" SELECTED>libretto or text</option>
+				<option value="d" selected="selected">libretto or text</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">libretto or text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11e" -->
-				<option value="e" SELECTED>biography of composer</option>
+				<option value="e" selected="selected">biography of composer</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">biography of composer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11f" -->
-				<option value="f" SELECTED>biography of performer or history of ensemble</option>
+				<option value="f" selected="selected">biography of performer or history of ensemble</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">biography of performer or history of ensemble</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11g" -->
-				<option value="g" SELECTED>technical or historical information on instruments</option>
+				<option value="g" selected="selected">technical or historical information on instruments</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">technical or historical information on instruments</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11h" -->
-				<option value="h" SELECTED>technical information on music</option>
+				<option value="h" selected="selected">technical information on music</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">technical information on music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11i" -->
-				<option value="i" SELECTED>historical information about music</option>
+				<option value="i" selected="selected">historical information about music</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">historical information about music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11j" -->
-				<option value="j" SELECTED>other historical information</option>
+				<option value="j" selected="selected">other historical information</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">other historical information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11k" -->
-				<option value="k" SELECTED>ethnological information</option>
+				<option value="k" selected="selected">ethnological information</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">ethnological information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11l" -->
-				<option value="l" SELECTED>biography of arranger or transcriber</option>
+				<option value="l" selected="selected">biography of arranger or transcriber</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">biography of arranger or transcriber</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11r" -->
-				<option value="r" SELECTED>instructional material</option>
+				<option value="r" selected="selected">instructional material</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">instructional material</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11s" -->
-				<option value="s" SELECTED>score</option>
+				<option value="s" selected="selected">score</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11z" -->
-				<option value="z" SELECTED>other accompanying textual material</option>
+				<option value="z" selected="selected">other accompanying textual material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying textual material</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Accompanying textual material 5:</td>
+		<td><label for="f12">Accompanying textual material 5:</label></td>
 		<td>
-			<select name="f12" size="1">
+			<select name="f12" id="f12" size="1">
                         <!-- TMPL_IF NAME="f12 "-->
-                            <option value=" " SELECTED>non required value</option>
+                            <option value=" " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                             <option value=" ">non required value</option>
                         <!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12a" -->
-				<option value="a" SELECTED>discography</option>
+				<option value="a" selected="selected">discography</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">discography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12b" -->
-				<option value="b" SELECTED>bibliography</option>
+				<option value="b" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12c" -->
-				<option value="c" SELECTED>thematic index</option>
+				<option value="c" selected="selected">thematic index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">thematic index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12d" -->
-				<option value="d" SELECTED>libretto or text</option>
+				<option value="d" selected="selected">libretto or text</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">libretto or text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12e" -->
-				<option value="e" SELECTED>biography of composer</option>
+				<option value="e" selected="selected">biography of composer</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">biography of composer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12f" -->
-				<option value="f" SELECTED>biography of performer or history of ensemble</option>
+				<option value="f" selected="selected">biography of performer or history of ensemble</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">biography of performer or history of ensemble</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12g" -->
-				<option value="g" SELECTED>technical or historical information on instruments</option>
+				<option value="g" selected="selected">technical or historical information on instruments</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">technical or historical information on instruments</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12h" -->
-				<option value="h" SELECTED>technical information on music</option>
+				<option value="h" selected="selected">technical information on music</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">technical information on music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12i" -->
-				<option value="i" SELECTED>historical information about music</option>
+				<option value="i" selected="selected">historical information about music</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">historical information about music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12j" -->
-				<option value="j" SELECTED>other historical information</option>
+				<option value="j" selected="selected">other historical information</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">other historical information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12k" -->
-				<option value="k" SELECTED>ethnological information</option>
+				<option value="k" selected="selected">ethnological information</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">ethnological information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12l" -->
-				<option value="l" SELECTED>biography of arranger or transcriber</option>
+				<option value="l" selected="selected">biography of arranger or transcriber</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">biography of arranger or transcriber</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12r" -->
-				<option value="r" SELECTED>instructional material</option>
+				<option value="r" selected="selected">instructional material</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">instructional material</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12s" -->
-				<option value="s" SELECTED>score</option>
+				<option value="s" selected="selected">score</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12z" -->
-				<option value="z" SELECTED>other accompanying textual material</option>
+				<option value="z" selected="selected">other accompanying textual material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying textual material</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Accompanying textual material 6:</td>
+		<td><label for="f13">Accompanying textual material 6:</label></td>
 		<td>
-			<select name="f13" size="1">
+			<select name="f13" id="f13" size="1">
                         <!-- TMPL_IF NAME="f13 "-->
-                            <option value=" " SELECTED>non required value</option>
+                            <option value=" " selected="selected">non required value</option>
                         <!-- TMPL_ELSE -->
                             <option value=" ">non required value</option>
                         <!-- /TMPL_IF -->
                         
 			<!-- TMPL_IF name="f13a" -->
-				<option value="a" SELECTED>discography</option>
+				<option value="a" selected="selected">discography</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">discography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13b" -->
-				<option value="b" SELECTED>bibliography</option>
+				<option value="b" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13c" -->
-				<option value="c" SELECTED>thematic index</option>
+				<option value="c" selected="selected">thematic index</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">thematic index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13d" -->
-				<option value="d" SELECTED>libretto or text</option>
+				<option value="d" selected="selected">libretto or text</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">libretto or text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13e" -->
-				<option value="e" SELECTED>biography of composer</option>
+				<option value="e" selected="selected">biography of composer</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">biography of composer</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13f" -->
-				<option value="f" SELECTED>biography of performer or history of ensemble</option>
+				<option value="f" selected="selected">biography of performer or history of ensemble</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">biography of performer or history of ensemble</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13g" -->
-				<option value="g" SELECTED>technical or historical information on instruments</option>
+				<option value="g" selected="selected">technical or historical information on instruments</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">technical or historical information on instruments</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13h" -->
-				<option value="h" SELECTED>technical information on music</option>
+				<option value="h" selected="selected">technical information on music</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">technical information on music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13i" -->
-				<option value="i" SELECTED>historical information about music</option>
+				<option value="i" selected="selected">historical information about music</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">historical information about music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13j" -->
-				<option value="j" SELECTED>other historical information</option>
+				<option value="j" selected="selected">other historical information</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">other historical information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13k" -->
-				<option value="k" SELECTED>ethnological information</option>
+				<option value="k" selected="selected">ethnological information</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">ethnological information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13l" -->
-				<option value="l" SELECTED>biography of arranger or transcriber</option>
+				<option value="l" selected="selected">biography of arranger or transcriber</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">biography of arranger or transcriber</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13r" -->
-				<option value="r" SELECTED>instructional material</option>
+				<option value="r" selected="selected">instructional material</option>
 			<!-- TMPL_ELSE -->
 				<option value="r">instructional material</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13s" -->
-				<option value="s" SELECTED>score</option>
+				<option value="s" selected="selected">score</option>
 			<!-- TMPL_ELSE -->
 				<option value="s">score</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13z" -->
-				<option value="z" SELECTED>other accompanying textual material</option>
+				<option value="z" selected="selected">other accompanying textual material</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other accompanying textual material</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Recording technique:</td>
+		<td><label for="f14">Recording technique:</label></td>
 		<td>
-			<select name="f14" size="1">
+			<select name="f14" id="f14" size="1">
 			<!-- TMPL_IF name="f14a" -->
-				<option value="a" SELECTED>acoustic</option>
+				<option value="a" selected="selected">acoustic</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">acoustic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14b" -->
-				<option value="b" SELECTED>electric</option>
+				<option value="b" selected="selected">electric</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">electric</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14c" -->
-				<option value="c" SELECTED>digital</option>
+				<option value="c" selected="selected">digital</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">digital</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Special reproduction characteristics:</td>
+		<td><label for="f15">Special reproduction characteristics:</label></td>
 		<td>
-			<select name="f15" size="1">
+			<select name="f15" id="f15" size="1">
 			<!-- TMPL_IF name="f15a" -->
-				<option value="a" SELECTED>NAB standard</option>
+				<option value="a" selected="selected">NAB standard</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">NAB standard</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15b" -->
-				<option value="b" SELECTED>CCIR/IEC standard</option>
+				<option value="b" selected="selected">CCIR/IEC standard</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">CCIR/IEC standard</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15c" -->
-				<option value="c" SELECTED>DBX processed</option>
+				<option value="c" selected="selected">DBX processed</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">DBX processed</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15d" -->
-				<option value="d" SELECTED>digital (compact disc)</option>
+				<option value="d" selected="selected">digital (compact disc)</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">digital (compact disc)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15e" -->
-				<option value="e" SELECTED>Dolby-A encoded</option>
+				<option value="e" selected="selected">Dolby-A encoded</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">Dolby-A encoded</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15f" -->
-				<option value="f" SELECTED>Dolby-B encoded</option>
+				<option value="f" selected="selected">Dolby-B encoded</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">Dolby-B encoded</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15g" -->
-				<option value="g" SELECTED>Dolby-C encoded</option>
+				<option value="g" selected="selected">Dolby-C encoded</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">Dolby-C encoded</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15h" -->
-				<option value="h" SELECTED>CX encoded</option>
+				<option value="h" selected="selected">CX encoded</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">CX encoded</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -1037,6 +1035,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tmpl
index 639fac6..e43cb39 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_126b.tmpl
@@ -1,178 +1,176 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 126b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 126b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 126b builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Kind of disc, cylinder or tape:</td>
+		<td><label for="f1">Kind of disc, cylinder or tape:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>instantaneous (unique, cut on the spot)</option>
+				<option value="a" selected="selected">instantaneous (unique, cut on the spot)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">instantaneous (unique, cut on the spot)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>mass produced</option>
+				<option value="b" selected="selected">mass produced</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">mass produced</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>master tape</option>
+				<option value="c" selected="selected">master tape</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">master tape</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>tape duplication master</option>
+				<option value="d" selected="selected">tape duplication master</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">tape duplication master</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>disc master (negative)</option>
+				<option value="e" selected="selected">disc master (negative)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">disc master (negative)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>mother (positive)</option>
+				<option value="f" selected="selected">mother (positive)</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">mother (positive)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>stamper (negative)</option>
+				<option value="g" selected="selected">stamper (negative)</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">stamper (negative)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>test pressing</option>
+				<option value="h" selected="selected">test pressing</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">test pressing</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Kind of material:</td>
+		<td><label for="f2">Kind of material:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2g" -->
-				<option value="g" SELECTED>wax (instantaneous)</option>
+				<option value="g" selected="selected">wax (instantaneous)</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">wax (instantaneous)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2h" -->
-				<option value="h" SELECTED>plastic (mass produced)</option>
+				<option value="h" selected="selected">plastic (mass produced)</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">plastic (mass produced)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>lacquered (e.g. acetate)</option>
+				<option value="a" selected="selected">lacquered (e.g. acetate)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">lacquered (e.g. acetate)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>metal (e.g. aluminium)</option>
+				<option value="b" selected="selected">metal (e.g. aluminium)</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">metal (e.g. aluminium)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>shellac pressing</option>
+				<option value="c" selected="selected">shellac pressing</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">shellac pressing</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>plastic pressing</option>
+				<option value="d" selected="selected">plastic pressing</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">plastic pressing</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>metal and plastic (compact discs)</option>
+				<option value="e" selected="selected">metal and plastic (compact discs)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">metal and plastic (compact discs)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2i" -->
-				<option value="i" SELECTED>paper backed</option>
+				<option value="i" selected="selected">paper backed</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">paper backed</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2j" -->
-				<option value="j" SELECTED>acetate</option>
+				<option value="j" selected="selected">acetate</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">acetate</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2k" -->
-				<option value="k" SELECTED>P.V.C.</option>
+				<option value="k" selected="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>
+				<option value="l" selected="selected">polyester</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">polyester</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Kind of cutting:</td>
+		<td><label for="f3">Kind of cutting:</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>lateral or combined cutting</option>
+				<option value="a" selected="selected">lateral or combined cutting</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">lateral or combined cutting</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>vertical (hill and dale) cutting</option>
+				<option value="b" selected="selected">vertical (hill and dale) cutting</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">vertical (hill and dale) cutting</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script>
+<script type="text/javascript">
+//<![CDATA[
 	function report() {
 
 
@@ -183,6 +181,7 @@
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tmpl
index d245e2d..084f771 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_127.tmpl
@@ -1,34 +1,30 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 127 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 127 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 127 builder</h3>
+<form name="f_pop" action="">
 <table>
-<tr>(Complete with 0 on the left)</tr>
-<tr>          <td>Hours:</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>Seconds:</td>
-                         <td><input type="text" name="f3" maxlength=2
-                         size=3
-                   value="<!-- TMPL_VAR name="f3" -->"></td>
+<tr><th colspan="9">(Complete with 0 on the left)</th></tr>
+<tr>          <td><label for="f1">Hours:</label></td>
+                         <td><input type="text" name="f1" id="f1" maxlength="2"
+                         size="3"
+                   value="<!-- TMPL_VAR name="f1" -->" /></td>
+          <td><label for="f2">Minutes:</label></td>
+                         <td><input type="text" name="f2" id="f2" maxlength="2"
+                         size="3"
+                   value="<!-- TMPL_VAR name="f2" -->" /></td>
+          <td><label for="f3">Seconds:</label></td>
+                         <td><input type="text" name="f3" id="f3" maxlength="2"
+                         size="3"
+                   value="<!-- TMPL_VAR name="f3" -->" /></td>
 </tr>
-
-
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script>
+<script type="text/javascript">
+//<![CDATA[
 	function report() {
 document.f_pop.f1.value=document.f_pop.f1.value+'   ';
 document.f_pop.f2.value=document.f_pop.f2.value+'  ';
@@ -48,6 +44,7 @@ document.f_pop.f3.value=document.f_pop.f3.value.substring(0,2);
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tmpl
index a157417..58631be 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128a.tmpl
@@ -1,374 +1,372 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 128a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 128a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 128a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Form of Musical Work:</td>
+		<td><label for="f1">Form of Musical Work:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1ai" -->
-				<option value="ai#" SELECTED>air</option>
+				<option value="ai#" selected="selected">air</option>
 			<!-- TMPL_ELSE -->
 				<option value="ai#">air</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1an" -->
-				<option value="an#" SELECTED>anthem </option>
+				<option value="an#" selected="selected">anthem </option>
 			<!-- TMPL_ELSE -->
 				<option value="an#">anthem </option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ar" -->
-				<option value="ar#" SELECTED>aria</option>
+				<option value="ar#" selected="selected">aria</option>
 			<!-- TMPL_ELSE -->
 				<option value="ar#">aria</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bt" -->
-				<option value="bt#" SELECTED>ballet</option>
+				<option value="bt#" selected="selected">ballet</option>
 			<!-- TMPL_ELSE -->
 				<option value="bt#">ballet</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bd" -->
-				<option value="bd#" SELECTED>ballad</option>
+				<option value="bd#" selected="selected">ballad</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd#">ballad</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bg" -->
-				<option value="bg#" SELECTED>bluegrass</option>
+				<option value="bg#" selected="selected">bluegrass</option>
 			<!-- TMPL_ELSE -->
 				<option value="bg#">bluegrass</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bl" -->
-				<option value="bl#" SELECTED>blues</option>
+				<option value="bl#" selected="selected">blues</option>
 			<!-- TMPL_ELSE -->
 				<option value="bl#">blues</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cb" -->
-				<option value="cb#" SELECTED>chant, non christian</option>
+				<option value="cb#" selected="selected">chant, non christian</option>
 			<!-- TMPL_ELSE -->
 				<option value="cb#">chant, non christian</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cc" -->
-				<option value="cc#" SELECTED>chant, christian</option>
+				<option value="cc#" selected="selected">chant, christian</option>
 			<!-- TMPL_ELSE -->
 				<option value="cc#">chant, christian</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cl" -->
-				<option value="cl#" SELECTED>choral-prelude</option>
+				<option value="cl#" selected="selected">choral-prelude</option>
 			<!-- TMPL_ELSE -->
 				<option value="cl#">choral-prelude</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cg" -->
-				<option value="cg#" SELECTED>concerto grosso</option>
+				<option value="cg#" selected="selected">concerto grosso</option>
 			<!-- TMPL_ELSE -->
 				<option value="cg#">concerto grosso</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ch" -->
-				<option value="ch#" SELECTED>choral</option>
+				<option value="ch#" selected="selected">choral</option>
 			<!-- TMPL_ELSE -->
 				<option value="ch#">choral</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cn" -->
-				<option value="cn#" SELECTED>canon</option>
+				<option value="cn#" selected="selected">canon</option>
 			<!-- TMPL_ELSE -->
 				<option value="cn#">canon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1co" -->
-				<option value="co#" SELECTED>concerto</option>
+				<option value="co#" selected="selected">concerto</option>
 			<!-- TMPL_ELSE -->
 				<option value="co#">concerto</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cp" -->
-				<option value="cp#" SELECTED>chanson, polyphonic</option>
+				<option value="cp#" selected="selected">chanson, polyphonic</option>
 			<!-- TMPL_ELSE -->
 				<option value="cp#">chanson, polyphonic</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cr" -->
-				<option value="cr#" SELECTED>carol</option>
+				<option value="cr#" selected="selected">carol</option>
 			<!-- TMPL_ELSE -->
 				<option value="cr#">carol</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cs" -->
-				<option value="cs#" SELECTED>chance composition / aleatoric music</option>
+				<option value="cs#" selected="selected">chance composition / aleatoric music</option>
 			<!-- TMPL_ELSE -->
 				<option value="cs#">chance composition / aleatoric music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ct" -->
-				<option value="ct#" SELECTED>cantata</option>
+				<option value="ct#" selected="selected">cantata</option>
 			<!-- TMPL_ELSE -->
 				<option value="ct#">cantata</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cy" -->
-				<option value="cy#" SELECTED>country music</option>
+				<option value="cy#" selected="selected">country music</option>
 			<!-- TMPL_ELSE -->
 				<option value="cy#">country music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cz" -->
-				<option value="cz#" SELECTED>canzona</option>
+				<option value="cz#" selected="selected">canzona</option>
 			<!-- TMPL_ELSE -->
 				<option value="cz#">canzona</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1df" -->
-				<option value="df#" SELECTED>danse form</option>
+				<option value="df#" selected="selected">danse form</option>
 			<!-- TMPL_ELSE -->
 				<option value="df#">danse form</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1dv" -->
-				<option value="dv#" SELECTED>divertimento</option>
+				<option value="dv#" selected="selected">divertimento</option>
 			<!-- TMPL_ELSE -->
 				<option value="dv#">divertimento</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1fg" -->
-				<option value="fg#" SELECTED>fugue</option>
+				<option value="fg#" selected="selected">fugue</option>
 			<!-- TMPL_ELSE -->
 				<option value="fg#">fugue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1fm" -->
-				<option value="fm#" SELECTED>folk music</option>
+				<option value="fm#" selected="selected">folk music</option>
 			<!-- TMPL_ELSE -->
 				<option value="fm#">folk music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ft" -->
-				<option value="ft#" SELECTED>fantasia</option>
+				<option value="ft#" selected="selected">fantasia</option>
 			<!-- TMPL_ELSE -->
 				<option value="ft#">fantasia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1gm" -->
-				<option value="gm#" SELECTED>gospel music</option>
+				<option value="gm#" selected="selected">gospel music</option>
 			<!-- TMPL_ELSE -->
 				<option value="gm#">gospel music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1hy" -->
-				<option value="hy#" SELECTED>hymn</option>
+				<option value="hy#" selected="selected">hymn</option>
 			<!-- TMPL_ELSE -->
 				<option value="hy#">hymn</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1in" -->
-				<option value="in#" SELECTED>intermezzo</option>
+				<option value="in#" selected="selected">intermezzo</option>
 			<!-- TMPL_ELSE -->
 				<option value="in#">intermezzo</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1jz" -->
-				<option value="jz#" SELECTED>jazz</option>
+				<option value="jz#" selected="selected">jazz</option>
 			<!-- TMPL_ELSE -->
 				<option value="jz#">jazz</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1li" -->
-				<option value="li#" SELECTED>lied</option>
+				<option value="li#" selected="selected">lied</option>
 			<!-- TMPL_ELSE -->
 				<option value="li#">lied</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1mc" -->
-				<option value="mc#" SELECTED>musical revue and comedy</option>
+				<option value="mc#" selected="selected">musical revue and comedy</option>
 			<!-- TMPL_ELSE -->
 				<option value="mc#">musical revue and comedy</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1md" -->
-				<option value="md#" SELECTED>madrigal</option>
+				<option value="md#" selected="selected">madrigal</option>
 			<!-- TMPL_ELSE -->
 				<option value="md#">madrigal</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1mi" -->
-				<option value="mi#" SELECTED>minuet</option>
+				<option value="mi#" selected="selected">minuet</option>
 			<!-- TMPL_ELSE -->
 				<option value="mi#">minuet</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1mr" -->
-				<option value="mr#" SELECTED>march</option>
+				<option value="mr#" selected="selected">march</option>
 			<!-- TMPL_ELSE -->
 				<option value="mr#">march</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ms" -->
-				<option value="ms#" SELECTED>mass</option>
+				<option value="ms#" selected="selected">mass</option>
 			<!-- TMPL_ELSE -->
 				<option value="ms#">mass</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1mo" -->
-				<option value="mo#" SELECTED>motet</option>
+				<option value="mo#" selected="selected">motet</option>
 			<!-- TMPL_ELSE -->
 				<option value="mo#">motet</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1mp" -->
-				<option value="mp#" SELECTED>moving picture music</option>
+				<option value="mp#" selected="selected">moving picture music</option>
 			<!-- TMPL_ELSE -->
 				<option value="mp#">moving picture music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1mu" -->
-				<option value="mu#" SELECTED>multiple forms</option>
+				<option value="mu#" selected="selected">multiple forms</option>
 			<!-- TMPL_ELSE -->
 				<option value="mu#">multiple forms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1mz" -->
-				<option value="mz#" SELECTED>mazurka</option>
+				<option value="mz#" selected="selected">mazurka</option>
 			<!-- TMPL_ELSE -->
 				<option value="mz#">mazurka</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1nc" -->
-				<option value="nc#" SELECTED>nocturne</option>
+				<option value="nc#" selected="selected">nocturne</option>
 			<!-- TMPL_ELSE -->
 				<option value="nc#">nocturne</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1op" -->
-				<option value="op#" SELECTED>opera</option>
+				<option value="op#" selected="selected">opera</option>
 			<!-- TMPL_ELSE -->
 				<option value="op#">opera</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1or" -->
-				<option value="or#" SELECTED>oratorio</option>
+				<option value="or#" selected="selected">oratorio</option>
 			<!-- TMPL_ELSE -->
 				<option value="or#">oratorio</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ov" -->
-				<option value="ov#" SELECTED>overture</option>
+				<option value="ov#" selected="selected">overture</option>
 			<!-- TMPL_ELSE -->
 				<option value="ov#">overture</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pf" -->
-				<option value="pf#" SELECTED>prelude and fugue</option>
+				<option value="pf#" selected="selected">prelude and fugue</option>
 			<!-- TMPL_ELSE -->
 				<option value="pf#">prelude and fugue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pg" -->
-				<option value="pg#" SELECTED>programme music</option>
+				<option value="pg#" selected="selected">programme music</option>
 			<!-- TMPL_ELSE -->
 				<option value="pg#">programme music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pm" -->
-				<option value="pm#" SELECTED>passion music</option>
+				<option value="pm#" selected="selected">passion music</option>
 			<!-- TMPL_ELSE -->
 				<option value="pm#">passion music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1po" -->
-				<option value="po#" SELECTED>polonaise</option>
+				<option value="po#" selected="selected">polonaise</option>
 			<!-- TMPL_ELSE -->
 				<option value="po#">polonaise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pp" -->
-				<option value="pp#" SELECTED>popular music</option>
+				<option value="pp#" selected="selected">popular music</option>
 			<!-- TMPL_ELSE -->
 				<option value="pp#">popular music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ps" -->
-				<option value="ps#" SELECTED>passacaglia</option>
+				<option value="ps#" selected="selected">passacaglia</option>
 			<!-- TMPL_ELSE -->
 				<option value="ps#">passacaglia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pt" -->
-				<option value="p#" SELECTED>partsong</option>
+				<option value="p#" selected="selected">partsong</option>
 			<!-- TMPL_ELSE -->
 				<option value="pt#">partsong</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pv" -->
-				<option value="pv#" SELECTED>pavan</option>
+				<option value="pv#" selected="selected">pavan</option>
 			<!-- TMPL_ELSE -->
 				<option value="pv#">pavan</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1rc" -->
-				<option value="rc#" SELECTED>rock music</option>
+				<option value="rc#" selected="selected">rock music</option>
 			<!-- TMPL_ELSE -->
 				<option value="rc#">rock music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1rd" -->
-				<option value="rd#" SELECTED>rondo</option>
+				<option value="rd#" selected="selected">rondo</option>
 			<!-- TMPL_ELSE -->
 				<option value="rd#">rondo</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1rg" -->
-				<option value="rg#" SELECTED>ragtime</option>
+				<option value="rg#" selected="selected">ragtime</option>
 			<!-- TMPL_ELSE -->
 				<option value="rg#">ragtime</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ri" -->
-				<option value="ri#" SELECTED>ricercare</option>
+				<option value="ri#" selected="selected">ricercare</option>
 			<!-- TMPL_ELSE -->
 				<option value="ri#">ricercare</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1rp" -->
-				<option value="rp#" SELECTED>rhapsody</option>
+				<option value="rp#" selected="selected">rhapsody</option>
 			<!-- TMPL_ELSE -->
 				<option value="rp#">rhapsody</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1rq" -->
-				<option value="rq#" SELECTED>requiem mass</option>
+				<option value="rq#" selected="selected">requiem mass</option>
 			<!-- TMPL_ELSE -->
 				<option value="rq#">requiem mass</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sg" -->
-				<option value="sg#" SELECTED>song</option>
+				<option value="sg#" selected="selected">song</option>
 			<!-- TMPL_ELSE -->
 				<option value="sg#">song</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1si" -->
-				<option value="si#" SELECTED>sinfonia</option>
+				<option value="si#" selected="selected">sinfonia</option>
 			<!-- TMPL_ELSE -->
 				<option value="si#">sinfonia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sn" -->
-				<option value="sn#" SELECTED>sonata</option>
+				<option value="sn#" selected="selected">sonata</option>
 			<!-- TMPL_ELSE -->
 				<option value="sn#">sonata</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sp" -->
-				<option value="sp#" SELECTED>symphonic poem</option>
+				<option value="sp#" selected="selected">symphonic poem</option>
 			<!-- TMPL_ELSE -->
 				<option value="sp#">symphonic poem</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sq" -->
-				<option value="sq#" SELECTED>square dance</option>
+				<option value="sq#" selected="selected">square dance</option>
 			<!-- TMPL_ELSE -->
 				<option value="sq#">square dance</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1st" -->
-				<option value="st#" SELECTED>study, exercise</option>
+				<option value="st#" selected="selected">study, exercise</option>
 			<!-- TMPL_ELSE -->
 				<option value="st#">study, exercise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1su" -->
-				<option value="su#" SELECTED>suite</option>
+				<option value="su#" selected="selected">suite</option>
 			<!-- TMPL_ELSE -->
 				<option value="su#">suite</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sy" -->
-				<option value="sy#" SELECTED>symphony</option>
+				<option value="sy#" selected="selected">symphony</option>
 			<!-- TMPL_ELSE -->
 				<option value="sy#">symphony</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1tc" -->
-				<option value="tc#" SELECTED>toccata</option>
+				<option value="tc#" selected="selected">toccata</option>
 			<!-- TMPL_ELSE -->
 				<option value="tc#">toccata</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ts" -->
-				<option value="ts#" SELECTED>triosonata</option>
+				<option value="ts#" selected="selected">triosonata</option>
 			<!-- TMPL_ELSE -->
 				<option value="ts#">triosonata</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vr" -->
-				<option value="vr#" SELECTED>variation</option>
+				<option value="vr#" selected="selected">variation</option>
 			<!-- TMPL_ELSE -->
 				<option value="vr#">variation</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wz" -->
-				<option value="wz#" SELECTED>waltz</option>
+				<option value="wz#" selected="selected">waltz</option>
 			<!-- TMPL_ELSE -->
 				<option value="wz#">waltz</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1zz" -->
-				<option value="zz#" SELECTED>other form</option>
+				<option value="zz#" selected="selected">other form</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz#">other form</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
     function report() {
         var doc   = opener.document; 
         var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -376,6 +374,7 @@
         window.close();
         return false;
     }
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tmpl
index 9fd586f..822db8e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128b.tmpl
@@ -1,473 +1,469 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_constructeur champ 128b</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 128b builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 128b builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Instruments ou voix dans un ensemble:</td>
+		<td><label for="f1">Instruments ou voix dans un ensemble:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1|" -->
-            	<option value="|" SELECTED>|- Caract??re de remplissage</option>
+            	<option value="|" selected="selected">|- Caract??re de remplissage</option>
             <!-- TMPL_ELSE -->
             	<option value="|">|- Caract??re de remplissage</option>
             <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1ba" -->
-				<option value="ba" SELECTED>Cor</option>
+				<option value="ba" selected="selected">Cor</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">Cor</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bb" -->
-				<option value="bb" SELECTED>Trompette</option>
+				<option value="bb" selected="selected">Trompette</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">Trompette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bc" -->
-				<option value="bc" SELECTED>Cornet a piston</option>
+				<option value="bc" selected="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>
+				<option value="bd" selected="selected">Trombone</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">Trombone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1be" -->
-				<option value="be" SELECTED>Tuba</option>
+				<option value="be" selected="selected">Tuba</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">Tuba</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bf" -->
-				<option value="bf" SELECTED>Saxophone</option>
+				<option value="bf" selected="selected">Saxophone</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">Saxophone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bt" -->
-				<option value="bt" SELECTED>Ethniques</option>
+				<option value="bt" selected="selected">Ethniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="bt">Ethniques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bu" -->
-				<option value="bu" SELECTED>Non precise (Cuivre)</option>
+				<option value="bu" selected="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>
+				<option value="bz" selected="selected">Autre cuivre</option>
 			<!-- TMPL_ELSE -->
 				<option value="bz">Autre cuivre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ca" -->
-				<option value="ca" SELECTED>Mixtes</option>
+				<option value="ca" selected="selected">Mixtes</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">Mixtes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cb" -->
-				<option value="cb" SELECTED>Femmes </option>
+				<option value="cb" selected="selected">Femmes </option>
 			<!-- TMPL_ELSE -->
 				<option value="cb">Femmes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cc" -->
-				<option value="cc" SELECTED>Hommes</option>
+				<option value="cc" selected="selected">Hommes</option>
 			<!-- TMPL_ELSE -->
 				<option value="cc">Hommes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cd" -->
-				<option value="cd" SELECTED>Enfants</option>
+				<option value="cd" selected="selected">Enfants</option>
 			<!-- TMPL_ELSE -->
 				<option value="cd">Enfants</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ct" -->
-				<option value="ct" SELECTED>Ethniques</option>
+				<option value="ct" selected="selected">Ethniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="ct">Ethniques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cu" -->
-				<option value="cu" SELECTED>Non precise (Choeurs)</option>
+				<option value="cu" selected="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>
+				<option value="oa" selected="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>
+				<option value="ob" selected="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>
+				<option value="oc" selected="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>
+				<option value="od" selected="selected">Fanfare</option>
 			<!-- TMPL_ELSE -->
 				<option value="od">Fanfare</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1oe" -->
-				<option value="oe" SELECTED>Orchestre de danse</option>
+				<option value="oe" selected="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>
+				<option value="of" selected="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>
+				<option value="ot" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="ot">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ou" -->
-				<option value="ou" SELECTED>Non precise (orchestre)</option>
+				<option value="ou" selected="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>
+				<option value="oz" selected="selected">Autre orchestre</option>
 			<!-- TMPL_ELSE -->
 				<option value="oz">Autre orchestre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pa" -->
-				<option value="pa" SELECTED>Tympanon</option>
+				<option value="pa" selected="selected">Tympanon</option>
 			<!-- TMPL_ELSE -->
 				<option value="pa">Tympanon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pb" -->
-				<option value="pb" SELECTED>Xylophone</option>
+				<option value="pb" selected="selected">Xylophone</option>
 			<!-- TMPL_ELSE -->
 				<option value="pb">Xylophone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pc" -->
-				<option value="pc" SELECTED>Marimba</option>
+				<option value="pc" selected="selected">Marimba</option>
 			<!-- TMPL_ELSE -->
 				<option value="pc">Marimba</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pd" -->
-				<option value="pd" SELECTED>Tambour, batterie</option>
+				<option value="pd" selected="selected">Tambour, batterie</option>
 			<!-- TMPL_ELSE -->
 				<option value="pd">Tambour, batterie</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pt" -->
-				<option value="pt" SELECTED>Ethnique</option>
+				<option value="pt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="pt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pu" -->
-				<option value="pu" SELECTED>Non precise (percussion)</option>
+				<option value="pu" selected="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>
+				<option value="pz" selected="selected">Autre percussions</option>
 			<!-- TMPL_ELSE -->
 				<option value="pz">Autre percussions</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sa" -->
-				<option value="sa" SELECTED>Violon</option>
+				<option value="sa" selected="selected">Violon</option>
 			<!-- TMPL_ELSE -->
 				<option value="sa">Violon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sb" -->
-				<option value="sb" SELECTED>Alto</option>
+				<option value="sb" selected="selected">Alto</option>
 			<!-- TMPL_ELSE -->
 				<option value="sb">Alto</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sc" -->
-				<option value="sc" SELECTED>Violoncelle</option>
+				<option value="sc" selected="selected">Violoncelle</option>
 			<!-- TMPL_ELSE -->
 				<option value="sc">Violoncelle</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sd" -->
-				<option value="sd" SELECTED>Contrebasse</option>
+				<option value="sd" selected="selected">Contrebasse</option>
 			<!-- TMPL_ELSE -->
 				<option value="sd">Contrebasse</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1se" -->
-				<option value="se" SELECTED>Viole</option>
+				<option value="se" selected="selected">Viole</option>
 			<!-- TMPL_ELSE -->
 				<option value="se">Viole</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sf" -->
-				<option value="sf" SELECTED>Viole d'amour</option>
+				<option value="sf" selected="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>
+				<option value="sg" selected="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>
+				<option value="st" selected="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>
+				<option value="su" selected="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>
+				<option value="sz" selected="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>
+				<option value="uu" selected="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>
+				<option value="ea" selected="selected">Synthetiseur</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">Synthetiseur</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1eb" -->
-				<option value="eb" SELECTED>Bande magnetique</option>
+				<option value="eb" selected="selected">Bande magnetique</option>
 			<!-- TMPL_ELSE -->
 				<option value="eb">Bande magnetique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ec" -->
-				<option value="ec" SELECTED>Ordinateur</option>
+				<option value="ec" selected="selected">Ordinateur</option>
 			<!-- TMPL_ELSE -->
 				<option value="ec">Ordinateur</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ed" -->
-				<option value="ed" SELECTED>Ondes Martenot</option>
+				<option value="ed" selected="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>
+				<option value="eu" selected="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>
+				<option value="ez" selected="selected">Autre (Electronique)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ez">Autre (Electronique)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ka" -->
-				<option value="ka" SELECTED>Piano</option>
+				<option value="ka" selected="selected">Piano</option>
 			<!-- TMPL_ELSE -->
 				<option value="ka">Piano</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kb" -->
-				<option value="kb" SELECTED>Orgue</option>
+				<option value="kb" selected="selected">Orgue</option>
 			<!-- TMPL_ELSE -->
 				<option value="kb">Orgue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kc" -->
-				<option value="kc" SELECTED>Clavecin</option>
+				<option value="kc" selected="selected">Clavecin</option>
 			<!-- TMPL_ELSE -->
 				<option value="kc">Clavecin</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kd" -->
-				<option value="kd" SELECTED>Clavicorde</option>
+				<option value="kd" selected="selected">Clavicorde</option>
 			<!-- TMPL_ELSE -->
 				<option value="kd">Clavicorde</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ke" -->
-				<option value="ke" SELECTED>Continuo</option>
+				<option value="ke" selected="selected">Continuo</option>
 			<!-- TMPL_ELSE -->
 				<option value="ke">Continuo</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kf" -->
-				<option value="kf" SELECTED>Celesta</option>
+				<option value="kf" selected="selected">Celesta</option>
 			<!-- TMPL_ELSE -->
 				<option value="kf">Celesta</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kt" -->
-				<option value="kt" SELECTED>Ethnique</option>
+				<option value="kt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="kt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ku" -->
-				<option value="ku" SELECTED>Non precise (clavier)</option>
+				<option value="ku" selected="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>
+				<option value="kz" selected="selected">Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="kz">Autre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1va" -->
-				<option value="va" SELECTED>Soprano</option>
+				<option value="va" selected="selected">Soprano</option>
 			<!-- TMPL_ELSE -->
 				<option value="va">Soprano</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vb" -->
-				<option value="vb" SELECTED>Mezzo-soprano</option>
+				<option value="vb" selected="selected">Mezzo-soprano</option>
 			<!-- TMPL_ELSE -->
 				<option value="vb">Mezzo-soprano</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vc" -->
-				<option value="vc" SELECTED>Alto</option>
+				<option value="vc" selected="selected">Alto</option>
 			<!-- TMPL_ELSE -->
 				<option value="vc">Alto</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vd" -->
-				<option value="vd" SELECTED>Tenor</option>
+				<option value="vd" selected="selected">Tenor</option>
 			<!-- TMPL_ELSE -->
 				<option value="vd">Tenor</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ve" -->
-				<option value="ve" SELECTED>Baryton</option>
+				<option value="ve" selected="selected">Baryton</option>
 			<!-- TMPL_ELSE -->
 				<option value="ve">Baryton</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vf" -->
-				<option value="vf" SELECTED>Basse</option>
+				<option value="vf" selected="selected">Basse</option>
 			<!-- TMPL_ELSE -->
 				<option value="vf">Basse</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vg" -->
-				<option value="vg" SELECTED>Haute contre</option>
+				<option value="vg" selected="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>
+				<option value="vh" selected="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>
+				<option value="vi" selected="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>
+				<option value="vj" selected="selected">Voix graves</option>
 			<!-- TMPL_ELSE -->
 				<option value="vj">Voix graves</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vt" -->
-				<option value="vt" SELECTED>Ethnique</option>
+				<option value="vt" selected="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>
+				<option value="vu" selected="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>
+				<option value="ta" selected="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>
+				<option value="tb" selected="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>
+				<option value="tc" selected="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>
+				<option value="td" selected="selected">Mandoline</option>
 			<!-- TMPL_ELSE -->
 				<option value="td">Mandoline</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1tt" -->
-				<option value="tt" SELECTED>Ethnique</option>
+				<option value="tt" selected="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>
+				<option value="tu" selected="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>
+				<option value="tz" selected="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>
+				<option value="wa" selected="selected">Flute traversiere</option>
 			<!-- TMPL_ELSE -->
 				<option value="wa">Flute traversiere</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wb" -->
-				<option value="wb" SELECTED>Hautbois</option>
+				<option value="wb" selected="selected">Hautbois</option>
 			<!-- TMPL_ELSE -->
 				<option value="wb">Hautbois</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wc" -->
-				<option value="wc" SELECTED>Clarinette</option>
+				<option value="wc" selected="selected">Clarinette</option>
 			<!-- TMPL_ELSE -->
 				<option value="wc">Clarinette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wd" -->
-				<option value="wd" SELECTED>Basson</option>
+				<option value="wd" selected="selected">Basson</option>
 			<!-- TMPL_ELSE -->
 				<option value="wd">Basson</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1we" -->
-				<option value="we" SELECTED>Piccolo</option>
+				<option value="we" selected="selected">Piccolo</option>
 			<!-- TMPL_ELSE -->
 				<option value="we">Piccolo</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wf" -->
-				<option value="wf" SELECTED>Cor anglais</option>
+				<option value="wf" selected="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>
+				<option value="wg" selected="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>
+				<option value="wh" selected="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>
+				<option value="wi" selected="selected">Saxophone</option>
 			<!-- TMPL_ELSE -->
 				<option value="wi">Saxophone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wt" -->
-				<option value="wt" SELECTED>Ethnique</option>
+				<option value="wt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="wt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wu" -->
-				<option value="wu" SELECTED>Non precise</option>
+				<option value="wu" selected="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>
+				<option value="wz" selected="selected">Autre bois</option>
 			<!-- TMPL_ELSE -->
 				<option value="wz">Autre bois</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script>
+<script type="javascript">
+//<![CDATA[
 	function report() {
-
-
 		var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
         
@@ -475,6 +471,7 @@
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tmpl
index fffc2dc..9f1177c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_128c.tmpl
@@ -1,465 +1,463 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_constructeur champ 128c</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 128c builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 128c builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td></td>
+		<td><label for="f1">Instruments ou voix pour un soloiste</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 	
 			<!-- TMPL_IF name="f1ba" -->
-				<option value="ba" SELECTED>Cor</option>
+				<option value="ba" selected="selected">Cor</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">Cor</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bb" -->
-				<option value="bb" SELECTED>Trompette</option>
+				<option value="bb" selected="selected">Trompette</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">Trompette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bc" -->
-				<option value="bc" SELECTED>Cornet a piston</option>
+				<option value="bc" selected="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>
+				<option value="bd" selected="selected">Trombone</option>
 			<!-- TMPL_ELSE -->
 				<option value="bd">Trombone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1be" -->
-				<option value="be" SELECTED>Tuba</option>
+				<option value="be" selected="selected">Tuba</option>
 			<!-- TMPL_ELSE -->
 				<option value="be">Tuba</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bf" -->
-				<option value="bf" SELECTED>Saxophone</option>
+				<option value="bf" selected="selected">Saxophone</option>
 			<!-- TMPL_ELSE -->
 				<option value="bf">Saxophone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bt" -->
-				<option value="bt" SELECTED>Ethniques</option>
+				<option value="bt" selected="selected">Ethniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="bt">Ethniques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1bu" -->
-				<option value="bu" SELECTED>Non precise (Cuivre)</option>
+				<option value="bu" selected="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>
+				<option value="bz" selected="selected">Autre cuivre</option>
 			<!-- TMPL_ELSE -->
 				<option value="bz">Autre cuivre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ca" -->
-				<option value="ca" SELECTED>Mixtes</option>
+				<option value="ca" selected="selected">Mixtes</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">Mixtes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cb" -->
-				<option value="cb" SELECTED>Femmes </option>
+				<option value="cb" selected="selected">Femmes </option>
 			<!-- TMPL_ELSE -->
 				<option value="cb">Femmes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cc" -->
-				<option value="cc" SELECTED>Hommes</option>
+				<option value="cc" selected="selected">Hommes</option>
 			<!-- TMPL_ELSE -->
 				<option value="cc">Hommes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cd" -->
-				<option value="cd" SELECTED>Enfants</option>
+				<option value="cd" selected="selected">Enfants</option>
 			<!-- TMPL_ELSE -->
 				<option value="cd">Enfants</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ct" -->
-				<option value="ct" SELECTED>Ethniques</option>
+				<option value="ct" selected="selected">Ethniques</option>
 			<!-- TMPL_ELSE -->
 				<option value="ct">Ethniques</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1cu" -->
-				<option value="cu" SELECTED>Non precise (Choeurs)</option>
+				<option value="cu" selected="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>
+				<option value="oa" selected="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>
+				<option value="ob" selected="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>
+				<option value="oc" selected="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>
+				<option value="od" selected="selected">Fanfare</option>
 			<!-- TMPL_ELSE -->
 				<option value="od">Fanfare</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1oe" -->
-				<option value="oe" SELECTED>Orchestre de danse</option>
+				<option value="oe" selected="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>
+				<option value="of" selected="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>
+				<option value="ot" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="ot">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ou" -->
-				<option value="ou" SELECTED>Non precise (orchestre)</option>
+				<option value="ou" selected="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>
+				<option value="oz" selected="selected">Autre orchestre</option>
 			<!-- TMPL_ELSE -->
 				<option value="oz">Autre orchestre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pa" -->
-				<option value="pa" SELECTED>Tympanon</option>
+				<option value="pa" selected="selected">Tympanon</option>
 			<!-- TMPL_ELSE -->
 				<option value="pa">Tympanon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pb" -->
-				<option value="pb" SELECTED>Xylophone</option>
+				<option value="pb" selected="selected">Xylophone</option>
 			<!-- TMPL_ELSE -->
 				<option value="pb">Xylophone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pc" -->
-				<option value="pc" SELECTED>Marimba</option>
+				<option value="pc" selected="selected">Marimba</option>
 			<!-- TMPL_ELSE -->
 				<option value="pc">Marimba</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pd" -->
-				<option value="pd" SELECTED>Tambour, batterie</option>
+				<option value="pd" selected="selected">Tambour, batterie</option>
 			<!-- TMPL_ELSE -->
 				<option value="pd">Tambour, batterie</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pt" -->
-				<option value="pt" SELECTED>Ethnique</option>
+				<option value="pt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="pt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1pu" -->
-				<option value="pu" SELECTED>Non precise (percussion)</option>
+				<option value="pu" selected="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>
+				<option value="pz" selected="selected">Autre percussions</option>
 			<!-- TMPL_ELSE -->
 				<option value="pz">Autre percussions</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sa" -->
-				<option value="sa" SELECTED>Violon</option>
+				<option value="sa" selected="selected">Violon</option>
 			<!-- TMPL_ELSE -->
 				<option value="sa">Violon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sb" -->
-				<option value="sb" SELECTED>Alto</option>
+				<option value="sb" selected="selected">Alto</option>
 			<!-- TMPL_ELSE -->
 				<option value="sb">Alto</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sc" -->
-				<option value="sc" SELECTED>Violoncelle</option>
+				<option value="sc" selected="selected">Violoncelle</option>
 			<!-- TMPL_ELSE -->
 				<option value="sc">Violoncelle</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sd" -->
-				<option value="sd" SELECTED>Contrebasse</option>
+				<option value="sd" selected="selected">Contrebasse</option>
 			<!-- TMPL_ELSE -->
 				<option value="sd">Contrebasse</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1se" -->
-				<option value="se" SELECTED>Viole</option>
+				<option value="se" selected="selected">Viole</option>
 			<!-- TMPL_ELSE -->
 				<option value="se">Viole</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1sf" -->
-				<option value="sf" SELECTED>Viole d'amour</option>
+				<option value="sf" selected="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>
+				<option value="sg" selected="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>
+				<option value="st" selected="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>
+				<option value="su" selected="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>
+				<option value="sz" selected="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>
+				<option value="uu" selected="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>
+				<option value="ea" selected="selected">Synthetiseur</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">Synthetiseur</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1eb" -->
-				<option value="eb" SELECTED>Bande magnetique</option>
+				<option value="eb" selected="selected">Bande magnetique</option>
 			<!-- TMPL_ELSE -->
 				<option value="eb">Bande magnetique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ec" -->
-				<option value="ec" SELECTED>Ordinateur</option>
+				<option value="ec" selected="selected">Ordinateur</option>
 			<!-- TMPL_ELSE -->
 				<option value="ec">Ordinateur</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ed" -->
-				<option value="ed" SELECTED>Ondes Martenot</option>
+				<option value="ed" selected="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>
+				<option value="eu" selected="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>
+				<option value="ez" selected="selected">Autre (Electronique)</option>
 			<!-- TMPL_ELSE -->
 				<option value="ez">Autre (Electronique)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ka" -->
-				<option value="ka" SELECTED>Piano</option>
+				<option value="ka" selected="selected">Piano</option>
 			<!-- TMPL_ELSE -->
 				<option value="ka">Piano</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kb" -->
-				<option value="kb" SELECTED>Orgue</option>
+				<option value="kb" selected="selected">Orgue</option>
 			<!-- TMPL_ELSE -->
 				<option value="kb">Orgue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kc" -->
-				<option value="kc" SELECTED>Clavecin</option>
+				<option value="kc" selected="selected">Clavecin</option>
 			<!-- TMPL_ELSE -->
 				<option value="kc">Clavecin</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kd" -->
-				<option value="kd" SELECTED>Clavicorde</option>
+				<option value="kd" selected="selected">Clavicorde</option>
 			<!-- TMPL_ELSE -->
 				<option value="kd">Clavicorde</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ke" -->
-				<option value="ke" SELECTED>Continuo</option>
+				<option value="ke" selected="selected">Continuo</option>
 			<!-- TMPL_ELSE -->
 				<option value="ke">Continuo</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kf" -->
-				<option value="kf" SELECTED>Celesta</option>
+				<option value="kf" selected="selected">Celesta</option>
 			<!-- TMPL_ELSE -->
 				<option value="kf">Celesta</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1kt" -->
-				<option value="kt" SELECTED>Ethnique</option>
+				<option value="kt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="kt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ku" -->
-				<option value="ku" SELECTED>Non precise (clavier)</option>
+				<option value="ku" selected="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>
+				<option value="kz" selected="selected">Autre</option>
 			<!-- TMPL_ELSE -->
 				<option value="kz">Autre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1va" -->
-				<option value="va" SELECTED>Soprano</option>
+				<option value="va" selected="selected">Soprano</option>
 			<!-- TMPL_ELSE -->
 				<option value="va">Soprano</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vb" -->
-				<option value="vb" SELECTED>Mezzo-soprano</option>
+				<option value="vb" selected="selected">Mezzo-soprano</option>
 			<!-- TMPL_ELSE -->
 				<option value="vb">Mezzo-soprano</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vc" -->
-				<option value="vc" SELECTED>Alto</option>
+				<option value="vc" selected="selected">Alto</option>
 			<!-- TMPL_ELSE -->
 				<option value="vc">Alto</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vd" -->
-				<option value="vd" SELECTED>Tenor</option>
+				<option value="vd" selected="selected">Tenor</option>
 			<!-- TMPL_ELSE -->
 				<option value="vd">Tenor</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1ve" -->
-				<option value="ve" SELECTED>Baryton</option>
+				<option value="ve" selected="selected">Baryton</option>
 			<!-- TMPL_ELSE -->
 				<option value="ve">Baryton</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vf" -->
-				<option value="vf" SELECTED>Basse</option>
+				<option value="vf" selected="selected">Basse</option>
 			<!-- TMPL_ELSE -->
 				<option value="vf">Basse</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vg" -->
-				<option value="vg" SELECTED>Haute contre</option>
+				<option value="vg" selected="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>
+				<option value="vh" selected="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>
+				<option value="vi" selected="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>
+				<option value="vj" selected="selected">Voix graves</option>
 			<!-- TMPL_ELSE -->
 				<option value="vj">Voix graves</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vt" -->
-				<option value="vt" SELECTED>Ethnique</option>
+				<option value="vt" selected="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>
+				<option value="vu" selected="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>
+				<option value="ta" selected="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>
+				<option value="tb" selected="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>
+				<option value="tc" selected="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>
+				<option value="td" selected="selected">Mandoline</option>
 			<!-- TMPL_ELSE -->
 				<option value="td">Mandoline</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1tt" -->
-				<option value="tt" SELECTED>Ethnique</option>
+				<option value="tt" selected="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>
+				<option value="tu" selected="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>
+				<option value="tz" selected="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>
+				<option value="wa" selected="selected">Flute traversiere</option>
 			<!-- TMPL_ELSE -->
 				<option value="wa">Flute traversiere</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wb" -->
-				<option value="wb" SELECTED>Hautbois</option>
+				<option value="wb" selected="selected">Hautbois</option>
 			<!-- TMPL_ELSE -->
 				<option value="wb">Hautbois</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wc" -->
-				<option value="wc" SELECTED>Clarinette</option>
+				<option value="wc" selected="selected">Clarinette</option>
 			<!-- TMPL_ELSE -->
 				<option value="wc">Clarinette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wd" -->
-				<option value="wd" SELECTED>Basson</option>
+				<option value="wd" selected="selected">Basson</option>
 			<!-- TMPL_ELSE -->
 				<option value="wd">Basson</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1we" -->
-				<option value="we" SELECTED>Piccolo</option>
+				<option value="we" selected="selected">Piccolo</option>
 			<!-- TMPL_ELSE -->
 				<option value="we">Piccolo</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wf" -->
-				<option value="wf" SELECTED>Cor anglais</option>
+				<option value="wf" selected="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>
+				<option value="wg" selected="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>
+				<option value="wh" selected="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>
+				<option value="wi" selected="selected">Saxophone</option>
 			<!-- TMPL_ELSE -->
 				<option value="wi">Saxophone</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wt" -->
-				<option value="wt" SELECTED>Ethnique</option>
+				<option value="wt" selected="selected">Ethnique</option>
 			<!-- TMPL_ELSE -->
 				<option value="wt">Ethnique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1wu" -->
-				<option value="wu" SELECTED>Non precise</option>
+				<option value="wu" selected="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>
+				<option value="wz" selected="selected">Autre bois</option>
 			<!-- TMPL_ELSE -->
 				<option value="wz">Autre bois</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -467,6 +465,7 @@
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tmpl
index 5575045..38dc8b8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_130.tmpl
@@ -1,335 +1,332 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 130 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 130 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 130 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Specific Material Designation:</td>
+		<td><label for="f1">Specific Material Designation:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>aperture card</option>
+				<option value="a" selected="selected">aperture card</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">aperture card</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>microform cartridge</option>
+				<option value="b" selected="selected">microform cartridge</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">microform cartridge</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>microfilm cassette</option>
+				<option value="c" selected="selected">microfilm cassette</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">microfilm cassette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>microfilm reel</option>
+				<option value="d" selected="selected">microfilm reel</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">microfilm reel</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>microfiche</option>
+				<option value="e" selected="selected">microfiche</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">microfiche</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>microfiche cassette</option>
+				<option value="f" selected="selected">microfiche cassette</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">microfiche cassette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>micro opaque</option>
+				<option value="g" selected="selected">micro opaque</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">micro opaque</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>microfilm slip</option>
+				<option value="h" selected="selected">microfilm slip</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">microfilm slip</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Polarity:</td>
+		<td><label for="f2">Polarity:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>positive</option>
+				<option value="a" selected="selected">positive</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">positive</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>negative</option>
+				<option value="b" selected="selected">negative</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">negative</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>unknown</option>
+				<option value="c" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>mixed polarity</option>
+				<option value="d" selected="selected">mixed polarity</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">mixed polarity</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Dimensions:</td>
+		<td><label for="f3">Dimensions:</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>8 mm (microfilm)</option>
+				<option value="a" selected="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>
+				<option value="d" selected="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>
+				<option value="f" selected="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>
+				<option value="g" selected="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>
+				<option value="h" selected="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 in.</option>
+				<option value="l" selected="selected">3 x 5 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">3 x 5 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3m" -->
-				<option value="m" SELECTED>4 x 6 in.</option>
+				<option value="m" selected="selected">4 x 6 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">4 x 6 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3o" -->
-				<option value="o" SELECTED>6 x 9 in.</option>
+				<option value="o" selected="selected">6 x 9 in.</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">6 x 9 in.</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3p" -->
-				<option value="p" SELECTED>9 x 19 cm</option>
+				<option value="p" selected="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>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Reduction ratio:</td>
+		<td><label for="f4">Reduction ratio:</label></td>
 		<td>
-			<select name="f4" size="1">		
+			<select name="f4" id="f4" size="1">		
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>low reduction</option>
+				<option value="a" selected="selected">low reduction</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">low reduction</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>Normal (16x - 30x)</option>
+				<option value="b" selected="selected">Normal (16x - 30x)</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">Normal (16x - 30x)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4c" -->
-				<option value="c" SELECTED>high (31x - 60x)</option>
+				<option value="c" selected="selected">high (31x - 60x)</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">high (31x - 60x)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4d" -->
-				<option value="d" SELECTED>very high (61x - 90x)</option>
+				<option value="d" selected="selected">very high (61x - 90x)</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">very high (61x - 90x)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4e" -->
-				<option value="e" SELECTED>ultrahigh (91x -)</option>
+				<option value="e" selected="selected">ultrahigh (91x -)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">ultrahigh (91x -)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4v" -->
-				<option value="v" SELECTED>varies</option>
+				<option value="v" selected="selected">varies</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">varies</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
     <tr>
-                <td>Specific reduction ratio</td>
-                <td><input type="text" name="f5" maxlength=3 size=4 
-value="<!-- TMPL_VAR name="f5" -->"></td>
+                <td><label for="f5">Specific reduction ratio</label></td>
+                <td><input type="text" name="f5" id="f5" maxlength="3" size="4" 
+value="<!-- TMPL_VAR name="f5" -->" /></td>
         </tr>
 
-		</td></tr>
 	<tr>
-		<td>Colour:</td>
+		<td><label for="f6">Color:</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>monochrome</option>
+				<option value="a" selected="selected">monochrome</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">monochrome</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6b" -->
-				<option value="b" SELECTED>colour</option>
+				<option value="b" selected="selected">color</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">colour</option>
+				<option value="b">color</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6v" -->
-				<option value="v" SELECTED>varies</option>
+				<option value="v" selected="selected">varies</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">varies</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Emulsion on film:</td>
+		<td><label for="f7">Emulsion on film:</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>silver halide</option>
+				<option value="a" selected="selected">silver halide</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">silver halide</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7b" -->
-				<option value="b" SELECTED>diazo</option>
+				<option value="b" selected="selected">diazo</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">diazo</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>vesicular</option>
+				<option value="c" selected="selected">vesicular</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">vesicular</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>unknown</option>
+				<option value="d" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7u" -->
-				<option value="u" SELECTED>mixed emulsion</option>
+				<option value="u" selected="selected">mixed emulsion</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">mixed emulsion</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Generation:</td>
+		<td><label for="f8">Generation:</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8a" -->
-				<option value="a" SELECTED>first generation (Master)</option>
+				<option value="a" selected="selected">first generation (Master)</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">first generation (Master)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8b" -->
-				<option value="b" SELECTED>printing master</option>
+				<option value="b" selected="selected">printing master</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">printing master</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8c" -->
-				<option value="c" SELECTED>service copy</option>
+				<option value="c" selected="selected">service copy</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">service copy</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8v" -->
-				<option value="v" SELECTED>mixed generations</option>
+				<option value="v" selected="selected">mixed generations</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed generations</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
 	<tr>
-		<td>Base of film:</td>
+		<td><label for="f9">Base of film:</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
 			<!-- TMPL_IF name="f9a" -->
-				<option value="a" SELECTED>safety base</option>
+				<option value="a" selected="selected">safety base</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">safety base</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9b" -->
-				<option value="b" SELECTED>not a safety base</option>
+				<option value="b" selected="selected">not a safety base</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">not a safety base</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9x" -->
-				<option value="x" SELECTED>not applicable</option>
+				<option value="x" selected="selected">not applicable</option>
 			<!-- TMPL_ELSE -->
 				<option value="x">not applicable</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	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);
@@ -339,6 +336,7 @@ value="<!-- TMPL_VAR name="f5" -->"></td>
 	    window.close();
 	    return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tmpl
index e572fa7..9c1565f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_135a.tmpl
@@ -1,64 +1,63 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 135a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 135a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 135a builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Type of electronic resource:</td>
+		<td><label for="f1">Type of electronic resource:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
             
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>numeric</option>
+				<option value="a" selected="selected">numeric</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">numeric</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>computer program(s)</option>
+				<option value="b" selected="selected">computer program(s)</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">computer program(s)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>representational</option>
+				<option value="c" selected="selected">representational</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">representational</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>text</option>
+				<option value="d" selected="selected">text</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1v" -->
-				<option value="v" SELECTED>combination</option>
+				<option value="v" selected="selected">combination</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">combination</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<p><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></p>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 	function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -67,6 +66,7 @@
             window.close();
             return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tmpl
index a3480d3..1358ce2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_140.tmpl
@@ -1,1549 +1,1564 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 140 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 140 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 140 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Illustration - Book 1:</td>
+		<td><label for="f1">Illustration - Book 1:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1b" -->
-				<option value="b" SELECTED>illuminations</option>
+				<option value="b" selected="selected">illuminations</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">illuminations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1c" -->
-				<option value="c" SELECTED>ornamental letter</option>
+				<option value="c" selected="selected">ornamental letter</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">ornamental letter</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1d" -->
-				<option value="d" SELECTED>miniature</option>
+				<option value="d" selected="selected">miniature</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">miniature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1e" -->
-				<option value="e" SELECTED>rubric (i.e. heading etc. in special lettering)</option>
+				<option value="e" selected="selected">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1f" -->
-				<option value="f" SELECTED>vignette</option>
+				<option value="f" selected="selected">vignette</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">vignette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1h" -->
-				<option value="h" SELECTED>portrait</option>
+				<option value="h" selected="selected">portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td>
-		<td>Illustration - Book 2:</td>
+		<td><label for="f2">Illustration - Book 2:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
 			<!-- TMPL_IF name="f2 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>illuminations</option>
+				<option value="b" selected="selected">illuminations</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">illuminations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>ornamental letter</option>
+				<option value="c" selected="selected">ornamental letter</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">ornamental letter</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>miniature</option>
+				<option value="d" selected="selected">miniature</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">miniature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>rubric (i.e. heading etc. in special lettering)</option>
+				<option value="e" selected="selected">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2f" -->
-				<option value="f" SELECTED>vignette</option>
+				<option value="f" selected="selected">vignette</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">vignette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2h" -->
-				<option value="h" SELECTED>portrait</option>
+				<option value="h" selected="selected">portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
-		</td></tr>	<tr>
-		<td>Illustration - Book 3:</td>
+			</select>
+		</td></tr>
+		<tr>
+		<td><label for="f3">Illustration - Book 3:</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
 			<!-- TMPL_IF name="f3 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3b" -->
-				<option value="b" SELECTED>illuminations</option>
+				<option value="b" selected="selected">illuminations</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">illuminations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3c" -->
-				<option value="c" SELECTED>ornamental letter</option>
+				<option value="c" selected="selected">ornamental letter</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">ornamental letter</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3d" -->
-				<option value="d" SELECTED>miniature</option>
+				<option value="d" selected="selected">miniature</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">miniature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3e" -->
-				<option value="e" SELECTED>rubric (i.e. heading etc. in special lettering)</option>
+				<option value="e" selected="selected">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3f" -->
-				<option value="f" SELECTED>vignette</option>
+				<option value="f" selected="selected">vignette</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">vignette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3h" -->
-				<option value="h" SELECTED>portrait</option>
+				<option value="h" selected="selected">portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td>
-		<td>Illustration - Book 4:</td>
+		<td><label for="f4">Illustration - Book 4:</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
             
 			<!-- TMPL_IF name="f4 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4b" -->
-				<option value="b" SELECTED>illuminations</option>
+				<option value="b" selected="selected">illuminations</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">illuminations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4c" -->
-				<option value="c" SELECTED>ornamental letter</option>
+				<option value="c" selected="selected">ornamental letter</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">ornamental letter</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4d" -->
-				<option value="d" SELECTED>miniature</option>
+				<option value="d" selected="selected">miniature</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">miniature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4e" -->
-				<option value="e" SELECTED>rubric (i.e. heading etc. in special lettering)</option>
+				<option value="e" selected="selected">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">rubric (i.e. heading etc. in special lettering)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4f" -->
-				<option value="f" SELECTED>vignette</option>
+				<option value="f" selected="selected">vignette</option>
 			<!-- TMPL_ELSE -->
 				<option value="f">vignette</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4h" -->
-				<option value="h" SELECTED>Portrait</option>
+				<option value="h" selected="selected">Portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">Portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td></tr>
 	<tr>
-		<td>Illustration - Full Page Plates 1:</td>
+		<td><label for="f5">Illustration - Full Page Plates 1:</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
             
 			<!-- TMPL_IF name="f5 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5h" -->
-				<option value="h" SELECTED>portrait</option>
+				<option value="h" selected="selected">portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td>
-		<td>Illustration - Full Page Plates 2:</td>
+		<td><label for="f6">Illustration - Full Page Plates 2:</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
             
 			<!-- TMPL_IF name="f6 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6h" -->
-				<option value="h" SELECTED>portrait</option>
+				<option value="h" selected="selected">portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td></tr>
-	<tr>
-		<td>Illustration - Full Page Plates 3:</td>
+		<tr>
+		<td><label for="f7">Illustration - Full Page Plates 3:</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
             
 			<!-- TMPL_IF name="f7 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7h" -->
-				<option value="h" SELECTED>portrait</option>
+				<option value="h" selected="selected">portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td>
-		<td>Illustration - Full Page Plates 4:</td>
+		<td><label for="f8">Illustration - Full Page Plates 4:</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
             
 			<!-- TMPL_IF name="f8 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8a" -->
-				<option value="a" SELECTED>illustrations</option>
+				<option value="a" selected="selected">illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8g" -->
-				<option value="g" SELECTED>frontispiece</option>
+				<option value="g" selected="selected">frontispiece</option>
 			<!-- TMPL_ELSE -->
 				<option value="g">frontispiece</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8h" -->
-				<option value="h" SELECTED>portrait</option>
+				<option value="h" selected="selected">portrait</option>
 			<!-- TMPL_ELSE -->
 				<option value="h">portrait</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8i" -->
-				<option value="i" SELECTED>vedute</option>
+				<option value="i" selected="selected">vedute</option>
 			<!-- TMPL_ELSE -->
 				<option value="i">vedute</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8j" -->
-				<option value="j" SELECTED>maps</option>
+				<option value="j" selected="selected">maps</option>
 			<!-- TMPL_ELSE -->
 				<option value="j">maps</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8k" -->
-				<option value="k" SELECTED>charts</option>
+				<option value="k" selected="selected">charts</option>
 			<!-- TMPL_ELSE -->
 				<option value="k">charts</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8l" -->
-				<option value="l" SELECTED>plans</option>
+				<option value="l" selected="selected">plans</option>
 			<!-- TMPL_ELSE -->
 				<option value="l">plans</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8m" -->
-				<option value="m" SELECTED>music</option>
+				<option value="m" selected="selected">music</option>
 			<!-- TMPL_ELSE -->
 				<option value="m">music</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8n" -->
-				<option value="n" SELECTED>coats of arms</option>
+				<option value="n" selected="selected">coats of arms</option>
 			<!-- TMPL_ELSE -->
 				<option value="n">coats of arms</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8o" -->
-				<option value="o" SELECTED>genealogical tables</option>
+				<option value="o" selected="selected">genealogical tables</option>
 			<!-- TMPL_ELSE -->
 				<option value="o">genealogical tables</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8y" -->
-				<option value="y" SELECTED>no illustrations</option>
+				<option value="y" selected="selected">no illustrations</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">no illustrations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td></tr>
-<tr>		<td>Illustration - Technique:</td>
+<tr>		<td><label for="f9">Illustration - Technique:</label></td>
 		<td>
-			<select name="f9" size="1">
+			<select name="f9" id="f9" size="1">
             
 			<!-- TMPL_IF name="f9 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9a" -->
-				<option value="a" SELECTED>woodcut</option>
+				<option value="a" selected="selected">woodcut</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">woodcut</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9b" -->
-				<option value="b" SELECTED>lithography</option>
+				<option value="b" selected="selected">lithography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">lithography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9c" -->
-				<option value="c" SELECTED>etching</option>
+				<option value="c" selected="selected">etching</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">etching</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9d" -->
-				<option value="d" SELECTED>aquatint</option>
+				<option value="d" selected="selected">aquatint</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">aquatint</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9e" -->
-				<option value="e" SELECTED>engraving</option>
+				<option value="e" selected="selected">engraving</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">engraving</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9u" -->
-				<option value="u" SELECTED>unknown</option>
+				<option value="u" selected="selected">unknown</option>
 			<!-- TMPL_ELSE -->
 				<option value="u">unknown</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9v" -->
-				<option value="v" SELECTED>mixed</option>
+				<option value="v" selected="selected">mixed</option>
 			<!-- TMPL_ELSE -->
 				<option value="v">mixed</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
-		</td></tr>
-<tr>		<td>Form of Contents 1:</td>
+			</select>
+		</td><td>&nbsp;</td>
+		</tr>
+		<tr>
+		<td><label for="f10">Form of Contents 1:</label></td>
 		<td>
-			<select name="f10" size="1">
+			<select name="f10" id="f10" size="1">
             
 			<!-- TMPL_IF name="f10  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10aa" -->
-				<option value="aa" SELECTED>religious work</option>
+				<option value="aa" selected="selected">religious work</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">religious work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ab" -->
-				<option value="ab" SELECTED>catechism</option>
+				<option value="ab" selected="selected">catechism</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">catechism</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ac" -->
-				<option value="ac" SELECTED>devotional literature</option>
+				<option value="ac" selected="selected">devotional literature</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">devotional literature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ad" -->
-				<option value="ad" SELECTED>sermon</option>
+				<option value="ad" selected="selected">sermon</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">sermon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ae" -->
-				<option value="ae" SELECTED>service books</option>
+				<option value="ae" selected="selected">service books</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">service books</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ba" -->
-				<option value="ba" SELECTED>scientific work</option>
+				<option value="ba" selected="selected">scientific work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">scientific work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10bb" -->
-				<option value="bb" SELECTED>discussion, dissertation, thesis</option>
+				<option value="bb" selected="selected">discussion, dissertation, thesis</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">discussion, dissertation, thesis</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ca" -->
-				<option value="ca" SELECTED>social customs</option>
+				<option value="ca" selected="selected">social customs</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">social customs</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10da" -->
-				<option value="da" SELECTED>legal work</option>
+				<option value="da" selected="selected">legal work</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">legal work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10db" -->
-				<option value="db" SELECTED>political work</option>
+				<option value="db" selected="selected">political work</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">political work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ea" -->
-				<option value="ea" SELECTED>ephemera</option>
+				<option value="ea" selected="selected">ephemera</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">ephemera</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10fa" -->
-				<option value="fa" SELECTED>reference work</option>
+				<option value="fa" selected="selected">reference work</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">reference work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10fb" -->
-				<option value="fb" SELECTED>library catalogue</option>
+				<option value="fb" selected="selected">library catalogue</option>
 			<!-- TMPL_ELSE -->
 				<option value="fb">library catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10fc" -->
-				<option value="fc" SELECTED>bibliography</option>
+				<option value="fc" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="fc">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10fd" -->
-				<option value="fd" SELECTED>calendar</option>
+				<option value="fd" selected="selected">calendar</option>
 			<!-- TMPL_ELSE -->
 				<option value="fd">calendar</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10fe" -->
-				<option value="fe" SELECTED>index</option>
+				<option value="fe" selected="selected">index</option>
 			<!-- TMPL_ELSE -->
 				<option value="fe">index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ff" -->
-				<option value="ff" SELECTED>dictionary</option>
+				<option value="ff" selected="selected">dictionary</option>
 			<!-- TMPL_ELSE -->
 				<option value="ff">dictionary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10fg" -->
-				<option value="fg" SELECTED>encyclopedia</option>
+				<option value="fg" selected="selected">encyclopedia</option>
 			<!-- TMPL_ELSE -->
 				<option value="fg">encyclopedia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ga" -->
-				<option value="ga" SELECTED>historical work</option>
+				<option value="ga" selected="selected">historical work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">historical work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ha" -->
-				<option value="ha" SELECTED>polemical treatise</option>
+				<option value="ha" selected="selected">polemical treatise</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">polemical treatise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ia" -->
-				<option value="ia" SELECTED>discursive work</option>
+				<option value="ia" selected="selected">discursive work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">discursive work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ja" -->
-				<option value="ja" SELECTED>commemorative work</option>
+				<option value="ja" selected="selected">commemorative work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ja">commemorative work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ka" -->
-				<option value="ka" SELECTED>instructional work</option>
+				<option value="ka" selected="selected">instructional work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ka">instructional work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10kb" -->
-				<option value="kb" SELECTED>manual</option>
+				<option value="kb" selected="selected">manual</option>
 			<!-- TMPL_ELSE -->
 				<option value="kb">manual</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10kc" -->
-				<option value="kc" SELECTED>textbook</option>
+				<option value="kc" selected="selected">textbook</option>
 			<!-- TMPL_ELSE -->
 				<option value="kc">textbook</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10la" -->
-				<option value="la" SELECTED>record-keeping work</option>
+				<option value="la" selected="selected">record-keeping work</option>
 			<!-- TMPL_ELSE -->
 				<option value="la">record-keeping work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10ma" -->
-				<option value="ma" SELECTED>recreations</option>
+				<option value="ma" selected="selected">recreations</option>
 			<!-- TMPL_ELSE -->
 				<option value="ma">recreations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10na" -->
-				<option value="na" SELECTED>version of a work</option>
+				<option value="na" selected="selected">version of a work</option>
 			<!-- TMPL_ELSE -->
 				<option value="na">version of a work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
-		</td></tr>
-<tr>		<td>Form of Contents 2:</td>
+			</select>
+		</td>
+		<td><label for="f11">Form of Contents 2:</label></td>
 		<td>
-			<select name="f11" size="1">
+			<select name="f11" id="f11" size="1">
             
 			<!-- TMPL_IF name="f11  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11aa" -->
-				<option value="aa" SELECTED>religious work</option>
+				<option value="aa" selected="selected">religious work</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">religious work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ab" -->
-				<option value="ab" SELECTED>catechism</option>
+				<option value="ab" selected="selected">catechism</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">catechism</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ac" -->
-				<option value="ac" SELECTED>devotional literature</option>
+				<option value="ac" selected="selected">devotional literature</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">devotional literature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ad" -->
-				<option value="ad" SELECTED>sermon</option>
+				<option value="ad" selected="selected">sermon</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">sermon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ae" -->
-				<option value="ae" SELECTED>service books</option>
+				<option value="ae" selected="selected">service books</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">service books</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ba" -->
-				<option value="ba" SELECTED>scientific work</option>
+				<option value="ba" selected="selected">scientific work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">scientific work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11bb" -->
-				<option value="bb" SELECTED>discussion, dissertation, thesis</option>
+				<option value="bb" selected="selected">discussion, dissertation, thesis</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">discussion, dissertation, thesis</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ca" -->
-				<option value="ca" SELECTED>social customs</option>
+				<option value="ca" selected="selected">social customs</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">social customs</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11da" -->
-				<option value="da" SELECTED>legal work</option>
+				<option value="da" selected="selected">legal work</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">legal work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11db" -->
-				<option value="db" SELECTED>political work</option>
+				<option value="db" selected="selected">political work</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">political work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ea" -->
-				<option value="ea" SELECTED>ephemera</option>
+				<option value="ea" selected="selected">ephemera</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">ephemera</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11fa" -->
-				<option value="fa" SELECTED>reference work</option>
+				<option value="fa" selected="selected">reference work</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">reference work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11fb" -->
-				<option value="fb" SELECTED>library catalogue</option>
+				<option value="fb" selected="selected">library catalogue</option>
 			<!-- TMPL_ELSE -->
 				<option value="fb">library catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11fc" -->
-				<option value="fc" SELECTED>bibliography</option>
+				<option value="fc" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="fc">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11fd" -->
-				<option value="fd" SELECTED>calendar</option>
+				<option value="fd" selected="selected">calendar</option>
 			<!-- TMPL_ELSE -->
 				<option value="fd">calendar</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11fe" -->
-				<option value="fe" SELECTED>index</option>
+				<option value="fe" selected="selected">index</option>
 			<!-- TMPL_ELSE -->
 				<option value="fe">index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ff" -->
-				<option value="ff" SELECTED>dictionary</option>
+				<option value="ff" selected="selected">dictionary</option>
 			<!-- TMPL_ELSE -->
 				<option value="ff">dictionary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11fg" -->
-				<option value="fg" SELECTED>encyclopedia</option>
+				<option value="fg" selected="selected">encyclopedia</option>
 			<!-- TMPL_ELSE -->
 				<option value="fg">encyclopedia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ga" -->
-				<option value="ga" SELECTED>historical work</option>
+				<option value="ga" selected="selected">historical work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">historical work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ha" -->
-				<option value="ha" SELECTED>polemical treatise</option>
+				<option value="ha" selected="selected">polemical treatise</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">polemical treatise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ia" -->
-				<option value="ia" SELECTED>discursive work</option>
+				<option value="ia" selected="selected">discursive work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">discursive work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ja" -->
-				<option value="ja" SELECTED>commemorative work</option>
+				<option value="ja" selected="selected">commemorative work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ja">commemorative work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ka" -->
-				<option value="ka" SELECTED>instructional work</option>
+				<option value="ka" selected="selected">instructional work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ka">instructional work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11kb" -->
-				<option value="kb" SELECTED>manual</option>
+				<option value="kb" selected="selected">manual</option>
 			<!-- TMPL_ELSE -->
 				<option value="kb">manual</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11kc" -->
-				<option value="kc" SELECTED>textbook</option>
+				<option value="kc" selected="selected">textbook</option>
 			<!-- TMPL_ELSE -->
 				<option value="kc">textbook</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11la" -->
-				<option value="la" SELECTED>record-keeping work</option>
+				<option value="la" selected="selected">record-keeping work</option>
 			<!-- TMPL_ELSE -->
 				<option value="la">record-keeping work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11ma" -->
-				<option value="ma" SELECTED>recreations</option>
+				<option value="ma" selected="selected">recreations</option>
 			<!-- TMPL_ELSE -->
 				<option value="ma">recreations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11na" -->
-				<option value="na" SELECTED>version of a work</option>
+				<option value="na" selected="selected">version of a work</option>
 			<!-- TMPL_ELSE -->
 				<option value="na">version of a work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
-		</td></tr>
-<tr>		<td>Form of Contents 3:</td>
-		<td>
-			<select name="f12" size="1">
+			</select>
+			</td>
+			</tr>
+			<tr>
+			<td><label for="f12">Form of Contents 3:</label></td>
+			<td>
+			<select name="f12" id="f12" size="1">
             
 			<!-- TMPL_IF name="f12  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12aa" -->
-				<option value="aa" SELECTED>religious work</option>
+				<option value="aa" selected="selected">religious work</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">religious work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ab" -->
-				<option value="ab" SELECTED>catechism</option>
+				<option value="ab" selected="selected">catechism</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">catechism</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ac" -->
-				<option value="ac" SELECTED>devotional literature</option>
+				<option value="ac" selected="selected">devotional literature</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">devotional literature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ad" -->
-				<option value="ad" SELECTED>sermon</option>
+				<option value="ad" selected="selected">sermon</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">sermon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ae" -->
-				<option value="ae" SELECTED>service books</option>
+				<option value="ae" selected="selected">service books</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">service books</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ba" -->
-				<option value="ba" SELECTED>scientific work</option>
+				<option value="ba" selected="selected">scientific work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">scientific work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12bb" -->
-				<option value="bb" SELECTED>discussion, dissertation, thesis</option>
+				<option value="bb" selected="selected">discussion, dissertation, thesis</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">discussion, dissertation, thesis</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ca" -->
-				<option value="ca" SELECTED>social customs</option>
+				<option value="ca" selected="selected">social customs</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">social customs</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12da" -->
-				<option value="da" SELECTED>legal work</option>
+				<option value="da" selected="selected">legal work</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">legal work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12db" -->
-				<option value="db" SELECTED>political work</option>
+				<option value="db" selected="selected">political work</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">political work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ea" -->
-				<option value="ea" SELECTED>ephemera</option>
+				<option value="ea" selected="selected">ephemera</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">ephemera</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12fa" -->
-				<option value="fa" SELECTED>reference work</option>
+				<option value="fa" selected="selected">reference work</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">reference work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12fb" -->
-				<option value="fb" SELECTED>library catalogue</option>
+				<option value="fb" selected="selected">library catalogue</option>
 			<!-- TMPL_ELSE -->
 				<option value="fb">library catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12fc" -->
-				<option value="fc" SELECTED>bibliography</option>
+				<option value="fc" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="fc">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12fd" -->
-				<option value="fd" SELECTED>calendar</option>
+				<option value="fd" selected="selected">calendar</option>
 			<!-- TMPL_ELSE -->
 				<option value="fd">calendar</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12fe" -->
-				<option value="fe" SELECTED>index</option>
+				<option value="fe" selected="selected">index</option>
 			<!-- TMPL_ELSE -->
 				<option value="fe">index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ff" -->
-				<option value="ff" SELECTED>dictionary</option>
+				<option value="ff" selected="selected">dictionary</option>
 			<!-- TMPL_ELSE -->
 				<option value="ff">dictionary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12fg" -->
-				<option value="fg" SELECTED>encyclopedia</option>
+				<option value="fg" selected="selected">encyclopedia</option>
 			<!-- TMPL_ELSE -->
 				<option value="fg">encyclopedia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ga" -->
-				<option value="ga" SELECTED>historical work</option>
+				<option value="ga" selected="selected">historical work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">historical work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ha" -->
-				<option value="ha" SELECTED>polemical treatise</option>
+				<option value="ha" selected="selected">polemical treatise</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">polemical treatise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ia" -->
-				<option value="ia" SELECTED>discursive work</option>
+				<option value="ia" selected="selected">discursive work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">discursive work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ja" -->
-				<option value="ja" SELECTED>commemorative work</option>
+				<option value="ja" selected="selected">commemorative work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ja">commemorative work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ka" -->
-				<option value="ka" SELECTED>instructional work</option>
+				<option value="ka" selected="selected">instructional work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ka">instructional work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12kb" -->
-				<option value="kb" SELECTED>manual</option>
+				<option value="kb" selected="selected">manual</option>
 			<!-- TMPL_ELSE -->
 				<option value="kb">manual</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12kc" -->
-				<option value="kc" SELECTED>textbook</option>
+				<option value="kc" selected="selected">textbook</option>
 			<!-- TMPL_ELSE -->
 				<option value="kc">textbook</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12la" -->
-				<option value="la" SELECTED>record-keeping work</option>
+				<option value="la" selected="selected">record-keeping work</option>
 			<!-- TMPL_ELSE -->
 				<option value="la">record-keeping work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12ma" -->
-				<option value="ma" SELECTED>recreations</option>
+				<option value="ma" selected="selected">recreations</option>
 			<!-- TMPL_ELSE -->
 				<option value="ma">recreations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12na" -->
-				<option value="na" SELECTED>version of a work</option>
+				<option value="na" selected="selected">version of a work</option>
 			<!-- TMPL_ELSE -->
 				<option value="na">version of a work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f12zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
-		</td></tr>
-<tr>		<td>Form of Contents 4:</td>
+			</select>
+		</td>
+		<td><label for="f13">Form of Contents 4:</label></td>
 		<td>
-			<select name="f13" size="1">
+			<select name="f13" id="f13" size="1">
             
 			<!-- TMPL_IF name="f13  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13aa" -->
-				<option value="aa" SELECTED>religious work</option>
+				<option value="aa" selected="selected">religious work</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">religious work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ab" -->
-				<option value="ab" SELECTED>catechism</option>
+				<option value="ab" selected="selected">catechism</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">catechism</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ac" -->
-				<option value="ac" SELECTED>devotional literature</option>
+				<option value="ac" selected="selected">devotional literature</option>
 			<!-- TMPL_ELSE -->
 				<option value="ac">devotional literature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ad" -->
-				<option value="ad" SELECTED>sermon</option>
+				<option value="ad" selected="selected">sermon</option>
 			<!-- TMPL_ELSE -->
 				<option value="ad">sermon</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ae" -->
-				<option value="ae" SELECTED>service books</option>
+				<option value="ae" selected="selected">service books</option>
 			<!-- TMPL_ELSE -->
 				<option value="ae">service books</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ba" -->
-				<option value="ba" SELECTED>scientific work</option>
+				<option value="ba" selected="selected">scientific work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ba">scientific work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13bb" -->
-				<option value="bb" SELECTED>discussion, dissertation, thesis</option>
+				<option value="bb" selected="selected">discussion, dissertation, thesis</option>
 			<!-- TMPL_ELSE -->
 				<option value="bb">discussion, dissertation, thesis</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ca" -->
-				<option value="ca" SELECTED>social customs</option>
+				<option value="ca" selected="selected">social customs</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">social customs</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13da" -->
-				<option value="da" SELECTED>legal work</option>
+				<option value="da" selected="selected">legal work</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">legal work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13db" -->
-				<option value="db" SELECTED>political work</option>
+				<option value="db" selected="selected">political work</option>
 			<!-- TMPL_ELSE -->
 				<option value="db">political work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ea" -->
-				<option value="ea" SELECTED>ephemera</option>
+				<option value="ea" selected="selected">ephemera</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">ephemera</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13fa" -->
-				<option value="fa" SELECTED>reference work</option>
+				<option value="fa" selected="selected">reference work</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">reference work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13fb" -->
-				<option value="fb" SELECTED>library catalogue</option>
+				<option value="fb" selected="selected">library catalogue</option>
 			<!-- TMPL_ELSE -->
 				<option value="fb">library catalogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13fc" -->
-				<option value="fc" SELECTED>bibliography</option>
+				<option value="fc" selected="selected">bibliography</option>
 			<!-- TMPL_ELSE -->
 				<option value="fc">bibliography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13fd" -->
-				<option value="fd" SELECTED>calendar</option>
+				<option value="fd" selected="selected">calendar</option>
 			<!-- TMPL_ELSE -->
 				<option value="fd">calendar</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13fe" -->
-				<option value="fe" SELECTED>index</option>
+				<option value="fe" selected="selected">index</option>
 			<!-- TMPL_ELSE -->
 				<option value="fe">index</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ff" -->
-				<option value="ff" SELECTED>dictionary</option>
+				<option value="ff" selected="selected">dictionary</option>
 			<!-- TMPL_ELSE -->
 				<option value="ff">dictionary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13fg" -->
-				<option value="fg" SELECTED>encyclopedia</option>
+				<option value="fg" selected="selected">encyclopedia</option>
 			<!-- TMPL_ELSE -->
 				<option value="fg">encyclopedia</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ga" -->
-				<option value="ga" SELECTED>historical work</option>
+				<option value="ga" selected="selected">historical work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">historical work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ha" -->
-				<option value="ha" SELECTED>polemical treatise</option>
+				<option value="ha" selected="selected">polemical treatise</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">polemical treatise</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ia" -->
-				<option value="ia" SELECTED>discursive work</option>
+				<option value="ia" selected="selected">discursive work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">discursive work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ja" -->
-				<option value="ja" SELECTED>commemorative work</option>
+				<option value="ja" selected="selected">commemorative work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ja">commemorative work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ka" -->
-				<option value="ka" SELECTED>instructional work</option>
+				<option value="ka" selected="selected">instructional work</option>
 			<!-- TMPL_ELSE -->
 				<option value="ka">instructional work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13kb" -->
-				<option value="kb" SELECTED>manual</option>
+				<option value="kb" selected="selected">manual</option>
 			<!-- TMPL_ELSE -->
 				<option value="kb">manual</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13kc" -->
-				<option value="kc" SELECTED>textbook</option>
+				<option value="kc" selected="selected">textbook</option>
 			<!-- TMPL_ELSE -->
 				<option value="kc">textbook</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13la" -->
-				<option value="la" SELECTED>record-keeping work</option>
+				<option value="la" selected="selected">record-keeping work</option>
 			<!-- TMPL_ELSE -->
 				<option value="la">record-keeping work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13ma" -->
-				<option value="ma" SELECTED>recreations</option>
+				<option value="ma" selected="selected">recreations</option>
 			<!-- TMPL_ELSE -->
 				<option value="ma">recreations</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13na" -->
-				<option value="na" SELECTED>version of a work</option>
+				<option value="na" selected="selected">version of a work</option>
 			<!-- TMPL_ELSE -->
 				<option value="na">version of a work</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f13zz" -->
-				<option value="zz" SELECTED>other</option>
+				<option value="zz" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td></tr>
-<tr>		<td>Literature:</td>
+<tr>		<td><label for="f14">Literature:</label></td>
 		<td>
-			<select name="f14" size="1">
+			<select name="f14" id="f14" size="1">
 
 			<!-- TMPL_IF name="f14  " -->
-				<option value="  " SELECTED>non required value</option>
+				<option value="  " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value="  ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14aa" -->
-				<option value="aa" SELECTED>poetry</option>
+				<option value="aa" selected="selected">poetry</option>
 			<!-- TMPL_ELSE -->
 				<option value="aa">poetry</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ab" -->
-				<option value="ab" SELECTED>romance</option>
+				<option value="ab" selected="selected">romance</option>
 			<!-- TMPL_ELSE -->
 				<option value="ab">romance</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ca" -->
-				<option value="ca" SELECTED>drama</option>
+				<option value="ca" selected="selected">drama</option>
 			<!-- TMPL_ELSE -->
 				<option value="ca">drama</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14da" -->
-				<option value="da" SELECTED>libretto</option>
+				<option value="da" selected="selected">libretto</option>
 			<!-- TMPL_ELSE -->
 				<option value="da">libretto</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ea" -->
-				<option value="ea" SELECTED>fiction</option>
+				<option value="ea" selected="selected">fiction</option>
 			<!-- TMPL_ELSE -->
 				<option value="ea">fiction</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14eb" -->
-				<option value="eb" SELECTED>novel</option>
+				<option value="eb" selected="selected">novel</option>
 			<!-- TMPL_ELSE -->
 				<option value="eb">novel</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ec" -->
-				<option value="ec" SELECTED>novella</option>
+				<option value="ec" selected="selected">novella</option>
 			<!-- TMPL_ELSE -->
 				<option value="ec">novella</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ed" -->
-				<option value="ed" SELECTED>fable</option>
+				<option value="ed" selected="selected">fable</option>
 			<!-- TMPL_ELSE -->
 				<option value="ed">fable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ef" -->
-				<option value="ef" SELECTED>fairy tale</option>
+				<option value="ef" selected="selected">fairy tale</option>
 			<!-- TMPL_ELSE -->
 				<option value="ef">fairy tale</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f14eg" -->
-				<option value="eg" SELECTED>allegory</option>
+				<option value="eg" selected="selected">allegory</option>
 			<!-- TMPL_ELSE -->
 				<option value="eg">allegory</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f14eh" -->
-				<option value="eh" SELECTED>legend</option>
+				<option value="eh" selected="selected">legend</option>
 			<!-- TMPL_ELSE -->
 				<option value="eh">legend</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f14ei" -->
-				<option value="ei" SELECTED>parable</option>
+				<option value="ei" selected="selected">parable</option>
 			<!-- TMPL_ELSE -->
 				<option value="ei">parable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ej" -->
-				<option value="ej" SELECTED>short story</option>
+				<option value="ej" selected="selected">short story</option>
 			<!-- TMPL_ELSE -->
 				<option value="ej">short story</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14fa" -->
-				<option value="fa" SELECTED>essay, feuilleton</option>
+				<option value="fa" selected="selected">essay, feuilleton</option>
 			<!-- TMPL_ELSE -->
 				<option value="fa">essay, feuilleton</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ga" -->
-				<option value="ga" SELECTED>humour, satire</option>
+				<option value="ga" selected="selected">humour, satire</option>
 			<!-- TMPL_ELSE -->
 				<option value="ga">humour, satire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ha" -->
-				<option value="ha" SELECTED>letters</option>
+				<option value="ha" selected="selected">letters</option>
 			<!-- TMPL_ELSE -->
 				<option value="ha">letters</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ia" -->
-				<option value="ia" SELECTED>miscellane</option>
+				<option value="ia" selected="selected">miscellane</option>
 			<!-- TMPL_ELSE -->
 				<option value="ia">miscellane</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ja" -->
-				<option value="ja" SELECTED>maxim, aphorism, proverb, anecdote</option>
+				<option value="ja" selected="selected">maxim, aphorism, proverb, anecdote</option>
 			<!-- TMPL_ELSE -->
 				<option value="ja">maxim, aphorism, proverb, anecdote</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ka" -->
-				<option value="ka" SELECTED>juvenile literature</option>
+				<option value="ka" selected="selected">juvenile literature</option>
 			<!-- TMPL_ELSE -->
 				<option value="ka">juvenile literature</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14la" -->
-				<option value="la" SELECTED>other</option>
+				<option value="la" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="la">other</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14lb" -->
-				<option value="lb" SELECTED>chronicle</option>
+				<option value="lb" selected="selected">chronicle</option>
 			<!-- TMPL_ELSE -->
 				<option value="lb">chronicle</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14lc" -->
-				<option value="lc" SELECTED>memoir</option>
+				<option value="lc" selected="selected">memoir</option>
 			<!-- TMPL_ELSE -->
 				<option value="lc">memoir</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ld" -->
-				<option value="ld" SELECTED>diary</option>
+				<option value="ld" selected="selected">diary</option>
 			<!-- TMPL_ELSE -->
 				<option value="ld">diary</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14le" -->
-				<option value="le" SELECTED>biography</option>
+				<option value="le" selected="selected">biography</option>
 			<!-- TMPL_ELSE -->
 				<option value="le">biography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14lf" -->
-				<option value="lf" SELECTED>hagiography</option>
+				<option value="lf" selected="selected">hagiography</option>
 			<!-- TMPL_ELSE -->
 				<option value="lf">hagiography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14lg" -->
-				<option value="lg" SELECTED>travelogue</option>
+				<option value="lg" selected="selected">travelogue</option>
 			<!-- TMPL_ELSE -->
 				<option value="lg">travelogue</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14lh" -->
-				<option value="lh" SELECTED>erotica</option>
+				<option value="lh" selected="selected">erotica</option>
 			<!-- TMPL_ELSE -->
 				<option value="lh">erotica</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14li" -->
-				<option value="li" SELECTED>erotica</option>
+				<option value="li" selected="selected">erotica</option>
 			<!-- TMPL_ELSE -->
 				<option value="li">erotica</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14ma" -->
-				<option value="ma" SELECTED>oratory, speeches</option>
+				<option value="ma" selected="selected">oratory, speeches</option>
 			<!-- TMPL_ELSE -->
 				<option value="ma">oratory, speeches</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14yy" -->
-				<option value="yy" SELECTED>not a literary text</option>
+				<option value="yy" selected="selected">not a literary text</option>
 			<!-- TMPL_ELSE -->
 				<option value="yy">not a literary text</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14zz" -->
-				<option value="zz" SELECTED>multiple or other</option>
+				<option value="zz" selected="selected">multiple or other</option>
 			<!-- TMPL_ELSE -->
 				<option value="zz">multiple or other</option>
 			<!-- /TMPL_IF -->
-		</td></tr>
-	<tr>
-		<td>Biography:</td>
+			</select>
+		</td>
+		<td><label for="f15">Biography:</label></td>
 		<td>
-			<select name="f15" size="1">
+			<select name="f15" id="f15" size="1">
 
 			<!-- TMPL_IF name="f15 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15a" -->
-				<option value="a" SELECTED>autobiography</option>
+				<option value="a" selected="selected">autobiography</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">autobiography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15b" -->
-				<option value="b" SELECTED>individual biography</option>
+				<option value="b" selected="selected">individual biography</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">individual biography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15c" -->
-				<option value="c" SELECTED>collective biography</option>
+				<option value="c" selected="selected">collective biography</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">collective biography</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15d" -->
-				<option value="d" SELECTED>contains biographical information</option>
+				<option value="d" selected="selected">contains biographical information</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">contains biographical information</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15y" -->
-				<option value="y" SELECTED>not biographical</option>
+				<option value="y" selected="selected">not biographical</option>
 			<!-- TMPL_ELSE -->
 				<option value="y">not biographical</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15z" -->
-				<option value="z" SELECTED>multiple or other form</option>
+				<option value="z" selected="selected">multiple or other form</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">multiple or other form</option>
 			<!-- /TMPL_IF -->
@@ -1551,86 +1566,84 @@
 		</td>
 </tr>
 	<tr>
-		<td>Support Material - Book:</td>
+		<td><label for="f16">Support Material - Book:</label></td>
 		<td>
-			<select name="f16" size="1">
+			<select name="f16" id="f16" size="1">
 
 			<!-- TMPL_IF name="f16 " -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f16a" -->
-				<option value="a" SELECTED>paper, general</option>
+				<option value="a" selected="selected">paper, general</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">paper, general</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f16b" -->
-				<option value="b" SELECTED>hand-made paper</option>
+				<option value="b" selected="selected">hand-made paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">hand-made paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f16c" -->
-				<option value="c" SELECTED>rice paper</option>
+				<option value="c" selected="selected">rice paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">rice paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f16d" -->
-				<option value="d" SELECTED>wood-pulp paper</option>
+				<option value="d" selected="selected">wood-pulp paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">wood-pulp paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f16e" -->
-				<option value="e" SELECTED>parchment, vellum</option>
+				<option value="e" selected="selected">parchment, vellum</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">parchment, vellum</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f16z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
 	</select>
 		</td>
-</tr>
-	<tr>
-		<td>Support Material - Plates:</td>
+		<td><label for="f17">Support Material - Plates:</label></td>
 		<td>
-			<select name="f17" size="1">
+			<select name="f17" id="f17" size="1">
 
          		<!-- TMPL_IF name="f17" -->
-				<option value=" " SELECTED>non required value</option>
+				<option value=" " selected="selected">non required value</option>
 			<!-- TMPL_ELSE -->
 				<option value=" ">non required value</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f17a" -->
-				<option value="a" SELECTED>paper, general</option>
+				<option value="a" selected="selected">paper, general</option>
 			<!-- TMPL_ELSE -->
 				<option value="a">paper, general</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17b" -->
-				<option value="b" SELECTED>hand-made paper</option>
+				<option value="b" selected="selected">hand-made paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="b">hand-made paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17c" -->
-				<option value="c" SELECTED>rice paper</option>
+				<option value="c" selected="selected">rice paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="c">rice paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17d" -->
-				<option value="d" SELECTED>wood-pulp paper</option>
+				<option value="d" selected="selected">wood-pulp paper</option>
 			<!-- TMPL_ELSE -->
 				<option value="d">wood-pulp paper</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17e" -->
-				<option value="e" SELECTED>parchment, vellum</option>
+				<option value="e" selected="selected">parchment, vellum</option>
 			<!-- TMPL_ELSE -->
 				<option value="e">parchment, vellum</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17z" -->
-				<option value="z" SELECTED>other</option>
+				<option value="z" selected="selected">other</option>
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
@@ -1638,35 +1651,33 @@
 		</td>
 </tr>
 	<tr>
-		<td>Watermark:</td>
+		<td><label for="f18">Watermark:</label></td>
 		<td>
-			<select name="f18" size="1">
+			<select name="f18" id="f18" size="1">
 
-			<!-- TMPL_IF name="f180" -->
-				<option value="0" SELECTED>paper does not contain watermark</option>
+			<!-- TMPL_IF name="f180" id="f180" -->
+				<option value="0" selected="selected">paper does not contain watermark</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">paper does not contain watermark</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f181" -->
-				<option value="1" SELECTED>paper contains watermark</option>
+			<!-- TMPL_IF name="f181" id="f181" -->
+				<option value="1" selected="selected">paper contains watermark</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">paper contains watermark</option>
 			<!-- /TMPL_IF -->
 	</select>
 		</td>
-</tr>
-	<tr>
-		<td>Printer's Device:</td>
+		<td><label for="f19">Printer's Device:</label></td>
 		<td>
-			<select name="f19" size="1">
+			<select name="f19" id="f19" size="1">
 
-			<!-- TMPL_IF name="f190" -->
-				<option value="0" SELECTED>printer's device not present</option>
+			<!-- TMPL_IF name="f190" id="f190" -->
+				<option value="0" selected="selected">printer's device not present</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">printer's device not present</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f191" -->
-				<option value="1" SELECTED>printer's device present</option>
+			<!-- TMPL_IF name="f191" id="f191" -->
+				<option value="1" selected="selected">printer's device present</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">printer's device present</option>
 			<!-- /TMPL_IF -->
@@ -1674,45 +1685,44 @@
 		</td>
 </tr>
 	<tr>
-		<td>Publisher's Device:</td>
+		<td><label for="f20">Publisher's Device:</label></td>
 		<td>
-			<select name="f20" size="1">
+			<select name="f20" id="f20" size="1">
 
-			<!-- TMPL_IF name="f200" -->
-				<option value="0" SELECTED>publisher's device not present</option>
+			<!-- TMPL_IF name="f200" id="f200" -->
+				<option value="0" selected="selected">publisher's device not present</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">publisher's device not present</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f201" -->
-				<option value="1" SELECTED>publisher's device present</option>
+			<!-- TMPL_IF name="f201" id="f201" -->
+				<option value="1" selected="selected">publisher's device present</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">publisher's device present</option>
 			<!-- /TMPL_IF -->
 	</select>
 		</td>
-</tr>
-	<tr>
-		<td>Ornamental Device:</td>
+		<td><label for="f21">Ornamental Device:</label></td>
 		<td>
-			<select name="f21" size="1">
+			<select name="f21" id="f21" size="1">
 
-			<!-- TMPL_IF name="f210" -->
-				<option value="0" SELECTED>ornamental device not present</option>
+			<!-- TMPL_IF name="f210" id="f210" -->
+				<option value="0" selected="selected">ornamental device not present</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">ornamental device not present</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f211" -->
-				<option value="1" SELECTED>ornamental device present</option>
+			<!-- TMPL_IF name="f211" id="f211" -->
+				<option value="1" selected="selected">ornamental device present</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">ornamental device present</option>
 			<!-- /TMPL_IF -->
 	</select>
 		</td>
 </tr>
-	<tr><td colspan=2><input type="button" value="OK"  onClick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
     function report() {
         var doc = opener.document; 
         var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -1720,6 +1730,7 @@
         self.close();
         return false;
     }
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tmpl
index 8b1c6b2..54b7ab5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_141.tmpl
@@ -1,18 +1,15 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 141 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 141 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-<form name="f_pop">
+<body style="padding:1em;">
+<h3>UNIMARC Field 141 builder</h3>
+<form name="f_pop" action="">
 <table>
 	<tr>
-		<td>Binding Material 1:</td>
+		<td><label for="f1">Binding Material 1:</label></td>
 		<td>
-			<select name="f1" size="1">
+			<select name="f1" id="f1" size="1">
             
 			<!-- TMPL_IF name="f1 " -->
 				<option value=" " SELECTED>non required value</option>
@@ -66,9 +63,9 @@
 			<!-- /TMPL_IF -->
 	</select>
 		</td></tr>	<tr>
-		<td>Binding Material 2:</td>
+		<td><label for="f2">Binding Material 2:</label></td>
 		<td>
-			<select name="f2" size="1">
+			<select name="f2" id="f2" size="1">
             
 			<!-- TMPL_IF name="f2 " -->
 				<option value=" " SELECTED>non required value</option>
@@ -123,9 +120,9 @@
 	</select>
 		</td></tr>
                 <tr>
-		<td>Binding Material 3:</td>
+		<td><label for="f3">Binding Material 3:</label></td>
 		<td>
-			<select name="f3" size="1">
+			<select name="f3" id="f3" size="1">
                         <!-- TMPL_IF name="f3 " -->
                                 <option value=" " SELECTED>non required value</option>
                         <!-- TMPL_ELSE -->
@@ -178,9 +175,10 @@
 			<!-- /TMPL_IF -->
 	</select>
 		</td></tr>
-		<td>Types of Binding:</td>
+		<tr>
+		<td><label for="f4">Types of Binding:</label></td>
 		<td>
-			<select name="f4" size="1">
+			<select name="f4" id="f4" size="1">
 
 			<!-- TMPL_IF name="f4a" -->
 				<option value="a" SELECTED>original, i.e. primary</option>
@@ -222,25 +220,27 @@
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td></tr>	<tr>
-		<td>Bound with':</td>
+		<td><label for="f5">Bound with':</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 
-			<!-- TMPL_IF name="f50" -->
+			<!-- TMPL_IF name="f50" id="f50" -->
 				<option value="0" SELECTED>single item</option>
 			<!-- TMPL_ELSE -->
 				<option value="0">single item</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="f51" -->
+			<!-- TMPL_IF name="f51" id="f51" -->
 				<option value="1" SELECTED>bound with one or more others</option>
 			<!-- TMPL_ELSE -->
 				<option value="1">bound with one or more others</option>
 			<!-- /TMPL_IF -->
+			</select>
 		</td></tr><tr>
-	<td>State of Preservation - Binding:</td>
+	<td><label for="f6">State of Preservation - Binding:</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 
 			<!-- TMPL_IF name="f6a" -->
 				<option value="a" SELECTED>excellent</option>
@@ -277,10 +277,11 @@
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 </td></tr><tr>
-	<td>State of Preservation - Body of the Book 1 :</td>
+	<td><label for="f7">State of Preservation - Body of the Book 1 :</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 
 			<!-- TMPL_IF name="f7a" -->
 				<option value="a" SELECTED>excellent</option>
@@ -317,10 +318,11 @@
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 </td></tr><tr>
-	<td>State of Preservation - Body of the Book 2 :</td>
+	<td><label for="f8">State of Preservation - Body of the Book 2 :</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 
 			<!-- TMPL_IF name="f8a" -->
 				<option value="a" SELECTED>excellent</option>
@@ -357,11 +359,13 @@
 			<!-- TMPL_ELSE -->
 				<option value="z">other</option>
 			<!-- /TMPL_IF -->
+			</select>
 </td></tr>
-	<tr><td colspan=2><input type="button" value="OK"  onclick="javascript:report()"></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
     function report() {
         var doc   = opener.document; 
         var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -370,6 +374,7 @@
         self.close();
         return false;
     }
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl
index c2d19c7..9eb49fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tmpl
@@ -1,57 +1,47 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_Field 210c builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 210c builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
-
-<div id="mainbloc">
-    <h1 class="authority">Authority search results</h1>
-    <div>
+<body style="padding:1em;">
+<h3>UNIMARC Field 210c builder</h3>
+    <h4>Search for authority type: EDITORS</h4>
         <form name="f" method="post" action="plugin_launcher.pl">
-            <input type="hidden" name="plugin_name" value="unimarc_field_210c.pl" />
+        <fieldset class="rows">
+            <input type="hidden" name="plugin_name" value="UNIMARC Field_210c.pl" />
             <input type="hidden" name="op" value="do_search" />
             <input type="hidden" name="type" value="intranet" />
             <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
-            <div>
-                <h2 class="authority">Search on</h2>
-                <p>
-                    <label class="label100">Authority type</label>
-                    EDITORS
-                </p>
-                <p>
-                    <label class="label100">Search value</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->" />
-                    <input type="hidden" name="index" value="<!--TMPL_VAR Name="index"-->" />
-                    <input type="hidden" name="authtypecode" value="EDITORS" />
-                    <input type="hidden" name="q" value="<!-- TMPL_VAR NAME="index" -->" />
-                    <input type="hidden" name="marclist" value="all" />
-                    <input type="hidden" name="and_or" value="and" />
-                    <input type="hidden" name="excluding" value="" />
-					<select name="orderby">
+            <input type="hidden" name="index" value="<!--TMPL_VAR Name="index"-->" />
+            <input type="hidden" name="authtypecode" value="EDITORS" />
+            <input type="hidden" name="q" value="<!-- TMPL_VAR NAME="index" -->" />
+            <input type="hidden" name="marclist" value="all" />
+            <input type="hidden" name="and_or" value="and" />
+            <input type="hidden" name="excluding" value="" />
+                 <ol>
+                    <li>
+					<select name="orderby" id="orderby">
             			<option value="">None</option>
             			<option value="HeadingAsc" selected="selected">Heading A-Z</option>
             			<option value="HeadingDsc">Heading Z-A</option>
         			</select>
-					<select name="operator">
+					<select name="operator" id="operator">
 			            <option value="contains">contains</option>
 			            <option value="start">starts with</option>
 			            <option value="is">is exactly</option>
 		        	</select>
-
-                </p>
-                <p>
-                <input type="submit" value="Start search" class="button authority" />
-                </p>
-            </div>
+                    <input type="text" id="value" name="value" value="<!-- TMPL_VAR name="resultstring" -->" />
+                    </li>
+                </ol>
+                </fieldset>
+                <fieldset class="action">
+                <input type="submit" value="Search" />
+                </fieldset>
         </form>
-    </div>
-    <div>
-        <div>
+            <!-- TMPL_IF NAME="total" -->
+            <h3>Authority search results</h3>
             <div class="paginationBar">
-              <!--TMPL_VAR Name="pagination_bar"-->      
-            </div>
+                          <!--TMPL_VAR Name="pagination_bar"-->      
+                        </div><!-- /TMPL_IF -->
             <p>
                 <!-- TMPL_IF name="total" -->
                     &nbsp;<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br /><br />
@@ -59,38 +49,35 @@
                     &nbsp; No results found<br />
                 <!-- /TMPL_IF -->
             </p>
-        </div>
+<!-- TMPL_IF NAME="total" -->
         <div id="resultlist">
             <table>
                 <tr>
-                    <th class="authority">Summary</th>
-                    <th class="authority">Used</th>
-                    <th class="authority">Get It!</th>
+                    <th>Summary</th>
+                    <th>Used</th>
+                    <th>Get It!</th>
                 </tr>
                 <!-- TMPL_LOOP NAME="result" -->
                     <tr>
                         <td><!-- TMPL_VAR NAME="summary" --></td>
                         <td><!-- TMPL_VAR NAME="used" --> times</td>
                         <td>
-			    <!-- TMPL_IF NAME="to_report" -->
+                <!-- TMPL_IF NAME="to_report" -->
                             <a href="javascript:report('<!-- TMPL_VAR name="to_report" ESCAPE=JS -->')"><img alt="choose" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/arrow.gif" width="32" hspace="0" vspace="0" border="0"></a>
-			    <!-- /TMPL_IF -->
+                <!-- /TMPL_IF -->
                         </td>
                     </tr>
                 <!-- /TMPL_LOOP -->
             </table>
-    
         </div>
-        <div>
-            <div class="paginationBar">
-              <!--TMPL_VAR Name="pagination_bar"-->      
-            </div>
-        </div>
-    </div>
-</div>
-
-<script language="JavaScript" type="text/javascript">
+<!-- /TMPL_IF -->
 
+            <!-- TMPL_IF NAME="total" --><div class="paginationBar">
+                          <!--TMPL_VAR Name="pagination_bar"-->      
+                        </div>
+            <!-- /TMPL_IF -->
+<script type="text/javascript">
+//<![CDATA[
 function report(summary)
 {    
     var doc   = opener.document; 
@@ -99,5 +86,7 @@ function report(summary)
     field.value = summary;
     self.close();
 }
+//]]>
 </script>
+
 <!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tmpl
index d3ef3fe..1f9b97b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_225a.tmpl
@@ -1,27 +1,27 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>UNIMARC_Field 225a builder</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+    <title>UNIMARC Field 225a builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
+<body style="padding:1em;">
+<h3>UNIMARC Field 225a builder</h3>
     <div id="mainbloc">
-        <form name="f_pop" onsubmit="javascript:report()" action="">
+        <form name="f_pop" onsubmit="report()" action="">
             <h2 class="authority">Collection</h2>
             <p><label>Select a collection</label><!-- TMPL_VAR name="collection" --></p>
             <input type="submit" value="OK" class="button authority" />
         </form>
     </div>
     
-    <script type="text/javascript">
-        function report() {
+<script type="text/javascript">
+//<![CDATA[
+function report() {
             var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
             field.value =  document.f_pop.f1.value;
             window.close();
             return false;
         }
-    </script>
-</body>
-</html>
\ No newline at end of file
+    //]]>
+</script>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl
index 253e8a3..0eb2ae5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tmpl
@@ -1,10 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Cataloging &rsaquo; 4XX plugin</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
 <!-- TMPL_IF NAME='fillinput' -->
-	<body>
         <script language="javascript" type="text/javascript">
 
             function go() {
@@ -77,12 +74,15 @@
             window.onload = go();
             opener.close();
             window.close();
-        </script>
-	</body>
+        //]]>
+</script>
+
+</head>
+<body style="padding:1em;">
+<h3>UNIMARC Field 4XX builder</h3>
 <!-- TMPL_ELSE -->
-	<body>
 		<script type="text/javascript">
-			
+//<![CDATA[			
 // 			document.getElementById('searchbox').focus();
 		
 			function report(value2report) {
@@ -98,23 +98,26 @@
                             self.close();
                             return false;
 			}
-		</script>
-    </head>
-	<h1>KOHA : INTRANET : Catalogue </h1>
+		//]]>
+</script>
+
+</head>
+<body style="padding:1em;">
+<h3>UNIMARC Field 4XX builder</h3>
 	<!--TMPL_IF Name = "Search"-->
-		<div id="unimarc_field_4XX_search">
+		<div id="UNIMARC_Field_4XX_search">
 		<h2> Search On  </h2>
-		<form name="f" method="post" action="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl">
+		<form name="f" method="post" action="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl">
 	
 			<p>
-				<input type="hidden" name="plugin_name" value="unimarc_field_4XX.pl">
-				<input type="hidden" name="index" value="<!--TMPL_VAR Name="index" -->">
-				<input type="hidden" name="result" value="unimarc field 4 <!--TMPL_VAR Name="index" -->">
-				<input type="hidden" name="op" value="do_search">
+				<input type="hidden" name="plugin_name" value="UNIMARC Field_4XX.pl" />
+				<input type="hidden" name="index" value="<!--TMPL_VAR Name="index" -->" /> 
+				<input type="hidden" name="result" value="unimarc field 4 <!--TMPL_VAR Name="index" -->" />
+				<input type="hidden" name="op" value="do_search" />
 				<label class="label100" for="searchbox">Any word</label>
-				<input type="text" name="search" id="searchbox" size="35"><br />
+				<input type="text" name="search" id="searchbox" size="35" /><br />
 				<label for="itypeloop">Item type:</label>
-				<select name="itype">
+				<select name="itype" id="itypeloop>
 				<option value="">All Item Types</option>
 				<!-- TMPL_LOOP NAME="itypeloop" -->
 				<!-- TMPL_IF NAME="selected" -->
@@ -126,8 +129,7 @@
 				</select>
 			</p>
 			<p>
-				<input type="submit" value="Start search">
-				<input type="reset"  value="Clear All Fields">
+				<input type="submit" value="Start search" />
 			</p>
 	
 		</div>
@@ -137,15 +139,15 @@
 	
 
 		<h2>Search results</h2>
-		<div id="unimarc_field_4XX_resultnumber">
-			<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt; Previous</a><!-- /TMPL_IF -->
+		<div id="UNIMARC_Field_4XX_resultnumber">
+			<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;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="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
+                                <!-- TMPL_ELSE --> <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;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="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">Next&gt;&gt;</a>
+                                  <a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&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" -->
@@ -183,9 +185,9 @@
 					</td>
 					<td>
                       <!--TMPL_IF Name="biblionumber"-->
-						<a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=<!--TMPL_VAR Name="index"-->&biblionumber=<!--TMPL_VAR Name="biblionumber"-->&type=intranet&op=fillinput')">Choose</a>
+						<a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;biblionumber=<!--TMPL_VAR Name="biblionumber"-->&amp;type=intranet&amp;op=fillinput')">Choose</a>
                       <!--TMPL_ELSE-->
-						<a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&index=<!--TMPL_VAR Name="index"-->&type=intranet&op=fillinput')">Clear Field</a>
+						<a href="javascript:jumpfull('/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;type=intranet&amp;op=fillinput')">Clear Field</a>
                       <!--/TMPL_IF-->
 					</td>
 				</tr>
@@ -196,7 +198,7 @@
 		<div id="resultnumber">
 			<p>
 				<!-- TMPL_IF NAME="displayprev" -->
-				<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+				<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;amp;index=<!--TMPL_VAR Name="index"-->&amp;amp;startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;amp;type=intranet&amp;amp;op=do_search">
 					&lt;&lt; Previous
 				</a>
 				<!-- /TMPL_IF -->
@@ -207,29 +209,30 @@
 							<!-- TMPL_VAR NAME="number" -->
 						</span>
 					<!-- TMPL_ELSE -->
-						<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+						<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;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="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+				<a class="resultnumber" href="/cgi-bin/koha/cataloguing/plugin_launcher.pl?plugin_name=UNIMARC Field_4XX.pl&amp;index=<!--TMPL_VAR Name="index"-->&amp;startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
 					Next&gt;&gt;
 				</a>
 				<!-- /TMPL_IF -->
 			</p>
 		</div>
 	
-		<script language="JavaScript" type="text/javascript">
-		
+<script type="text/javascript">
+//<![CDATA[
 		function jumpfull(page){	
 			window.open(page,'','fullscreen,scrollbars');
 		}
-		</script>
+//]]>
+</script>
+
 		
 	<!--/TMPL_IF-->
 
-</body>
 <!-- /TMPL_IF -->
-</html>
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tmpl
index 8e91f15..28a6be2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_686a.tmpl
@@ -1,11 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>UNIMARC_Field 686a builder</title>
+<title>UNIMARC Field 686a builder</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <style type="text/css">
 #custom-doc { width:51.46em;*width:50.17em;min-width:675px; margin:auto; text-align:left; }
 </style>
 </head>
-<body>
+<body style="padding:1em;">
+<h3>UNIMARC Field 686a builder</h3>
 <div id="custom-doc" class="yui-t7">
    <div id="bd">
 	<div id="yui-main">
@@ -66,12 +67,11 @@
                         <option value="HeadingDsc">Heading Descendant</option>
                     </select>
                 </li></ol></fieldset>
-            <fieldset class="action"> <input type="submit" value="Start search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>
+            <fieldset class="action"> <input type="submit" value="Search" class="submit" /> <a class="cancel close" href="#">Cancel</a></fieldset>
 		</form>
 	</div>
 	</div>
    </div>
 </div>
 </div>
-</body>
-</html>
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tmpl
index 6eb17fd..ef2a326 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_700-4.tmpl
@@ -1,17 +1,14 @@
-???<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>UNIMARC_constructeur champ 700-4</title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>UNIMARC Field 700-4 builder</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
+<body style="padding:1em;">
+<h3>UNIMARC Field 700-4 builder</h3>
 <p>S??lectionnez la valeur pour le champ 700 $4. Elle sera automatiquement report??e dans la zone 700 $8 qui suit.</p>
-<form name="f_pop" onSubmit="report()">
+<form name="f_pop" onsubmit="report()" action="">
 <table>
 	<tr>
-		<td>Code date publication </td><td><select name="f1" size="1">
+		<td><label for="f1">Code date publication </label></td><td><select name="f1" id="f1" size="1">
 			<!-- TMPL_IF name="f1_075" -->
 			<option value="075 - postface" selected="selected">postface</option>
 			<!-- TMPL_ELSE -->
@@ -44,10 +41,11 @@
 			</select>
 		</td>
 	</tr>
-	<tr><td colspan="2"><input type="submit" value="OK" /></td></tr>
 </table>
+<fieldset class="action"><input type="submit" value="OK" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
-<script>
+<script type="text/javascript">
+//<![CDATA[
 	function report() {
 		x = document.f_pop.f1.value.split(' - ');
 		var doc   = opener.document; 
@@ -60,6 +58,7 @@
 		self.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tmpl
index b267614..7549aa5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_leader.tmpl
@@ -1,8 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Leader building</title>
+<title>UNIMARC Leader builder</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
+<body style="padding:1em;">
+<h3>UNIMARC Leader builder</h3>
 <form name="f_pop" action="">
 <table>
 	<tr>
@@ -10,9 +11,9 @@
 		<td>(auto-calculated)</td>
 	</tr>
 	<tr>
-		<td>5- Record status</td>
+		<td><label for="f5">5- Record status</label></td>
 		<td>
-			<select name="f5" size="1">
+			<select name="f5" id="f5" size="1">
 			<!-- TMPL_IF name="f5|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -48,9 +49,9 @@
 		</td>
 	</tr>
 	<tr>
-		<td>6- Type of record</td>
+		<td><label for="f6">6- Type of record</label></td>
 		<td>
-			<select name="f6" size="1">
+			<select name="f6" id="f6" size="1">
 			<!-- TMPL_IF name="f6|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -139,9 +140,9 @@
 		</td>
 	</tr>
 	<tr>
-		<td>7- Bibliographic level</td>
+		<td><label for="f7">7- Bibliographic level</label></td>
 		<td>
-			<select name="f7" size="1">
+			<select name="f7" id="f7" size="1">
 			<!-- TMPL_IF name="f7|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -178,9 +179,9 @@
 	</tr>
 	
 	<tr>
-		<td>8- Hierarchical level code</td>
+		<td><label for="f8">8- Hierarchical level code</label></td>
 		<td>
-			<select name="f8" size="1">
+			<select name="f8" id="f8" size="1">
 			<!-- TMPL_IF name="f8|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -193,13 +194,13 @@
 					<option value=" "> - Hierarchical relationship undefined</option>
 				<!-- /TMPL_IF -->
 				
-				<!-- TMPL_IF name="f80" -->
+				<!-- TMPL_IF name="f80" id="f80" -->
 					<option value="0" selected="selected">0 - No hierarchical relationship</option>
 				<!-- TMPL_ELSE -->
 					<option value="0">0 - No hierarchical relationship</option>
 				<!-- /TMPL_IF -->
 				
-				<!-- TMPL_IF name="f81" -->
+				<!-- TMPL_IF name="f81" id="f81" -->
 					<option value="1" selected="selected">1 - Highest level record</option>
 				<!-- TMPL_ELSE -->
 					<option value="1">1 - Highest level record</option>
@@ -220,9 +221,9 @@
 		<td>(auto-filled)</td>
 	</tr>
 	<tr>
-		<td>17- Encoding level</td>
+		<td><label for="f17">17- Encoding level</label></td>
 		<td>
-			<select name="f17" size="1">
+			<select name="f17" id="f17" size="1">
 			<!-- TMPL_IF name="f17|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -234,12 +235,12 @@
 				<!-- TMPL_ELSE -->
 					<option value=" "> Full level ("item in hand")</option>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="f171" -->
+				<!-- TMPL_IF name="f171" id="f171" -->
 					<option value="1" selected="selected">1 - Sublevel 1 (not "item in hand")</option>
 				<!-- TMPL_ELSE -->
 					<option value="1">1 - Sublevel 1 (not "item in hand")</option>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="f172" -->
+				<!-- TMPL_IF name="f172" id="f172" -->
 					<option value="2" selected="selected">2 - Sublevel 2. The record is a prepublication (Cataloguing In Publication) record</option>
 				<!-- TMPL_ELSE -->
 					<option value="2">2 - Sublevel 2. The record is a prepublication (Cataloguing In Publication) record</option>
@@ -254,9 +255,9 @@
 	</tr>
 
 	<tr>
-		<td>18- Descriptive cataloging form</td>
+		<td><label for="f18">18- Descriptive cataloging form</label></td>
 		<td>
-			<select name="f18" size="1">
+			<select name="f18" id="f18" size="1">
 			<!-- TMPL_IF name="f18|" -->
             	<option value="|" selected="selected">|- Filling character</option>
             <!-- TMPL_ELSE -->
@@ -286,11 +287,11 @@
 		<td>19-24 Entry map &amp; lengths</td>
 		<td>(auto-filled)</td>
 	</tr>
-
-	<tr><td colspan="2"><input type="button" value="OK"  onclick="javascript:report()" /></td></tr>
 </table>
+<fieldset class="action"><input type="button" value="OK" onclick="report();" /> <a href="#" class="cancel close">Cancel</a></fieldset>
 </form>
 <script type="text/javascript">
+//<![CDATA[
 function report() {
 	    var doc   = opener.document; 
             var field = doc.getElementById("<!-- TMPL_VAR NAME='index'-->");
@@ -302,7 +303,8 @@ function report() {
 		window.close();
 		return false;
 	}
+//]]>
 </script>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
 
-- 
1.7.0.4


From oleonard at myacpl.org  Mon Jul 26 18:47:33 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 26 Jul 2010 12:47:33 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 4991,
	Overhaul of Calendar interface
Message-ID: <AANLkTinazNLai_8ZodBbB-1ntzExstDYMmu2-Kc9ekd4@mail.gmail.com>

For some reason this gets rejected when I try to send it via "git
send-email." Patch is attached.

- Put hints, key, and existing holidays into right column
- Style entry form for added clarity and consistency with other
 forms in Koha
- Change the way dynamically displayed hints are shown to better
 match existing static hints in Koha's interface
- Add branch name (instead of branch code) for clarity
- Add the ability to add and edit holiday titles (previously
 only description could be edited).
- Add links to the list of existing single-day holidays and
 exceptions which opens the calendar to that month/year

  -- Owen

-- 
Web Developer
Athens County Public Libraries
http://www.myacpl.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Fix-for-Bug-4991-Overhaul-of-Calendar-interface.patch
Type: text/x-patch
Size: 29255 bytes
Desc: not available
URL: </pipermail/koha-patches/attachments/20100726/f3b9df69/attachment-0001.bin>

From oleonard at myacpl.org  Mon Jul 26 21:03:09 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 26 Jul 2010 15:03:09 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 5056,
	Untranslatable strings in members.js
Message-ID: <1280170989-31128-1-git-send-email-oleonard@myacpl.org>

---
 koha-tmpl/intranet-tmpl/prog/en/js/members.js      |   19 ++++++++++---------
 .../prog/en/modules/members/memberentrygen.tmpl    |   12 ++++++++++--
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/members.js b/koha-tmpl/intranet-tmpl/prog/en/js/members.js
index 145e95f..796db0a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/members.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/members.js
@@ -8,7 +8,7 @@ if (d!="") {
       var ok=1;
       var msg;
       if ( (date.length < 2) && (ok==1) ) {
-        msg = _("Separator must be /"); 
+        msg = MSG_SEPARATOR+field.name;
     	alert(msg); ok=0; field.focus();
     	return;
       }
@@ -17,19 +17,19 @@ if (d!="") {
       var yyyy = date[2]; 
       // checking days
       if ( ((isNaN(dd))||(dd<1)||(dd>31)) && (ok==1) ) {
-        msg = _("day not correct."); 
+        msg = MSG_INCORRECT_DAY+field.name;
 	    alert(msg); ok=0; field.focus();
 	    return false;
       }
       // checking months
       if ( ((isNaN(mm))||(mm<1)||(mm>12)) && (ok==1) ) {
-        msg = _("month not correct.");
+        msg = MSG_INCORRECT_MONTH+field.name;
 	    alert(msg); ok=0; field.focus();
 	    return false;
       }
       // checking years
       if ( ((isNaN(yyyy))||(yyyy<amin)||(yyyy>amax)) && (ok==1) ) {
-        msg = _("years not correct."); 
+        msg = MSG_INCORRECT_YEAR+field.name;
 	    alert(msg); ok=0; field.focus();
 	    return false;
       }
@@ -43,13 +43,13 @@ var msg2;
 if (  document.form.check_member.value==1){
 	if (document.form.categorycode.value != "I"){
 		
-		msg1 += ("Warning  !!!! Duplicate patron!!!!");
+		msg1 += MSG_DUPLICATE_PATRON;
 		alert(msg1);
 	check_form_borrowers(0);
 	document.form.submit();
 	
 	}else{
-		msg2 += ("Warning !!!! Duplicate organisation!!!!");
+		msg2 += MSG_DUPLICATE_ORGANIZATION;
 		alert(msg2);
 	check_form_borrowers(0);
 	}
@@ -73,7 +73,7 @@ var myDate2=document.form.dateexpiry.value.split ('/');
 	
 		{ 
 		document.form.dateenrolled.focus();
-		var msg = ("Warning !!! check date expiry  >= date enrolment");
+		var msg = MSG_LATE_EXPIRY;
 		alert(msg);
 		}
 	}
@@ -101,7 +101,8 @@ function check_form_borrowers(nav){
 	else
 	{
 	    var champ_verif = document.form.BorrowerMandatoryField.value.split ('|');
-	    var message ="The following fields are mandatory :\n";
+	    var message = MSG_MISSING_MANDATORY
+	    message += "\n";
 	    var message_champ="";
 		for (var i=0; i<champ_verif.length; i++) {
 			if (document.getElementsByName(""+champ_verif[i]+"")[0]) {
@@ -131,7 +132,7 @@ function check_form_borrowers(nav){
  	if (statut!=1 && document.form.check_member.value > 0 ) {
 		if (!(document.form_double.answernodouble.checked)){
 			message ="";
-			message_champ+=("Please confirm suspicious duplicate patron !!! ");
+			message_champ+= MSG_DUPLICATE_SUSPICION;
 			statut=1;
 			document.form.nodouble.value=0;
 		} else {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index b21d35a..6bd4266 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -2,7 +2,6 @@
 <title>Koha &rsaquo; Patrons &rsaquo; 
 <!-- TMPL_IF NAME="opadd" -->	Add<!-- TMPL_ELSE --> Modify<!--/TMPL_IF--> <!--TMPL_IF Name="categoryname"--> <!--TMPL_VAR Name="categoryname"--> patron<!-- TMPL_ELSE --><!--TMPL_IF Name="I"--> Organization patron<!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adult patron<!--/TMPL_IF --><!--TMPL_IF Name="C"--> Child patron<!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professional patron<!--/TMPL_IF --><!--TMPL_IF Name="S"--> Staff patron<!--/TMPL_IF --><!--/TMPL_IF --><!--TMPL_UNLESS Name="opadd"--> <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR name="firstname" --><!--/TMPL_UNLESS--></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/members.js"></script>
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
@@ -48,9 +47,18 @@
         });
         original.parentNode.insertBefore(clone, original.nextSibling);
     }
-
+		var MSG_SEPARATOR = _("Separator must be / in field ");
+        var MSG_INCORRECT_DAY = _("Invalid day entered in field ");
+        var MSG_INCORRECT_MONTH = _("Invalid month entered in field ");
+        var MSG_INCORRECT_YEAR = _("Invalid year entered in field ");
+        var MSG_DUPLICATE_PATRON = _("Warning: Duplicate patron");
+        var MSG_DUPLICATE_ORGANIZATION = _("Warning: Duplicate organization");
+        var MSG_LATE_EXPIRY = _("Warning: Expiration date falls before enrollment date");
+        var MSG_MISSING_MANDATORY = _("The following fields are mandatory:");
+        var MSG_DUPLICATE_SUSPICION = _("Please confirm whether this is a duplicate patron");
 //]]>
 </script>
+<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/members.js"></script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-- 
1.7.0.4


From oleonard at myacpl.org  Mon Jul 26 21:50:39 2010
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 26 Jul 2010 15:50:39 -0400
Subject: [Koha-patches] [PATCH] Fix for Bug 5000,
	Uncertain prices misses option to choose display language
Message-ID: <1280173839-31346-1-git-send-email-oleonard@myacpl.org>

- Adding missing footer include for language chooser
- Correcting markup and structure errors
---
 .../prog/en/modules/acqui/uncertainprice.tmpl      |   23 ++++++++-----------
 1 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tmpl
index 86f635e..86d9186 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tmpl
@@ -22,7 +22,7 @@ function check(form) {
         <!-- TMPL_IF name="validate" -->
             <META HTTP-EQUIV=Refresh CONTENT="0; URL=<!-- TMPL_VAR name="scriptname" -->?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->">
         <!-- TMPL_ELSE -->
-        <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!--TMPL_VAR name="booksellername" --></a> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->&op=enter">(edit)</a></h1>
+        <h1>Orders with uncertain prices for vendor <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!--TMPL_VAR name="booksellername" --></a> <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;op=enter">(edit)</a></h1>
         <h2>Contact information</h2>
         <p><strong>Address: </strong>
             <!-- TMPL_VAR name="booksellerpostal" -->
@@ -35,8 +35,8 @@ function check(form) {
         <p><strong>Phone: </strong>
             <!--TMPL_VAR name="booksellerphone" --> / Fax:
             <!--TMPL_VAR name="booksellerfax" --></p>
-        <p><dl>
-            <dt><strong>Contact: </strong> 
+        <dl>
+            <dt><strong>Contact: </strong></dt>
             <dd><!--TMPL_VAR name="booksellercontact" -->
             <!--TMPL_VAR name="booksellercontpos" -->
             <!--TMPL_VAR name="booksellercontphone" -->
@@ -44,7 +44,7 @@ function check(form) {
             <!--TMPL_VAR name="booksellercontemail" -->
             <!--TMPL_VAR name="booksellercontnotes" -->
             </dd>
-        </dl></p>
+        </dl>
         <!-- TMPL_IF name="booksellernotes" -->
         <p><strong>Notes: </strong>
             <!--TMPL_VAR name="booksellernotes" --></p>
@@ -84,7 +84,7 @@ function check(form) {
         </td>
 	    <td>
 	        <!-- TMPL_VAR name="bibtitle" --> / <!-- TMPL_VAR name="bibauthor" --> <br /> <!-- TMPL_VAR name="bibpublishercode" -->, <!-- TMPL_VAR name="bibpublicationyear" --><br /><!-- TMPL_VAR name="bibisbn" --><br />
-	        <a href="neworderempty.pl?ordernumber=<!-- TMPL_VAR name="ordernumber" -->&booksellerid=<!-- TMPL_VAR name="booksellerid" -->&basketno=<!-- TMPL_VAR name="basketno" -->">
+	        <a href="neworderempty.pl?ordernumber=<!-- TMPL_VAR name="ordernumber" -->&amp;booksellerid=<!-- TMPL_VAR name="booksellerid" -->&amp;basketno=<!-- TMPL_VAR name="basketno" -->">
 	            edit
 	        </a>
 	    </td>
@@ -92,25 +92,22 @@ function check(form) {
             <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
         </td>
 	    <td>
-	        <input type="checkbox" name="uncertainprice<!-- TMPL_VAR name="ordernumber" -->" value="1" checked>
+	        <input type="checkbox" name="uncertainprice<!-- TMPL_VAR name="ordernumber" -->" value="1" checked="checked" />
 	    </td>
 	    <td>
 	        <input type="text" size="10" name="price<!-- TMPL_VAR name="ordernumber"-->" value="<!-- TMPL_VAR name="listprice" -->"
-	                                        onChange="uncheckbox(this.form, <!-- TMPL_VAR name="ordernumber" -->);" />
+	                                        onchange="uncheckbox(this.form, <!-- TMPL_VAR name="ordernumber" -->);" />
 	    </td>
 	    <td>
 	        
 	        <input type="text" size="10" name="qty<!-- TMPL_VAR name="ordernumber"-->" value="<!-- TMPL_VAR name="quantity" -->"
-	                                        onChange="uncheckbox(this.form, <!-- TMPL_VAR name="ordernumber" -->);" />
+	                                        onchange="uncheckbox(this.form, <!-- TMPL_VAR name="ordernumber" -->);" />
 	    </td>
 	    </tr>
 	    <!-- /TMPL_LOOP -->
 	</table>
-	<input type="button" value="Save" onclick="check(this.form)" />
+	<fieldset class="action"><input type="button" value="Save" onclick="check(this.form)" /></fieldset>
 	</form>
 	<!-- /TMPL_IF -->
 </div>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
+</div><!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-- 
1.7.0.4


From colin.campbell at ptfs-europe.com  Tue Jul 27 14:17:34 2010
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Tue, 27 Jul 2010 13:17:34 +0100
Subject: [Koha-patches] [PATCH] bug_5064 Rework data retrieval in
	booksellers.pl
Message-ID: <1280233054-7774-1-git-send-email-colin.campbell@ptfs-europe.com>

loops were slightly illogical and db accesss was excessive
and repetitive. caused it not to scale well on large datasets
Routines in Acquisition.pm seem to have inconsistent views
of the data.
rework logic to utilize db and processing better
---
 acqui/booksellers.pl |  124 ++++++++++++++++++++++++++++----------------------
 1 files changed, 70 insertions(+), 54 deletions(-)

diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 0918f5d..88dbaa9 100755
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -4,6 +4,7 @@
 
 # Copyright 2000-2002 Katipo Communications
 # Copyright 2008-2009 BibLibre SARL
+# Copyright 2010 PTFS Europe
 #
 # This file is part of Koha.
 #
@@ -20,14 +21,13 @@
 # with Koha; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-
 =head1 NAME
 
 booksellers.pl
 
 =head1 DESCRIPTION
 
-this script displays the list of suppliers & orders like C<$supplier> given on input arg.
+this script displays the list of suppliers & baskets like C<$supplier> given on input arg.
 thus, this page brings differents features like to display supplier's details,
 to add an order for a specific supplier or to just add a new supplier.
 
@@ -37,40 +37,34 @@ to add an order for a specific supplier or to just add a new supplier.
 
 =item supplier
 
-C<$supplier> is the suplier we have to search order.
-=back
-
-=item op
+C<$supplier> is the string with which we search for a supplier
 
-C<OP> can be equals to 'close' if we have to close a basket before building the page.
+=back
 
-=item basket
+=item id or supplierid
 
-the C<basket> we have to close if op is equal to 'close'.
+The id of the supplier whose baskets we will display
 
 =back
 
 =cut
 
 use strict;
-#use warnings; FIXME - Bug 2505
+use warnings;
 use C4::Auth;
 use C4::Biblio;
 use C4::Output;
 use CGI;
 
-
-use C4::Acquisition;
 use C4::Dates qw/format_date/;
 use C4::Bookseller qw/ GetBookSellerFromId GetBookSeller /;
 use C4::Members qw/GetMember/;
 
-my $query = new CGI;
+my $query = CGI->new;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {
-        template_name   => "acqui/booksellers.tmpl",
+    {   template_name   => 'acqui/booksellers.tmpl',
         query           => $query,
-        type            => "intranet",
+        type            => 'intranet',
         authnotrequired => 0,
         flagsrequired   => { acquisition => 'vendors_manage' },
         debug           => 1,
@@ -79,56 +73,78 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 
 #parameters
 my $supplier = $query->param('supplier');
-my $id       = $query->param('id') || $query->param('supplierid');
+my $id = $query->param('id') || $query->param('supplierid');
 my @suppliers;
 
 if ($id) {
-	push @suppliers, GetBookSellerFromId($id);
+    push @suppliers, GetBookSellerFromId($id);
 } else {
-	@suppliers = GetBookSeller($supplier);
+    @suppliers = GetBookSeller($supplier);
+}
+
+my $supplier_count = @suppliers;
+if ( $supplier_count == 1 ) {
+    $template->param(
+        supplier_name => $suppliers[0]->{'name'},
+        id            => $suppliers[0]->{'id'}
+    );
 }
-my $count = scalar @suppliers;
-if ($count == 1){
-	$template->param( supplier_name => $suppliers[0]->{'name'},
-		id => $suppliers[0]->{'id'}
-	);
+
+my $uid;
+if ($loggedinuser) {
+    $uid = GetMember( borrowernumber => $loggedinuser )->{userid};
 }
 
 #build result page
-my @loop_suppliers;
-for ( my $i = 0 ; $i < $count ; $i++ ) {
-    my $orders  = GetBasketsByBookseller( $suppliers[$i]->{'id'}, {groupby => "aqbasket.basketno", orderby => "aqbasket.basketname"} );
-    my $ordcount = scalar @$orders;
-    my %line;
-
-    $line{supplierid} = $suppliers[$i]->{'id'};
-    $line{name}       = $suppliers[$i]->{'name'};
-    $line{active}     = $suppliers[$i]->{'active'};
-    my @loop_basket;
-    my $uid = GetMember(borrowernumber => $loggedinuser)->{userid} if $loggedinuser;
-    for ( my $i2 = 0 ; $i2 < $ordcount ; $i2++ ) {
-        if ( $orders->[$i2]{'authorisedby'} eq $loggedinuser || haspermission($uid, { flagsrequired   => { 'acquisition' => '*' } } ) ) {
-            my %inner_line;
-            $inner_line{basketno}     = $orders->[$i2]{'basketno'};
-            $inner_line{basketname}     = $orders->[$i2]{'basketname'};
-            $inner_line{total}        = scalar GetOrders($orders->[$i2]{'basketno'});
-            $inner_line{authorisedby} = $orders->[$i2]{'authorisedby'};
-            my $authby = GetMember(borrowernumber => $orders->[$i2]{'authorisedby'});
-            $inner_line{surname}      = $authby->{'firstname'};
-            $inner_line{firstname}    = $authby->{'surname'};
-            $inner_line{creationdate} = format_date( $orders->[$i2]{'creationdate'} );
-            $inner_line{closedate}    = format_date( $orders->[$i2]{'closedate'}    );
-            $inner_line{uncertainprice} = $orders->[$i2]{'uncertainprice'};
-            push @loop_basket, \%inner_line;
+my $loop_suppliers = [];
+
+for my $vendor (@suppliers) {
+    my $baskets = get_vendors_baskets( $vendor->{id} );
+
+    my $loop_basket = [];
+    for my $basket ( @{$baskets} ) {
+        if ((      $basket->{authorisedby}
+                && $basket->{authorisedby} eq $loggedinuser
+            )
+            || haspermission( $uid, { flagsrequired => { acquisition => q{*} } } )
+          ) {
+            for my $date_field (qw( creationdate closedate)) {
+                if ( $basket->{$date_field} ) {
+                    $basket->{$date_field} =
+                      format_date( $basket->{$date_field} );
+                }
+            }
+            push @{$loop_basket}, $basket;
         }
     }
-    $line{loop_basket} = \@loop_basket;
-    push @loop_suppliers, \%line;
+
+    push @{$loop_suppliers},
+      { loop_basket => $loop_basket,
+        supplierid  => $vendor->{id},
+        name        => $vendor->{name},
+        active      => $vendor->{active},
+      };
+
 }
 $template->param(
-    loop_suppliers          => \@loop_suppliers,
-    supplier                => ($id || $supplier),
-    count                   => $count,
+    loop_suppliers => $loop_suppliers,
+    supplier       => ( $id || $supplier ),
+    count          => $supplier_count,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;
+
+sub get_vendors_baskets {
+    my $supplier_id = shift;
+    my $dbh         = C4::Context->dbh;
+    my $sql         = <<'ENDSQL';
+select aqbasket.*, count(*) as total,  borrowers.firstname, borrowers.surname
+from aqbasket left join aqorders on aqorders.basketno = aqbasket.basketno
+left join borrowers on aqbasket.authorisedby = borrowers.borrowernumber
+where booksellerid = ?
+AND ( aqorders.quantity > aqorders.quantityreceived OR quantityreceived IS NULL)
+AND datecancellationprinted IS NULL
+group by basketno
+ENDSQL
+    return $dbh->selectall_arrayref( $sql, { Slice => {} }, $supplier_id );
+}
-- 
1.7.1.1


From M.de.Rooy at rijksmuseum.nl  Wed Jul 28 16:01:59 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Wed, 28 Jul 2010 14:01:59 +0000
Subject: [Koha-patches] [PATCH] Bug 5066 (Incorrect use of localtime
 function when calling _session_log) for 3.0.x only
Message-ID: <32857065C79E3F4E8FDFBB0CAC6897F702946A59@S-MAIL-1B.rijksmuseum.intra>

This patch applies to 3.0.x only and solves a little bug in using the localtime function when writing to tmp/sessionlog. It should be called in scalar context iinstead of list context.
---
 C4/Auth.pm |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index c50658c..108d9e3 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -564,7 +564,7 @@ sub checkauth {
             $session->flush;      
             $session->delete();
             C4::Context->_unset_userenv($sessionID);
-            _session_log(sprintf "%20s from %16s logged out at %30s (manually).\n", $userid,$ip,localtime);
+            _session_log(sprintf "%20s from %16s logged out at %30s (manually).\n", $userid,$ip,scalar localtime);
             $sessionID = undef;
             $userid    = undef;
         }
@@ -573,7 +573,7 @@ sub checkauth {
             $info{'timed_out'} = 1;
             $session->delete();
             C4::Context->_unset_userenv($sessionID);
-            _session_log(sprintf "%20s from %16s logged out at %30s (inactivity).\n", $userid,$ip,localtime);
+            _session_log(sprintf "%20s from %16s logged out at %30s (inactivity).\n", $userid,$ip,scalar localtime);
             $userid    = undef;
             $sessionID = undef;
         }
@@ -584,7 +584,7 @@ sub checkauth {
             $info{'different_ip'} = 1;
             $session->delete();
             C4::Context->_unset_userenv($sessionID);
-            _session_log(sprintf "%20s from %16s logged out at %30s (ip changed to %16s).\n", $userid,$ip,localtime, $info{'newip'});
+            _session_log(sprintf "%20s from %16s logged out at %30s (ip changed to %16s).\n", $userid,$ip,scalar localtime, $info{'newip'});
             $sessionID = undef;
             $userid    = undef;
         }
@@ -611,7 +611,7 @@ sub checkauth {
             my $password = $query->param('password');
             my ( $return, $cardnumber ) = checkpw( $dbh, $userid, $password );
             if ($return) {
-                _session_log(sprintf "%20s from %16s logged in  at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},localtime);
+                _session_log(sprintf "%20s from %16s logged in  at %30s.\n", $userid,$ENV{'REMOTE_ADDR'},scalar localtime);
                 if ( $flags = haspermission($userid, $flagsrequired) ) {
                     $loggedin = 1;
                 }
-- 
1.6.0.6


From cnighswonger at foundations.edu  Wed Jul 28 20:59:09 2010
From: cnighswonger at foundations.edu (Chris Nighswonger)
Date: Wed, 28 Jul 2010 14:59:09 -0400
Subject: [Koha-patches] [PATCH] Bug 3756: Adding the ability to have local
	use systempreferences
Message-ID: <1280343549-9190-1-git-send-email-cnighswonger@foundations.edu>

Correcting the systempreferences link on the main intranet page.
---
 .../prog/en/modules/intranet-main.tmpl             |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
index 420d7e1..120ca52 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
@@ -69,7 +69,7 @@
     <!-- TMPL_IF NAME="CAN_user_parameters" -->
    <h3> <a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a></h3>
    			<ul>
-            <li><a href="/cgi-bin/koha/admin/preferences.pl">System preferences</a></li>
+            <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></li>
         </ul>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="CAN_user_tools" --> <h3><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></h3> <!-- /TMPL_IF -->
-- 
1.7.0.4


From f.demians at tamil.fr  Thu Jul 29 11:31:21 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Thu, 29 Jul 2010 11:31:21 +0200
Subject: [Koha-patches] [PATCH] Bug 5067 Add a parameter do disable ISBN
	cleaning
Message-ID: <1280395881-1469-1-git-send-email-f.demians@tamil.fr>

By default, bulkmarcimport.pl was cleaning hyphens from ISBN in entering
biblio records. A new parameter -cleanisbn allows to disable ISBN
cleaing. By default, bulkmarcimport.pl continues to remove ISBN hyphens.
You have to add -nocleanisbn to disable it explicitely.
---
 misc/migration_tools/bulkmarcimport.pl |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/misc/migration_tools/bulkmarcimport.pl b/misc/migration_tools/bulkmarcimport.pl
index da0ebf7..8c14928 100755
--- a/misc/migration_tools/bulkmarcimport.pl
+++ b/misc/migration_tools/bulkmarcimport.pl
@@ -34,6 +34,7 @@ binmode(STDOUT, ":utf8");
 my ( $input_marc_file, $number, $offset) = ('',0,0);
 my ($version, $delete, $test_parameter, $skip_marc8_conversion, $char_encoding, $verbose, $commit, $fk_off,$format,$biblios,$authorities,$keepids,$match, $isbn_check, $logfile);
 my ($sourcetag,$sourcesubfield,$idmapfl);
+my $cleanisbn = 1;
 
 $|=1;
 
@@ -59,6 +60,7 @@ GetOptions(
     'x:s' => \$sourcetag,
     'y:s' => \$sourcesubfield,
     'idmap:s' => \$idmapfl,
+    'cleanisbn!'     => \$cleanisbn,
 );
 $biblios=!$authorities||$biblios;
 
@@ -196,19 +198,13 @@ RECORD: while (  ) {
     }
     my $isbn;
     # remove trailing - in isbn (only for biblios, of course)
-    if ($biblios) {
-        if ($marcFlavour eq 'UNIMARC') {
-            if (my $f010 = $record->field('010')) {
-                $isbn = $f010->subfield('a');
-                $isbn =~ s/-//g;
-                $f010->update('a' => $isbn);
-            }
-        } else {
-            if (my $f020 = $record->field('020')) {
-                $isbn = $f020->subfield('a');
-                $isbn =~ s/-//g;
-                $f020->update('a' => $isbn);
-            }
+    if ($biblios && $cleanisbn) {
+        my $tag = $marcFlavour eq 'UNIMARC' ? '010' : '020';
+        my $field = $record->field($tag);
+        my $isbn = $field && $field->subfield('a');
+        if ( $isbn ) {
+            $isbn =~ s/-//g;
+            $field->update('a' => $isbn);
         }
     }
     my $id;
@@ -517,6 +513,11 @@ If set, a search will be done on isbn, and, if the same isbn is found, the
 biblio is not added. It's another method to deduplicate.  B<-match> & B<-isbn>
 can be both set.
 
+=item B<-cleanisbn>
+
+Clean ISBN fields from entering biblio records, ie removes hyphens. By default,
+ISBN are cleaned. --nocleanisbn will keep ISBN unchanged.
+
 =item B<-x>=I<TAG>
 
 Source bib I<TAG> for reporting the source bib number
-- 
1.7.1


From M.de.Rooy at rijksmuseum.nl  Thu Jul 29 14:46:02 2010
From: M.de.Rooy at rijksmuseum.nl (Marcel de Rooy)
Date: Thu, 29 Jul 2010 12:46:02 +0000
Subject: [Koha-patches] [PATCH] Enhancement 5074 (Adding possibility to
 cleanup_database.pl to purge only older sessions) [for 3.0.x and master]
Message-ID: <32857065C79E3F4E8FDFBB0CAC6897F7029473E1@S-MAIL-1B.rijksmuseum.intra>

Currently, the misc/cronjobs script cleanup_database truncates the session table (deleting all records, including active sessions).
With an additional parameter sessdays, this behavior could be changed or (perhaps better) extended. If the parameter sessdays is passed along with a number of days, the script only deletes older session records. This is accomplished by examining the values of lasttime, atime or ctime in the record.
So, calling the script like:
  ./cleanup_database.pl -v -sessions -sessdays 7
will only delete sessions records older than 7 days. The "old style" call
  ./cleanup_database.pl -v -sessions
still works too and truncates the table as before. 
Patch can be applied to 3.0.x and master.
---
 misc/cronjobs/cleanup_database.pl |   46 ++++++++++++++++++++++++++++++++++--
 1 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/misc/cronjobs/cleanup_database.pl b/misc/cronjobs/cleanup_database.pl
index 47b9c26..f68e3eb 100755
--- a/misc/cronjobs/cleanup_database.pl
+++ b/misc/cronjobs/cleanup_database.pl
@@ -37,21 +37,23 @@ use Getopt::Long;
 
 sub usage {
     print STDERR <<USAGE;
-Usage: $0 [-h|--help] [--sessions] [-v|--verbose] [--zebraqueue DAYS]
+Usage: $0 [-h|--help] [--sessions] [--sessdays DAYS] [-v|--verbose] [--zebraqueue DAYS]
    -h --help         prints this help message, and exits, ignoring all other options
    --sessions        purge the sessions table.  If you use this while users are logged
                      into Koha, they will have to reconnect.
+   --sessdays DAYS   purge only sessions older than DAYS days (use together with sessions parameter).
    -v --verbose      will cause the script to give you a bit more information about the run.
    --zebraqueue DAYS purge completed entries from the zebraqueue from more than DAYS days ago.
 USAGE
     exit $_[0];
 }
 
-my ($help, $sessions, $verbose, $zebraqueue_days);
+my ($help, $sessions, $sess_days, $verbose, $zebraqueue_days);
 
 GetOptions(
     'h|help' => \$help,
     'sessions' => \$sessions,
+    'sessdays:i' => \$sess_days,
     'v|verbose' => \$verbose,
     'zebraqueue:i' => \$zebraqueue_days,
 ) || usage(1);
@@ -71,7 +73,7 @@ my $sth;
 my $sth2;
 my $count;
 
-if ($sessions) {
+if ($sessions && !$sess_days) { #old behavior
     if ($verbose){
         print "Session purge triggered.\n";
         $sth = $dbh->prepare("SELECT COUNT(*) FROM sessions");
@@ -85,6 +87,15 @@ if ($sessions) {
         print "Done with session purge.\n";
     }
 }
+elsif($sessions && $sess_days>0) { #new behavior with number of days old
+    if ($verbose){
+        print "Session purge triggered with days>$sess_days.\n";
+    }
+    RemoveOldSessions();
+    if ($verbose){
+        print "Done with session purge with days>$sess_days.\n";
+    }
+}
 
 if ($zebraqueue_days){
     $count = 0;
@@ -104,3 +115,32 @@ if ($zebraqueue_days){
     }
 }
 exit(0);
+
+sub RemoveOldSessions {
+  my ($id, $a_session, $limit, $lasttime);
+  $limit= time() - 24*3600*$sess_days;
+
+  $sth= $dbh->prepare("SELECT id, a_session FROM sessions");
+  $sth->execute or die $dbh->errstr;
+  $sth->bind_columns(\$id, \$a_session);
+  $sth2 = $dbh->prepare("DELETE FROM sessions WHERE id=?");
+  $count=0;
+
+  while ($sth->fetch) {
+    $lasttime=0;
+    if($a_session =~ /lasttime:\s+(\d+)/) {
+	$lasttime= $1;
+    }
+    elsif($a_session =~ /(ATIME|CTIME):\s+(\d+)/ ) {
+	$lasttime= $2;
+    }
+    if($lasttime && $lasttime < $limit) {
+	$sth2->execute($id) or die $dbh->errstr;
+	$count++;
+    }
+  }
+  if ($verbose){
+      print "$count sessions were deleted.\n";
+  }
+}
+
-- 
1.6.0.6


From f.demians at tamil.fr  Thu Jul 29 16:12:27 2010
From: f.demians at tamil.fr (=?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Demians?=)
Date: Thu, 29 Jul 2010 16:12:27 +0200
Subject: [Koha-patches] [PATCH] Bug 4305 Get Amazon book covers for ISBN13
Message-ID: <1280412747-15662-1-git-send-email-f.demians@tamil.fr>

The way Koha get book cover from Amazon doesn't work from biblio records
having ISBN13 because Amazon expect an ISBN10. This patch transforms
ISBN13 into ISBN10 before sending it to Amazon.

Warning! On some devel installations, you will have to install by hand a
new CPAN depency:

  Business::ISBN
---
 C4/Installer/PerlDependencies.pm     |    5 +++++
 C4/Koha.pm                           |   21 ++++++++-------------
 install_misc/apt-get-debian-lenny.sh |    1 +
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/C4/Installer/PerlDependencies.pm b/C4/Installer/PerlDependencies.pm
index 19a84a0..3ac49dc 100644
--- a/C4/Installer/PerlDependencies.pm
+++ b/C4/Installer/PerlDependencies.pm
@@ -464,6 +464,11 @@ our $PERL_DEPS = {
         'required' => '0',
         'min_ver'  => '0.97',
     },
+    'Business::ISBN' => {
+        'usage'    => 'Core',
+        'required' => '0',
+        'min_ver'  => '2.05',
+    },
 };
 
 1;
diff --git a/C4/Koha.pm b/C4/Koha.pm
index cb93034..fb27ee2 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -24,6 +24,7 @@ use C4::Context;
 use C4::Output;
 use URI::Split qw(uri_split);
 use Memoize;
+use Business::ISBN;
 
 use vars qw($VERSION @ISA @EXPORT $DEBUG);
 
@@ -1235,6 +1236,7 @@ sub GetNormalizedUPC {
 }
 
 # Normalizes and returns the first valid ISBN found in the record
+# ISBN13 are converted into ISBN10. This is required to get Amazon cover book.
 sub GetNormalizedISBN {
     my ($isbn,$record,$marcflavour) = @_;
     my @fields;
@@ -1321,19 +1323,12 @@ sub _normalize_match_point {
 }
 
 sub _isbn_cleanup ($) {
-    my $normalized_isbn = shift;
-    $normalized_isbn =~ s/-//g;
-    $normalized_isbn =~/([0-9x]{1,})/i;
-    $normalized_isbn = $1;
-    if (
-        $normalized_isbn =~ /\b(\d{13})\b/ or
-        $normalized_isbn =~ /\b(\d{12})\b/i or
-        $normalized_isbn =~ /\b(\d{10})\b/ or
-        $normalized_isbn =~ /\b(\d{9}X)\b/i
-    ) { 
-        return $1;
-    }
-    return undef;
+    my $isbn = Business::ISBN->new( shift );
+    return undef unless $isbn;
+    $isbn = $isbn->as_isbn10 if $isbn->type eq 'ISBN13';
+    $isbn = $isbn->as_string;
+    $isbn =~ s/-//g;
+    return $isbn;
 }
 
 1;
diff --git a/install_misc/apt-get-debian-lenny.sh b/install_misc/apt-get-debian-lenny.sh
index 48c53e4..8b90a85 100755
--- a/install_misc/apt-get-debian-lenny.sh
+++ b/install_misc/apt-get-debian-lenny.sh
@@ -12,6 +12,7 @@ idzebra-2.0 \
 idzebra-2.0-utils \
 libalgorithm-checkdigits-perl \
 libbiblio-endnotestyle-perl \
+libbusiness-isbn-perl \
 libcgi-session-perl \
 libcgi-session-serialize-yaml-perl \
 libclass-accessor-perl \
-- 
1.7.1