From 70501283b32ebbfc64822be9ae431c4bd3ea2104 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Fri, 9 Mar 2007 14:41:32 +0000
Subject: [PATCH] rel_3_0 moved to HEAD

---
 C4/Calendar/Calendar.pm                       |  578 -----
 C4/Format.pm                                  |  232 ---
 C4/Interface/CGI/Output.pm                    |   49 +-
 acqui/select-late.pl                          |  102 -
 admin/biblios_framework.pl                    |  177 --
 admin/biblios_subfields_structure.pl          |  467 -----
 admin/bibliostagstructure.pl                  |  397 ----
 admin/holdings_subfields_structure.pl         |  458 ----
 admin/holdingstagstructure.pl                 |  366 ----
 admin/institutions-careers.pl                 |   74 -
 admin/koha-electronic.pl                      |  102 -
 admin/koha-news.pl                            |   95 -
 admin/koha_attr.pl                            |  321 ---
 admin/stopwords.pl                            |  171 --
 admin/viewlog.pl                              |  148 --
 barcodes/create_labels_conf_table.sql         |   44 -
 catalogue/catalogue-search.pl                 |  268 ---
 cataloguing/isbnsearch.pl                     |  190 --
 circ/renewscript.pl                           |   70 -
 circ/rescirculation.pl                        |  460 ----
 circ/resreturns.pl                            |  478 -----
 koha-tmpl/errors/400.pl                       |    5 +-
 koha-tmpl/errors/401.pl                       |    5 +-
 koha-tmpl/errors/402.pl                       |    5 +-
 koha-tmpl/errors/403.pl                       |    5 +-
 koha-tmpl/errors/404.pl                       |    5 +-
 koha-tmpl/errors/500.pl                       |    5 +-
 koha-tmpl/intranet-tmpl/prog/en/about.tmpl    |   52 +-
 .../prog/en/acqui/acqui-home.tmpl             |  174 +-
 .../intranet-tmpl/prog/en/acqui/basket.tmpl   |  277 ++-
 .../prog/en/acqui/booksellers.tmpl            |   58 +-
 .../prog/en/acqui/histsearch.tmpl             |    8 +-
 .../prog/en/acqui/lateorders.tmpl             |   41 +-
 .../prog/en/acqui/neworderempty.tmpl          |  465 +++--
 .../prog/en/acqui/newordersuggestion.tmpl     |  113 +-
 .../intranet-tmpl/prog/en/acqui/parcel.tmpl   |  238 +--
 .../intranet-tmpl/prog/en/acqui/parcels.tmpl  |  182 +-
 .../intranet-tmpl/prog/en/acqui/supplier.tmpl |  376 ++--
 .../prog/en/admin/admin-home.tmpl             |   86 +-
 .../prog/en/admin/aqbookfund.tmpl             |   20 +-
 .../intranet-tmpl/prog/en/admin/aqbudget.tmpl |   12 +-
 .../en/admin/auth_subfields_structure.tmpl    |   98 +-
 .../prog/en/admin/auth_tag_structure.tmpl     |  298 +--
 .../prog/en/admin/authorised_values.tmpl      |   56 +-
 .../prog/en/admin/authtypes.tmpl              |    3 +-
 .../intranet-tmpl/prog/en/admin/branches.tmpl |  422 ++--
 .../prog/en/admin/categorie.tmpl              |   72 +-
 .../prog/en/admin/checkmarc.tmpl              |  197 +-
 .../prog/en/admin/itemtypes.tmpl              |   26 +-
 .../intranet-tmpl/prog/en/admin/roadtype.tmpl |    4 +-
 .../prog/en/admin/systempreferences.tmpl      |  408 ++--
 .../prog/en/admin/thesaurus.tmpl              |  249 +--
 koha-tmpl/intranet-tmpl/prog/en/auth.tmpl     |   34 +-
 .../prog/en/authorities/auth_finder.tmpl      |   81 +-
 .../prog/en/authorities/authorities-home.tmpl |  158 +-
 .../prog/en/authorities/authorities.tmpl      |  337 ++-
 .../blinddetail-biblio-search.tmpl            |   56 +-
 .../en/authorities/blinddetail-linker.tmpl    |   40 +-
 .../prog/en/authorities/detail.tmpl           |  141 +-
 .../en/authorities/linkresultlist-auth.tmpl   |   22 +-
 .../en/authorities/searchresultlist-auth.tmpl |  225 +-
 .../prog/en/authorities/searchresultlist.tmpl |  148 +-
 .../prog/en/barcodes/barcodes.tmpl            |    5 +-
 .../prog/en/barcodes/printerConfig.tmpl       |    6 +-
 .../en/bookshelves/addbookbybiblionumber.tmpl |   66 +-
 .../prog/en/bookshelves/shelves.tmpl          |  396 ++--
 .../prog/en/catalogue/ISBDdetail.tmpl         |   33 +-
 .../prog/en/catalogue/MARCdetail.tmpl         |  607 +++---
 .../prog/en/catalogue/detail.tmpl             |  308 ++-
 .../prog/en/catalogue/moredetail.tmpl         |  148 +-
 .../prog/en/cataloguing/addbiblio.tmpl        |  311 ++-
 .../prog/en/cataloguing/addbooks.tmpl         |  132 +-
 .../prog/en/cataloguing/additem.tmpl          |  247 +--
 .../prog/en/circ/branchreserves.tmpl          |   16 +-
 .../prog/en/circ/branchtransfers.tmpl         |   78 +-
 .../prog/en/circ/circulation.tmpl             | 1116 +++++++---
 .../prog/en/circ/currenttransfers.tmpl        |    8 +-
 .../intranet-tmpl/prog/en/circ/returns.tmpl   |  397 ++--
 .../prog/en/circ/selectbranchprinter.tmpl     |   21 +-
 .../en/circ/waitingreservestransfers.tmpl     |    6 +-
 .../prog/en/includes/doc-head-close.inc       |   14 +-
 .../prog/en/includes/holidays-top.inc         |    4 +-
 .../prog/en/includes/intranet-bottom.inc      |    3 +-
 .../prog/en/includes/intranet.css             |  438 +++-
 .../prog/en/includes/menu-acqui.inc           |    6 +-
 .../prog/en/includes/menu-admin.inc           |   39 +-
 .../prog/en/includes/menu-authorities.inc     |    2 +
 .../prog/en/includes/menu-catalogue.inc       |   15 +-
 .../prog/en/includes/menu-circ.inc            |   21 +-
 .../prog/en/includes/menu-members.inc         |    5 +-
 .../prog/en/includes/menu-serials.inc         |   14 +-
 .../prog/en/includes/menu-tools.inc           |   18 +-
 .../intranet-tmpl/prog/en/includes/menus.inc  |  121 +-
 .../intranet-tmpl/prog/en/intranet-main.tmpl  |  120 +-
 .../prog/en/members/boraccount.tmpl           |   32 +-
 .../prog/en/members/deletemem.tmpl            |    3 +-
 .../prog/en/members/guarantor_search.tmpl     |    2 +-
 .../prog/en/members/mancredit.tmpl            |   52 +-
 .../prog/en/members/maninvoice.tmpl           |   27 +-
 .../prog/en/members/member-flags.tmpl         |   36 +-
 .../members/member-quicksearch-results.tmpl   |   31 +-
 .../prog/en/members/member-quicksearch.tmpl   |    8 +-
 .../intranet-tmpl/prog/en/members/member.tmpl |   70 +-
 .../prog/en/members/memberentryA.tmpl         |   51 +-
 .../prog/en/members/memberentryC.tmpl         |  123 +-
 .../prog/en/members/memberentryI.tmpl         |   89 +-
 .../prog/en/members/memberentryP.tmpl         |  116 +-
 .../prog/en/members/members-home.tmpl         |   52 +-
 .../prog/en/members/moremember-print.tmpl     |    9 +-
 .../prog/en/members/moremember-receipt.tmpl   |    9 +-
 .../prog/en/members/moremember.tmpl           |  541 +++--
 .../intranet-tmpl/prog/en/members/pay.tmpl    |   63 +-
 .../prog/en/members/readingrec.tmpl           |   14 +-
 .../prog/en/reports/acquisitions_stats.tmpl   |   13 +-
 .../prog/en/reports/bor_issues_top.tmpl       |    7 +-
 .../prog/en/reports/borrowers_out.tmpl        |  205 +-
 .../prog/en/reports/borrowers_stats.tmpl      |    7 +-
 .../prog/en/reports/cat_issues_top.tmpl       |   18 +-
 .../prog/en/reports/catalogue_out.tmpl        |    5 +-
 .../prog/en/reports/catalogue_stats.tmpl      |    5 +-
 .../prog/en/reports/inventory.tmpl            |    1 +
 .../prog/en/reports/issues_avg_stats.tmpl     |    7 +-
 .../reports/issues_by_borrower_category.tmpl  |    5 +-
 .../prog/en/reports/issues_stats.tmpl         |    5 +-
 .../prog/en/reports/itemtypes.tmpl            |    3 +-
 .../prog/en/reports/reports-home.tmpl         |    5 +-
 .../prog/en/reserve/request.tmpl              |  229 +-
 .../prog/en/reviews/reviewswaiting.tmpl       |   14 +-
 .../prog/en/serials/acqui-search-result.tmpl  |   16 +-
 .../prog/en/serials/acqui-search.tmpl         |   13 +-
 .../intranet-tmpl/prog/en/serials/claims.tmpl |   80 +-
 .../prog/en/serials/distributedto.tmpl        |    7 +-
 .../prog/en/serials/member-search.tmpl        |   19 +-
 .../en/serials/receipt-search-result.tmpl     |    6 +-
 .../intranet-tmpl/prog/en/serials/result.tmpl |  120 +-
 .../prog/en/serials/routing-preview-slip.tmpl |    2 +-
 .../prog/en/serials/routing-preview.tmpl      |    7 +-
 .../prog/en/serials/routing.tmpl              |   10 +-
 .../prog/en/serials/serial-issues-full.tmpl   |   14 +-
 .../prog/en/serials/serial-issues.tmpl        |  199 +-
 .../prog/en/serials/serials-home.tmpl         |  111 +-
 .../prog/en/serials/subscription-add.tmpl     | 1853 +++++++++--------
 .../en/serials/subscription-bib-search.tmpl   |   76 +-
 .../prog/en/serials/subscription-detail.tmpl  |  760 ++++---
 .../prog/en/serials/subscription-renew.tmpl   |    2 +-
 .../prog/en/serials/viewalerts.tmpl           |    7 +-
 .../prog/en/suggestion/acceptorreject.tmpl    |  209 +-
 .../suggestion/mail_suggestion_REJECTED.tmpl  |    6 +-
 .../intranet-tmpl/prog/en/tools/barcodes.tmpl |    5 +-
 .../intranet-tmpl/prog/en/tools/export.tmpl   |   94 +-
 .../intranet-tmpl/prog/en/tools/holidays.tmpl |    4 +-
 .../intranet-tmpl/prog/en/tools/import.tmpl   |    2 +
 .../prog/en/tools/koha-news.tmpl              |  233 ++-
 .../intranet-tmpl/prog/en/tools/letter.tmpl   |  111 +-
 .../prog/en/tools/tools-home.tmpl             |   51 +-
 .../prog/en/z3950/searchresult.tmpl           |  116 +-
 koha-tmpl/opac-tmpl/prog/en/kohaerror.tmpl    |    2 +-
 .../opac-tmpl/prog/en/opac-ISBDdetail.tmpl    |  198 +-
 .../opac-tmpl/prog/en/opac-MARCdetail.tmpl    |  263 +--
 koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl |   82 +-
 .../prog/en/opac-addbookbybiblionumber.tmpl   |   72 +-
 koha-tmpl/opac-tmpl/prog/en/opac-auth.tmpl    |    4 +-
 koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl  |  290 ++-
 koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl  |  491 +++--
 .../opac-tmpl/prog/en/opac-detailprint.tmpl   |    2 +-
 .../prog/en/opac-full-serial-issues.tmpl      |  127 +-
 koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl    |  206 +-
 koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl  |   77 +-
 .../opac-tmpl/prog/en/opac-readingrecord.tmpl |   13 +-
 .../prog/en/opac-recacquisitions.tmpl         |    2 +-
 koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl |  101 +-
 .../opac-tmpl/prog/en/opac-sendbasket.tmpl    |   22 +-
 .../prog/en/opac-sendbasketform.tmpl          |   40 +-
 .../opac-tmpl/prog/en/opac-serial-issues.tmpl |   13 +-
 koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl |  338 ++-
 .../opac-tmpl/prog/en/opac-suggestions.tmpl   |  238 +--
 koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl    |  295 +--
 .../opac-tmpl/prog/en/opac-userdetails.tmpl   |   45 +-
 .../opac-tmpl/prog/en/opac-userupdate.tmpl    |   22 +-
 179 files changed, 10854 insertions(+), 13254 deletions(-)
 delete mode 100644 C4/Calendar/Calendar.pm
 delete mode 100755 C4/Format.pm
 delete mode 100755 acqui/select-late.pl
 delete mode 100644 admin/biblios_framework.pl
 delete mode 100644 admin/biblios_subfields_structure.pl
 delete mode 100644 admin/bibliostagstructure.pl
 delete mode 100644 admin/holdings_subfields_structure.pl
 delete mode 100644 admin/holdingstagstructure.pl
 delete mode 100644 admin/institutions-careers.pl
 delete mode 100644 admin/koha-electronic.pl
 delete mode 100644 admin/koha-news.pl
 delete mode 100644 admin/koha_attr.pl
 delete mode 100755 admin/stopwords.pl
 delete mode 100755 admin/viewlog.pl
 delete mode 100644 barcodes/create_labels_conf_table.sql
 delete mode 100644 catalogue/catalogue-search.pl
 delete mode 100755 cataloguing/isbnsearch.pl
 delete mode 100644 circ/renewscript.pl
 delete mode 100644 circ/rescirculation.pl
 delete mode 100644 circ/resreturns.pl

diff --git a/C4/Calendar/Calendar.pm b/C4/Calendar/Calendar.pm
deleted file mode 100644
index 355065da68..0000000000
--- a/C4/Calendar/Calendar.pm
+++ /dev/null
@@ -1,578 +0,0 @@
-package C4::Calendar::Calendar;
-
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-require Exporter;
-use vars qw($VERSION @EXPORT);
-
-use C4::Context;
-
-use C4::Date;
-
-# set the version for version checking
-$VERSION = 1.01;
-
-=head1 NAME
-
-C4::Calendar::Calendar - Koha module dealing with holidays.
-
-=head1 SYNOPSIS
-
-	use C4::Calendar::Calendar;
-
-=head1 DESCRIPTION
-
-This package is used to deal with holidays. Through this package, you can set all kind of holidays for the library.
-
-=head1 FUNCTIONS
-
-=over 2
-
-=cut
-
-@EXPORT = qw(&new 
-             &change_branchcode 
-			 &get_week_days_holidays 
-			 &get_day_month_holidays 
-             &get_exception_holidays 
-			 &get_single_holidays 
-			 &insert_week_day_holiday 
-			 &insert_day_month_holiday 
-			 &insert_single_holiday 
-			 &insert_exception_holiday
-			 &delete_holiday 
-			 &isHoliday 
-			 &addDate
-			 &daysBetween);
-
-=item new
-
-	$calendar = C4::Calendar::Calendar->new(branchcode => $branchcode);
-
-C<$branchcode> Is the branch code wich you want to use calendar.
-
-=cut
-
-sub new {
-	my $classname = shift @_;
-	my %options = @_;
-
-	my %hash;
-	my $self = bless(\%hash, $classname);
-
-	foreach my $optionName (keys %options) {
-		$self->{lc($optionName)} = $options{$optionName};
-	}
-
-	$self->_init;
-
-	return $self;
-}
-
-sub _init {
-	my $self = shift @_;
-
-	my $dbh = C4::Context->dbh();
-	my $week_days_sql = $dbh->prepare("select weekday, title, description from repeatable_holidays where ('$self->{branchcode}' = branchcode) and (NOT(ISNULL(weekday)))");
-	$week_days_sql->execute;
-	my %week_days_holidays;
-	while (my ($weekday, $title, $description) = $week_days_sql->fetchrow) {
-		$week_days_holidays{$weekday}{title} = $title;
-		$week_days_holidays{$weekday}{description} = $description;
-	}
-	$week_days_sql->finish;
-	$self->{'week_days_holidays'} = \%week_days_holidays;
-
-	my $day_month_sql = $dbh->prepare("select day, month, title, description from repeatable_holidays where ('$self->{branchcode}' = branchcode) and ISNULL(weekday)");
-	$day_month_sql->execute;
-	my %day_month_holidays;
-	while (my ($day, $month, $title, $description) = $day_month_sql->fetchrow) {
-		$day_month_holidays{"$month/$day"}{title} = $title;
-		$day_month_holidays{"$month/$day"}{description} = $description;
-	}
-	$day_month_sql->finish;
-	$self->{'day_month_holidays'} = \%day_month_holidays;
-
-	my $exception_holidays_sql = $dbh->prepare("select day, month, year, title, description from special_holidays where ('$self->{branchcode}' = branchcode) and (isexception = 1)");
-	$exception_holidays_sql->execute;
-	my %exception_holidays;
-	while (my ($day, $month, $year, $title, $description) = $exception_holidays_sql->fetchrow) {
-		$exception_holidays{"$year/$month/$day"}{title} = $title;
-		$exception_holidays{"$year/$month/$day"}{description} = $description;
-	}
-	$exception_holidays_sql->finish;
-	$self->{'exception_holidays'} = \%exception_holidays;
-
-	my $holidays_sql = $dbh->prepare("select day, month, year, title, description from special_holidays where ('$self->{branchcode}' = branchcode) and (isexception = 0)");
-	$holidays_sql->execute;
-	my %single_holidays;
-	while (my ($day, $month, $year, $title, $description) = $holidays_sql->fetchrow) {
-		$single_holidays{"$year/$month/$day"}{title} = $title;
-		$single_holidays{"$year/$month/$day"}{description} = $description;
-	}
-	$holidays_sql->finish;
-	$self->{'single_holidays'} = \%single_holidays;
-}
-
-=item change_branchcode
-
-	$calendar->change_branchcode(branchcode => $branchcode)
-
-Change the calendar branch code. This means to change the holidays structure.
-
-C<$branchcode> Is the branch code wich you want to use calendar.
-
-=cut
-
-sub change_branchcode {
-	my ($self, $branchcode) = @_;
-	my %options = @_;
-
-	foreach my $optionName (keys %options) {
-		$self->{lc($optionName)} = $options{$optionName};
-	}
-	$self->_init;
-
-	return $self;
-}
-
-=item get_week_days_holidays
-
-	$week_days_holidays = $calendar->get_week_days_holidays();
-
-Returns a hash reference to week days holidays.
-
-=cut
-
-sub get_week_days_holidays {
-	my $self = shift @_;
-	my $week_days_holidays = $self->{'week_days_holidays'};
-	return $week_days_holidays;
-}
-
-=item get_day_month_holidays
-	
-	$day_month_holidays = $calendar->get_day_month_holidays();
-
-Returns a hash reference to day month holidays.
-
-=cut
-
-sub get_day_month_holidays {
-	my $self = shift @_;
-	my $day_month_holidays = $self->{'day_month_holidays'};
-	return $day_month_holidays;
-}
-
-=item get_exception_holidays
-	
-	$exception_holidays = $calendar->exception_holidays();
-
-Returns a hash reference to exception holidays. This kind of days are those
-which stands for a holiday, but you wanted to make an exception for this particular
-date.
-
-=cut
-
-sub get_exception_holidays {
-	my $self = shift @_;
-	my $exception_holidays = $self->{'exception_holidays'};
-	return $exception_holidays;
-}
-
-=item get_single_holidays
-	
-	$single_holidays = $calendar->get_single_holidays();
-
-Returns a hash reference to single holidays. This kind of holidays are those which
-happend just one time.
-
-=cut
-
-sub get_single_holidays {
-	my $self = shift @_;
-	my $single_holidays = $self->{'single_holidays'};
-	return $single_holidays;
-}
-
-=item insert_week_day_holiday
-
-	insert_week_day_holiday(weekday => $weekday,
-							title => $title,
-							description => $description);
-
-Inserts a new week day for $self->{branchcode}.
-
-C<$day> Is the week day to make holiday.
-
-C<$title> Is the title to store for the holiday formed by $year/$month/$day.
-
-C<$description> Is the description to store for the holiday formed by $year/$month/$day.
-
-=cut
-
-sub insert_week_day_holiday {
-	my $self = shift @_;
-	my %options = @_;
-
-	my $dbh = C4::Context->dbh();
-	my $insertHoliday = $dbh->prepare("insert into repeatable_holidays (id,branchcode,weekday,day,month,title,description) values ('', '$self->{branchcode}', $options{weekday}, NULL, NULL, '$options{title}', '$options{description}')");
-	$insertHoliday->execute;
-	$insertHoliday->finish;
-
-	$self->{'week_days_holidays'}->{$options{weekday}}{title} = $options{title};
-	$self->{'week_days_holidays'}->{$options{weekday}}{description} = $options{description};
-	return $self;
-}
-
-=item insert_day_month_holiday
-
-	insert_day_month_holiday(day => $day,
-	                         month => $month,
-							 title => $title,
-							 description => $description);
-
-Inserts a new day month holiday for $self->{branchcode}.
-
-C<$day> Is the day month to make the date to insert.
-
-C<$month> Is month to make the date to insert.
-
-C<$title> Is the title to store for the holiday formed by $year/$month/$day.
-
-C<$description> Is the description to store for the holiday formed by $year/$month/$day.
-
-=cut
-
-sub insert_day_month_holiday {
-	my $self = shift @_;
-	my %options = @_;
-
-	my $dbh = C4::Context->dbh();
-	my $insertHoliday = $dbh->prepare("insert into repeatable_holidays (id,branchcode,weekday,day,month,title,description) values ('', '$self->{branchcode}', NULL, $options{day}, $options{month}, '$options{title}', '$options{description}')");
-	$insertHoliday->execute;
-	$insertHoliday->finish;
-
-	$self->{'day_month_holidays'}->{"$options{month}/$options{day}"}{title} = $options{title};
-	$self->{'day_month_holidays'}->{"$options{month}/$options{day}"}{description} = $options{description};
-	return $self;
-}
-
-=item insert_single_holiday
-
-	insert_single_holiday(day => $day,
-	                      month => $month,
-						  year => $year,
-						  title => $title,
-						  description => $description);
-
-Inserts a new single holiday for $self->{branchcode}.
-
-C<$day> Is the day month to make the date to insert.
-
-C<$month> Is month to make the date to insert.
-
-C<$year> Is year to make the date to insert.
-
-C<$title> Is the title to store for the holiday formed by $year/$month/$day.
-
-C<$description> Is the description to store for the holiday formed by $year/$month/$day.
-
-=cut
-
-sub insert_single_holiday {
-	my $self = shift @_;
-	my %options = @_;
-
-	my $dbh = C4::Context->dbh();
-	my $isexception = 0;
-	my $insertHoliday = $dbh->prepare("insert into special_holidays (id,branchcode,day,month,year,isexception,title,description) values ('', '$self->{branchcode}', $options{day}, $options{month}, $options{year}, $isexception, '$options{title}', '$options{description}')");
-	$insertHoliday->execute;
-	$insertHoliday->finish;
-
-	$self->{'single_holidays'}->{"$options{year}/$options{month}/$options{day}"}{title} = $options{title};
-	$self->{'single_holidays'}->{"$options{year}/$options{month}/$options{day}"}{description} = $options{description};
-	return $self;
-}
-
-=item insert_exception_holiday
-
-	insert_exception_holiday(day => $day,
-	                         month => $month,
-						     year => $year,
-						     title => $title,
-						     description => $description);
-
-Inserts a new exception holiday for $self->{branchcode}.
-
-C<$day> Is the day month to make the date to insert.
-
-C<$month> Is month to make the date to insert.
-
-C<$year> Is year to make the date to insert.
-
-C<$title> Is the title to store for the holiday formed by $year/$month/$day.
-
-C<$description> Is the description to store for the holiday formed by $year/$month/$day.
-
-=cut
-
-sub insert_exception_holiday {
-	my $self = shift @_;
-	my %options = @_;
-
-	my $dbh = C4::Context->dbh();
-	my $isexception = 1;
-	my $insertException = $dbh->prepare("insert into special_holidays (id,branchcode,day,month,year,isexception,title,description) values ('', '$self->{branchcode}', $options{day}, $options{month}, $options{year}, $isexception, '$options{title}', '$options{description}')");
-	$insertException->execute;
-	$insertException->finish;
-
-	$self->{'exceptions_holidays'}->{"$options{year}/$options{month}/$options{day}"}{title} = $options{title};
-	$self->{'exceptions_holidays'}->{"$options{year}/$options{month}/$options{day}"}{description} = $options{description};
-	return $self;
-}
-
-=item delete_holiday
-
-	delete_holiday(weekday => $weekday
-	               day => $day,
-	               month => $month,
-				   year => $year);
-
-Delete a holiday for $self->{branchcode}.
-
-C<$weekday> Is the week day to delete.
-
-C<$day> Is the day month to make the date to delete.
-
-C<$month> Is month to make the date to delete.
-
-C<$year> Is year to make the date to delete.
-
-=cut
-
-sub delete_holiday {
-	my $self = shift @_;
-	my %options = @_;
-
-	# Verify what kind of holiday that day is. For example, if it is
-	# a repeatable holiday, this should check if there are some exception
-	# for that holiday rule. Otherwise, if it is a regular holiday, it´s 
-	# ok just deleting it.
-
-	my $dbh = C4::Context->dbh();
-	my $isSingleHoliday = $dbh->prepare("select id from special_holidays where (branchcode = '$self->{branchcode}') and (day = $options{day}) and (month = $options{month}) and (year = $options{year})");
-	$isSingleHoliday->execute;
-	if ($isSingleHoliday->rows) {
-		my $id = $isSingleHoliday->fetchrow;
-		$isSingleHoliday->finish; # Close the last query
-
-		my $deleteHoliday = $dbh->prepare("delete from special_holidays where (id = $id)");
-		$deleteHoliday->execute;
-		$deleteHoliday->finish; # Close the last query
-		delete($self->{'single_holidays'}->{"$options{year}/$options{month}/$options{day}"});
-	} else {	
-		$isSingleHoliday->finish; # Close the last query
-
-		my $isWeekdayHoliday = $dbh->prepare("select id from repeatable_holidays where (branchcode = '$self->{branchcode}') and (weekday = $options{weekday})");
-		$isWeekdayHoliday->execute;
-		if ($isWeekdayHoliday->rows) {
-			my $id = $isWeekdayHoliday->fetchrow;
-			$isWeekdayHoliday->finish; # Close the last query
-
-			my $updateExceptions = $dbh->prepare("update special_holidays set isexception = 0 where (WEEKDAY(CONCAT(special_holidays.year,'-',special_holidays.month,'-',special_holidays.day)) = $options{weekday}) and (branchcode = '$self->{branchcode}')");
-			$updateExceptions->execute;
-			$updateExceptions->finish; # Close the last query
-
-			my $deleteHoliday = $dbh->prepare("delete from repeatable_holidays where (id = $id)");
-			$deleteHoliday->execute;
-			$deleteHoliday->finish;
-			delete($self->{'week_days_holidays'}->{$options{weekday}});
-		} else {
-			$isWeekdayHoliday->finish; # Close the last query
-
-			my $isDayMonthHoliday = $dbh->prepare("select id from repeatable_holidays where (branchcode = '$self->{branchcode}') (day = $options{day}) and (month = $options{month})");
-			$isDayMonthHoliday->execute;
-			if ($isDayMonthHoliday->rows) {
-				my $id = $isDayMonthHoliday->fetchrow;
-				$isDayMonthHoliday->finish;
-				my $updateExceptions = $dbh->prepare("update special_holidays set isexception = 0 where (special_holidays.branchcode = '$self->{branchcode}') and (special_holidays.day = $options{day}) and (special_holidays.month = $options{month})");
-				$updateExceptions->execute;
-				$updateExceptions->finish; # Close the last query
-
-				my $deleteHoliday = $dbh->prepare("delete from repeatable_holidays where (id = $id)");
-				$deleteHoliday->execute;
-				$deleteHoliday->finish; # Close the last query
-				$isDayMonthHoliday->finish; # Close the last query
-				delete($self->{'day_month_holidays'}->{"$options{month}/$options{day}"});
-			}
-		}
-	}	
-	return $self;
-}
-
-=item isHoliday
-	
-	$isHoliday = isHoliday($day, $month $year);
-
-
-C<$day> Is the day to check wether if is a holiday or not.
-
-C<$month> Is the month to check wether its a holiday or not.
-
-C<$year> Is the year to check wether if its a holiday or not.
-
-=cut
-
-sub isHoliday {
-	my ($self, $day, $month, $year) = @_;
-
-	my $weekday = Date_DayOfWeek($month, $day, $year) % 7;	
-	my $weekDays = $self->get_week_days_holidays();
-	my $dayMonths = $self->get_day_month_holidays();
-	my $exceptions = $self->get_exception_holidays();
-	my $singles = $self->get_single_holidays();
-
-	if (defined($exceptions->{"$year/$month/$day"})) {
-		return 0;
-	} else {		
-		if ((exists($weekDays->{$weekday})) || 
-			(exists($dayMonths->{"$month/$day"})) || 
-			(exists($singles->{"$year/$month/$day"}))) {			
-			return 1;
-		} else {
-			return 0;
-		}
-	}
-
-}
-
-=item addDate
-
-	my ($day, $month, $year) = $calendar->addDate($day, $month, $year, $offset)
-
-C<$day> Is the starting day of the interval.
-
-C<$month> Is the starting month of the interval.
-
-C<$year> Is the starting year of the interval.
-
-C<$offset> Is the number of days that this function has to count from $date.
-
-=cut
-
-sub addDate {
-	my ($self, $day, $month, $year, $offset) = @_;
-	if ($offset < 0) { # In case $offset is negative
-		$offset = $offset*(-1);
-	}
-
-	my $daysMode = C4::Context->preference('useDaysMode');
-	if ($daysMode eq 'normal') {
-		($year, $month, $day) = Add_Delta_Days($year, $month, $day, ($offset - 1));
-	} else {
-		while ($offset > 0) {								
-			if (!($self->isHoliday($day, $month, $year))) {
-				$offset = $offset - 1;					
-			}				
-			if ($offset > 0) {
-				($year, $month, $day) = Add_Delta_Days($year, $month, $day, 1);
-			}				
-		}
-	}
-	return($day, $month, $year);	
-}
-
-=item daysBetween
-
-	my $daysBetween = $calendar->daysBetween($dayFrom, $monthFrom, $yearFrom,
-	                                         $dayTo, $monthTo, $yearTo)
-
-C<$dayFrom> Is the starting day of the interval.
-
-C<$monthFrom> Is the starting month of the interval.
-
-C<$yearFrom> Is the starting year of the interval.
-
-C<$dayTo> Is the ending day of the interval.
-
-C<$monthTo> Is the ending month of the interval.
-
-C<$yearTo> Is the ending year of the interval.
-
-=cut
-
-sub daysBetween {
-	my ($self, $dayFrom, $monthFrom, $yearFrom, $dayTo, $monthTo, $yearTo) = @_;
-	 
-	my $daysMode = C4::Context->preference('useDaysMode');
-	my $count = 1;
-	my $continue = 1;
-	if ($daysMode eq 'normal') {
-		while ($continue) {
-			if (($yearFrom != $yearTo) || ($monthFrom != $monthTo) || ($dayFrom != $dayTo)) {
-				($yearFrom, $monthFrom, $dayFrom) = Add_Delta_Days($yearFrom, $monthFrom, $dayFrom, 1);
-				$count++;
-			} else {
-				$continue = 0;	
-			}
-		}		
-	} else {
-		while ($continue) {
-			if (($yearFrom != $yearTo) || ($monthFrom != $monthTo) || ($dayFrom != $dayTo)) {
-				if (!($self->isHoliday($dayFrom, $monthFrom, $yearFrom))) {
-					$count++;
-				}	
-				($yearFrom, $monthFrom, $dayFrom) = Add_Delta_Days($yearFrom, $monthFrom, $dayFrom, 1);				
-			} else {
-				$continue = 0;	
-			}
-		}		
-	}
-	return($count);	
-}
-
-sub Date_DayOfWeek{
-my ($month, $day, $year)=@_;
-my $date=DATE_obj($year."-".$month."-".$day);
-
-return $date->day_of_week;
-}
-
-sub Add_Delta_Days{
-my ($year, $month, $day, $offset)=@_;
-my $date=DATE_obj($year."-".$month."-".$day);
-my $duration=get_duration($offset." days");
-
- $date->add_duration($duration);
-
-return ($date->year, $date->month, $date->day);
-}
-
-
-
-1;
-
-__END__
-
-=back
-
-=head1 AUTHOR
-
-Koha Physics Library UNLP <matias_veleda@hotmail.com>
-Modified by Tumer Garip NUE Grand Library --No more Date::Manip
-=cut
\ No newline at end of file
diff --git a/C4/Format.pm b/C4/Format.pm
deleted file mode 100755
index 0bf917bbe5..0000000000
--- a/C4/Format.pm
+++ /dev/null
@@ -1,232 +0,0 @@
-package C4::Format;
-
-# $Id$
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-require Exporter;
-
-
-use vars qw($VERSION @ISA @EXPORT);
-
-# set the version for version checking
-$VERSION = 0.01;
-
-=head1 NAME
-
-C4::Format - Functions for pretty-printing strings and numbers
-
-=head1 SYNOPSIS
-
-  use C4::Format;
-
-=head1 DESCRIPTION
-
-These functions return pretty-printed versions of strings and numbers.
-
-=head1 FUNCTIONS
-
-=over 2
-
-=cut
-
-@ISA = qw(Exporter);
-@EXPORT = qw(&fmtstr &fmtdec);
-
-=item fmtstr
-
-  $str = &fmtstr($env, $string, $format);
-
-Returns C<$string>, padded with space to a given length.
-
-C<$format> is either C<Ln> or C<Rn>, where I<n> is a positive integer.
-C<$str> will be either left-padded or right-padded, respectively.
-
-C<&fmtstr> is almost equivalent to
-
-  sprintf("%-n.ns", $string);
-
-or
-
-  sprintf("%n.ns", $string);
-
-The only difference is that if I<n> is less than the length of
-C<$string>, then C<&fmtstr> will return the last I<n> characters of
-C<$string>, whereas C<sprintf> will return the first I<n> characters.
-
-C<$env> is ignored.
-
-=cut
-#'
-sub fmtstr {
-  # format (space pad) a string
-  # $fmt is Ln.. or Rn.. where n is the length
-  my ($env,$strg,$fmt)=@_;
-  my $align = substr($fmt,0,1);
-  my $lenst = substr($fmt,1,length($fmt)-1);
-  if ($align eq"R" ) {
-     $strg = substr((" "x$lenst).$strg,0-$lenst,$lenst);
-  } elsif  ($align eq "C" ) {
-     $strg =
-       substr((" "x(($lenst/2)-(length($strg)/2))).$strg.(" "x$lenst),0,$lenst);
-  } else {
-     $strg = substr($strg.(" "x$lenst),0,$lenst);
-  }
-  return ($strg);
-}
-
-=item fmtdec
-
-  $str = &fmtdec($env, $number, $format)
-
-Returns a pretty-printed version of C<$number>.
-
-C<$format> specifies how to print the number. It is of the form
-
-  [$][,]n[m]
-
-where I<n> and I<m> are digits, specifying the number of digits to use
-before and after the decimal, respectively. Thus,
-
-  &fmtdec(undef, 123.456, "42")
-
-will return
-
-  " 123.45"
-
-If I<n> is smaller than the size of the integer part, only the last
-I<n> digits will be returned. If I<m> is greater than the number of
-digits after the decimal in C<$number>, the result will be
-right-padded with zeros.
-
-If C<$format> has a leading dollar sign, the number is assumed to be a
-monetary amount. C<$str> will have a dollar sign prepended to the
-value.
-
-If C<$format> has a comma after the optional dollar sign, the integer
-part will be split into three-digit groups separated by commas.
-
-C<$env> is effectively ignored.
-
-=cut
-#'
-# FIXME - This is all terribly provincial, not at all
-# internationalized. I'm pretty sure there's already something out
-# there that'll figure out the current locale, look up the local
-# currency symbol (and whether it goes on the left or right), figure
-# out how numbers are grouped (commas, periods, or what? And how many
-# digits per group?), and will print the whole thing prettily.
-# But I can't find it just now. Maybe POSIX::setlocale() or
-# perllocale(1) might help.
-# FIXME - Bug:
-#	fmtdec(undef, 12345.6, ',82') prints "     345.60"
-#	fmtdec(undef, 12345.6, '$,82') prints ".60"
-sub fmtdec {
-  # format a decimal
-  # $fmt is [$][,]n[m]
-  my ($env,$numb,$fmt)=@_;
-
-  # FIXME - Use $fmt =~ /^(\$)?(,)?(\d)(\d)?$/ instead of this mess of
-  # substr()s.
-
-  # See if there's a leading dollar sign.
-  my $curr = substr($fmt,0,1);
-  if ($curr eq "\$") {
-    $fmt = substr($fmt,1,length($fmt)-1);
-  };
-  # See if there's a leading comma
-  my $comma = substr($fmt,0,1);
-  if ($comma eq ",") {
-    $fmt = substr($fmt,1,length($fmt)-1);
-  };
-  # See whether one number was given, or two.
-  my $right;
-  my $left = substr($fmt,0,1);
-  if (length($fmt) == 1) {
-    $right = 0;
-  } else {
-    $right = substr($fmt,1,1);
-  }
-  # See if $numb is a floating-point number.
-  my $fnumb = "";
-  my $tempint = "";
-  my $tempdec = "";
-  # FIXME - Use
-  #	$numb =~ /(\d+)\.(\d+)/;
-  #	$tempint = $1 + 0;
-  #	$tempdec = $2;
-  if (index($numb,".") == 0 ){
-     $tempint = 0;
-     $tempdec = substr($numb,1,length($numb)-1);
-  } else {
-     if (index($numb,".") > 0) {
-       my $decpl = index($numb,".");
-       $tempint = substr($numb,0,$decpl);
-       $tempdec = substr($numb,$decpl+1,length($numb)-1-$decpl);
-     } else {
-       $tempint = $numb;
-       $tempdec = 0;
-     }
-     # If a comma was specified, then comma-separate the integer part
-     # FIXME - From the Perl Cookbook (ISBN 1-56592-243-3), sec. 2.1.7:
-     #	sub commify {
-     #		my $test = reverse $_[0];
-     #		$text =~ s/(\d\d\d)(?=\d)(?!\d*\.)/$1,/g;
-     #		return scalar reverse $text;
-     #	}
-     if ($comma eq ",") {
-        while (length($tempdec) > 3) {
-           $fnumb = ",".substr($tempint,-3,3).$fnumb;
-	   substr($tempint,-3,3) = "";
-	}
-	$fnumb = substr($tempint,-3,3).$fnumb;
-     } else {
-        $fnumb = $tempint;
-     }
-  }
-  # If a dollar sign was specified, prepend a dollar sign and
-  # right-justify the number
-  if ($curr eq "\$") {
-     $fnumb = fmtstr($env,$curr.$fnumb,"R".$left+1);
-  } else {
-     if ($left==0) {
-        $fnumb = "";
-     } else {
-        $fnumb = fmtstr($env,$fnumb,"R".$left);
-     }
-  }
-  # Right-pad the decimal part to the given number of digits.
-  if ($right > 0) {
-     $tempdec .= "0"x$right;
-     $tempdec = substr($tempdec,0,$right);
-     $fnumb .= ".".$tempdec;
-  }
-  return $fnumb;	# FIXME - Shouldn't return a list.
-}
-
-1;
-__END__
-
-=back
-
-=head1 AUTHOR
-
-Koha Developement team <info@koha.org>
-
-=cut
diff --git a/C4/Interface/CGI/Output.pm b/C4/Interface/CGI/Output.pm
index 9f97e75432..fad75ce48b 100644
--- a/C4/Interface/CGI/Output.pm
+++ b/C4/Interface/CGI/Output.pm
@@ -22,9 +22,10 @@ package C4::Interface::CGI::Output;
 # You should have received a copy of the GNU General Public License along with
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
+
 use strict;
 require Exporter;
-use open ':utf8';
+
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
@@ -36,9 +37,9 @@ C4::CGI::Output - Convenience functions for handling outputting HTML pages
 
 =head1 SYNOPSIS
 
-  use C4::Interface::CGI::Output;
+  use C4::CGI::Output;
 
-  print $query->header(-type => "text/html"), $output;
+  print $query->header(-type => C4::CGI::Output::gettype($output)), $output;
 
 =head1 DESCRIPTION
 
@@ -52,12 +53,46 @@ related to the (guessed) charset.
 =cut
 
 @ISA = qw(Exporter);
-@EXPORT = qw(	&output_html_with_http_headers
+@EXPORT = qw(
+		&guesscharset
+		&guesstype
+		&output_html_with_http_headers
 		);
 
+=item guesscharset
+
+   &guesscharset($output)
+
+"Guesses" the charset from the some HTML that would be output.
 
+C<$output> is the HTML page to be output. If it contains a META tag
+with a Content-Type, the tag will be scanned for a language code.
+This code is returned if it is found; undef is returned otherwise.
 
+This function only does sloppy guessing; it will be confused by
+unexpected things like SGML comments. What it basically does is to
+grab something that looks like a META tag and scan it.
 
+=cut
+
+sub guesscharset ($) {
+    my($html) = @_;
+    my $charset = undef;
+    local($`, $&, $', $1, $2, $3);
+    # FIXME... These regular expressions will miss a lot of valid tags!
+    if ($html =~ /<meta\s+http-equiv=(["']?)Content-Type\1\s+content=(["'])text\/html\s*;\s*charset=([^\2\s\r\n]+)\2\s*(?:\/?)>/is) {
+        $charset = $3;
+    } elsif ($html =~ /<meta\s+content=(["'])text\/html\s*;\s*charset=([^\1\s\r\n]+)\1\s+http-equiv=(["']?)Content-Type\3\s*(?:\/?)>/is) {
+        $charset = $2;
+    }
+    return $charset;
+} # guess
+
+sub guesstype ($) {
+    my($html) = @_;
+    my $charset = guesscharset($html);
+    return defined $charset? "text/html; charset=$charset": "text/html";
+}
 
 =item output_html_with_http_headers
 
@@ -70,13 +105,11 @@ corresponds to the HTML page $html.
 =cut
 
 sub output_html_with_http_headers ($$$) {
-
     my($query, $cookie, $html) = @_;
     print $query->header(
-	-type   => "text/html",
-	-charset=>"UTF-8",
+	-type   => guesstype($html),
 	-cookie => $cookie,
-  ), $html;
+    ), $html;
 }
 
 #---------------------------------
diff --git a/acqui/select-late.pl b/acqui/select-late.pl
deleted file mode 100755
index 4503effadc..0000000000
--- a/acqui/select-late.pl
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/perl
-
-# $Id$
-
-#script to show suppliers and orders
-#written by chris@katipo.co.nz 23/2/2000
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use C4::Auth;
-use C4::Biblio;
-use CGI;
-use C4::Interface::CGI::Output;
-use C4::Context;
-use C4::Date;
-use C4::Acquisition;
-
-my $query=new CGI;
-my $dbh = C4::Context->dbh;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "acqui/select-late.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {acquisition => 1},
-			     debug => 1,
-			     });
-
-my $supplier=$query->param('id');
-my @suppliers=GetBookSeller($supplier);
-my $count = scalar @suppliers;
-
-my $sth = $dbh->prepare("select s.serialseq from serial s, subscription u where s.subscriptionid = u.subscriptionid and u.aqbooksellerid = ? and s.status = 2");
-
-$sth->execute($supplier);
-my  @final;
-while (my $sol = $sth->fetchrow_hashref)
-{
-    push @final, $sol;
-}
-
-$template->param(@loop_sol => \@final);
-
-my $colour='#EEEEEE';
-my $toggle=0;
-my @loop_suppliers;
-for (my $i=0; $i<$count; $i++) {
-	my $orders = GetPendingOrders($suppliers[$i]->{'id'});
-    my $ordcount = scalar @$orders;
-    
-	my %line;
-	if ($toggle==0){
-		$line{color}='#EEEEEE';
-		$toggle=1;
-	} else {
-		$line{color}='white';
-		$toggle=0;
-	}
-	$line{id} =$suppliers[$i]->{'id'};
-	$line{name} = $suppliers[$i]->{'name'};
-	$line{active} = $suppliers[$i]->{'active'};
-	$line{total} = $orders->[0]->{'count(*)'};
-	$line{authorisedby} = $orders->[0]->{'authorisedby'};
-	$line{entrydate} = $orders->[0]->{'entrydate'};
-	my @loop_basket;
-	for (my $i2=0;$i2<$ordcount;$i2++){
-		my %inner_line;
-		$inner_line{basketno} =$orders->[$i2]->{'basketno'};
-		$inner_line{total} =$orders->[$i2]->{'count(*)'};
-		$inner_line{authorisedby} = $orders->[$i2]->{'authorisedby'};
-		$inner_line{entrydate} = format_date($orders->[$i2]->{'entrydate'});
-		push @loop_basket, \%inner_line;
-	}
-	$line{loop_basket} = \@loop_basket;
-	push @loop_suppliers, \%line;
-}
-$template->param(loop_suppliers => \@loop_suppliers,
-						supplier => $supplier,
-						count => $count,
-						intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-						);
-
-output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/admin/biblios_framework.pl b/admin/biblios_framework.pl
deleted file mode 100644
index 2054c5df43..0000000000
--- a/admin/biblios_framework.pl
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/usr/bin/perl
-# NOTE: 4-character tabs
-
-#written 20/02/2002 by paul.poulain@free.fr
-# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Context;
-use C4::Output;
-use C4::Search;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-
-sub StringSearch  {
-	my ($env,$searchstring,$type)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select * from biblios_framework where (frameworkcode like ?) order by frameworktext");
-	$sth->execute("$data[0]%");
-	my @results;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	}
-	#  $sth->execute;
-	$sth->finish;
-	return (scalar(@results),\@results);
-}
-
-my $input = new CGI;
-my $searchfield=$input->param('frameworkcode');
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/biblios_framework.pl";
-my $frameworkcode=$input->param('frameworkcode');
-my $pagesize=20;
-my $op = $input->param('op');
-$searchfield=~ s/\,//g;
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/biblios_framework.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	#start the page and read in includes
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($frameworkcode) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select * from biblios_framework where frameworkcode=?");
-		$sth->execute($frameworkcode);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-	$template->param(frameworkcode => $frameworkcode,
-							frameworktext => $data->{'frameworktext'},
-							);
-;
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("replace biblios_framework (frameworkcode,frameworktext) values (?,?)");
-	$sth->execute($input->param('frameworkcode'),$input->param('frameworktext'));
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=biblios_framework.pl\"></html>";
-	exit;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	#start the page and read in includes
-	my $dbh = C4::Context->dbh;
-
-	# Check both categoryitem and biblioitems, see Bug 199
-	my $total = 0;
-	for my $table ('biblios_tag_structure') {
-	   my $sth=$dbh->prepare("select count(*) as total from $table where frameworkcode=?");
-	   $sth->execute($frameworkcode);
-	   $total += $sth->fetchrow_hashref->{total};
-	   $sth->finish;
-	}
-
-	my $sth=$dbh->prepare("select * from biblios_framework where frameworkcode=?");
-	$sth->execute($frameworkcode);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-
-	$template->param(frameworkcode => $frameworkcode,
-							frameworktext => $data->{'frameworktext'},
-							total => $total);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	#start the page and read in includes
-	my $dbh = C4::Context->dbh;
-	my $frameworkcode=uc($input->param('frameworkcode'));
-	my $sth=$dbh->prepare("delete from biblios_tag_structure where frameworkcode=?");
-	$sth->execute($frameworkcode);
-	$sth=$dbh->prepare("delete from biblios_subfield_structure where frameworkcode=?");
-	$sth->execute($frameworkcode);
-	$sth=$dbh->prepare("delete from biblios_framework where frameworkcode=?");
-	$sth->execute($frameworkcode);
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=biblios_framework.pl\"></html>";
-	exit;
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	my $env;
-	my ($count,$results)=StringSearch($env,$searchfield,'web');
-	my $toggle="white";
-	my @loop_data;
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-		my %row_data;
-		if ($toggle eq 'white'){
-			$row_data{toggle}="#ffffcc";
-		} else {
-			$row_data{toggle}="white";
-		}
-		$row_data{frameworkcode} = $results->[$i]{'frameworkcode'};
-		$row_data{frameworktext} = $results->[$i]{'frameworktext'};
-		push(@loop_data, \%row_data);
-	}
-	$template->param(loop => \@loop_data);
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(previous => "$script_name?offset=".$prevpage);
-	}
-	if ($offset+$pagesize<$count) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(next => "$script_name?offset=".$nextpage);
-	}
-} #---- END $OP eq DEFAULT
-output_html_with_http_headers $input, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 4
-# End:
diff --git a/admin/biblios_subfields_structure.pl b/admin/biblios_subfields_structure.pl
deleted file mode 100644
index 016dc1dcd8..0000000000
--- a/admin/biblios_subfields_structure.pl
+++ /dev/null
@@ -1,467 +0,0 @@
-#!/usr/bin/perl
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Auth;
-use CGI;
-use C4::Search;
-use C4::Context;
-
-sub StringSearch  {
-	my ($env,$searchstring,$frameworkcode)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select * from biblios_subfield_structure where (tagfield like ? and frameworkcode=?) order by tagfield");
-	$sth->execute("$searchstring%",$frameworkcode);
-	my @results;
-	my $cnt=0;
-	my $u=1;
-	while (my $data=$sth->fetchrow_hashref){
-		push(@results,$data);
-		$cnt ++;
-		$u++;
-	}
-	$sth->finish;
-	$dbh->disconnect;
-	return ($cnt,\@results);
-}
-
-my $input = new CGI;
-my $tagfield=$input->param('tagfield');
-my $tagsubfield=$input->param('tagsubfield');
-my $frameworkcode=$input->param('frameworkcode');
-my $pkfield="tagfield";
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/biblios_subfields_structure.pl";
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/biblios_subfields_structure.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-my $pagesize=30;
-my $op = $input->param('op');
-$tagfield=~ s/\,//g;
-
-if ($op) {
-$template->param(script_name => $script_name,
-						tagfield =>$tagfield,
-						frameworkcode => $frameworkcode,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						tagfield =>$tagfield,
-						frameworkcode => $frameworkcode,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	my $data;
-	my $dbh = C4::Context->dbh;
-	my $more_subfields = $input->param("more_subfields")+1;
-	
-	
-	# build authorised value list
-	
-my	$sth2 = $dbh->prepare("select distinct category from authorised_values");
-	$sth2->execute;
-	my @authorised_values;
-	push @authorised_values,"";
-	while ((my $category) = $sth2->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	push (@authorised_values,"branches");
-	push (@authorised_values,"itemtypes");
-	# build thesaurus categories list
-	$sth2->finish;
-	$sth2 = $dbh->prepare("select authtypecode from auth_types");
-	$sth2->execute;
-	my @authtypes;
-	push @authtypes,"";
-	while ((my $authtypecode) = $sth2->fetchrow_array) {
-		push @authtypes, $authtypecode;
-	}
-	# build value_builder list
-	my @value_builder=('');
-
-	# read value_builder directory.
-	# 2 cases here : on CVS install, $cgidir does not need a /cgi-bin
-	# on a standard install, /cgi-bin need to be added. 
-	# test one, then the other
-	my $cgidir = C4::Context->intranetdir ."/cgi-bin";
-	unless (opendir(DIR, "$cgidir/value_builder")) {
-		$cgidir = C4::Context->intranetdir;
-		opendir(DIR, "$cgidir/value_builder") || die "can't opendir $cgidir/value_builder: $!";
-	} 
-	while (my $line = readdir(DIR)) {
-		if ($line =~ /\.pl$/) {
-			push (@value_builder,$line);
-		}
-	}
-	closedir DIR;
-
-	# build values list
-	my $sth=$dbh->prepare("select * from biblios_subfield_structure where tagfield=? and frameworkcode=?"); # and tagsubfield='$tagsubfield'");
-	$sth->execute($tagfield,$frameworkcode);
-	my @loop_data = ();
-	my $toggle=1;
-	my $i=0;
-	while ($data =$sth->fetchrow_hashref) {
-		my %row_data;  # get a fresh hash for the row data
-		if ($toggle eq 1){
-			$toggle=0;
-	  	} else {
-			$toggle=1;
-	  	}
-		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-					-id=>"tab$i",
-					-values=>['-1','0','1','2','3','4','5','6','7','8','9'],
-					-labels => {'-1' =>'ignore','0'=>'0','1'=>'1','2' =>'2','3'=>'3','4'=>'4',
-									'5' =>'5','6'=>'6','7'=>'7',
-									'8' =>'8','9'=>'9',},
-					-default=>$data->{'tab'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
-					-id=>"ohidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show',
-									'2' =>'Hide',
-									},
-					-default=>substr($data->{'hidden'},0,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
-					-id=>"ihidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show',
-									'2' =>'Hide',
-									},
-					-default=>substr($data->{'hidden'},1,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
-					-id=>"ehidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>substr($data->{'hidden'},2,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{tagsubfield} =$data->{'tagsubfield'}."<input type=\"hidden\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" id=\"tagsubfield\">";
-		$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
-		$row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
-		$row_data{seealso} = CGI::escapeHTML($data->{'seealso'});
-		
-		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
-					-id=>'authorised_value',
-					-values=> \@authorised_values,
-					-default=>$data->{'authorised_value'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{value_builder}  = CGI::scrolling_list(-name=>'value_builder',
-					-id=>'value_builder',
-					-values=> \@value_builder,
-					-default=>$data->{'value_builder'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{authtypes}  = CGI::scrolling_list(-name=>'authtypecode',
-					-id=>'authtypecode',
-					-values=> \@authtypes,
-					-default=>$data->{'authtypecode'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{repeatable} = CGI::checkbox(-name=>"repeatable$i",
-	-checked => $data->{'repeatable'}?'checked':'',
-	-value => 1,
-	-label => '',
-	-id => "repeatable$i");
-		$row_data{mandatory} = CGI::checkbox(-name => "mandatory$i",
-	-checked => $data->{'mandatory'}?'checked':'',
-	-value => 1,
-	-label => '',
-	-id => "mandatory$i");
-		$row_data{hidden} = CGI::escapeHTML($data->{hidden});
-		$row_data{isurl} = CGI::checkbox( -name => "isurl$i",
-			-id => "isurl$i",
-			-checked => $data->{'isurl'}?'checked':'',
-			-value => 1,
-			-label => '');
-		$row_data{row} = $i;
-		$row_data{toggle} = $toggle;
-		$row_data{link} = CGI::escapeHTML($data->{'link'});
-		push(@loop_data, \%row_data);
-		$i++;
-	}
-	# add more_subfields empty lines for add if needed
-	for (my $i=1;$i<=$more_subfields;$i++) {
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-					-id => "tab$i",
-					-values=>['-1','0','1','2','3','4','5','6','7','8','9'],
-					-labels => {'-1' =>'ignore','0'=>'0','1'=>'1',
-									'2' =>'2','3'=>'3','4'=>'4',
-									'5' =>'5','6'=>'6','7'=>'7',
-									'8' =>'8','9'=>'9',
-									},
-					-default=>"",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
-					-id=>"ohidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show','2' =>'Hide',},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-
-		$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
-					-id=>"ihidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show','2' =>'Hide',},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
-					-id=>"ehidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{tagsubfield} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\">";
-		$row_data{liblibrarian} = "";
-		$row_data{libopac} = "";
-		$row_data{seealso} = "";
-		$row_data{hidden} = "000";
-		$row_data{repeatable} = CGI::checkbox( -name=> 'repeatable',
-				-id => "repeatable$i",
-				-checked => '',
-				-value => 1,
-				-label => '');
-		$row_data{mandatory} = CGI::checkbox( -name=> 'mandatory',
-			-id => "mandatory$i",
-			-checked => '',
-			-value => 1,
-			-label => '');
-		$row_data{isurl} = CGI::checkbox(-name => 'isurl',
-			-id => "isurl$i",
-			-checked => '',
-			-value => 1,
-			-label => '');
-		
-		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
-					-id => 'authorised_value',
-					-values=> \@authorised_values,
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{authtypes}  = CGI::scrolling_list(-name=>'authtypecode',
-					-id => 'authtypecode',
-					-values=> \@authtypes,
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{link} = CGI::escapeHTML($data->{'link'});
-		$row_data{toggle} = $toggle;
-		$row_data{row} = $i;
-		push(@loop_data, \%row_data);
-	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param('heading-edit-subfields-p' => 1);
-	$template->param(action => "Edit subfields",
-							tagfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\">$tagfield",
-							loop => \@loop_data,
-							more_subfields => $more_subfields,
-							more_tag => $tagfield);
-
-												# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	my $dbh = C4::Context->dbh;
-	$template->param(tagfield => "$input->param('tagfield')");
-	my $sth=$dbh->prepare("replace biblios_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,seealso,authorised_value,authtypecode,value_builder,hidden,isurl,frameworkcode, link)
-									values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-	my @tagsubfield	= $input->param('tagsubfield');
-	my @liblibrarian	= $input->param('liblibrarian');
-	my @libopac		= $input->param('libopac');
-
-	my @tab				= $input->param('tab');
-	my @seealso		= $input->param('seealso');
-#	my @hidden		= $input->param('hidden');
-	my @hidden;
-	my @ohidden		= $input->param('ohidden');
-	my @ihidden		= $input->param('ihidden');
-	my @ehidden		= $input->param('ehidden');
-	my @authorised_values	= $input->param('authorised_value');
-	my @authtypecodes	= $input->param('authtypecode');
-	my @value_builder	=$input->param('value_builder');
-	my @link		=$input->param('link');
-	for (my $i=0; $i<= $#tagsubfield ; $i++) {
-		my $tagfield			=$input->param('tagfield');
-		my $tagsubfield		=$tagsubfield[$i];
-		$tagsubfield="@" unless $tagsubfield ne '';
-		my $liblibrarian		=$liblibrarian[$i];
-		my $libopac			=$libopac[$i];
-		my $repeatable		=$input->param("repeatable$i")?1:0;
-		my $mandatory		=$input->param("mandatory$i")?1:0;
-	
-		my $tab				=$tab[$i];
-		my $seealso				=$seealso[$i];
-		my $authorised_value		=$authorised_values[$i];
-		my $authtypecode		=$authtypecodes[$i];
-		my $value_builder=$value_builder[$i];
-		my $hidden = $ohidden[$i].$ihidden[$i].$ehidden[$i]; #collate from 3 hiddens;
-		my $isurl = $input->param("isurl$i")?1:0;
-		my $link = $link[$i];
-		if ($liblibrarian) {
-			unless (C4::Context->config('demo') eq 1) {
-				$sth->execute ($tagfield,
-									$tagsubfield,
-									$liblibrarian,
-									$libopac,
-									$repeatable,
-									$mandatory,
-									
-									$tab,
-									$seealso,
-									$authorised_value,
-									$authtypecode,
-									$value_builder,
-									$hidden,
-									$isurl,
-									$frameworkcode,
-
-	 $link,
-					      );
-			}
-		}
-	}
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=biblios_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
-	exit;
-
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select * from biblios_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
-	#FIXME : called with 2 bind variables when 3 are needed
-	$sth->execute($tagfield,$tagsubfield);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(liblibrarian => $data->{'liblibrarian'},
-							tagsubfield => $data->{'tagsubfield'},
-							delete_link => $script_name,
-							tagfield      =>$tagfield,
-							tagsubfield => $tagsubfield,
-							frameworkcode => $frameworkcode,
-							);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	my $dbh = C4::Context->dbh;
-	unless (C4::Context->config('demo') eq 1) {
-		my $sth=$dbh->prepare("delete from biblios_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
-		$sth->execute($tagfield,$tagsubfield,$frameworkcode);
-		$sth->finish;
-	}
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=biblios_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
-	exit;
-	$template->param(tagfield => $tagfield);
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	my $env;
-	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
-	my $toggle=1;
-	my @loop_data = ();
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-	  	if ($toggle eq 1){
-			$toggle=0;
-	  	} else {
-			$toggle=1;
-	  	}
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{tagfield} = $results->[$i]{'tagfield'};
-		$row_data{tagsubfield} = $results->[$i]{'tagsubfield'};
-		$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
-		$row_data{repeatable} = $results->[$i]{'repeatable'};
-		$row_data{mandatory} = $results->[$i]{'mandatory'};
-		$row_data{tab} = $results->[$i]{'tab'};
-		$row_data{seealso} = $results->[$i]{'seealso'};
-		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
-		$row_data{authtypecode}	= $results->[$i]{'authtypecode'};
-		$row_data{value_builder}	= $results->[$i]{'value_builder'};
-		$row_data{hidden}	= $results->[$i]{'hidden'} if($results->[$i]{'hidden'} gt "000") ;
-		$row_data{isurl}	= $results->[$i]{'isurl'};
-		$row_data{link}	= $results->[$i]{'link'};
-		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
-		$row_data{toggle} = $toggle;
-		if ($row_data{tab} eq -1) {
-			$row_data{subfield_ignored} = 1;
-		}
-
-		push(@loop_data, \%row_data);
-	}
-	$template->param(loop => \@loop_data);
-	$template->param(edit_tagfield => $tagfield,
-		edit_frameworkcode => $frameworkcode);
-	
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(prev =>"<a href=\"$script_name?offset=$prevpage\">");
-	}
-	if ($offset+$pagesize<$count) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(next => "<a href=\"$script_name?offset=$nextpage\">");
-	}
-} #---- END $OP eq DEFAULT
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/admin/bibliostagstructure.pl b/admin/bibliostagstructure.pl
deleted file mode 100644
index 5255e44e17..0000000000
--- a/admin/bibliostagstructure.pl
+++ /dev/null
@@ -1,397 +0,0 @@
-#!/usr/bin/perl
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Koha;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
-
-
-# retrieve parameters
-my $input = new CGI;
-my $frameworkcode = $input->param('frameworkcode'); # set to select framework
-$frameworkcode="" unless $frameworkcode;
-my $existingframeworkcode = $input->param('existingframeworkcode'); # set when we have to create a new framework (in frameworkcode) by copying an old one (in existingframeworkcode)
-$existingframeworkcode = "" unless $existingframeworkcode;
-my $frameworkinfo = getframeworkinfo($frameworkcode);
-my $searchfield=$input->param('searchfield');
-$searchfield=0 unless $searchfield;
-$searchfield=~ s/\,//g;
-
-my $offset=$input->param('offset');
-my $op = $input->param('op');
-my $dspchoice = $input->param('select_display');
-my $pagesize=20;
-
-my $script_name="/cgi-bin/koha/admin/bibliostagstructure.pl";
-
-my $dbh = C4::Context->dbh;
-
-# open template
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/bibliostagstructure.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-# get framework list
-my $frameworks = getframeworks();
-my @frameworkloop;
-foreach my $thisframeworkcode (keys %$frameworks) {
-	my $selected = 1 if $thisframeworkcode eq $frameworkcode;
-	my %row =(value => $thisframeworkcode,
-				selected => $selected,
-				frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
-			);
-	push @frameworkloop, \%row;
-}
-
-# check that framework is defined in biblios_tag_structure
-my $sth=$dbh->prepare("select count(*) from biblios_tag_structure where frameworkcode=?");
-$sth->execute($frameworkcode);
-my ($frameworkexist) = $sth->fetchrow;
-if ($frameworkexist) {
-} else {
-	# if frameworkcode does not exists, then OP must be changed to "create framework" if we are not on the way to create it
-	# (op = itemtyp_create_confirm)
-	if ($op eq "framework_create_confirm") {
-		duplicate_framework($frameworkcode, $existingframeworkcode);
-		$op=""; # unset $op to go back to framework list
-	} else {
-		$op = "framework_create";
-	}
-}
-$template->param(frameworkloop => \@frameworkloop,
-				frameworkcode => $frameworkcode,
-				frameworktext => $frameworkinfo->{frameworktext});
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($searchfield) {
-		$sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from biblios_tag_structure where tagfield=? and frameworkcode=?");
-		$sth->execute($searchfield,$frameworkcode);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-	my $sth = $dbh->prepare("select distinct category from authorised_values");
-	$sth->execute;
-	my @authorised_values;
-	push @authorised_values,"";
-	while ((my $category) = $sth->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	my $authorised_value  = CGI::scrolling_list(-name=>'authorised_value',
-			-values=> \@authorised_values,
-			-size=>1,
-			-id=>"authorised_value",
-			-multiple=>0,
-			-default => $data->{'authorised_value'},
-			);
-
-	if ($searchfield) {
-		$template->param(action => "Modify tag",
-								searchfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$searchfield\" />$searchfield");
-		$template->param('heading-modify-tag-p' => 1);
-	} else {
-		$template->param(action => "Add tag",
-								searchfield => "<input type=\"text\" name=\"tagfield\" size=\"5\" maxlength=\"3\" />");
-		$template->param('heading-add-tag-p' => 1);
-	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param(liblibrarian => $data->{'liblibrarian'},
-			libopac => $data->{'libopac'},
-			repeatable => CGI::checkbox(-name=>'repeatable',
-						-checked=> $data->{'repeatable'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'repeatable'),
-			mandatory => CGI::checkbox(-name => 'mandatory',
-						-checked => $data->{'mandatory'}?'checked':'',
-						-value => 1,
-						-label => '',
-						-id => 'mandatory'),
-			authorised_value => $authorised_value,
-			frameworkcode => $frameworkcode,
-			);
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	$sth=$dbh->prepare("replace biblios_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) values (?,?,?,?,?,?,?)");
-	my $tagfield       =$input->param('tagfield');
-	my $liblibrarian  = $input->param('liblibrarian');
-	my $libopac       =$input->param('libopac');
-	my $repeatable =$input->param('repeatable');
-	my $mandatory =$input->param('mandatory');
-	my $authorised_value =$input->param('authorised_value');
-	unless (C4::Context->config('demo') eq 1) {
-		$sth->execute($tagfield,
-							$liblibrarian,
-							$libopac,
-							$repeatable?1:0,
-							$mandatory?1:0,
-							$authorised_value,
-							$frameworkcode
-							);
-	}
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=bibliostagstructure.pl?searchfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
-	exit;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from biblios_tag_structure where tagfield=? and frameworkcode=?");
-	$sth->execute($searchfield,$frameworkcode);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(liblibrarian => $data->{'liblibrarian'},
-							searchfield => $searchfield,
-							frameworkcode => $frameworkcode,
-							);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	unless (C4::Context->config('demo') eq 1) {
-		$dbh->do("delete from biblios_tag_structure where tagfield='$searchfield' and frameworkcode='$frameworkcode'");
-		$dbh->do("delete from biblios_subfield_structure where tagfield='$searchfield' and frameworkcode='$frameworkcode'");
-		
-	}
-													# END $OP eq DELETE_CONFIRMED
-################## ITEMTYPE_CREATE ##################################
-# called automatically if an unexisting  frameworkis selected
-} elsif ($op eq 'framework_create') {
-	$sth = $dbh->prepare("select count(*),biblios_tag_structure.frameworkcode,frameworktext from biblios_tag_structure,biblios_framework where biblios_framework.frameworkcode=biblios_tag_structure.frameworkcode group by biblios_tag_structure.frameworkcode");
-	$sth->execute;
-	my @existingframeworkloop;
-	while (my ($tot,$thisframeworkcode,$frameworktext) = $sth->fetchrow) {
-		if ($tot>0) {
-			my %line = ( value => $thisframeworkcode,
-						frameworktext => $frameworktext,
-					);
-			push @existingframeworkloop,\%line;
-		}
-	}
-	$template->param(existingframeworkloop => \@existingframeworkloop,
-					frameworkcode => $frameworkcode,
-# 					FRtext => $frameworkinfo->{frameworktext},
-					);
-################## DEFAULT ##################################
-} else { # DEFAULT
-	# here, $op can be unset or set to "framework_create_confirm".
-	if  ($searchfield ne '') {
-		 $template->param(searchfield => $searchfield);
-	}
-	my $cnt=0;
-	if ($dspchoice) {
-		#here, user only wants used tags/subfields displayed
-		my $env;
-		$searchfield=~ s/\'/\\\'/g;
-		my @data=split(' ',$searchfield);
-		my $sth=$dbh->prepare("Select biblios_tag_structure.tagfield as mts_tagfield,biblios_tag_structure.liblibrarian as mts_liblibrarian,biblios_tag_structure.libopac as mts_libopac,biblios_tag_structure.repeatable as mts_repeatable,biblios_tag_structure.mandatory as mts_mandatory,biblios_tag_structure.authorised_value as mts_authorized_value,biblios_subfield_structure.* from biblios_tag_structure LEFT JOIN biblios_subfield_structure ON (biblios_tag_structure.tagfield=biblios_subfield_structure.tagfield AND biblios_tag_structure.frameworkcode=biblios_subfield_structure.frameworkcode) where (biblios_tag_structure.tagfield >= ? and biblios_tag_structure.frameworkcode=?) AND biblios_subfield_structure.tab>=0 order by biblios_tag_structure.tagfield,biblios_subfield_structure.tagsubfield");
-		#could be ordoned by tab
-		$sth->execute($data[0], $frameworkcode);
-		my @results = ();
-		while (my $data=$sth->fetchrow_hashref){
-			push(@results,$data);
-			$cnt++;
-		}
-		$sth->finish;
-		
-		my $toggle=0;
-		my @loop_data = ();
-		my $j=1;
-		my $i=$offset;
-		while ($i < ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt)) {
-			if ($toggle eq 0){
-				$toggle=1;
-			} else {
-				$toggle=0;
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{tagfield} = $results[$i]->{'mts_tagfield'};
-			$row_data{liblibrarian} = $results[$i]->{'mts_liblibrarian'};
-			$row_data{repeatable} = $results[$i]->{'mts_repeatable'};
-			$row_data{mandatory} = $results[$i]->{'mts_mandatory'};
-			$row_data{authorised_value} = $results[$i]->{'mts_authorised_value'};
-			$row_data{subfield_link} ="biblios_subfields_structure.pl?op=add_form&tagfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{toggle} = $toggle;
-			$j=$i;
-			my @internal_loop = ();
-			while (($results[$i]->{'tagfield'}==$results[$j]->{'tagfield'}) and ($j< ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt))) {
-				if ($toggle eq 0) {
-					$toggle=1;
-				} else {
-					$toggle=0;
-				}
-				my %subfield_data;
-				$subfield_data{tagsubfield} = $results[$j]->{'tagsubfield'};
-				$subfield_data{liblibrarian} = $results[$j]->{'liblibrarian'};
-				$subfield_data{repeatable} = $results[$j]->{'repeatable'};
-				$subfield_data{mandatory} = $results[$j]->{'mandatory'};
-				$subfield_data{tab} = $results[$j]->{'tab'};
-				$subfield_data{seealso} = $results[$j]->{'seealso'};
-				$subfield_data{authorised_value} = $results[$j]->{'authorised_value'};
-				$subfield_data{authtypecode}= $results[$j]->{'authtypecode'};
-				$subfield_data{value_builder}= $results[$j]->{'value_builder'};
-				$subfield_data{toggle}	= $toggle;
-# 				warn "tagfield :  ".$results[$j]->{'tagfield'}." tagsubfield :".$results[$j]->{'tagsubfield'};
-				push @internal_loop,\%subfield_data;
-				$j++;
-			}
-			$row_data{'subfields'}=\@internal_loop;
-			push(@loop_data, \%row_data);
-#			undef @internal_loop;
-			$i=$j;
-		}
-		$template->param(select_display => "True",
-						loop => \@loop_data);
-		#  $sth->execute;
-		$sth->finish;
-	} else {
-		#here, normal old style : display every tags
-		my $env;
-		my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
-		$cnt = $count;
-		my $toggle=0;
-		my @loop_data = ();
-		for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-			if ($toggle eq 0){
-				$toggle=1;
-			} else {
-				$toggle=0;
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{tagfield} = $results->[$i]{'tagfield'};
-			$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
-			$row_data{repeatable} = $results->[$i]{'repeatable'};
-			$row_data{mandatory} = $results->[$i]{'mandatory'};
-			$row_data{authorised_value} = $results->[$i]{'authorised_value'};
-			$row_data{subfield_link} ="biblios_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{toggle} = $toggle;
-			push(@loop_data, \%row_data);
-		}
-		$template->param(loop => \@loop_data);
-	}
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(isprevpage => $offset,
-						prevpage=> $prevpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-						frameworkcode => $frameworkcode,
-		);
-	}
-	if ($offset+$pagesize<$cnt) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(nextpage =>$nextpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-						frameworkcode => $frameworkcode,
-		);
-	}
-} #---- END $OP eq DEFAULT
-
-$template->param(loggeninuser => $loggedinuser,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
-
-
-#
-# the sub used for searches
-#
-sub StringSearch  {
-	my ($env,$searchstring,$frameworkcode)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from biblios_tag_structure where (tagfield >= ? and frameworkcode=?) order by tagfield");
-	$sth->execute($data[0], $frameworkcode);
-	my @results;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	}
-	#  $sth->execute;
-	$sth->finish;
-	return (scalar(@results),\@results);
-}
-
-#
-# the sub used to duplicate a framework from an existing one in MARC parameters tables.
-#
-sub duplicate_framework {
-	my ($newframeworkcode,$oldframeworkcode) = @_;
-	my $sth = $dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from biblios_tag_structure where frameworkcode=?");
-	$sth->execute($oldframeworkcode);
-	my $sth_insert = $dbh->prepare("insert into biblios_tag_structure (tagfield, liblibrarian, libopac, repeatable, mandatory, authorised_value, frameworkcode) values (?,?,?,?,?,?,?)");
-	while ( my ($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value) = $sth->fetchrow) {
-		$sth_insert->execute($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value,$newframeworkcode);
-	}
-
-	$sth = $dbh->prepare("select frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,authorised_value,authtypecode,value_builder,seealso from biblios_subfield_structure where frameworkcode=?");
-	$sth->execute($oldframeworkcode);
-	$sth_insert = $dbh->prepare("insert into biblios_subfield_structure (frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,authorised_value,authtypecode,value_builder,seealso) values (?,?,?,?,?,?,?,?,?,?,?,?)");
-	while ( my ($frameworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory,  $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso) = $sth->fetchrow) {
-	    $sth_insert->execute($newframeworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso);
-	}
-	
-## now the same for holdings
-	$sth = $dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from holdings_tag_structure where frameworkcode=?");
-	$sth->execute($oldframeworkcode);
-	my $sth_insert = $dbh->prepare("insert into holdings_tag_structure (tagfield, liblibrarian, libopac, repeatable, mandatory, authorised_value, frameworkcode) values (?,?,?,?,?,?,?)");
-	while ( my ($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value) = $sth->fetchrow) {
-		$sth_insert->execute($tagfield,$liblibrarian,$libopac,$repeatable,$mandatory,$authorised_value,$newframeworkcode);
-	}
-
-	$sth = $dbh->prepare("select frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,authorised_value,authtypecode,value_builder,seealso from holdings_subfield_structure where frameworkcode=?");
-	$sth->execute($oldframeworkcode);
-	$sth_insert = $dbh->prepare("insert into holdings_subfield_structure (frameworkcode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,authorised_value,authtypecode,value_builder,seealso) values (?,?,?,?,?,?,?,?,?,?,?,?)");
-	while ( my ($frameworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory,  $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso) = $sth->fetchrow) {
-	    $sth_insert->execute($newframeworkcode, $tagfield, $tagsubfield, $liblibrarian, $libopac, $repeatable, $mandatory, $tab, $authorised_value, $thesaurus_category, $value_builder, $seealso);
-	}
-}
-
diff --git a/admin/holdings_subfields_structure.pl b/admin/holdings_subfields_structure.pl
deleted file mode 100644
index 21486e5740..0000000000
--- a/admin/holdings_subfields_structure.pl
+++ /dev/null
@@ -1,458 +0,0 @@
-#!/usr/bin/perl
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Auth;
-use CGI;
-use C4::Search;
-use C4::Context;
-
-
-sub StringSearch  {
-	my ($env,$searchstring,$frameworkcode)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select * from holdings_subfield_structure where (tagfield like ? and frameworkcode=?) order by tagfield");
-	$sth->execute("$searchstring%",$frameworkcode);
-	my @results;
-	my $cnt=0;
-	my $u=1;
-	while (my $data=$sth->fetchrow_hashref){
-		push(@results,$data);
-		$cnt ++;
-		$u++;
-	}
-	$sth->finish;
-	$dbh->disconnect;
-	return ($cnt,\@results);
-}
-
-my $input = new CGI;
-my $tagfield=$input->param('tagfield');
-my $tagsubfield=$input->param('tagsubfield');
-my $frameworkcode=$input->param('frameworkcode');
-my $pkfield="tagfield";
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/holdings_subfields_structure.pl";
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/holdings_subfields_structure.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-my $pagesize=30;
-my $op = $input->param('op');
-$tagfield=~ s/\,//g;
-
-if ($op) {
-$template->param(script_name => $script_name,
-						tagfield =>$tagfield,
-						frameworkcode => $frameworkcode,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						tagfield =>$tagfield,
-						frameworkcode => $frameworkcode,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	my $data;
-	my $dbh = C4::Context->dbh;
-	my $more_subfields = $input->param("more_subfields")+1;
-	
-	
-	# build authorised value list
-	
-my	$sth2 = $dbh->prepare("select distinct category from authorised_values");
-	$sth2->execute;
-	my @authorised_values;
-	push @authorised_values,"";
-	while ((my $category) = $sth2->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	push (@authorised_values,"branches");
-	push (@authorised_values,"itemtypes");
-	# build thesaurus categories list
-	$sth2->finish;
-	$sth2 = $dbh->prepare("select authtypecode from auth_types");
-	$sth2->execute;
-	my @authtypes;
-	push @authtypes,"";
-	while ((my $authtypecode) = $sth2->fetchrow_array) {
-		push @authtypes, $authtypecode;
-	}
-	# build value_builder list
-	my @value_builder=('');
-
-	# read value_builder directory.
-	# 2 cases here : on CVS install, $cgidir does not need a /cgi-bin
-	# on a standard install, /cgi-bin need to be added. 
-	# test one, then the other
-	my $cgidir = C4::Context->intranetdir ."/cgi-bin";
-	unless (opendir(DIR, "$cgidir/value_builder")) {
-		$cgidir = C4::Context->intranetdir;
-		opendir(DIR, "$cgidir/value_builder") || die "can't opendir $cgidir/value_builder: $!";
-	} 
-	while (my $line = readdir(DIR)) {
-		if ($line =~ /\.pl$/) {
-			push (@value_builder,$line);
-		}
-	}
-	closedir DIR;
-
-	# build values list
-	my $sth=$dbh->prepare("select * from holdings_subfield_structure where tagfield=? and frameworkcode=?"); # and tagsubfield='$tagsubfield'");
-	$sth->execute($tagfield,$frameworkcode);
-	my @loop_data = ();
-	my $toggle=1;
-	my $i=0;
-	while ($data =$sth->fetchrow_hashref) {
-		my %row_data;  # get a fresh hash for the row data
-		if ($toggle eq 1){
-			$toggle=0;
-	  	} else {
-			$toggle=1;
-	  	}
-		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-					-id=>"tab$i",
-					-values=>['-1','10'],
-					-labels => {'-1' =>'ignore','10'=>'items (10)',	},
-					-default=>$data->{'tab'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
-					-id=>"ohidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show','2' =>'Hide',},
-					-default=>substr($data->{'hidden'},0,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
-					-id=>"ihidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show','2' =>'Hide',},
-					-default=>substr($data->{'hidden'},1,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
-					-id=>"ehidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>substr($data->{'hidden'},2,1),
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{tagsubfield} =$data->{'tagsubfield'}."<input type=\"hidden\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" id=\"tagsubfield\">";
-		$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
-		$row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
-		$row_data{seealso} = CGI::escapeHTML($data->{'seealso'});
-		
-		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
-					-id=>'authorised_value',
-					-values=> \@authorised_values,
-					-default=>$data->{'authorised_value'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{value_builder}  = CGI::scrolling_list(-name=>'value_builder',
-					-id=>'value_builder',
-					-values=> \@value_builder,
-					-default=>$data->{'value_builder'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{authtypes}  = CGI::scrolling_list(-name=>'authtypecode',
-					-id=>'authtypecode',
-					-values=> \@authtypes,
-					-default=>$data->{'authtypecode'},
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{repeatable} = CGI::checkbox(-name=>"repeatable$i",
-	-checked => $data->{'repeatable'}?'checked':'',
-	-value => 1,
-	-label => '',
-	-id => "repeatable$i");
-		$row_data{mandatory} = CGI::checkbox(-name => "mandatory$i",
-	-checked => $data->{'mandatory'}?'checked':'',
-	-value => 1,
-	-label => '',
-	-id => "mandatory$i");
-		$row_data{hidden} = CGI::escapeHTML($data->{hidden});
-		$row_data{isurl} = CGI::checkbox( -name => "isurl$i",
-			-id => "isurl$i",
-			-checked => $data->{'isurl'}?'checked':'',
-			-value => 1,
-			-label => '');
-		$row_data{row} = $i;
-		$row_data{toggle} = $toggle;
-		$row_data{link} = CGI::escapeHTML($data->{'link'});
-		push(@loop_data, \%row_data);
-		$i++;
-	}
-	# add more_subfields empty lines for add if needed
-	for (my $i=1;$i<=$more_subfields;$i++) {
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
-					-id => "tab$i",
-					-values=>['-1','10'],
-					-labels => {'-1' =>'ignore','10'=>'items (10)',},
-					-default=>"",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
-					-id=>"ohidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show','2' =>'Hide',},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
-					-id=>"ihidden$i",
-					-values=>['0','2'],
-					-labels => {'0'=>'Show','2' =>'Hide',},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
-					-id=>"ehidden$i",
-					-values=>['0','1','2'],
-					-labels => {'0'=>'Show','1'=>'Show Collapsed',
-									'2' =>'Hide',
-									},
-					-default=>"0",
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{tagsubfield} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\">";
-		$row_data{liblibrarian} = "";
-		$row_data{libopac} = "";
-		$row_data{seealso} = "";
-		$row_data{hidden} = "000";
-		$row_data{repeatable} = CGI::checkbox( -name=> 'repeatable',
-				-id => "repeatable$i",
-				-checked => '',
-				-value => 1,
-				-label => '');
-		$row_data{mandatory} = CGI::checkbox( -name=> 'mandatory',
-			-id => "mandatory$i",
-			-checked => '',
-			-value => 1,
-			-label => '');
-		$row_data{isurl} = CGI::checkbox(-name => 'isurl',
-			-id => "isurl$i",
-			-checked => '',
-			-value => 1,
-			-label => '');
-		
-		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
-					-id => 'authorised_value',
-					-values=> \@authorised_values,
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{authtypes}  = CGI::scrolling_list(-name=>'authtypecode',
-					-id => 'authtypecode',
-					-values=> \@authtypes,
-					-size=>1,
-					-multiple=>0,
-					);
-		$row_data{link} = CGI::escapeHTML($data->{'link'});
-		$row_data{toggle} = $toggle;
-		$row_data{row} = $i;
-		push(@loop_data, \%row_data);
-	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param('heading-edit-subfields-p' => 1);
-	$template->param(action => "Edit subfields",
-							tagfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\">$tagfield",
-							loop => \@loop_data,
-							more_subfields => $more_subfields,
-							more_tag => $tagfield);
-
-												# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	my $dbh = C4::Context->dbh;
-	$template->param(tagfield => "$input->param('tagfield')");
-	my $sth=$dbh->prepare("replace holdings_subfield_structure (tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,tab,seealso,authorised_value,authtypecode,value_builder,hidden,isurl,frameworkcode, link)
-									values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
-	my @tagsubfield	= $input->param('tagsubfield');
-	my @liblibrarian	= $input->param('liblibrarian');
-	my @libopac		= $input->param('libopac');
-	
-	my @tab				= $input->param('tab');
-	my @seealso		= $input->param('seealso');
-#	my @hidden		= $input->param('hidden');
-	my @hidden;
-	my @ohidden		= $input->param('ohidden');
-	my @ihidden		= $input->param('ihidden');
-	my @ehidden		= $input->param('ehidden');
-	my @authorised_values	= $input->param('authorised_value');
-	my @authtypecodes	= $input->param('authtypecode');
-	my @value_builder	=$input->param('value_builder');
-	my @link		=$input->param('link');
-	for (my $i=0; $i<= $#tagsubfield ; $i++) {
-		my $tagfield			=$input->param('tagfield');
-		my $tagsubfield		=$tagsubfield[$i];
-		$tagsubfield="@" unless $tagsubfield ne '';
-		my $liblibrarian		=$liblibrarian[$i];
-		my $libopac			=$libopac[$i];
-		my $repeatable		=$input->param("repeatable$i")?1:0;
-		my $mandatory		=$input->param("mandatory$i")?1:0;
-		
-		my $tab				=$tab[$i];
-		my $seealso				=$seealso[$i];
-		my $authorised_value		=$authorised_values[$i];
-		my $authtypecode		=$authtypecodes[$i];
-		my $value_builder=$value_builder[$i];
-		my $hidden = $ohidden[$i].$ihidden[$i].$ehidden[$i]; #collate from 3 hiddens;
-		my $isurl = $input->param("isurl$i")?1:0;
-		my $link = $link[$i];
-		if ($liblibrarian) {
-			unless (C4::Context->config('demo') eq 1) {
-				$sth->execute ($tagfield,
-									$tagsubfield,
-									$liblibrarian,
-									$libopac,
-									$repeatable,
-									$mandatory,
-									
-									$tab,
-									$seealso,
-									$authorised_value,
-									$authtypecode,
-									$value_builder,
-									$hidden,
-									$isurl,
-									$frameworkcode,
-
-	 $link,
-					      );
-			}
-		}
-	}
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=holdings_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
-	exit;
-
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("select * from holdings_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
-	#FIXME : called with 2 bind variables when 3 are needed
-	$sth->execute($tagfield,$tagsubfield);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(liblibrarian => $data->{'liblibrarian'},
-							tagsubfield => $data->{'tagsubfield'},
-							delete_link => $script_name,
-							tagfield      =>$tagfield,
-							tagsubfield => $tagsubfield,
-							frameworkcode => $frameworkcode,
-							);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	my $dbh = C4::Context->dbh;
-	unless (C4::Context->config('demo') eq 1) {
-		my $sth=$dbh->prepare("delete from holdings_subfield_structure where tagfield=? and tagsubfield=? and frameworkcode=?");
-		$sth->execute($tagfield,$tagsubfield,$frameworkcode);
-		$sth->finish;
-	}
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=holdings_subfields_structure.pl?tagfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
-	exit;
-	$template->param(tagfield => $tagfield);
-													# END $OP eq DELETE_CONFIRMED
-################## DEFAULT ##################################
-} else { # DEFAULT
-	my $env;
-	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
-	my $toggle=1;
-	my @loop_data = ();
-	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-	  	if ($toggle eq 1){
-			$toggle=0;
-	  	} else {
-			$toggle=1;
-	  	}
-		my %row_data;  # get a fresh hash for the row data
-		$row_data{tagfield} = $results->[$i]{'tagfield'};
-		$row_data{tagsubfield} = $results->[$i]{'tagsubfield'};
-		$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
-		
-		$row_data{repeatable} = $results->[$i]{'repeatable'};
-		$row_data{mandatory} = $results->[$i]{'mandatory'};
-		$row_data{tab} = $results->[$i]{'tab'};
-		$row_data{seealso} = $results->[$i]{'seealso'};
-		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
-		$row_data{authtypecode}	= $results->[$i]{'authtypecode'};
-		$row_data{value_builder}	= $results->[$i]{'value_builder'};
-		$row_data{hidden}	= $results->[$i]{'hidden'} if($results->[$i]{'hidden'} gt "000") ;
-		$row_data{isurl}	= $results->[$i]{'isurl'};
-		$row_data{link}	= $results->[$i]{'link'};
-		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
-		$row_data{toggle} = $toggle;
-		if ($row_data{tab} eq -1) {
-			$row_data{subfield_ignored} = 1;
-		}
-
-		push(@loop_data, \%row_data);
-	}
-	$template->param(loop => \@loop_data);
-	$template->param(edit_tagfield => $tagfield,
-		edit_frameworkcode => $frameworkcode);
-	
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(prev =>"<a href=\"$script_name?offset=$prevpage\">");
-	}
-	if ($offset+$pagesize<$count) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(next => "<a href=\"$script_name?offset=$nextpage\">");
-	}
-} #---- END $OP eq DEFAULT
-$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/admin/holdingstagstructure.pl b/admin/holdingstagstructure.pl
deleted file mode 100644
index 61578d5c05..0000000000
--- a/admin/holdingstagstructure.pl
+++ /dev/null
@@ -1,366 +0,0 @@
-#!/usr/bin/perl
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Koha;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
-
-
-# retrieve parameters
-my $input = new CGI;
-my $frameworkcode = $input->param('frameworkcode'); # set to select framework
-$frameworkcode="" unless $frameworkcode;
-my $existingframeworkcode = $input->param('existingframeworkcode'); # set when we have to create a new framework (in frameworkcode) by copying an old one (in existingframeworkcode)
-$existingframeworkcode = "" unless $existingframeworkcode;
-my $frameworkinfo = getframeworkinfo($frameworkcode);
-my $searchfield=$input->param('searchfield');
-$searchfield=0 unless $searchfield;
-$searchfield=~ s/\,//g;
-
-my $offset=$input->param('offset');
-my $op = $input->param('op');
-my $dspchoice = $input->param('select_display');
-my $pagesize=20;
-
-my $script_name="/cgi-bin/koha/admin/holdingstagstructure.pl";
-
-my $dbh = C4::Context->dbh;
-
-# open template
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/holdingstagstructure.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-# get framework list
-my $frameworks = getframeworks();
-my @frameworkloop;
-foreach my $thisframeworkcode (keys %$frameworks) {
-	my $selected = 1 if $thisframeworkcode eq $frameworkcode;
-	my %row =(value => $thisframeworkcode,
-				selected => $selected,
-				frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
-			);
-	push @frameworkloop, \%row;
-}
-
-# check that framework is defined in holdings_tag_structure
-my $sth=$dbh->prepare("select count(*) from holdings_tag_structure where frameworkcode=?");
-$sth->execute($frameworkcode);
-my ($frameworkexist) = $sth->fetchrow;
-if ($frameworkexist) {
-} else {
-	# if frameworkcode does not exists, then OP must be changed to "create framework" if we are not on the way to create it
-	# (op = itemtyp_create_confirm)
-	if ($op eq "framework_create_confirm") {
-		duplicate_framework($frameworkcode, $existingframeworkcode);
-		$op=""; # unset $op to go back to framework list
-	} else {
-		$op = "framework_create";
-	}
-}
-$template->param(frameworkloop => \@frameworkloop,
-				frameworkcode => $frameworkcode,
-				frameworktext => $frameworkinfo->{frameworktext});
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($searchfield) {
-		$sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from holdings_tag_structure where tagfield=? and frameworkcode=?");
-		$sth->execute($searchfield,$frameworkcode);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-	my $sth = $dbh->prepare("select distinct category from authorised_values");
-	$sth->execute;
-	my @authorised_values;
-	push @authorised_values,"";
-	while ((my $category) = $sth->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	my $authorised_value  = CGI::scrolling_list(-name=>'authorised_value',
-			-values=> \@authorised_values,
-			-size=>1,
-			-id=>"authorised_value",
-			-multiple=>0,
-			-default => $data->{'authorised_value'},
-			);
-
-	if ($searchfield) {
-		$template->param(action => "Modify tag",
-								searchfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$searchfield\" />$searchfield");
-		$template->param('heading-modify-tag-p' => 1);
-	} else {
-		$template->param(action => "Add tag",
-								searchfield => "<input type=\"text\" name=\"tagfield\" size=\"5\" maxlength=\"3\" />");
-		$template->param('heading-add-tag-p' => 1);
-	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param(liblibrarian => $data->{'liblibrarian'},
-			libopac => $data->{'libopac'},
-			repeatable => CGI::checkbox(-name=>'repeatable',
-						-checked=> $data->{'repeatable'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'repeatable'),
-			mandatory => CGI::checkbox(-name => 'mandatory',
-						-checked => $data->{'mandatory'}?'checked':'',
-						-value => 1,
-						-label => '',
-						-id => 'mandatory'),
-			authorised_value => $authorised_value,
-			frameworkcode => $frameworkcode,
-			);
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-	$sth=$dbh->prepare("replace holdings_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,frameworkcode) values (?,?,?,?,?,?,?)");
-	my $tagfield       =$input->param('tagfield');
-	my $liblibrarian  = $input->param('liblibrarian');
-	my $libopac       =$input->param('libopac');
-	my $repeatable =$input->param('repeatable');
-	my $mandatory =$input->param('mandatory');
-	my $authorised_value =$input->param('authorised_value');
-	unless (C4::Context->config('demo') eq 1) {
-		$sth->execute($tagfield,
-							$liblibrarian,
-							$libopac,
-							$repeatable?1:0,
-							$mandatory?1:0,
-							$authorised_value,
-							$frameworkcode
-							);
-	}
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=holdingstagstructure.pl?searchfield=$tagfield&frameworkcode=$frameworkcode\"></html>";
-	exit;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from holdings_tag_structure where tagfield=? and frameworkcode=?");
-	$sth->execute($searchfield,$frameworkcode);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(liblibrarian => $data->{'liblibrarian'},
-							searchfield => $searchfield,
-							frameworkcode => $frameworkcode,
-							);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-	unless (C4::Context->config('demo') eq 1) {
-		$dbh->do("delete from holdings_tag_structure where tagfield='$searchfield' and frameworkcode='$frameworkcode'");
-		$dbh->do("delete from holdings_subfield_structure where tagfield='$searchfield' and frameworkcode='$frameworkcode'");
-
-	}
-													# END $OP eq DELETE_CONFIRMED
-################## ITEMTYPE_CREATE ##################################
-# called automatically if an unexisting  frameworkis selected
-} elsif ($op eq 'framework_create') {
-	$sth = $dbh->prepare("select count(*),holdings_tag_structure.frameworkcode,frameworktext from holdings_tag_structure,biblio_framework where biblio_framework.frameworkcode=holdings_tag_structure.frameworkcode group by holdings_tag_structure.frameworkcode");
-	$sth->execute;
-	my @existingframeworkloop;
-	while (my ($tot,$thisframeworkcode,$frameworktext) = $sth->fetchrow) {
-		if ($tot>0) {
-			my %line = ( value => $thisframeworkcode,
-						frameworktext => $frameworktext,
-					);
-			push @existingframeworkloop,\%line;
-		}
-	}
-	$template->param(existingframeworkloop => \@existingframeworkloop,
-					frameworkcode => $frameworkcode,
-# 					FRtext => $frameworkinfo->{frameworktext},
-					);
-################## DEFAULT ##################################
-} else { # DEFAULT
-	# here, $op can be unset or set to "framework_create_confirm".
-	if  ($searchfield ne '') {
-		 $template->param(searchfield => $searchfield);
-	}
-	my $cnt=0;
-	if ($dspchoice) {
-		#here, user only wants used tags/subfields displayed
-		my $env;
-		$searchfield=~ s/\'/\\\'/g;
-		my @data=split(' ',$searchfield);
-		my $sth=$dbh->prepare("Select holdings_tag_structure.tagfield as mts_tagfield,holdings_tag_structure.liblibrarian as mts_liblibrarian,holdings_tag_structure.libopac as mts_libopac,holdings_tag_structure.repeatable as mts_repeatable,holdings_tag_structure.mandatory as mts_mandatory,holdings_tag_structure.authorised_value as mts_authorized_value,holdings_subfield_structure.* from holdings_tag_structure LEFT JOIN holdings_subfield_structure ON (holdings_tag_structure.tagfield=holdings_subfield_structure.tagfield AND holdings_tag_structure.frameworkcode=holdings_subfield_structure.frameworkcode) where (holdings_tag_structure.tagfield >= ? and holdings_tag_structure.frameworkcode=?) AND holdings_subfield_structure.tab>=0 order by holdings_tag_structure.tagfield,holdings_subfield_structure.tagsubfield");
-		#could be ordoned by tab
-		$sth->execute($data[0], $frameworkcode);
-		my @results = ();
-		while (my $data=$sth->fetchrow_hashref){
-			push(@results,$data);
-			$cnt++;
-		}
-		$sth->finish;
-		
-		my $toggle=0;
-		my @loop_data = ();
-		my $j=1;
-		my $i=$offset;
-		while ($i < ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt)) {
-			if ($toggle eq 0){
-				$toggle=1;
-			} else {
-				$toggle=0;
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{tagfield} = $results[$i]->{'mts_tagfield'};
-			$row_data{liblibrarian} = $results[$i]->{'mts_liblibrarian'};
-			$row_data{repeatable} = $results[$i]->{'mts_repeatable'};
-			$row_data{mandatory} = $results[$i]->{'mts_mandatory'};
-			$row_data{authorised_value} = $results[$i]->{'mts_authorised_value'};
-			$row_data{subfield_link} ="holdings_subfields_structure.pl?op=add_form&tagfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results[$i]->{'mts_tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{toggle} = $toggle;
-			$j=$i;
-			my @internal_loop = ();
-			while (($results[$i]->{'tagfield'}==$results[$j]->{'tagfield'}) and ($j< ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt))) {
-				if ($toggle eq 0) {
-					$toggle=1;
-				} else {
-					$toggle=0;
-				}
-				my %subfield_data;
-				$subfield_data{tagsubfield} = $results[$j]->{'tagsubfield'};
-				$subfield_data{liblibrarian} = $results[$j]->{'liblibrarian'};
-				
-				$subfield_data{repeatable} = $results[$j]->{'repeatable'};
-				$subfield_data{mandatory} = $results[$j]->{'mandatory'};
-				$subfield_data{tab} = $results[$j]->{'tab'};
-				$subfield_data{seealso} = $results[$j]->{'seealso'};
-				$subfield_data{authorised_value} = $results[$j]->{'authorised_value'};
-				$subfield_data{authtypecode}= $results[$j]->{'authtypecode'};
-				$subfield_data{value_builder}= $results[$j]->{'value_builder'};
-				$subfield_data{toggle}	= $toggle;
-# 				warn "tagfield :  ".$results[$j]->{'tagfield'}." tagsubfield :".$results[$j]->{'tagsubfield'};
-				push @internal_loop,\%subfield_data;
-				$j++;
-			}
-			$row_data{'subfields'}=\@internal_loop;
-			push(@loop_data, \%row_data);
-#			undef @internal_loop;
-			$i=$j;
-		}
-		$template->param(select_display => "True",
-						loop => \@loop_data);
-		#  $sth->execute;
-		$sth->finish;
-	} else {
-		#here, normal old style : display every tags
-		my $env;
-		my ($count,$results)=StringSearch($env,$searchfield,$frameworkcode);
-		$cnt = $count;
-		my $toggle=0;
-		my @loop_data = ();
-		for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-			if ($toggle eq 0){
-				$toggle=1;
-			} else {
-				$toggle=0;
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{tagfield} = $results->[$i]{'tagfield'};
-			$row_data{liblibrarian} = $results->[$i]{'liblibrarian'};
-			$row_data{repeatable} = $results->[$i]{'repeatable'};
-			$row_data{mandatory} = $results->[$i]{'mandatory'};
-			$row_data{authorised_value} = $results->[$i]{'authorised_value'};
-			$row_data{subfield_link} ="holdings_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
-			$row_data{toggle} = $toggle;
-			push(@loop_data, \%row_data);
-		}
-		$template->param(loop => \@loop_data);
-	}
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(isprevpage => $offset,
-						prevpage=> $prevpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-						frameworkcode => $frameworkcode,
-		);
-	}
-	if ($offset+$pagesize<$cnt) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(nextpage =>$nextpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-						frameworkcode => $frameworkcode,
-		);
-	}
-} #---- END $OP eq DEFAULT
-
-$template->param(loggeninuser => $loggedinuser,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
-
-
-#
-# the sub used for searches
-#
-sub StringSearch  {
-	my ($env,$searchstring,$frameworkcode)=@_;
-	my $dbh = C4::Context->dbh;
-	$searchstring=~ s/\'/\\\'/g;
-	my @data=split(' ',$searchstring);
-	my $count=@data;
-	my $sth=$dbh->prepare("Select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from holdings_tag_structure where (tagfield >= ? and frameworkcode=?) order by tagfield");
-	$sth->execute($data[0], $frameworkcode);
-	my @results;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@results,$data);
-	}
-	#  $sth->execute;
-	$sth->finish;
-	return (scalar(@results),\@results);
-}
-
-#
-
-
diff --git a/admin/institutions-careers.pl b/admin/institutions-careers.pl
deleted file mode 100644
index 911efc9597..0000000000
--- a/admin/institutions-careers.pl
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/perl
-
-# Script to manage the educational institutions and its careers.
-# written 12/04
-# Castañeda, Carlos Sebastian - seba3c@yahoo.com.ar - Physics Library UNLP Argentina
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-
-use C4::Auth;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::AcademicInfo;
-
-my $cgi = new CGI;
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/institutions-careers.tmpl",
-			     query => $cgi,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {editcatalogue => 1},
-			     debug => 1,
-			     });
-
-my $op = $cgi->param('op'); 
-my $id_institution = $cgi->param('id_institution'); 
-my $institution_name = $cgi->param('institution_name'); 
-
-if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	
-	if ($id_institution) {
-		my $info = get_educational_institution($id_institution);
-		$template->param(op => 'edit');
-		$template->param(institution_name => $info->{'institution_name'});
-		$template->param(id_institution => $id_institution);
-	} else {
-		$template->param(op => 'add');
-	}
-
-} elsif ($op eq 'add') {
-	add_educational_institution($institution_name);
-	print $cgi->redirect('/cgi-bin/koha/admin/institutions-careers.pl');
-} elsif ($op eq 'edit') {
-	update_educational_institution($id_institution, $institution_name);
-	print $cgi->redirect('/cgi-bin/koha/admin/institutions-careers.pl');
-} elsif ($op eq 'del') {
-	del_educational_institution($id_institution);
-	print $cgi->redirect('/cgi-bin/koha/admin/institutions-careers.pl');
-} else {
-	my @educ_institutions = &get_careers_by_institution();
-	$template->param(institutions => \@educ_institutions);
-}
-
-output_html_with_http_headers $cgi, $cookie, $template->output;
diff --git a/admin/koha-electronic.pl b/admin/koha-electronic.pl
deleted file mode 100644
index f105451df6..0000000000
--- a/admin/koha-electronic.pl
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/perl
-
-# Script to manage the opac news.
-# written 11/04
-# Castañeda, Carlos Sebastian - seba3c@yahoo.com.ar - Physics Library UNLP Argentina
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-
-use C4::Auth;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::NewsChannels;
-
-
-my $cgi = new CGI;
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/koha-electronic.tmpl",
-			     query => $cgi,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-my $op = $cgi->param('op');
-
-if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	my $id = $cgi->param("id");
-	my $edata;
-# warn "add_form";	
-	if ($id) {
-		$template->param(op => 'edit');
-		$edata = get_opac_electronic($id);
-		$template->param($edata);
-		$template->param(id => $edata->{'idelectronic'});
-	} else {
-		$template->param(op => 'add');
-	}
-	
-} elsif ($op eq 'add') {
-# warn "add";
-	my $title	= $cgi->param('title');
-	my $edata	= $cgi->param('edata');
-	my $lang	= $cgi->param('lang');
-	my $image	= $cgi->param('image');
-	my $href	= $cgi->param('href');
-	my $section	= $cgi->param('section');
-	add_opac_electronic($title, $edata, $lang,$image, $href,$section);
-	print $cgi->redirect('/cgi-bin/koha/admin/koha-electronic.pl');
-
-} elsif ($op eq 'edit') {
-# warn "edit";
-	my $id		= $cgi->param('id');
-	my $title	= $cgi->param('title');
-	my $edata	= $cgi->param('edata');
-	my $lang	= $cgi->param('lang');
-	my $image	= $cgi->param('image');
-	my $href	= $cgi->param('href');
-	my $section	= $cgi->param('section');
-	upd_opac_electronic($id, $title, $edata, $lang,$image,$href,$section);
-	print $cgi->redirect('/cgi-bin/koha/admin/koha-electronic.pl');
-
-} elsif ($op eq 'del') {
-# warn "del";
-	my @ids = $cgi->param('ids');
-	del_opac_electronic(join ",", @ids);
-	print $cgi->redirect('/cgi-bin/koha/admin/koha-electronic.pl');
-
-} else { 
-# warn "else";
-
-	my $lang = $cgi->param('lang');
-
-	my ($opac_electronic_count, $opac_electronic) = &get_opac_electronics(undef, $lang);
-	$template->param($lang => 1);
-	$template->param(opac_electronic => $opac_electronic);
-	$template->param(opac_electronic_count => $opac_electronic_count);
-
-}
-
-output_html_with_http_headers $cgi, $cookie, $template->output;
diff --git a/admin/koha-news.pl b/admin/koha-news.pl
deleted file mode 100644
index 869710e73d..0000000000
--- a/admin/koha-news.pl
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/perl
-
-# Script to manage the opac news.
-# written 11/04
-# Castañeda, Carlos Sebastian - seba3c@yahoo.com.ar - Physics Library UNLP Argentina
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-
-use C4::Auth;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::NewsChannels;
-
-
-my $cgi = new CGI;
-
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/koha-news.tmpl",
-			     query => $cgi,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {management => 1},
-			     debug => 1,
-			     });
-
-my $op = $cgi->param('op');
-
-if ($op eq 'add_form') {
-	$template->param(add_form => 1);
-	my $id = $cgi->param("id");
-	my $new;
-	
-	if ($id) {
-		$template->param(op => 'edit');
-		$new = get_opac_new($id);
-		$template->param($new);
-		$template->param(id => $new->{'idnew'});
-	} else {
-		$template->param(op => 'add');
-	}
-	
-} elsif ($op eq 'add') {
-
-	my $title	= $cgi->param('title');
-	my $new		= $cgi->param('new');
-	my $lang	= $cgi->param('lang');
-
-	add_opac_new($title, $new, $lang);
-	print $cgi->redirect('/cgi-bin/koha/admin/koha-news.pl');
-
-} elsif ($op eq 'edit') {
-
-	my $id		= $cgi->param('id');
-	my $title	= $cgi->param('title');
-	my $new		= $cgi->param('new');
-	my $lang	= $cgi->param('lang');
-
-	upd_opac_new($id, $title, $new, $lang);
-	print $cgi->redirect('/cgi-bin/koha/admin/koha-news.pl');
-
-} elsif ($op eq 'del') {
-	my @ids = $cgi->param('ids');
-	del_opac_new(join ",", @ids);
-	print $cgi->redirect('/cgi-bin/koha/admin/koha-news.pl');
-
-} else { 
-
-	my $lang = $cgi->param('lang');
-	my ($opac_news_count, $opac_news) = &get_opac_news(undef, $lang);
-	$template->param($lang => 1);
-	$template->param(opac_news => $opac_news);
-	$template->param(opac_news_count => $opac_news_count);
-
-}
-
-output_html_with_http_headers $cgi, $cookie, $template->output;
diff --git a/admin/koha_attr.pl b/admin/koha_attr.pl
deleted file mode 100644
index 1ce336a74c..0000000000
--- a/admin/koha_attr.pl
+++ /dev/null
@@ -1,321 +0,0 @@
-#!/usr/bin/perl
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Auth;
-use C4::Koha;
-use C4::Context;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Search;
-
-
-# retrieve parameters
-my $input = new CGI;
-
-my $searchfield=$input->param('searchfield');
-$searchfield="" unless $searchfield;
-my $id=$input->param('id');
-my $offset=$input->param('offset');
-$offset=0 unless $offset;
-my $op = $input->param('op');
-my $dspchoice = $input->param('select_display');
-my $pagesize=20;
-my @results = ();
-my $script_name="/cgi-bin/koha/admin/koha_attr.pl";
-
-my $dbh = C4::Context->dbh;
-my $sth;
-# open template
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/koha_attr.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {parameters => 1},
-			     debug => 1,
-			     });
-
-
-if ($op) {
-$template->param(script_name => $script_name,
-						$op              => 1); # we show only the TMPL_VAR names $op
-} else {
-$template->param(script_name => $script_name,
-						else              => 1); # we show only the TMPL_VAR names $op
-}
-
-
-################## ADD_FORM ##################################
-# called by default. Used to create form to add or  modify a record
-if ($op eq 'add_form') {
-	#---- if primkey exists, it's a modify action, so read values to modify...
-	my $data;
-	if ($id) {
-		$sth=$dbh->prepare("select id,kohafield,attr,label,sorts,recordtype,tagfield,tagsubfield,opacshow,intrashow from koha_attr where id=? ");
-		$sth->execute($id);
-		$data=$sth->fetchrow_hashref;
-		$sth->finish;
-	}
-	my $sth = $dbh->prepare("select authorised_value from authorised_values where category='recordtype'");
-	$sth->execute;
-	my @authorised_values;
-	#push @authorised_values,"";
-	while ((my $category) = $sth->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	my $recordlist  = CGI::scrolling_list(-name=>'recordtype',
-			-values=> \@authorised_values,
-			-size=>1,
-			-multiple=>0,
-			-default => $data->{'recordtype'},
-			);
-	my $sth = $dbh->prepare("select authorised_value from authorised_values where category='mfield' order by lib");
-	$sth->execute;
-	my @authorised_values;
-	#push @authorised_values,"";
-	while ((my $category) = $sth->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	my $taglist  = CGI::scrolling_list(-name=>'tagfield',
-			-values=> \@authorised_values,
-			-size=>1,
-			-multiple=>0,
-			-default => $data->{'tagfield'},
-			);
-	my $sth = $dbh->prepare("select authorised_value from authorised_values where category='subfield' order by lib ");
-	$sth->execute;
-	my @authorised_values;
-	#push @authorised_values,"";
-	while ((my $category) = $sth->fetchrow_array) {
-		push @authorised_values, $category;
-	}
-	my $tagsublist  = CGI::scrolling_list(-name=>'tagsubfield',
-			-values=> \@authorised_values,
-			-size=>1,
-			-multiple=>0,
-			-default => $data->{'tagsubfield'},
-			);
-	
-	if ($searchfield) {
-		$template->param(action => "Modify tag",id=>$id ,searchfield => "<input type=\"hidden\" name=\"kohafield\" value=\"$searchfield\" />$searchfield");
-		$template->param('heading-modify-tag-p' => 1);
-	} else {
-		$template->param(action => "Add tag",
-								searchfield => "<input type=\"text\" name=\"kohafield\" size=\"40\" maxlength=\"80\" />");
-		$template->param('heading-add-tag-p' => 1);
-	}
-	$template->param('use-heading-flags-p' => 1);
-	$template->param(label => $data->{'label'},
-			attr=> $data->{'attr'},
-			recordtype=>$recordlist,
-			tagfield=>$taglist,
-			tagsubfield=>$tagsublist,
-			sorts => CGI::checkbox(-name=>'sorts',
-					-checked=> $data->{'sorts'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'sorts'),
-			opacshow => CGI::checkbox(-name=>'opacshow',
-						-checked=> $data->{'opacshow'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'opacshow'),
-			intrashow => CGI::checkbox(-name=>'intrashow',
-						-checked=> $data->{'intrashow'}?'checked':'',
-						-value=> 1,
-						-label => '',
-						-id=> 'intrashow'),
-
-
-			);
-													# END $OP eq ADD_FORM
-################## ADD_VALIDATE ##################################
-# called by add_form, used to insert/modify data in DB
-} elsif ($op eq 'add_validate') {
-my $id       =$input->param('id');
-
-	$sth=$dbh->prepare("replace koha_attr  set id=?,kohafield=?,attr=?,label=?,sorts=?,recordtype=?,tagfield=?,tagsubfield=? ,opacshow=?,intrashow=? ");
-
-	
-	my $kohafield       =$input->param('kohafield');
-	my $attr       =$input->param('attr');
-	my $label  = $input->param('label');
-	my $sorts =$input->param('sorts');
-	my $opacshow =$input->param('opacshow');
-	my $intrashow =$input->param('intrashow');
-	my $recordtype =$input->param('recordtype');
-	my $tagfield =$input->param('tagfield');
-	my $tagsubfield =$input->param('tagsubfield');
-	unless (C4::Context->config('demo') eq 1) {
-		$sth->execute( $id,$kohafield,$attr,$label,$sorts?1:0,$recordtype,$tagfield,$tagsubfield,$opacshow?1:0,$intrashow?1:0);
-	}
-	$sth->finish;
-	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=koha_attr.pl?searchfield=$kohafield\"></html>";
-
-	exit;
-													# END $OP eq ADD_VALIDATE
-################## DELETE_CONFIRM ##################################
-# called by default form, used to confirm deletion of data in DB
-} elsif ($op eq 'delete_confirm') {
-	$sth=$dbh->prepare("select id,kohafield,label,recordtype from koha_attr where id=? ");
-		$sth->execute($id);
-	my $data=$sth->fetchrow_hashref;
-	$sth->finish;
-	$template->param(label => $data->{'label'}."/". $data->{'recordtype'},id=>$data->{'id'},
-							searchfield => $searchfield,
-							);
-													# END $OP eq DELETE_CONFIRM
-################## DELETE_CONFIRMED ##################################
-# called by delete_confirm, used to effectively confirm deletion of data in DB
-} elsif ($op eq 'delete_confirmed') {
-
-	unless (C4::Context->config('demo') eq 1) {
-		$dbh->do("delete from koha_attr where id=$id ");
-	}
-													# END $OP eq DELETE_CONFIRMED
-
-################## DEFAULT ##################################
-} else { # DEFAULT
-	# here, $op can be unset or set 
-	if  ($searchfield ne '') {
-		 $template->param(searchfield => $searchfield);
-	}
-	my $cnt=0;
-	if ($dspchoice) {
-		#here, user only wants used tags/subfields displayed
-		my $sth=$dbh->prepare("Select * from koha_attr where tagfield <>'' and kohafield >= ? ");
-		#could be ordoned by tab
-		$sth->execute($searchfield);
-
-		while (my $data=$sth->fetchrow_hashref){
-			push(@results,$data);
-			$cnt++;
-		}
-
-		$sth->finish;
-		
-		my $toggle=0;
-		my @loop_data = ();
-		my $j=1;
-		my $i=$offset;
-		while ($i < ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt)) {
-			if ($toggle eq 0){
-				$toggle=1;
-			} else {
-				$toggle=0;
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{id} = $results[$i]->{'id'};
-			$row_data{kohafield} = $results[$i]->{'kohafield'};
-			$row_data{label} = $results[$i]->{'label'};
-			$row_data{sorts} = $results[$i]->{'sorts'};
-			$row_data{attr} = $results[$i]->{'attr'};
-			$row_data{recordtype} = $results[$i]->{'recordtype'};
-			$row_data{tagfield} = $results[$i]->{'tagfield'};
-			$row_data{tagsubfield} = $results[$i]->{'tagsubfield'};
-			$row_data{opacshow} = $results[$i]->{'opacshow'};
-			$row_data{intrashow} = $results[$i]->{'intrashow'};
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results[$i]->{'kohafield'}."&amp;id=".$results[$i]->{'id'};
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results[$i]->{'kohafield'}."&amp;id=".$results[$i]->{'id'};
-			$row_data{toggle} = $toggle;
-			push(@loop_data, \%row_data);
-			$i++;
-		}
-		$template->param(select_display => "True",
-						loop => \@loop_data);
-		$sth->finish;
-	} else {
-		#here, normal old style : display every tags
-		my ($count,@results)=StringSearch($dbh,$searchfield);
-		$cnt = $count;
-		my $toggle=0;
-		my @loop_data = ();
-		for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-			if ($toggle eq 0){
-				$toggle=1;
-			} else {
-				$toggle=0;
-			}
-			my %row_data;  # get a fresh hash for the row data
-			$row_data{id} = $results[$i]->{'id'};
-			$row_data{kohafield} = $results[$i]->{'kohafield'};
-			$row_data{label} = $results[$i]->{'label'};
-			$row_data{sorts} = $results[$i]->{'sorts'};
-			$row_data{attr} = $results[$i]->{'attr'};
-			$row_data{recordtype} = $results[$i]->{'recordtype'};
-			$row_data{tagfield} = $results[$i]->{'tagfield'};
-			$row_data{tagsubfield} = $results[$i]->{'tagsubfield'};
-			$row_data{opacshow} = $results[$i]->{'opacshow'};
-			$row_data{intrashow} = $results[$i]->{'intrashow'};
-			$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results[$i]->{'kohafield'}."&amp;id=".$results[$i]->{'id'};
-			$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results[$i]->{'kohafield'}."&amp;id=".$results[$i]->{'id'};
-			$row_data{toggle} = $toggle;
-			push(@loop_data, \%row_data);
-		}
-		$template->param(loop => \@loop_data);
-	}
-	if ($offset>0) {
-		my $prevpage = $offset-$pagesize;
-		$template->param(isprevpage => $offset,
-						prevpage=> $prevpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-						
-		);
-	}
-	if ($offset+$pagesize<$cnt) {
-		my $nextpage =$offset+$pagesize;
-		$template->param(nextpage =>$nextpage,
-						searchfield => $searchfield,
-						script_name => $script_name,
-						
-		);
-	}
-} #---- END $OP eq DEFAULT
-
-$template->param(loggeninuser => $loggedinuser,
-		intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
-		);
-output_html_with_http_headers $input, $cookie, $template->output;
-
-
-#
-# the sub used for searches
-#
-sub StringSearch  {
-	my ($dbh,$searchstring)=@_;
-	my $sth=$dbh->prepare("Select * from koha_attr  where kohafield >=?  order by kohafield");
-	$sth->execute($searchstring);
-	my @dataresults;
-	while (my $data=$sth->fetchrow_hashref){
-	push(@dataresults,$data);
-
-	}
-
-	$sth->finish;
-	return (scalar(@dataresults),@dataresults);
-}
-
-
-
diff --git a/admin/stopwords.pl b/admin/stopwords.pl
deleted file mode 100755
index da465c8a92..0000000000
--- a/admin/stopwords.pl
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/usr/bin/perl
-
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-#
-###
-#
-# script to administer the stopwords table
-#
-# - written on 2002/02/20 by paul.poulain@free.fr
-#
-# - experimentaly rewrittten on 2006/04/06 by Pierrick LE GALL (INEO media
-#   system)
-#
-
-use strict;
-use CGI;
-use List::Util qw/min/;
-
-use C4::Koha;
-use C4::Context;
-use C4::Output;
-use C4::Search;
-use HTML::Template;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-sub StringSearch  {
-    my ($searchstring) = @_;
-
-    my $dbh = C4::Context->dbh;
-    $searchstring =~ s/\'/\\\'/g;
-    my @tokens = split(' ',$searchstring);
-
-    my $query = '
-SELECT word
-  FROM stopwords
-  WHERE (word like ?)
-  ORDER BY word
-';
-    my $sth = $dbh->prepare($query);
-    $sth->execute($tokens[0].'%');
-    my @results;
-    while (my $row = $sth->fetchrow_hashref) {
-        push(@results, $row->{word});
-    }
-    $sth->finish;
-
-    return @results;
-}
-
-my $dbh = C4::Context->dbh;
-my $sth;
-my $query;
-my $input = new CGI;
-my $searchfield = $input->param('searchfield');
-my $script_name="/cgi-bin/koha/admin/stopwords.pl";
-
-my $pagesize = 40;
-my $op = $input->param('op');
-$searchfield=~ s/\,//g;
-
-my ($template, $loggedinuser, $cookie) 
-    = get_template_and_user({template_name => "admin/stopwords.tmpl",
-                            query => $input,
-                            type => "intranet",
- 			    flagsrequired => {parameters => 1, management => 1},
-			    authnotrequired => 0,
-                            debug => 1,
-                            });
-
-$template->param(script_name => $script_name,
-		 searchfield => $searchfield);
-
-if ($input->param('add')) {
-    if ($input->param('word')) {
-        my @words = split / |,/, $input->param('word');
-
-        $query = '
-DELETE
-  FROM stopwords
-  WHERE word IN (?'.(',?' x scalar @words - 1).')
-';
-        $sth = $dbh->prepare($query);
-        $sth->execute(@words);
-        $sth->finish;
-
-        $query = '
-INSERT
-  INTO stopwords
-  (word)
-  VALUES
-  (?)'.(',(?)' x scalar @words - 1).'
-';
-        $sth = $dbh->prepare($query);
-        $sth->execute(@words);
-        $sth->finish;
-
-        $template->param(stopword_added => 1);
-    }
-}
-elsif ($input->param('deleteSelected')) {
-    if ($input->param('stopwords[]')) {
-        my @stopwords_loop = ();
-
-        foreach my $word ($input->param('stopwords[]')) {
-            push @stopwords_loop,  {word => $word};
-        }
-
-        $template->param(
-            delete_confirm => 1,
-            stopwords_to_delete => \@stopwords_loop,
-        );
-    }
-}
-elsif ($input->param('confirmDeletion')) {
-    my @words = $input->param('confirmed_stopwords[]');
-
-    $query = '
-DELETE
-  FROM stopwords
-  WHERE word IN (?'.(',?' x scalar @words - 1).')
-';
-    $sth = $dbh->prepare($query);
-    $sth->execute(@words);
-    $sth->finish;
-
-    $template->param(delete_confirmed => 1);
-}
-
-my $page = $input->param('page') || 1;
-
-my @results = StringSearch($searchfield);
-my @loop;
-
-my $first = ($page - 1) * $pagesize;
-
-# if we are on the last page, the number of the last word to display must
-# not exceed the length of the results array
-my $last = min(
-    $first + $pagesize - 1,
-    scalar(@results) - 1,
-);
-
-foreach my $word (@results[$first .. $last]) {
-    push @loop, {word => $word};
-}
-
-$template->param(
-    loop => \@loop,
-    pagination_bar => pagination_bar(
-        $script_name,
-        getnbpages(scalar @results, $pagesize),
-        $page,
-        'page'
-    )
-);
-
-output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/admin/viewlog.pl b/admin/viewlog.pl
deleted file mode 100755
index 3a8f369feb..0000000000
--- a/admin/viewlog.pl
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/usr/bin/perl
-
-# $Id$
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use C4::Auth;
-use CGI;
-use C4::Context;
-use C4::Koha;
-use C4::Interface::CGI::Output;
-use C4::Log;
-use Date::Manip;
-
-=head1 NAME
-
-plugin that shows a stats on catalogers
-
-=head1 DESCRIPTION
-
-
-=over2
-
-=cut
-
-my $input = new CGI;
-my $do_it=$input->param('do_it');
-my $fullreportname = "parameters/viewlog.tmpl";
-my $modulename = $input->param("module");
-my $userfilter = $input->param("user");
-my $actionfilter = $input->param("action");
-my $fromfilter = $input->param("from");
-my $tofilter = $input->param("to");
-my $basename = $input->param("basename");
-my $mime = $input->param("MIME");
-my $del = $input->param("sep");
-my $output = $input->param("output");
-
-
-my ($template, $borrowernumber, $cookie)
-	= get_template_and_user({template_name => $fullreportname,
-				query => $input,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {editcatalogue => 1},
-				debug => 1,
-				});
-$template->param(do_it => $do_it);
-if ($do_it) {
-# Displaying results
-	#building filters
-	my @filters;
-	push @filters, {name=> 'user', value=> $userfilter} if ($userfilter);
-	push @filters, {name=> 'action', value=> $actionfilter} if ($actionfilter);
-	push @filters, {name=> 'from', value=> $fromfilter} if ($fromfilter);
-	push @filters, {name=> 'to', value=> $tofilter} if ($tofilter);
-	if ($modulename eq "catalogue"){
-		my $titlefilter = $input->param("title");
-		my $authorfilter = $input->param("author");
-		my $publisherfilter = $input->param("publisher");
-		my $callnumberfilter = $input->param("itemcallnumber");
-		
-		push @filters, {name=> 'title', value=> $titlefilter} if ($titlefilter);
-		push @filters, {name=> 'author', value=> $authorfilter} if ($authorfilter);
-		push @filters, {name=> 'publisher', value=> $publisherfilter} if ($publisherfilter);
-		push @filters, {name=> 'callnumber', value=> $callnumberfilter} if ($callnumberfilter);
-	}
-	
-	my ($count, $results) = displaylog( $modulename, @filters);
-	if ($output eq "screen"){
-# Printing results to screen
-		$template->param(modulename =>$modulename, $modulename => 1, looprow => $results,counter=>$count);
-		output_html_with_http_headers $input, $cookie, $template->output;
-		exit(1);
-	} else {
-# Printing to a csv file
-		print $input->header(-type => 'application/vnd.sun.xml.calc',
-			-attachment=>"$basename.csv",
-			-filename=>"$basename.csv" );
-		my $sep;
-		$sep =C4::Context->preference("delimiter");
-# header top-right
-# Other header
-# Table
-		foreach my $line ( @$results ) {
-			if ($modulename eq "catalogue"){
-				print $line->{timestamp}.$sep;
-				print $line->{firstname}.$sep;
-				print $line->{surname}.$sep;
-				print $line->{action}.$sep;
-				print $line->{info}.$sep;
-				print $line->{title}.$sep;
-				print $line->{author}.$sep;
-			}
- 			print "\n";
-	 	}
-# footer
-		exit(1);
-	}
-} else {
-	my $dbh = C4::Context->dbh;
-	my @values;
-	my %labels;
-	my %select;
-	my $req;
-	
-	my @mime = ( C4::Context->preference("MIME") );
-#	foreach my $mime (@mime){
-#		warn "".$mime;
-#	}
-	
-	my $CGIextChoice=CGI::scrolling_list(
-				-name     => 'MIME',
-				-id       => 'MIME',
-				-values   => \@mime,
-				-size     => 1,
-				-multiple => 0 );
-	
-	my @dels = ( C4::Context->preference("delimiter") );
-	my $CGIsepChoice=CGI::scrolling_list(
-				-name     => 'sep',
-				-id       => 'sep',
-				-values   => \@dels,
-				-size     => 1,
-				-multiple => 0 );
-	
-	$template->param(
-					CGIextChoice => $CGIextChoice,
-					CGIsepChoice => $CGIsepChoice
-					);
-output_html_with_http_headers $input, $cookie, $template->output;
-}
diff --git a/barcodes/create_labels_conf_table.sql b/barcodes/create_labels_conf_table.sql
deleted file mode 100644
index 6fec07a3d7..0000000000
--- a/barcodes/create_labels_conf_table.sql
+++ /dev/null
@@ -1,44 +0,0 @@
--- MySQL dump 9.11
---
--- Host: localhost    Database: opusdev
--- ------------------------------------------------------
--- Server version	4.0.24_Debian-10sarge1
-
---
--- Table structure for table `labels_conf`
---
-
-DROP TABLE IF EXISTS `labels_conf`;
-CREATE TABLE `labels_conf` (
-  `id` int(4) NOT NULL auto_increment,
-  `barcodetype` char(100) default '',
-  `title` tinyint(1) default '0',
-  `isbn` tinyint(1) default '0',
-  `itemtype` tinyint(1) default '0',
-  `barcode` tinyint(1) default '0',
-  `dewey` tinyint(1) default '0',
-  `class` tinyint(1) default '0',
-  `author` tinyint(1) default '0',
-  `papertype` char(100) default '',
-  `startrow` int(2) default NULL,
-  `printingtype` char(10) default NULL,
-  `guidebox` tinyint(1) default NULL,
-  PRIMARY KEY  (`id`)
-) TYPE=MyISAM;
-
---
--- Table structure for table `labels`
---
-
-DROP TABLE IF EXISTS `labels`;
-CREATE TABLE `labels` (
-  `labelid` int(11) NOT NULL auto_increment,
-  `itemnumber` varchar(100) NOT NULL default '',
-  `timestamp` timestamp(14) NOT NULL,
-  PRIMARY KEY  (`labelid`)
-) TYPE=MyISAM;
-
-
-
-
-
diff --git a/catalogue/catalogue-search.pl b/catalogue/catalogue-search.pl
deleted file mode 100644
index 1e8d27179f..0000000000
--- a/catalogue/catalogue-search.pl
+++ /dev/null
@@ -1,268 +0,0 @@
-#!/usr/bin/perl
-use strict;
-
-use CGI;
-use C4::Search;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Biblio;
-use C4::Koha;
-use POSIX qw(ceil floor);
-
-my $query = new CGI;
-my $dbh = C4::Context->dbh;
-
-my $op = $query->param('op'); #show the search form or execute the search
-
-my $format=$query->param('MARC');
-my ($template, $borrowernumber, $cookie);
-
-# get all the common search variables, 
-my @value=$query->param('value');
-my @kohafield=$query->param('kohafield');
-my @and_or=$query->param('and_or');
-my @relation=$query->param('relation');
-my $order=$query->param('order');
-my $reorder=$query->param('reorder');
-my $number_of_results=$query->param('number_of_results');
-my $zoom=$query->param('zoom');
-my $ascend=$query->param('asc');
-my $searchtype=$query->param('searchtype'); ## this is actual query type
-
-my @marclist = $query->param('marclist');
-# collect all the fields ...
-my %search;
-my @forminputs;		#this is for the links to navigate among the results
-my (@searchdesc, %hashdesc,$facetsdesc); 	#this is to show the description of the current search
-my @fields = ('value', 'kohafield', 'and_or', 'relation','order','barcode','biblionumber','itemnumber','asc','from','searchtype');
-
-###Collect all the marclist values coming from old Koha MARCdetails
-## Although we can not search on all marc fields- if any is matched in Zebra we can use it 
-my $sth=$dbh->prepare("Select kohafield from koha_attr where tagfield=? and tagsubfield=? and intrashow=1");
-foreach my $marc (@marclist) {
-		if ($marc) {
-		$sth->execute(substr($marc,0,3),substr($marc,3,1));
-			if ((my $kohafield)=$sth->fetchrow){
-			push @kohafield,$kohafield;
-			push @and_or,"\@or";
-			push @value,@value[0] if @kohafield>1;
-			push @relation ,"\@attr 5=1";
-			}
-		}
-}
-#### Now   normal search routine
-foreach my $field (@fields) {
-	$search{$field} = $query->param($field);
-	my @fieldvalue = $query->param($field);
-	foreach my $fvalue (@fieldvalue) {
-		push @forminputs, { field=>$field ,value=> $fvalue} unless ($field eq 'reorder');
-		
-	  }
-}
-## Build the query for facets as well
- for (my $i=0;$i<@value;$i++){
-$facetsdesc.="&value=".$value[$i];
-$facetsdesc.="&kohafield=".$kohafield[$i];
-$facetsdesc.="&relation=".$relation[$i];
-$facetsdesc.="&and_or=".$and_or[$i];
-}
-$facetsdesc.="&order=".$order;
-$hashdesc{'query'} = join " , ", @value;
-push @searchdesc,\%hashdesc;
-
-
-############################################################################
-if ($op eq "do_search"){
- 
-#this fields is just to allow the user come back to the search form with all the values  previously entered
-$search{'search_type'} = $query->param('search_type');# this is the panel type
-push @forminputs, {field => 'search_type', value => $search{'search_type'}};
-
-
-	($template, $borrowernumber, $cookie)
-		= get_template_and_user({template_name => "catalogue/catalogue_searchresults.tmpl",
-					 query => $query,
-					 type => "intranet",
-					 authnotrequired => 1,
-	});
-
-	$search{'from'} = 'intranet';
-	$search{'borrowernumber'} = $borrowernumber;
-	$search{'remote_IP'} = $query->remote_addr();
-	$search{'remote_URL'} = $query->url(-query=>1);
-	$search{'searchdesc'} = \@searchdesc;
-	$template->param(FORMINPUTS => \@forminputs);
-	$template->param(reorder => $query->param('reorder'));
-	$template->param(facetsdesc=>$facetsdesc);
-	# do the searchs ....
-	 $number_of_results = 10 unless $number_of_results;
-	my $startfrom=$query->param('startfrom');
-	($startfrom) || ($startfrom=0);
-my ($count,@results,$facets);
-if (!$zoom){
-## using sql search for barcode,biblionumber or itemnumber only useful for libraian interface
-	($count, @results) =sqlsearch($dbh,\%search);
-}else{
-my $sortorder=$order.$ascend if $order;
- ($count,$facets,@results) =ZEBRAsearch_kohafields(\@kohafield,\@value, \@relation,$sortorder, \@and_or, 1,$reorder,$startfrom, $number_of_results,"intranet",$searchtype);
-}
-	if ( $count eq "error"){
-	$template->param(error =>1);
-	goto "show";
-	}
-	my $num = scalar(@results) - 1;
-if ( $count == 1){
-    # if its a barcode search by definition we will only have one result.
-    # And if we have a result
-    # lets jump straight to the detail.pl page
-	if ($format eq '1') {
-    print $query->redirect("/cgi-bin/koha/catalogue/MARCdetail.pl?type=intra&biblionumber=$results[0]->{'biblionumber'}");
-	}else{
-    print $query->redirect("/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=$results[0]->{'biblionumber'}");
-	}
-}
-	# sorting out which results to display.
-	# the result number to star to show
-	$template->param(startfrom => $startfrom);
-	$template->param(beginning => $startfrom+1);
-	# the result number to end to show
-	($startfrom+$num<=$count) ? ($template->param(endat => $startfrom+$num+1)) : ($template->param(endat => $count));
-	# the total results searched
-	$template->param(numrecords => $count);
-	$template->param(FORMINPUTS => \@forminputs );
-	$template->param(searchdesc => \@searchdesc );
-	$template->param(SEARCH_RESULTS => \@results,
-			facets_loop => $facets,
-			);
-
-	#this is to show the images numbers to navigate among the results, if it has to show the number highlighted or not
-	my $numbers;
-	@$numbers = ();
-	my $pg = 1;
-	if (defined($query->param('pg'))) {
-		$pg = $query->param('pg');
-	}
-	my $start = 0;
-	
-	$start = ($pg - 1) * $number_of_results;
-	my $pages = ceil($count / $number_of_results);
-	my $total_pages = ceil($count / $number_of_results);
-
-	if ($pg > 1) {
-		my $url = $pg - 1;
-		push @$numbers, { number => "&lt;&lt;", 
-					      highlight => 0 , 
-					      startfrom => 0, 
-					      pg => '1' };
-		push @$numbers, { number => "&lt;", 
-						  highlight => 0 , forminputs=>\@forminputs,
-						  startfrom => ($url-1)*$number_of_results+1, 
-						  pg => $url };
-	}
-	my $current_ten = $pg / 10;
-	if ($current_ten == 0) {
-		 $current_ten = 0.1;           # In case it´s in ten = 0
-	} 
-	my $from = $current_ten * 10; # Calculate the initial page
-	my $end_ten = $from + 9;
-	my $to;
-	if ($pages > $end_ten) {
-		$to = $end_ten;
-	} else {
-		$to = $pages;
-	}
-	for (my $i = $from; $i <= $to ; $i++) {
-		if ($i == $pg) {   
-			if ($count > $number_of_results) {
-				push @$numbers, { number => $i, 
-								  highlight => 1 , forminputs=>\@forminputs,
-								  startfrom => ($i-1)*$number_of_results , 
-								  pg => $i };
-			}
-		} else {
-			push @$numbers, { number => $i, 
-							  highlight => 0 , forminputs=>\@forminputs,
-							  startfrom => ($i-1)*$number_of_results , 
-							  pg => $i };
-		}
-	}	        					
-	if ($pg < $pages) {
-		my $url = $pg + 1;
-		push @$numbers, { number => "&gt;", 
-						  highlight => 0 , forminputs=>\@forminputs,
-						  startfrom => ($url-1)*$number_of_results, 
-						  pg => $url };
-		push @$numbers, { number => "&gt;&gt;", 
-						  highlight => 0 , forminputs=>\@forminputs,
-						  startfrom => ($total_pages-1)*$number_of_results, 
-						  pg => $total_pages};
-	}
-#	push @$numbers,{forminputs=>@forminputs};
-	$template->param(numbers =>$numbers,
-			);
-	#show the virtual shelves
-	#my $results = &GetShelfList($borrowernumber);
-	#$template->param(shelvescount => scalar(@{$results}));
-	#$template->param(shelves => $results);
-
-########
-if ($format eq '1') {
-	$template->param(script => "catalogue/MARCdetail.pl");
-}else{
-	$template->param(script => "catalogue/detail.pl");
-}
-
-}else{ ## No search yet
-($template, $borrowernumber, $cookie)
-		= get_template_and_user({template_name => "catalogue/catalogue_search.tmpl",
-					query => $query,
-					type => "intranet",
-					authnotrequired => 1,
-				});
-#show kohafields
-	my $kohafield = $query->param('kohafield');
-	my ($fieldcount,@kohafields)=getkohafields();
-	foreach my $row (@kohafields) {
-		if ($kohafield eq $row->{'kohafield'}) {
-			$row->{'sel'} = 1;
-		}
-	}
-	$template->param(kohafields => \@kohafields);
-##show sorting fields
-my @sorts;
- $order=$query->param('order');
-	foreach my $sort (@kohafields) {
-	    if ($sort->{sorts}){
-		push @sorts,$sort;
-		if ($order eq $sort->{'kohafield'}) {
-			$sort->{'sel'} = 1;
-		}
-	   }
-	}
-	$template->param(sorts => \@sorts);
-# load the branches
-my @branches = GetallBranches();
-$template->param(branchloop => \@branches,);
-
-# load the itemtypes 
-my $itemtypes=GetItemTypes();
-my (@item_type_loop);
-foreach my $thisitemtype (sort keys %$itemtypes) {
-    my %row =(itemtype => $thisitemtype,
-                 description => $itemtypes->{$thisitemtype}->{'description'},
-            );
-    push @item_type_loop, \%row;
-}
-
-$template->param(itemtypeloop=>\@item_type_loop,);
-my $search_type = $query->param('search_type');
-	if ((!$search_type) || ($search_type eq 'zoom'))  {
-		$template->param(zoom_search => 1);
-	} else{
-		$template->param(sql_search => 1);
-	} 
-}
-
-show:
-output_html_with_http_headers $query, $cookie, $template->output();
-
diff --git a/cataloguing/isbnsearch.pl b/cataloguing/isbnsearch.pl
deleted file mode 100755
index b2f9c2dd4e..0000000000
--- a/cataloguing/isbnsearch.pl
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-
-use C4::Auth;
-use C4::Biblio;
-use C4::Search;
-use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Breeding;
-use C4::Koha;
-
-my $input      = new CGI;
-my $isbn       = $input->param('isbn');
-my $title      = $input->param('title');
-my $offset     = $input->param('offset');
-my $num        = $input->param('num');
-my $showoffset = $offset + 1;
-my $total;
-my $count;
-my @results;
-my $facets;
-my %search;
-my $toggle;
-my $marc_p = C4::Context->boolean_preference("marc");
-my $SQLorZEBRA=C4::Context->preference("SQLorZEBRA");
-if ( !$isbn && !$title ) {
-    print $input->redirect('addbooks.pl');
-}
-else {
-    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-        {
-            template_name   => "cataloguing/isbnsearch.tmpl",
-            query           => $input,
-            type            => "intranet",
-            authnotrequired => 0,
-            flagsrequired   => { editcatalogue => 1 },
-            debug           => 1,
-        }
-    );
-
-    # fill with books in ACTIVE DB (biblio)
-    if ( !$offset ) {
-        $offset     = 0;
-        $showoffset = 1;
-    }
-    if ( !$num ) { $num = 10 }
-my @kohafield;
-my @value;
-my @relation;
-my @and_or;
-my $order="title,1";
-if ($isbn){
-$search{'isbn'}=$isbn;
-push @kohafield, "isbn";
-push @value,$isbn;
-}else{
-$search{'title'}=$title;
-push @kohafield, "title";
-push @value,$title;
-push @relation, "\@attr 5=1 \@attr 6=3 \@attr 4=1 \@attr 3=1 ";
-  }
-$search{avoidquerylog}=1;
-if ($SQLorZEBRA eq "sql"){
-($count, @results) =cataloguing_search(\%search,$num,$offset);
-}else{
-($count,$facets,@results) =ZEBRAsearch_kohafields(\@kohafield,\@value, \@relation,$order, \@and_or, 1,"",$offset, $num,"intranet");
-
-}
-my $grandtotal=$count;
-    if ( $count < ( $offset + $num ) ) {
-        $total = $count;
-    }
-    else {
-        $total = $offset + $num;
-    }    # else
-
-    my @loop_data;
- 
- @loop_data=@results if $count >0;;
-    $template->param( startfrom => $offset + 1 );
-    ( $offset + $num <= $count )
-      ? ( $template->param( endat => $offset + $num ) )
-      : ( $template->param( endat => $count ) );
-    $template->param( numrecords => $count );
-    my $nextstartfrom = ( $offset + $num < $count ) ? ( $offset + $num ) : (-1);
-    my $prevstartfrom = ( $offset - $num >= 0 ) ? ( $offset - $num ) : (-1);
-    $template->param( nextstartfrom => $nextstartfrom );
-    my $displaynext = 1;
-    my $displayprev = 0;
-    ( $nextstartfrom == -1 ) ? ( $displaynext = 0 ) : ( $displaynext = 1 );
-    ( $prevstartfrom == -1 ) ? ( $displayprev = 0 ) : ( $displayprev = 1 );
-    $template->param( displaynext => $displaynext );
-    $template->param( displayprev => $displayprev );
-    my @numbers = ();
-    my $term;
-    my $value;
-
-    if ($isbn) {
-        $term  = "isbn";
-        $value = $isbn;
-    }
-    else {
-        $term  = "title";
-        $value = $title;
-    }
-    if ( $count > 10 ) {
-        for ( my $i = 1 ; $i < $count / 10 + 1 ; $i++ ) {
-            if ( $i < 16 ) {
-                my $highlight = 0;
-                ( $offset == ( $i - 1 ) * 10 ) && ( $highlight = 1 );
-                push @numbers,
-                  {
-                    number    => $i,
-                    highlight => $highlight,
-                    term      => $term,
-                    value     => $value,
-                    startfrom => ( $i - 1 ) * 10
-                };
-            }
-        }
-    }
-
-    # fill with books in breeding farm
-    ( $count, @results ) = BreedingSearch( $title, $isbn );
-    my @breeding_loop = ();
-    for ( my $i = 0 ; $i <= $#results ; $i++ ) {
-        my %row_data;
-        if ( $i % 2 ) {
-            $toggle = "#ffffcc";
-        }
-        else {
-            $toggle = "white";
-        }
-        $row_data{toggle} = $toggle;
-        $row_data{id}     = $results[$i]->{'id'};
-        $row_data{isbn}   = $results[$i]->{'isbn'};
-        $row_data{file}   = $results[$i]->{'file'};
-        $row_data{title}  = $results[$i]->{'title'};
-        $row_data{author} = $results[$i]->{'author'};
-	$row_data{classification} = $results[$i]->{'classification'};
-	$row_data{subclass} = $results[$i]->{'subclass'};
-          push ( @breeding_loop, \%row_data );
-    }
-# get framework list
-	my $frameworks = getframeworks;
-	my @frameworkcodeloop;
-	foreach my $thisframeworkcode (keys %$frameworks) {
-		my %row =(value => $thisframeworkcode,
-					frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
-				);
-		push @frameworkcodeloop, \%row;
-	}
-
-
-    $template->param(
-        isbn          => $isbn,
-        title         => $title,
-        showoffset    => $showoffset,
-        total         => $total,
-	grandtotal         => $grandtotal,
-        offset        => $offset,
-        results_loop          => \@loop_data,
-        breeding_loop => \@breeding_loop,
-        numbers       => \@numbers,
-        term          => $term,
-        value         => $value,
-  	frameworkcodeloop => \@frameworkcodeloop
-    );
-
-  output_html_with_http_headers $input, $cookie, $template->output;
-}    # else
diff --git a/circ/renewscript.pl b/circ/renewscript.pl
deleted file mode 100644
index c567a04034..0000000000
--- a/circ/renewscript.pl
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/perl
-
-# $Id$
-
-#written 18/1/2000 by chris@katipo.co.nz
-#script to renew items from the web
-
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use CGI;
-use C4::Circulation::Circ2;
-use C4::Date;
-use C4::Members;
-#get input
-my $input= new CGI;
-
-
-my @names=$input->param();
-my $count=@names;
-my %data;
-my $dbh = C4::Context->dbh;
-for (my $i=0;$i<$count;$i++){
-  if ($names[$i] =~ /renew/){
-    my $temp=$names[$i];
-    $temp=~ s/renew_item_//;
-    $data{$temp}=$input->param($names[$i]);
-  }
-}
-my %env;
-my $barcode;
-my $destination = $input->param("destination");
-my $cardnumber = $input->param("cardnumber");
-my $bornum=$input->param("bornum");
-my $error;
-my $status=0;
-while ( my ($itemno, $value) = each %data) {
-
-   if ($value eq 'y'){
-my $iteminformation = getiteminformation($env, $itemno,0);
-$barcode=$iteminformation->{'barcode'};
-	 $status=renewstatus(\%env,$bornum,$itemno);
-	if ($status==1){
-     renewbook($env,$bornum,$itemno);	
-	}else{
-	last;
-	}   
-}
-}
-
-if($destination eq "circ" || $status>1){
-	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?bornum=$bornum&error=$status&barcode=$barcode");
-} else {
-	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
-}
\ No newline at end of file
diff --git a/circ/rescirculation.pl b/circ/rescirculation.pl
deleted file mode 100644
index 392267a7f0..0000000000
--- a/circ/rescirculation.pl
+++ /dev/null
@@ -1,460 +0,0 @@
-#!/usr/bin/perl
-
-# Please use 8-character tabs for this file (indents are every 4 characters)
-
-#written 8/5/2002 by Finlay
-#script to execute issuing of books
-# New functions added 07-08-2005 Tumer Garip tgarip@neu.edu.tr
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Circulation::Circ3;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-use C4::Koha;
-use C4::Date;
-use C4::Context;
-use C4::Members;
-use C4::Print;
-#
-# PARAMETERS READING
-#
-my $query=new CGI;
-
-my ($template, $loggedinuser, $cookie) = get_template_and_user
-    ({
-	template_name	=> 'circ/rescirculation.tmpl',
-	query		=> $query,
-	type		=> "intranet",
-	authnotrequired	=> 0,
-	flagsrequired	=> { circulate => 1 },
-    });
-my $branches = GetBranches();
-my $printers = getprinters();
-my $branch=C4::Context->preference("defaultBranch");
-my $printer = getprinter($query, $printers);
-
-my $findborrower = $query->param('findborrower');
-$findborrower =~ s|,| |g;
-$findborrower =~ s|'| |g;
-my $borrowernumber = $query->param('borrnumber');
-
-my $print=$query->param('print');
-my $barcode = $query->param('barcode');
-my $year=$query->param('year');
-my $month=$query->param('month');
-my $day=$query->param('day');
-my $stickyduedate=$query->param('stickyduedate');
-my $issueconfirmed = $query->param('issueconfirmed');
-my $cancelreserve = $query->param('cancelreserve');
-
-my $renew=0;
- 
-#set up cookie.....
-my $branchcookie;
-my $printercookie;
-#if ($query->param('setcookies')) {
-#	$branchcookie = $query->cookie(-name=>'branch', -value=>"$branch", -expires=>'+1y');
-#	$printercookie = $query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y');
-#}
-
-my %env; # FIXME env is used as an "environment" variable. Could be dropped probably...
-
-$env{'branchcode'}=$branch;
-$env{'printer'}=$printer;
-$env{'queue'}=$printer;
-
-my $todaysdate =get_today();
-
-
-# check and see if we should print
- if ($barcode eq ''  && $print eq 'maybe'){
- 	$print = 'yes';
- }
- if ($print eq 'yes' && $borrowernumber ne ''){
- 	printslip(\%env,$borrowernumber);
- 	$query->param('borrnumber','');
- 	$borrowernumber='';
- }
-
-#
-# STEP 2 : FIND BORROWER
-# if there is a list of find borrowers....
-#
-my $borrowerslist;
-my $message;
-if ($findborrower) {
-	my ($count,$borrowers)=BornameSearch(\%env,$findborrower,'cardnumber','web');
-	my @borrowers=@$borrowers;
-	if ($#borrowers == -1) {
-		$query->param('findborrower', '');
-		$message =  "'$findborrower'";
-	} elsif ($#borrowers == 0) {
-		$query->param('borrnumber', $borrowers[0]->{'borrowernumber'});
-		$query->param('barcode','');
-		$borrowernumber=$borrowers[0]->{'borrowernumber'};
-	} else {
-		$borrowerslist = \@borrowers;
-	}
-}
-
-# get the borrower information.....
-my $borrower;
-my $bornum=$query->param('bornum');
-if ($bornum){
-$borrowernumber=$bornum;
-}
-
-if ($borrowernumber) {
-	$borrower = C4::Circulation::Circ2::getpatroninformation(\%env,$borrowernumber,0);
-	my ($od,$issue,$fines,$resfine)=borrdata3(\%env,$borrowernumber);
-if ($resfine >0 || $fines) {
-$template->param(
-			flagged => 1,
-			noissues => 'true',
-			 );
-}
-	$template->param(overduecount => $od,
-							issuecount => $issue,
-							finetotal => $fines,
-							resfine => $resfine);
-my $picture;
- my $htdocs = C4::Context->config('opacdir');
-
-$picture =$htdocs. "/htdocs/uploaded-files/users-photo/".$borrower->{'cardnumber'}.".jpg";
- if (-e $picture)
-{ 
-
-   $template->param(borrowerphoto => "http://library.neu.edu.tr/uploaded-files/users-photo/".$borrower->{'cardnumber'}.".jpg");
- }else{
-$picture = "http://cc.neu.edu.tr/stdpictures/".$borrower->{'cardnumber'}.".jpg";
-  $template->param(borrowerphoto => $picture);
-}
-}
-$renew=$query->param('renew');
-
-#
-# STEP 3 : ISSUING
-#
-#Try to issue
-
-if ($barcode) {
-
-	$barcode = cuecatbarcodedecode($barcode);
-#	my ($datedue, $invalidduedate) = fixdate($year, $month, $day);
-	if ($issueconfirmed) {
-			issuebook(\%env, $borrower, $barcode, $cancelreserve);
-my ($od,$issue,$fines,$resfine)=borrdata3(\%env,$borrowernumber);
-	$template->param(overduecount => $od,
-							issuecount => $issue,
-							finetotal => $fines,
-							resfine => $resfine);
-	} else {
-		my ($error, $question) = canbookbeissued(\%env, $borrower, $barcode, $year, $month, $day);
-		my $noerror=1;
-		my $noquestion = 1;
-		foreach my $impossible (keys %$error) {
-			$template->param($impossible => $$error{$impossible},
-							IMPOSSIBLE => 1);
-			$noerror = 0;
-		}
-		foreach my $needsconfirmation (keys %$question) {
-			$template->param($needsconfirmation => $$question{$needsconfirmation},
-							NEEDSCONFIRMATION => 1);
-			$noquestion = 0;
-		}
-		$template->param(day => $day,
-						month => $month,
-						year => $year);
-		if ($noerror && ($noquestion || $issueconfirmed)) {
-			issuebook(\%env, $borrower, $barcode);
-			my ($od,$issue,$fines,$resfine)=borrdata3(\%env,$borrowernumber);
-				$template->param(overduecount => $od,
-							issuecount => $issue,
-							finetotal => $fines,
-							resfine => $resfine);
-		}
-	}
-	}#barcode
-
-
-
-
-
-##################################################################################
-# BUILD HTML
-
-# make the issued books table.....
-my $todaysissues='';
-my $previssues='';
-my @realtodayissues;
-my @realprevissues;
-my $allowborrow;
-if ($borrower) {
-# get each issue of the borrower & separate them in todayissues & previous issues
-	my @todaysissues;
-	my @previousissues;
-	my $issueslist = getissues($borrower);
-	
-	# split in 2 arrays for today & previous
-	foreach my $it (keys %$issueslist) {
-		my $issuedate = $issueslist->{$it}->{'timestamp'};
-		$issuedate = substr($issuedate, 0, 10);
-#warn "$todaysdate,$issuedate";
-		if ($todaysdate == $issuedate) {
-			push @todaysissues, $issueslist->{$it};
-		} else {
-			push @previousissues, $issueslist->{$it};
-		}
-    }
-
-
-	my $od; # overdues
-	my $togglecolor;
-	# parses today & build Template array
-	foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){
-		my $dd = $book->{'duetime'};
-		my $overdue = $book->{'overdue'};
-#		$dd=format_date($dd);
-#		$datedue=~s/-//g;
-		if ($overdue) {
-			$od = 1;
-		} else {
-			$od=0;
-		}
-		$book->{'od'}=$od;
-		$book->{'dd'}=$dd;
-		
-		if ($togglecolor) {
-			$togglecolor=0;
-		} else {
-			$togglecolor=1;
-		}
-		$book->{'tcolor'}=$togglecolor;
-		if ($book->{'author'} eq ''){
-			$book->{'author'}=' ';
-		}    
-		push @realtodayissues,$book;
-	}
-
-	# parses previous & build Template array
-    foreach my $book (sort {$a->{'date_due'} cmp $b->{'date_due'}} @previousissues){
-		my $dd = $book->{'duedate'};
-		my $overdue = $book->{'overdue'};
-#		$dd=format_date($dd);
-		my $pcolor = '';
-		my $od = '';
-#		$datedue=~s/-//g;
-		if ($overdue) {
-			$od = 1;
-		} else {
-			$od = 0;
-		}
-		
-		if ($togglecolor) {
-			$togglecolor=0;
-		} else {
-			$togglecolor=1;
-		}
-		$book->{'dd'}=$dd; 
-		$book->{'od'}=$od;
-		$book->{'tcolor'}=$togglecolor;
-		if ($book->{'author'} eq ''){
-			$book->{'author'}=' ';
-		}    
-		push @realprevissues,$book
-	}
-}
-
-
-my @values;
-my %labels;
-my $CGIselectborrower;
-if ($borrowerslist) {
-	foreach (sort {$a->{'surname'}.$a->{'firstname'} cmp $b->{'surname'}.$b->{'firstname'}} @$borrowerslist){
-		push @values,$_->{'borrowernumber'};
-		$labels{$_->{'borrowernumber'}} ="$_->{'surname'}, $_->{'firstname'} ... ($_->{'cardnumber'} - $_->{'categorycode'}) ...  $_->{'streetaddress'} ";
-	}
-	$CGIselectborrower=CGI::scrolling_list( -name     => 'borrnumber',
-				-values   => \@values,
-				-labels   => \%labels,
-				-size     => 7,
-				-multiple => 0 );
-}
-#title
-
-my ($patrontable, $flaginfotable) = patrontable($borrower);
-my $amountold=$borrower->{flags}->{'CHARGES'}->{'message'};
-my @temp=split(/\$/,$amountold);
-$amountold=$temp[1];
-$template->param( today=>format_date($todaysdate),
-		findborrower => $findborrower,
-		borrower => $borrower,
-		borrowernumber => $borrowernumber,
-		branch => $branch,
-		printer => $printer,
-		branchname => $branches->{$branch}->{'branchname'},
-		printername => $printers->{$printer}->{'printername'},
-		firstname => $borrower->{'firstname'},
-		surname => $borrower->{'surname'},
-		categorycode => getborrowercategory($borrower->{'categorycode'}),
-		streetaddress => $borrower->{'streetaddress'},
-		emailaddress => $borrower->{'emailaddress'},
-		borrowernotes => $borrower->{'borrowernotes'},
-		city => $borrower->{'city'},
-		phone => $borrower->{'phone'},
-		cardnumber => $borrower->{'cardnumber'},
-		amountold => $amountold,
-		barcode => $barcode,
-		renew=>$renew,
-		stickyduedate => $stickyduedate,
-		message => $message,
-		CGIselectborrower => $CGIselectborrower,
-		todayissues => \@realtodayissues,
-		previssues => \@realprevissues,
-	);
-# set return date if stickyduedate
-if ($stickyduedate) {
-	my $t_year = "year".$year;
-	my $t_month = "month".$month;
-	my $t_day = "day".$day;
-	$template->param(
-		$t_year => 1,
-		$t_month => 1,
-		$t_day => 1,
-	);
-}
-
-
-if ($branchcookie) {
-    $cookie=[$cookie, $branchcookie, $printercookie];
-}
-
-output_html_with_http_headers $query, $cookie, $template->output;
-
-####################################################################
-# Extra subroutines,,,
-
-sub patrontable {
-    my ($borrower) = @_;
-    my $flags = $borrower->{'flags'};
-    my $flaginfotable='';
-    my $flaginfotext;
-    #my $flaginfotext='';
-    my $flag;
-    my $color='';
-    foreach $flag (sort keys %$flags) {
-#    	my @itemswaiting='';
-	$flags->{$flag}->{'message'}=~s/\n/<br>/g;
-	if ($flags->{$flag}->{'noissues'}) {
-		$template->param(
-			flagged => 1,
-			noissues => 'true',
-			 );
-		if ($flag eq 'GNA'){
-			$template->param(
-				gna => 'true'
-				);
-			}
-		if ($flag eq 'LOST'){
-			$template->param(
-				lost => 'true'
-			);
-			}
-		if ($flag eq 'DBARRED'){
-			$template->param(
-				dbarred => 'true'
-			);
-			}
-		if ($flag eq 'CHARGES') {
-			$template->param(
-				charges => 'true',
-				chargesmsg => $flags->{'CHARGES'}->{'message'}
-				 );
-		}
-	} else {
-		 if ($flag eq 'CHARGES') {
-			$template->param(
-				charges => 'true',
-				flagged => 1,
-				chargesmsg => $flags->{'CHARGES'}->{'message'}
-			 );
-		}
-	    	if ($flag eq 'WAITING') {
-			my $items=$flags->{$flag}->{'itemlist'};
-		        my @itemswaiting;
-			foreach my $item (@$items) {
-			my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
-			$iteminformation->{'branchname'} = $branches->{$iteminformation->{'holdingbranch'}}->{'branchname'};
-			push @itemswaiting, $iteminformation;
-			}
-			$template->param(
-				flagged => 1,
-				waiting => 'true',
-				waitingmsg => $flags->{'WAITING'}->{'message'},
-				itemswaiting => \@itemswaiting,
-				 );
-		}
-		if ($flag eq 'ODUES') {
-			$template->param(
-				odues => 'true',
-				flagged => 1,
-				oduesmsg => $flags->{'ODUES'}->{'message'}
-				 );
-
-			my $items=$flags->{$flag}->{'itemlist'};
-			{
-			    my @itemswaiting;
-			foreach my $item (@$items) {
-				my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
-				push @itemswaiting, $iteminformation;
-			}
-			}
-			if ($query->param('module') ne 'returns'){
-				$template->param( nonreturns => 'true' );
-			}
-		}
-		if ($flag eq 'NOTES') {
-			$template->param(
-				notes => 'true',
-				flagged => 1,
-				notesmsg => $flags->{'NOTES'}->{'message'}
-				 );
-		}
-	}
-    }
-    return($patrontable, $flaginfotext);
-}
-
-sub cuecatbarcodedecode {
-    my ($barcode) = @_;
-    chomp($barcode);
-    my @fields = split(/\./,$barcode);
-    my @results = map(decode($_), @fields[1..$#fields]);
-    if ($#results == 2){
-  	return $results[2];
-    } else {
-	return $barcode;
-    }
-}
-
-# Local Variables:
-# tab-width: 8
-# End:
diff --git a/circ/resreturns.pl b/circ/resreturns.pl
deleted file mode 100644
index a6fd31fce2..0000000000
--- a/circ/resreturns.pl
+++ /dev/null
@@ -1,478 +0,0 @@
-#!/usr/bin/perl
-# WARNING: This file contains mixed-sized tabs! (some 4-character, some 8)
-# WARNING: Currently, 4-character tabs seem to be dominant
-# WARNING: But there are still lots of 8-character tabs
-
-#written 11/3/2002 by Finlay
-#script to execute returns of books
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
-
-use strict;
-use CGI;
-use C4::Circulation::Circ3;
-use C4::Search;
-use C4::Output;
-use C4::Print;
-use C4::Reserves2;
-use C4::Auth;
-use C4::Interface::CGI::Output;
-
-use C4::Koha;
-use C4::Members;
-my $query = new CGI;
-
-#getting the template
-my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
-    {
-        template_name   => "circ/resreturns.tmpl",
-        query           => $query,
-        type            => "intranet",
-        authnotrequired => 0,
-        flagsrequired   => { circulate => 1 },
-    }
-);
-
-#####################
-#Global vars
-my %env;
-my $headerbackgroundcolor = '#99cc33';
-my $linecolor1            = '#ffffcc';
-my $linecolor2            = 'white';
-
-my $branches = GetBranches();
-my $printers = getprinters( \%env );
-
-# my $branch  = getbranch( $query,  $branches );
-my $printer = getprinter( $query, $printers );
-
-#
-# Some code to handle the error if there is no branch or printer setting.....
-#
-my $branch=C4::Context->preference("defaultBranch");
-$env{'branchcode'} = $branch;
-$env{'printer'}    = $printer;
-$env{'queue'}      = $printer;
-
-# Set up the item stack ....
-my %returneditems;
-my %riduedate;
-my %riborrowernumber;
-my @inputloop;
-foreach ( $query->param ) {
-    (next) unless (/ri-(\d*)/);
-    my %input;
-    my $counter = $1;
-    (next) if ( $counter > 20 );
-    my $barcode        = $query->param("ri-$counter");
-    my $duedate        = $query->param("dd-$counter");
-    my $borrowernumber = $query->param("bn-$counter");
-    $counter++;
-
-    # decode cuecat
-    $barcode = cuecatbarcodedecode($barcode);
-
-    ######################
-    #Are these lines still useful ?
-    $returneditems{$counter}    = $barcode;
-    $riduedate{$counter}        = $duedate;
-    $riborrowernumber{$counter} = $borrowernumber;
-
-    #######################
-    $input{counter} = $counter;
-    $input{barcode} = $barcode;
-    $input{duedate} = $duedate;
-    $input{bornum}  = $borrowernumber;
-    push ( @inputloop, \%input );
-}
-
-############
-# Deal with the requests....
-if ( $query->param('resbarcode') ) {
-    my $item       = $query->param('itemnumber');
-    my $borrnum    = $query->param('borrowernumber');
-    my $resbarcode = $query->param('resbarcode');
-
-    # set to waiting....
-    my $iteminfo = getiteminformation( \%env, $item );
-    my $tobranchcd = ReserveWaiting( $item, $borrnum );
-    my $branchname = $branches->{$tobranchcd}->{'branchname'};
-    my ($borr) = getpatroninformation( \%env, $borrnum, 0 );
-    my $borcnum = $borr->{'cardnumber'};
-    my $name    =
-      $borr->{'surname'} . " " . $borr->{'title'} . " " . $borr->{'firstname'};
-    my $slip = $query->param('resslip');
-    printslip( \%env, $slip ); #removed by paul
-
-    if ( $tobranchcd ne $branch ) {
-        $template->param(
-            itemtitle  => $iteminfo->{'title'},
-            iteminfo   => $iteminfo->{'author'},
-            branchname => $branchname,
-            name       => $name,
-            bornum     => $borrnum,
-            borcnum    => $borcnum,
-            diffbranch => 1
-        );
-    }
-}
-
-my $iteminformation;
-my $borrower;
-my $returned = 0;
-my $messages;
-
-my $barcode = $query->param('barcode');
-
-# actually return book and prepare item table.....
-if ($barcode) {
-
-    # decode cuecat
-    $barcode = cuecatbarcodedecode($barcode);
-    ( $returned, $messages, $iteminformation, $borrower ) =
-      returnbook( $barcode, $branch );
-    if ($returned) {
-        $returneditems{0}    = $barcode;
-        $riborrowernumber{0} = $borrower->{'borrowernumber'};
-        $riduedate{0}        = $iteminformation->{'date_due'};
-        my %input;
-        $input{counter} = 0;
-        $input{first}   = 1;
-        $input{barcode} = $barcode;
-        $input{duedate} = $riduedate{0};
-        $input{bornum}  = $riborrowernumber{0};
-        push ( @inputloop, \%input );
-    }
-    elsif ( !$messages->{'BadBarcode'} ) {
-		if ( $messages->{'NotIssued'} ) {
-		my $dbh = C4::Context->dbh;
-		my $sth=$dbh->prepare("select date_due from issues where itemnumber=? and isnull(returndate)");
-		$sth->execute($iteminformation->{'itemnumber'});
-		my ($date_due) = $sth->fetchrow;
-		
-		$sth->finish;
-			if ($date_due){	
-			print $query->redirect("/cgi-bin/koha/circ/returns.pl?barcode=$barcode");
-			}
-		}
-        my %input;
-        $input{counter} = 0;
-        $input{first}   = 1;
-        $input{barcode} = $barcode;
-        $input{duedate} = 0;
-
-        $returneditems{0} = $barcode;
-        $riduedate{0}     = 0;
-        if ( $messages->{'wthdrawn'} ) {
-            $input{withdrawn} = 1;
-            $input{bornum}    = "Item Cancelled";
-            $riborrowernumber{0} = 'Item Cancelled';
-        }
-        else {
-            $input{bornum} = "&nbsp;";
-            $riborrowernumber{0} = '&nbsp;';
-        }
-        push ( @inputloop, \%input );
-    }
-    $template->param(
-        returned  => $returned,
-        itemtitle => $iteminformation->{'title'},
-
-        #									itembc => $iteminformation->{'barcode'},
-        #									itemdatedue => $iteminformation->{'date_due'},
-        itemauthor => $iteminformation->{'author'}
-    );
-}
-$template->param( inputloop => \@inputloop );
-
-my $found    = 0;
-my $waiting  = 0;
-my $reserved = 0;
-
-if ( $messages->{'ResFound'} ) {
-    my $res        = $messages->{'ResFound'};
-    my $branchname = $branches->{ $res->{'branchcode'} }->{'branchname'};
-    my ($borr) = getpatroninformation( \%env, $res->{'borrowernumber'}, 0 );
-    my $name =
-      $borr->{'surname'} . " " . $borr->{'title'} . " " . $borr->{'firstname'};
-    my ($iteminfo) = getiteminformation( \%env, 0, $barcode );
-
-    if ( $res->{'ResFound'} eq "Waiting" ) {
-        $template->param(
-            found         => 1,
-            name          => $name,
-            borfirstname  => $borr->{'firstname'},
-            borsurname    => $borr->{'surname'},
-            bortitle      => $borr->{'title'},
-            borphone      => $borr->{'phone'},
-            borstraddress => $borr->{'streetaddress'},
-            borcity       => $borr->{'city'},
-            borzip        => $borr->{'zipcode'},
-            bornum        => $res->{'borrowernumber'},
-            borcnum       => $borr->{'cardnumber'},
-            branchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
-            waiting     => 1,
-            itemnumber  => $res->{'itemnumber'},
-            itemtitle   => $iteminfo->{'title'},
-            itemauthor  => $iteminfo->{'author'},
-            itembarcode => $iteminfo->{'barcode'},
-            itemtype    => $iteminfo->{'itemtype'},
-            itembiblionumber => $iteminfo->{'biblionumber'}
-        );
-
-    }
-    if ( $res->{'ResFound'} eq "Reserved" ) {
-        my @da         = localtime( time() );
-        my $todaysdate =
-          sprintf( "%0.2d", ( $da[3] + 1 ) ) . "/"
-          . sprintf( "%0.2d", ( $da[4] + 1 ) ) . "/"
-          . ( $da[5] + 1900 );
-        $template->param(
-            found       => 1,
-            branchname  => $branches->{ $res->{'branchcode'} }->{'branchname'},
-            reserved    => 1,
-            today       => $todaysdate,
-            itemnumber  => $res->{'itemnumber'},
-            itemtitle   => $iteminfo->{'title'},
-            itemauthor  => $iteminfo->{'author'},
-            itembarcode => $iteminfo->{'barcode'},
-            itemtype    => $iteminfo->{'itemtype'},
-            itembiblionumber => $iteminfo->{'biblionumber'},
-            borsurname       => $borr->{'surname'},
-            bortitle         => $borr->{'title'},
-            borfirstname     => $borr->{'firstname'},
-            bornum           => $res->{'borrowernumber'},
-            borcnum          => $borr->{'cardnumber'},
-            borphone         => $borr->{'phone'},
-            borstraddress    => $borr->{'streetaddress'},
-            borsub           => $borr->{'suburb'},
-            borcity          => $borr->{'city'},
-            borzip           => $borr->{'zipcode'},
-            boremail         => $borr->{'emailadress'},
-            barcode          => $barcode
-        );
-    }
-}
-
-# Error Messages
-my @errmsgloop;
-foreach my $code ( keys %$messages ) {
-
-   #     warn $code;
-    my %err;
-    my $exit_required_p = 0;
-    if ( $code eq 'BadBarcode' ) {
-        $err{badbarcode} = 1;
-        $err{msg}        = $messages->{'BadBarcode'};
-    }
-    elsif ( $code eq 'NotIssued' ) {
-        $err{notissued} = 1;
-        $err{msg} = $branches->{ $messages->{'IsPermanent'} }->{'branchname'};
-    }
-    elsif ( $code eq 'WasLost' ) {
-        $err{waslost} = 1;
-    }
-    elsif ( $code eq 'ResFound' ) {
-        ;    # FIXME... anything to do here?
-    }
-    elsif ( $code eq 'WasReturned' ) {
-        ;    # FIXME... anything to do here?
-    }
-    elsif ( $code eq 'WasTransfered' ) {
-        ;    # FIXME... anything to do here?
-    }
-    elsif ( $code eq 'wthdrawn' ) {
-        $err{withdrawn} = 1;
-        $exit_required_p = 1;
-    }
-    elsif ( ( $code eq 'IsPermanent' ) && ( not $messages->{'ResFound'} ) ) {
-        if ( $messages->{'IsPermanent'} ne $branch ) {
-            $err{ispermanent} = 1;
-            $err{msg}         =
-              $branches->{ $messages->{'IsPermanent'} }->{'branchname'};
-        }
-    }
-    else {
-        die "Unknown error code $code";    # XXX
-    }
-    if (%err) {
-        push ( @errmsgloop, \%err );
-    }
-    last if $exit_required_p;
-}
-$template->param( errmsgloop => \@errmsgloop );
-
-# patrontable ....
-if ($borrower) {
-    my $flags = $borrower->{'flags'};
-    my $color = '';
-    my @flagloop;
-    my $flagset;
-    foreach my $flag ( sort keys %$flags ) {
-        my %flaginfo;
-        ( $color eq $linecolor1 ) 
-          ? ( $color = $linecolor2 )
-          : ( $color = $linecolor1 );
-        unless ($flagset) { $flagset = 1; }
-        $flaginfo{color}   = $color;
-        $flaginfo{redfont} = ( $flags->{$flag}->{'noissues'} );
-        $flaginfo{flag}    = $flag;
-        if ( $flag eq 'CHARGES' ) {
-            $flaginfo{msg}     = $flag;
-            $flaginfo{charges} = 1;
-	    $flaginfo{bornum} = $borrower->{borrowernumber};
-        }
-        elsif ( $flag eq 'WAITING' ) {
-            $flaginfo{msg}     = $flag;
-            $flaginfo{waiting} = 1;
-            my @waitingitemloop;
-            my $items = $flags->{$flag}->{'itemlist'};
-            foreach my $item (@$items) {
-                my ($iteminformation) =
-                  getiteminformation( \%env, $item->{'itemnumber'}, 0 );
-                my %waitingitem;
-                $waitingitem{biblionum} = $iteminformation->{'biblionumber'};
-                $waitingitem{barcode}   = $iteminformation->{'barcode'};
-                $waitingitem{title}     = $iteminformation->{'title'};
-                $waitingitem{brname}    =
-                  $branches->{ $iteminformation->{'holdingbranch'} }->{
-                  'branchname'};
-                push ( @waitingitemloop, \%waitingitem );
-            }
-            $flaginfo{itemloop} = \@waitingitemloop;
-        }
-        elsif ( $flag eq 'ODUES' ) {
-            my $items = $flags->{$flag}->{'itemlist'};
-            my @itemloop;
-            foreach my $item ( sort { $a->{'date_due'} cmp $b->{'date_due'} }
-                @$items )
-            {
-                my ($iteminformation) =
-                  getiteminformation( \%env, $item->{'itemnumber'}, 0 );
-                my %overdueitem;
-                $overdueitem{duedate}   = $item->{'date_due'};
-                $overdueitem{biblionum} = $iteminformation->{'biblionumber'};
-                $overdueitem{barcode}   = $iteminformation->{'barcode'};
-                $overdueitem{title}     = $iteminformation->{'title'};
-                $overdueitem{brname}    =
-                  $branches->{ $iteminformation->{'holdingbranch'} }->{
-                  'branchname'};
-                push ( @itemloop, \%overdueitem );
-            }
-            $flaginfo{itemloop} = \@itemloop;
-            $flaginfo{overdue}  = 1;
-        }
-        else {
-            $flaginfo{other} = 1;
-            $flaginfo{msg}   = $flags->{$flag}->{'message'};
-        }
-        push ( @flagloop, \%flaginfo );
-    }
-    $template->param(
-        flagset        => $flagset,
-        flagloop       => \@flagloop,
-        ribornum       => $borrower->{'borrowernumber'},
-        riborcnum      => $borrower->{'cardnumber'},
-        riborsurname   => $borrower->{'surname'},
-        ribortitle     => $borrower->{'title'},
-        riborfirstname => $borrower->{'firstname'}
-    );
-}
-
-my $color = '';
-
-#set up so only the last 8 returned items display (make for faster loading pages)
-my $count = 0;
-my @riloop;
-foreach ( sort { $a <=> $b } keys %returneditems ) {
-    my %ri;
-    if ( $count < 8 ) {
-        ( $color eq $linecolor1 ) 
-          ? ( $color = $linecolor2 )
-          : ( $color = $linecolor1 );
-        $ri{color} = $color;
-        my $barcode = $returneditems{$_};
-        my $duedate = $riduedate{$_};
-        my $overduetext;
-        my $borrowerinfo;
-        if ($duedate) {
-            my @tempdate = split ( /-/, $duedate );
-	    $ri{year}=$tempdate[0];
-	    $ri{month}=$tempdate[1];
-	    $ri{day}=$tempdate[2];
-            my $duedatenz  = "$tempdate[2]/$tempdate[1]/$tempdate[0]";
-            my @datearr    = localtime( time() );
-            my $todaysdate =
-              $datearr[5] . '-'
-              . sprintf( "%0.2d", ( $datearr[4] + 1 ) ) . '-'
-              . sprintf( "%0.2d", $datearr[3] );
-	    $ri{duedate}=$duedate;
-            my ($borrower) =              getpatroninformation( \%env, $riborrowernumber{$_}, 0 );
-            $ri{bornum}       = $borrower->{'borrowernumber'};
-            $ri{borcnum}      = $borrower->{'cardnumber'};
-            $ri{borfirstname} = $borrower->{'firstname'};
-            $ri{borsurname}   = $borrower->{'surname'};
-            $ri{bortitle}     = $borrower->{'title'};
-        }
-        else {
-            $ri{bornum} = $riborrowernumber{$_};
-        }
-#        my %ri;
-        my ($iteminformation) =C4::Circulation::Circ2::getiteminformation( \%env, 0, $barcode );
-        $ri{color}            = $color;
-        $ri{itembiblionumber} = $iteminformation->{'biblionumber'};
-        $ri{itemtitle}        = $iteminformation->{'title'};
-        $ri{itemauthor}       = $iteminformation->{'author'};
-        $ri{itemtype}         = $iteminformation->{'itemtype'};
-        $ri{barcode}          = $barcode;
-    }
-    else {
-        last;
-    }
-    $count++;
-    push ( @riloop, \%ri );
-}
-$template->param( riloop => \@riloop );
-
-$template->param(
-    genbrname  => $branches->{$branch}->{'branchname'},
-    genprname  => $printers->{$printer}->{'printername'},
-    branch     => $branch,
-    printer    => $printer,
-    errmsgloop => \@errmsgloop
-);
-
-# actually print the page!
-output_html_with_http_headers $query, $cookie, $template->output;
-
-sub cuecatbarcodedecode {
-    my ($barcode) = @_;
-    chomp($barcode);
-    my @fields = split ( /\./, $barcode );
-    my @results = map( decode($_), @fields[ 1 .. $#fields ] );
-    if ( $#results == 2 ) {
-        return $results[2];
-    }
-    else {
-        return $barcode;
-    }
-}
-
-# Local Variables:
-# tab-width: 4
-# End:
diff --git a/koha-tmpl/errors/400.pl b/koha-tmpl/errors/400.pl
index 94a721caf2..cf328e6fa7 100755
--- a/koha-tmpl/errors/400.pl
+++ b/koha-tmpl/errors/400.pl
@@ -6,7 +6,7 @@ use C4::Auth;
 use C4::Output;
 use C4::Interface::CGI::Output;
 use C4::Context;
-use HTML::Template;
+
 
 my $query = new CGI;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
@@ -14,8 +14,7 @@ my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "errors/400.tmpl",
 				query => $query,
 				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
+				authnotrequired => 1,
 				debug => 1,
 				});
 $template->param( admin => $admin);
diff --git a/koha-tmpl/errors/401.pl b/koha-tmpl/errors/401.pl
index 7d0acb990a..ed02d4e0e0 100755
--- a/koha-tmpl/errors/401.pl
+++ b/koha-tmpl/errors/401.pl
@@ -6,7 +6,7 @@ use C4::Auth;
 use C4::Output;
 use C4::Interface::CGI::Output;
 use C4::Context;
-use HTML::Template;
+
 
 my $query = new CGI;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
@@ -14,8 +14,7 @@ my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "errors/401.tmpl",
 				query => $query,
 				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
+				authnotrequired => 1,
 				debug => 1,
 				});
 $template->param( admin => $admin);				
diff --git a/koha-tmpl/errors/402.pl b/koha-tmpl/errors/402.pl
index c4dc56b628..632d3a6970 100755
--- a/koha-tmpl/errors/402.pl
+++ b/koha-tmpl/errors/402.pl
@@ -6,7 +6,7 @@ use C4::Auth;
 use C4::Output;
 use C4::Interface::CGI::Output;
 use C4::Context;
-use HTML::Template;
+
 
 my $query = new CGI;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
@@ -14,8 +14,7 @@ my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "errors/402.tmpl",
 				query => $query,
 				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
+				authnotrequired => 1,
 				debug => 1,
 				});
 $template->param( admin => $admin);				
diff --git a/koha-tmpl/errors/403.pl b/koha-tmpl/errors/403.pl
index e73be2e539..9760c467f5 100755
--- a/koha-tmpl/errors/403.pl
+++ b/koha-tmpl/errors/403.pl
@@ -6,7 +6,7 @@ use C4::Auth;
 use C4::Output;
 use C4::Interface::CGI::Output;
 use C4::Context;
-use HTML::Template;
+
 
 my $query = new CGI;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
@@ -14,8 +14,7 @@ my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "errors/403.tmpl",
 				query => $query,
 				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
+				authnotrequired => 1,
 				debug => 1,
 				});
 $template->param( admin => $admin);				
diff --git a/koha-tmpl/errors/404.pl b/koha-tmpl/errors/404.pl
index f750dacf3a..95dc494d43 100755
--- a/koha-tmpl/errors/404.pl
+++ b/koha-tmpl/errors/404.pl
@@ -6,7 +6,7 @@ use C4::Auth;
 use C4::Output;
 use C4::Interface::CGI::Output;
 use C4::Context;
-use HTML::Template;
+
 
 my $query = new CGI;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
@@ -14,8 +14,7 @@ my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "errors/404.tmpl",
 				query => $query,
 				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
+				authnotrequired => 1,
 				debug => 1,
 				});
 $template->param( admin => $admin);				
diff --git a/koha-tmpl/errors/500.pl b/koha-tmpl/errors/500.pl
index 1681feb21f..72d14ea32e 100755
--- a/koha-tmpl/errors/500.pl
+++ b/koha-tmpl/errors/500.pl
@@ -6,7 +6,7 @@ use C4::Auth;
 use C4::Output;
 use C4::Interface::CGI::Output;
 use C4::Context;
-use HTML::Template;
+
 
 my $query = new CGI;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
@@ -14,8 +14,7 @@ my ($template, $loggedinuser, $cookie)
 = get_template_and_user({template_name => "errors/500.tmpl",
 				query => $query,
 				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {catalogue => 1},
+				authnotrequired => 1,
 				debug => 1,
 				});
 $template->param( admin => $admin);
diff --git a/koha-tmpl/intranet-tmpl/prog/en/about.tmpl b/koha-tmpl/intranet-tmpl/prog/en/about.tmpl
index b81bf349b4..bd1c45f3e5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/about.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/about.tmpl
@@ -1,54 +1,47 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->About Koha
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
 
+<div id="main">
 <div id="mainbloc">
 	<h1>Data about the current version of Koha for bug reports (or general interest).</h1>
 	
 <table>
 	<caption>Server information</caption>
-	<tr><th scope="row">Koha version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></td></tr>
-	<tr><th scope="row">OS version ('uname -a'): </th><td><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></td></tr>
-	<tr><th scope="row">Perl version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></td></tr>
-	<tr><th scope="row">MySQL version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></td></tr>
-	<tr><th scope="row">Apache version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></td></tr>
-	<tr><th scope="row">Zebra version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="zebraVersion" --></td></tr>
+	<tr><th>Koha version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></td></tr>
+	<tr><th>OS version ('uname -a'): </th><td><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></td></tr>
+	<tr><th>Perl version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></td></tr>
+	<tr><th>MySQL version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></td></tr>
+	<tr><th>Apache version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></td></tr>
+	<tr><th>Zebra version: </th><td><!-- TMPL_VAR ESCAPE=HTML name="zebraVersion" --></td></tr>
 </table>
 
 <table>
         <caption>Perl modules</caption>
 	<!-- TMPL_LOOP name="components" -->
 	<tr>
-	  <th scope="row"><!-- TMPL_VAR NAME="name" --></th>
+	  <th><!-- TMPL_VAR NAME="name" --></th>
           <td><!-- TMPL_VAR NAME="version" --></td>
         </tr>
 	<!-- /TMPL_LOOP -->
 </table>
 
 	
-		<h2>Special thanks to the following libraries</h2>
+<h2>Special thanks to the following libraries</h2>
 <ul>
 	<li><strong>Horowhenua Library Trust</strong>, New Zealand, and Rosalie Blake, Head of Libraries, (Koha 1.0)</li>
 	<li>The <strong>Nelsonville Public Library</strong>, USA, Ohio (MARC support funding)</li>
 	<li><strong>EMN (Ecole des Mines de Nantes)</strong>, France (Suggestion, stats modules and improved ldap support funding)</li>
-	<li><strong>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</strong>, France (biblio frameworks, MARC authorities, OPAC basket, Serials support funding)</li>
+	<li><strong>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</strong>, France (biblio frameworks, MARC authorities, OPAC basket, Serials support funding)</li>
+	<li><strong>SAN-Ouest Provence </strong> Koha 3.0 members &amp; reserve modules.
 </ul>	
 	
-		<h2>Core team for 2.2</h2>
+<h2>Core team</h2>
 <ul>
-	<li><strong>Rachel Hamilton-Williams</strong>, Kaitiaki</li>
-	<li><strong>Paul Poulain</strong>, 2.2 release manager (MARC developer)</li>
-	<li>Stephen Hedges, Owen Leonard, Joshua Ferraro (<strong>Nelsonville Public Library</strong>)</li>
-	<li><strong>Katipo Communications</strong> (Koha 1.0 developers)</li>
-	<li><ul></li>
-	<li>Rachel Hamilton-Williams, General Manager (Webmistress)</li>
-	<li>Chris Cormack, 1.2 release manager</li>
-	<li>and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson,</li>
-	<li>Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</li></ul></li>
-	<li>Emiliano Marmonti, Matías Veleda and Sebastian Catañeda <strong>La Plata University, Argentina</strong> (barcode printing)</li>
-	<li>MJ Ray and <strong>Turo Technology LLP</strong>, (quality control, installer and updater, 2.0 release maintainer)</li>
-	<li>Nicholas Rosasco, (Documentation Compiler)</li>
-	<li>Mike Hansen</li>
-	<li><strong>Pate Eyler</strong> (Kaitiaki from 2002 to 2004)</li>
+	<li><strong>LibLime (Joshua Ferraro)</strong>, USA (Koha 3.0 Release Manager)</li>
+	<li><strong>Paul Poulain, Henri Damien Laurent, Antoine Farnault</strong>, France (Koha 2.0 &amp; 2.2 Release Manager)</li>
+	<li><strong>Katipo Communications (Chris Cormack)</strong>, New Zealand (Koha 1.0 &amp; 1.2 Release Manager)</li>
+	<li><strong>SAN-Ouest Provence (Bruno Toumi &amp; Arnaud Laurin)</strong>, France</li>
 </ul>
 	
 	
@@ -66,7 +59,7 @@
 	<li>Dorian Meid (German translation)</li>
 	<li>doXulting (Matthieu Branlat) OPAC basket</li>
 	<li>Ed Summers (Some code and Perl packages like MARC::Record)</li>
-	<li>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
+	<li>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
 	<li>Florian Bischof</li>
 	<li>Francisco M. Marzoa Alonso</li>
 	<li>Glen Stewart</li>
@@ -76,15 +69,20 @@
 	<li>Marco Gaiarin</li>
 	<li>Md. Aftabuddin</li>
 	<li>Michaes Herman</li>
+	<li>Mike Hansen</li>
 	<li>Mike Johnson</li>
 	<li>Mike Mylonas</li>
+	<li>MJ Ray and Turo Technology LLP, (quality control, installer and updater, 2.0 release maintainer)</li>
+	<li>Nicholas Rosasco, (Documentation Compiler)</li>
 	<li>Nicolas Morin (French Translation in 2.0)</li>
 	<li>Pawel Skuza (Polish for 1.2)</li>
+	<li>Pate Eyler (Kaitiaki from 2002 to 2004)</li>
 	<li>Regula Sebastiao</li>
 	<li>Roger Buck</li>
 	<li>Ron Wickersham</li>
 	<li>Sebastiaan Durand</li>
 	<li>Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</li>
+	<li>Stephen Hedges</li>
 	<li>Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)</li>
 </ul>
 	
@@ -96,7 +94,7 @@
 	<li><strong>Spanish: </strong>Andres Tarallo</li>
 	<li><strong>Italian: </strong>Giuseppe Angilella</li>
 </ul>
-	
+</div>
 
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl
index 329d978439..ad71fb19ea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/acqui-home.tmpl
@@ -4,99 +4,111 @@
 
 <h1>Acquisitions</h1>
 <div id="acqui_acqui_home_order">
-	<!-- TMPL_IF name="nobudget" -->
-		You must define a budget in parameters
-	<!-- TMPL_ELSE -->
-		<form action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
-			<h2>Start, recieve, or modify any order</h2>
-			<p><label for="supplier">Supplier ID or name</label><input type="text" size="25" name="supplier" id="supplier" />
-			<input type="submit" value="Search" />
-			</p>
-		</form>
-	<!-- /TMPL_IF -->
+    <fieldset>
+        <legend>Start, recieve, or modify any order</legend>
+    <!-- TMPL_IF name="nobudget" -->
+        <span class="problem">You must define a budget in parameters</span>
+        <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
+            <p><label for="supplier">Supplier </label><input type="text" size="25" name="supplier" id="supplier" />
+            <input type="submit" value="Search" />
+            </p>
+        </form>
+    <!-- TMPL_ELSE -->
+        <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
+            <p><label for="supplier">Supplier </label><input type="text" size="25" name="supplier" id="supplier" />
+            <input type="submit" value="Search" />
+            </p>
+        </form>
+    <!-- /TMPL_IF -->
+    </fieldset>
+</div>
+<div id="acqui_acqui_home_suggestions">
+    <fieldset>
+    <legend>Pending suggestions</legend>
+        <!-- TMPL_IF name="suggestion" -->
+            <!--TMPL_VAR NAME="suggestion" --> suggestions waiting <a href="/cgi-bin/koha/suggestion/acceptorreject.pl">Manage suggestions</a>
+        <!-- TMPL_ELSE -->
+            <p>No suggestions waiting</p>
+        <!-- /TMPL_IF -->
+    </fieldset>
 </div>
 
 
 <div id="acqui_acqui_home_currency">
 <!-- TMPL_IF NAME="loop_currency" -->
-	<h2>Exchange rates</h2>
-	<form action="/cgi-bin/koha/acqui/currency.pl">
-	<table>
-		<tr>
-			<th>Currency</th>
-			<th>Rate</th>
-		</tr>
-		<!-- TMPL_LOOP name="loop_currency" -->
-			<tr>
-				<td>
-					<label for="<!-- TMPL_VAR name="currency" -->"><!-- TMPL_VAR name="currency" --></label>
-				</td>
-				<td>
-						<input type="hidden" name="type" value="change" />
-						<input type="text" size="10" id="<!-- TMPL_VAR name="currency" -->" name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->" />
-				</td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-	<input type="submit" value="Save Exchange Rate" />
-	</form>
+    <h2>Exchange rates</h2>
+    <form action="/cgi-bin/koha/acqui/currency.pl">
+    <table>
+        <tr>
+            <th>Currency</th>
+            <th>Rate</th>
+        </tr>
+        <!-- TMPL_LOOP name="loop_currency" -->
+            <tr>
+                <td>
+                    <label for="<!-- TMPL_VAR name="currency" -->"><!-- TMPL_VAR name="currency" --></label>
+                </td>
+                <td>
+                        <input type="hidden" name="type" value="change" />
+                        <input type="text" size="10" id="<!-- TMPL_VAR name="currency" -->" name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->" />
+                </td>
+            </tr>
+        <!-- /TMPL_LOOP -->
+    </table>
+    <input type="submit" value="Save Exchange Rate" />
+    </form>
 <!-- TMPL_ELSE -->
-	<form action="/cgi-bin/koha/admin/currency.pl" method="post">
-	<input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Currency" />
-	</form>
+    <a href="/cgi-bin/koha/admin/currency.pl?op=add_form" class="button acquisition">
+    Add Currency
+    </a>
 <!-- /TMPL_IF -->
 </div>
 
-<div id="acqui_acqui_home_suggestions">
-	<h2>Pending Suggestions</h2>
-		<!-- TMPL_IF name="suggestion" -->
-			<!--TMPL_VAR NAME="suggestion" --> suggestions waiting <a href="/cgi-bin/koha/suggestion/acceptorreject.pl">Manage suggestions</a>
-		<!-- TMPL_ELSE -->
-			<p>No suggestions waiting</p>
-		<!-- /TMPL_IF -->
-</div>
-
 <div id="acqui_acqui_home_budgets">
-	<!-- TMPL_IF name="nobudget" -->
-		<p>You must define a budget in parameters</p>
-	<!-- TMPL_ELSE -->
-	<h2>Budgets and bookfunds</h2>
-	<table>
-		<tr>
-			<th>Budgets</th>
-			<th>Total</th>
-			<th>Spent</th>
-			<th>Comtd</th>
-			<th>Avail</th>
-		</tr>
-		<!-- TMPL_LOOP name="loop_budget" -->
-			<tr>
-				<td><!-- TMPL_VAR name="bookfundname" --></td>
-				<td><!-- TMPL_VAR name="budgetamount" --></td>
-				<td><!-- TMPL_VAR name="spent" --></td>
-				<td><!-- TMPL_VAR name="comtd" --></td>
-				<td><!-- TMPL_VAR name="avail" --></td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-		<tr>
-			<td>Total</td>
-			<td><!-- TMPL_VAR name="total" --></td>
-			<td><!-- TMPL_VAR name="totspent" --></td>
-			<td><!-- TMPL_VAR name="totcomtd" --></td>
-			<td><!-- TMPL_VAR name="totavail" --></td>
-		</tr>
-	</table><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="nobudget" -->
+    <!-- TMPL_ELSE -->
+    <h2>Budgets and Bookfunds</h2>
+    <a href="/cgi-bin/koha/admin/aqbookfund.pl" title="[ Manage Bookfunds ]">[ Manage ]</a>
+    <table>
+        <tr>
+            <th>Budgets</th>
+            <th>Total</th>
+            <th>Spent</th>
+            <th>Comtd</th>
+            <th>Avail</th>
+        </tr>
+        <!-- TMPL_LOOP name="loop_budget" -->
+            <tr>
+                <td><!-- TMPL_VAR name="bookfundname" --></td>
+                <td><!-- TMPL_VAR name="budgetamount" --></td>
+                <td><!-- TMPL_VAR name="spent" --></td>
+                <td><!-- TMPL_VAR name="comtd" --></td>
+                <td><!-- TMPL_VAR name="avail" --></td>
+            </tr>
+        <!-- /TMPL_LOOP -->
+        <tr>
+            <td>Total</td>
+            <td><!-- TMPL_VAR name="total" --></td>
+            <td><!-- TMPL_VAR name="totspent" --></td>
+            <td><!-- TMPL_VAR name="totcomtd" --></td>
+            <td><!-- TMPL_VAR name="totavail" --></td>
+        </tr>
+    </table>
+    <!-- /TMPL_IF -->
 </div>
 <div id="acqui_acqui_home_hints">
-	<p>Use your reload button [ctrl + r] to get the most recent figures.
-	Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>
-	
-	<h2>Help</h2>
-	<p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, (set donations as a supplier if you wish), and click add order which  will set up a "shopping basket" for you.</p>
-	<p>To place an order you need to establish whether a biblio already exists for it, or set up a new biblio from scratch or from a suggestion.  </p>
-	<p>To close  a shopping basket  click on "confirm Close Basket". After closing a basket it can not be modified or deleted</p>
-	<p>To receive an order (a parcel)  search for the supplier and click receive. After confirming invoice details you will be asked to create items for the order</p>
-	
+    <p>Use your reload button [ctrl + r] to get the most recent figures.
+    Committed figures are approximate only, as exchange rates will affect the amount actually paid.</p>
+    
+    <h2>Help</h2>
+    <p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which  will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).</p>
+    <p>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.  </p>
+    <p>To start a new shopping basket with a new supplier return to this page and just start a new supplier search.</p>
+    <p>To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".</p>
 </div>
 
+<script type="text/JavaScript">
+    document.findsupplier.supplier.focus();
+</script>
+
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl
index 962e567e05..af84d8060b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/basket.tmpl
@@ -2,146 +2,141 @@
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-<script>
-function Searchrecord()
-{
-	 window.open('/cgi-bin/koha/serials/subscription-bib-search.pl','FindABibIndex','width=500,height=400,toolbar=no,scrollbars=yes');
-}
-</script>
-	<h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <!-- TMPL_VAR NAME="basketno" --> for <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
-	<div id="acqui_basket_summary">
-		<h2>Basket Details</h2>
-		<table>
-		<tr><th>Basket Number:</th><td><!-- TMPL_VAR NAME="basketno" --></td></tr>
-		<tr><th>Managed By:</th><td><!-- TMPL_VAR NAME="authorisedbyname" --></td></tr>
-		<tr><th>Open On:</th><td><!-- TMPL_VAR NAME="creationdate" --></td></tr>
-		<tr><th>For:</th><td>Supplier Id <!-- TMPL_VAR NAME="booksellerid" --></td></tr>
-		<tr><th>Invoice Number:</th><td><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></td></tr>
-		<tr><th>Purchase Order Number:</th><td><!-- TMPL_VAR NAME="purchaseordernumber" --></td></tr>
-		<!-- TMPL_IF name="closedate" --><tr><th>Closed On:</th><td> <!-- TMPL_VAR name="closedate" --></td></tr><!-- /TMPL_IF -->
-		</table>
-		<!-- TMPL_UNLESS name="closedate" -->
-		<!-- TMPL_IF NAME="basketno" -->
-		<form action="/cgi-bin/koha/acqui/booksellers.pl" method="get">
-			<input type="hidden" name="op" value="close" />
-			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
-			<input type="hidden" name="supplier" value="<!-- TMPL_VAR name="booksellerid" -->" />
-			<input type="submit" value="Confirm Close this Basket" />
-		</form>
-		<!-- /TMPL_IF-->
-		<!-- /TMPL_UNLESS -->
-	</div>
-	
-	<div id="acqui_basket_content">
-	<h2>Order Details</h2>
-	<!-- TMPL_IF name="books_loop" -->
-		<table>
-			<tr>
-				<th scope="col">Order</th>
-				<th scope="col">Publisher</th>
-				<th scope="col"><a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->&amp;order=biblio.title">Title</a></th>
-				<th scope="col">RRP</th>
-				<th scope="col">Qty.</th>
-				<th scope="col">Total</th>
-				<th scope="col"><a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid">Fund</a></th>
-<!-- TMPL_IF name="active" -->
-<!-- TMPL_UNLESS name="closedate" -->
-					<th scope="col">Remove</th>
-				<!-- /TMPL_UNLESS -->
-					<!-- /TMPL_IF -->
-			</tr>
-			<!-- TMPL_LOOP NAME="books_loop" -->
-				<!-- TMPL_IF NAME="highlight" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
-					<td><!-- TMPL_VAR NAME="publishercode" --></td>
-					<!-- TMPL_IF name="closedate" -->
-						<td><p>
-							<!-- TMPL_VAR NAME="title" --><br/>
-								<!-- TMPL_VAR NAME="author" -->
-								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
-								<!-- TMPL_IF name="notes" --></p><p><!--TMPL_VAR name="notes" --><!-- /TMPL_IF -->
-							</p>
-						</td>
-					<!-- TMPL_ELSE -->
-						<td>
-							<p>
-							<a href="neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
-								<!-- TMPL_VAR NAME="author" -->
-								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
-								<!-- TMPL_IF name="notes" --></p><p><!--TMPL_VAR name="notes" --><!-- /TMPL_IF -->
-							</p>
-						</td>
-					<!-- /TMPL_IF -->
-					<td><!-- TMPL_VAR NAME="rrp" --></td>					
-					<td><!-- TMPL_VAR NAME="quantity" --></td>
-					<td><!-- TMPL_VAR NAME="line_total" --></td>
-					<td><!-- TMPL_VAR NAME="bookfundid" --></td>
-					<!-- TMPL_IF name="active" -->
-					<!-- TMPL_UNLESS name="closedate" -->
-					<!-- TMPL_UNLESS name="donotdelete" -->
-					<td>
-							<form action="addorder.pl" method="get">
-								<input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
-								<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
-								<input type="hidden" name="quantity" value="0" />
-								<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-								<input type="submit" class="delete" value="Delete" />
-							</form>
-						</td>
-					<!-- /TMPL_UNLESS -->
-					<!-- /TMPL_UNLESS -->
-					<!-- /TMPL_IF -->
-				</tr>
-			<!-- /TMPL_LOOP -->
-			
-			<tr>
-				<td colspan="2" rowspan="3">
-					<input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" />
-					<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
-				</td>
-				<th align="right">SubTotal</th>
-				<th><!-- TMPL_VAR NAME="sub_total_est" --></th>
-				<th><!-- TMPL_VAR name="qty_total" --></th>				
-			</tr>
-			<!--TMPL_IF NAME="disc_est"-->
-			<tr>
-				<th align="right">Discount</th>
-				<th>-<!-- TMPL_VAR NAME="disc_est" --></th>
-			</tr>
-			<!--/TMPL_IF-->
-			<!--TMPL_IF NAME="gist"-->
-			<tr>
-				<th align="right">Tax</th>
-				<th><!-- TMPL_VAR NAME="gist_est" --></th>
-			</tr>
-			<!--/TMPL_IF-->
-			<tr><td></td><td></td>
-				<th align="right">TOTAL</th>
-				<th><!-- TMPL_VAR NAME="grand_total_est" --></th>
-			</tr>
-		</table>
-	<!-- TMPL_ELSE -->
-		<table>
-			<tr><td>Basket empty</td></tr>
-		</table>
-	<!-- /TMPL_IF -->
-	
-	<!-- TMPL_UNLESS name="closedate" -->
-	</div>
-	<div id="acqui_basket_add">
-		<h2>Add To Order</h2>
-		<form action="/cgi-bin/koha/acqui/neworderempty.pl" method="get" name="f" id="f">
-			<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
-			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
-			To add from an existing record:
-			<li>Enter an existing  biblionumber: <input type="text"  size="25"   name="biblionumber" />
-			<input type="submit" value="Add order" /></li>
-			<li>or <a href="#" onClick="Searchrecord()">Search for an existing Biblio</a></li>
-			<ul><li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">From a Suggestion</a></li>
-			<li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">New Record</a></li>
-			</ul>
-		</form>
-	</div>
-	<!-- /TMPL_UNLESS -->
+
+    <h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket <!-- TMPL_VAR NAME="basketno" --> for <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
+    <div id="acqui_basket_summary">
+        <h2>Basket Details</h2>
+        <p><label>Basket number </label> <!-- TMPL_VAR NAME="basketno" -->&nbsp;</p>
+        <p><label>Managed by </label> <!-- TMPL_VAR NAME="authorisedbyname" -->&nbsp;</p>
+        <p><label>Open on </label> <!-- TMPL_VAR NAME="creationdate" -->&nbsp;</p>
+        <p><label>For </label> Supplier Id <!-- TMPL_VAR NAME="booksellerid" -->&nbsp;</p>
+        <p><label>Invoice number </label><!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&nbsp;</p>
+        <!-- TMPL_IF name="closedate" --><p><label>Closed On: </label> <!-- TMPL_VAR name="closedate" --></p><!-- /TMPL_IF -->
+        </table>
+        <!-- TMPL_UNLESS name="closedate" -->
+        <form action="/cgi-bin/koha/acqui/booksellers.pl" method="get">
+            <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
+            <input type="hidden" name="supplier" value="<!-- TMPL_VAR name="booksellerid" -->" />
+            <input type="hidden" name="op" value="close" />
+            <input type="submit" value="Close this Basket" />
+        </form>
+        <!-- /TMPL_UNLESS -->
+    </div>
+    
+    <div id="acqui_basket_content">
+    <h2>Order Details</h2>
+    <!-- TMPL_IF name="books_loop" -->
+        <table>
+            <tr>
+                <th>Order</th>
+                <th><a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
+                <th>Title</th>
+                <th>RRP</th>
+                <th>Est.</th>
+                <th>Qty.</th>
+                <th>Total</th>
+                <th class="DoNotPrint">
+                    <a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">
+                        Fund
+                    </a>
+                </th>
+                <!-- TMPL_IF name="active" -->
+                    <!-- TMPL_UNLESS name="closedate" -->
+                        <th>Modify</th>
+                        <th>Delete</th>
+                    <!-- /TMPL_UNLESS -->
+                <!-- /TMPL_IF -->
+            </tr>
+            <!-- TMPL_LOOP NAME="books_loop" -->
+                <!-- TMPL_IF NAME="highlight" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+                    <td><!-- TMPL_VAR NAME="ordernumber" --></td>
+                    <td><!-- TMPL_VAR NAME="publishercode" --></td>
+                    <!-- TMPL_IF name="closedate" -->
+                        <td><p>
+                            <!-- TMPL_VAR NAME="title" --><br/>
+                                <!-- TMPL_VAR NAME="author" -->
+                                <!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
+                                <!-- TMPL_IF name="notes" --></p><p><!--TMPL_VAR name="notes" --><!-- /TMPL_IF -->
+                            </p>
+                        </td>
+                    <!-- TMPL_ELSE -->
+                        <td>
+                            <p>
+                            <!-- TMPL_VAR NAME="title" --></p>
+                                <p><!-- TMPL_VAR NAME="author" -->
+                                <!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
+                                <!-- TMPL_IF name="notes" --></p><p><!--TMPL_VAR name="notes" --><!-- /TMPL_IF -->
+                            </p>
+                        </td>
+                    <!-- /TMPL_IF -->
+                    <td class="number"><!-- TMPL_VAR NAME="rrp" --></td>
+                    <td class="number"><!-- TMPL_VAR NAME="ecost" --></td>
+                    <td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
+                    <td class="number"><!-- TMPL_VAR NAME="line_total" --></td>
+                    <td class="DoNotPrint"><!-- TMPL_VAR NAME="bookfundname" --></td>
+                    <!-- TMPL_IF name="active" -->
+                        <!-- TMPL_UNLESS name="closedate" -->
+                        <td>
+                            <a href="neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">Modify</a>
+                        </td>
+                        <td>
+                        <a href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&quantity=0&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Delete</a>
+                        </td>
+                        <!-- /TMPL_UNLESS -->
+                    <!-- /TMPL_IF -->
+                </tr>
+            <!-- /TMPL_LOOP -->
+            <tr>
+                <td colspan="2" rowspan="3">
+                    <input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" />
+                    <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
+                </td>
+                <th>SubTotal</th>
+                <th><!-- TMPL_VAR NAME="sub_total_est" --></th>
+                <th><!-- TMPL_VAR NAME="sub_total" --></td>
+                <th><!-- TMPL_VAR name="qty_total" --></th>
+                    <!-- TMPL_IF name="active" -->
+                        <!-- TMPL_IF name="closedate" -->
+                          <td colspan="2" rowspan="3">&nbsp;</td>
+                        <!-- TMPL_ELSE -->
+                          <td colspan="3" rowspan="3">&nbsp;</td>
+                        <!-- /TMPL_IF -->
+                    <!-- /TMPL_IF -->
+                
+            </tr>
+            <tr>
+                <th>GST</th>
+                <th><!-- TMPL_VAR NAME="gist_est" --></th>
+                <th><!-- TMPL_VAR NAME="gist" --></th>
+                <th>&nbsp;</th>
+            </tr>
+            <tr>
+                <th>TOTAL  (<!-- TMPL_VAR NAME="currency" -->)</th>
+                <th><!-- TMPL_VAR NAME="grand_total_est" --></th>
+                <th><!-- TMPL_VAR NAME="grand_total" --></th>
+                <th>&nbsp;</th>
+            </tr>
+        </table>
+    <!-- TMPL_ELSE -->
+        <table>
+            <tr><td>Basket empty</p>
+        </table>
+    <!-- /TMPL_IF -->
+    
+    <!-- TMPL_UNLESS name="closedate" -->
+    </div>
+    <div id="acqui_basket_add">
+        <h2>Add To Order</h2>
+        <form action="/cgi-bin/koha/acqui/neworderbiblio.pl" method="post">
+            <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
+            <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
+            <ul><li><label for="q">From an existing record: </label><input id="q" type="text"  size="25"   name="q" />
+            <input type="submit" value="Search" /></li>
+            <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">From a Suggestion</a></li>
+            <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->">New Record</a></li>
+            </ul>
+        </form>
+    </div>
+    <!-- /TMPL_UNLESS -->
 
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl
index ff3cdbde0b..58da6b077e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/booksellers.tmpl
@@ -2,14 +2,14 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
-<h1>You searched on <b>supplier: <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> baskets found</h1>
+<h1>You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h1>
 <div id="acqui_order_supplierlist">
 	<table>
 	<tr>
 		<th>Order</th>
+		<th>Order receive</th>
 		<th>Company</th>
 		<th>&nbsp;</th>
-		
 	</tr>
 	
 	<!-- TMPL_LOOP name="loop_suppliers" -->
@@ -21,27 +21,24 @@
 					Inactive
 				<!-- /TMPL_IF -->
 			</td>
-			
+			<td>
+				<a href="parcels.pl?supplierid=<!-- TMPL_VAR name=supplierid -->">Receive order</a>
+			</td>
 			<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><!-- TMPL_VAR name="name" --></a></td>
-			
-			<!--TMPL_IF NAME="ordcount"-->
-				<td>
-				<a href="parcel.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->">Recieve All orders</a>
-				</td>
-			<!--/TMPL_IF-->
-			
-				<td>
-				<table><!--TMPL_IF NAME="ordcount"-->
-					<th>Basket</th>
-					<th>Purchase order</th>
-					<th>Created by</th>
-					<th>Date</th>
-					<th>&nbsp;</th>
-					<!--/TMPL_IF-->	
+			<td>
+				<table>
+				    <!-- TMPL_IF NAME="loop_basket"-->
+						<tr>
+							<th>Basket</th>
+							<th>Items</th>
+							<th>Created by</th>
+							<th>Date</th>
+							<th>&nbsp;</th>
+						</tr>
 						<!-- TMPL_LOOP NAME="loop_basket" -->
 							<tr>
 								<td><!-- TMPL_VAR NAME="basketno" --></td>
-								<td><TMPL_VAR NAME="purchaseordernumber"></td>
+								<td><TMPL_VAR NAME="total"></td>
 								<td>
 									<!-- TMPL_VAR name="firstname" -->
 										<!-- TMPL_VAR name="surname" -->
@@ -50,34 +47,27 @@
 								<td>
 									<!-- TMPL_IF name="closedate" -->
 										closed on <!-- TMPL_VAR NAME="closedate" -->
-										<a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
+										<a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">View</a>
 									<!-- TMPL_ELSE -->
 										<!-- TMPL_IF name="active" -->
-											<a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">modify</a>
+											<a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">modify</a>
 										<!-- TMPL_ELSE -->
-											<a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
+											<a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">View</a>
 										<!-- /TMPL_IF -->
 									<!-- /TMPL_IF -->
 								</td>
-								<td>
-								<!--TMPL_IF NAME="ordcount"-->
-								
-								<a href="parcel.pl?supplierid=<!-- TMPL_VAR name="supplierid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->">Recieve this order</a>
-								
-								<!--/TMPL_IF-->
-								</td>
 							</tr>
 						<!-- /TMPL_LOOP -->
+					<!-- TMPL_ELSE -->
+					    <tr><td>No pending basket</td></tr>
+					<!-- /TMPL_IF -->
 					</table>
 			</td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 		</table>
 </div>
-<div id="acqui_order_add_supplier">
-	<form action="supplier.pl">
-		<input type="hidden" name="supplierid" value="0" />
-		<input type="submit" value="Add supplier" />
-	</form>
+<div id="action">
+    <a href="supplier.pl?op=enter">Add supplier</a>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl
index 77ebdd64e9..584cab4110 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl
@@ -88,7 +88,13 @@
 			</tr>
 			<!-- TMPL_LOOP NAME="suggestions_loop" -->
 				<tr>
-					<td>&nbsp;</td>
+					<td>
+					    <!-- TMPL_IF NAME="invoicenumber" -->
+					        <a href="/cgi-bin/koha/acqui/parcel.pl?code=<!-- TMPL_VAR NAME="invoicenumber"-->&supplierid=<!-- TMPL_VAR NAME="id"-->&datereceived=<!-- TMPL_VAR NAME="datereceived" -->">Parcel</a>
+					    <!-- TMPL_ELSE -->
+					        &nbsp;
+					    <!-- /TMPL_IF -->
+					</td>
 					<td><a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
 					<td><!-- TMPL_VAR NAME="author" --></td>
 					<td><!-- TMPL_VAR NAME="name" --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl
index 32f79185ca..2a9f233b22 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/lateorders.tmpl
@@ -4,7 +4,6 @@
 
 <h1 ><!-- TMPL_IF name="Supplier" --><!-- TMPL_VAR name="Supplier" --> : <!--/TMPL_IF -->Late issues</h1>
 	<div id="acqui_lateorders">
-		<form action="lateorders.pl" method="post">
 		<table>
 			<tr>
 				<th>Supplier</th>
@@ -19,9 +18,11 @@
 				<th>Total cost</th>
 				<th>Budget</th>
 				<th>&nbsp;</th>
+				<th>&nbsp;</th>
 			</tr>
 			<tr>
 					<td class="doNotPrint">
+                        <form action="lateorders.pl" method="post">
 						<!-- TMPL_VAR name="CGIsupplier" -->
 					</td>
 					<td> &nbsp;</td>
@@ -31,19 +32,24 @@
 					<td colspan="2">
 						&nbsp;
 					</td>
-					<td class="doNotPrint">
-						<select name="branch">
-						<!-- TMPL_LOOP name="branchloop" -->
-							<option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="branchname" --></option>
-						<!-- /TMPL_LOOP -->
-						</select>
-					</td>
-					<td colspan="5">
+					<td colspan="6">
 						&nbsp;
 					</td>
 					
-					<td class="doNotPrint">
+					
+                    <td class="doNotPrint">
 						<input type="submit" value="filter" />
+                        </form>
+					</td>
+					<td class="doNotPrint">
+                        <form name="claim" method="post">
+                        <input type="hidden" name="op" value="send_alert" />
+                        <select name="letter_code" >
+                          <!--TMPL_LOOP Name="letters"-->
+                            <option value="<!--TMPL_VAR Name="code"-->"><!--TMPL_VAR Name="name"--></option>
+                          <!--/TMPL_LOOP -->
+                        </select>
+						<input type="submit" value="Claim Order" />
 					</td>
 			</tr>
 			<!-- TMPL_LOOP name="lateorders" -->
@@ -58,7 +64,9 @@
 						<!-- TMPL_VAR name="latesince" -->
 					</td>
 					<td align="center" class="doNotPrint">
-						<!-- TMPL_VAR name="basketno" -->
+						<a href="basket.pl?basketno=<!-- TMPL_VAR name="basketno" -->">
+						    <!-- TMPL_VAR name="basketno" -->
+						</a>
 					</td>
 					<td >
 						<b><!-- TMPL_VAR name="title" --></b>
@@ -86,6 +94,9 @@
 					<td class="doNotPrint">
 						&nbsp;
 					</td>
+					<td class="doNotPrint">
+						<input type="checkbox" name="claim_for" value="<!--TMPL_VAR Name="ordernumber" -->" />
+					</td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 			<tr> 
@@ -103,9 +114,15 @@
 					<th>
 						<!-- TMPL_VAR name="total" -->
 					</th>
+					<td colspan="2">
+                        &nbsp;
+					</td>
+					<td>
+						<input type="submit" value="Claim Order" />
+                        </form>
+					</td>
 			</tr>
 		</table>
-		</form>
 	</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl
index ba101dc3b0..45d01b3f66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl
@@ -4,251 +4,258 @@
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
 <script language="javascript" type="text/javascript">
-
+<!--
 function update(f){
-  //collect values
-  quantity=f.quantity.value
-  if (quantity ==0) {
-  	alert("Quantity must be >0");
-  }
-  discount=f.discount.value
-  listinc=parseInt(f.listinc.value)
-  currency=f.currency.value
-  applygst=parseInt(f.applygst.value)
-  listprice=f.list_price.value
-  //  rrp=f.rrp.value
-  //  ecost=f.ecost.value  //budgetted cost
-  //  GST=f.GST.value
-  //  total=f.total.value
-  //make useful constants out of the above
-  exchangerate=f.elements[currency].value      //get exchange rate
-  gst_on=(applygst);
-  //do real stuff
-   if (listinc){
-listprice=listprice*100/(100+f.gstrate.value)
+//collect values
+quantity=f.quantity.value
+if (quantity ==0) {
+    alert("Quantity must be >0");
+}
+discount=f.discount.value
+listinc=parseInt(f.listinc.value)
+currency=f.currency.value
+applygst=parseInt(f.applygst.value)
+listprice=f.list_price.value
+//  rrp=f.rrp.value
+//  ecost=f.ecost.value  //budgetted cost
+//  GST=f.GST.value
+//  total=f.total.value
+//make useful constants out of the above
+exchangerate=f.elements[currency].value      //get exchange rate
+gst_on=(!listinc && applygst);
+//do real stuff
+rrp=listprice*exchangerate;
+ecost=rrp*(100-discount)/100
+GST=0;
+if (gst_on){
+    rrp=rrp*(1+<!-- TMPL_VAR NAME="gstrate" -->);
+    GST=ecost*(<!-- TMPL_VAR NAME="gstrate" -->);
 }
-  rrp=listprice*exchangerate;
-  ecost=rrp*(100-discount)/100
-  GST=0;
-  if (gst_on){
- //   rrp=rrp*(1+f.gstrate.value/100);
-    GST=ecost*(f.gstrate.value)/100;
-  }
 
-  total=(ecost+GST)*quantity
+total=(ecost+GST)*quantity
 
-  f.rrp.value=rrp;
-  f.ecost.value=ecost;
-  f.unitprice.value=ecost+GST
-  f.GST.value=GST;
-  f.total.value=total;
-  return true;
+f.rrp.value=rrp;
+f.ecost.value=ecost;
+f.total.value=total;
+<!-- TMPL_IF NAME="GST"-->
+f.GST.value=GST;
+<!-- /TMPL_IF -->
+return true;
 }
 
 
 
 function messenger(X,Y,etc){
-	win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
-	win.focus();
-	win.document.close();
-	win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size='2'><p><br>");
-	win.document.write(etc);
-	win.document.write("<center><form><input type=button onclick='self.close()' value='Close'></form></center>");
-	win.document.write("</font></body></html>");
+    win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
+    win.focus();
+    win.document.close();
+    win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size='2'><p><br>");
+    win.document.write(etc);
+    win.document.write("<center><form><input type=button onclick='self.close()' value='Close'></form></center>");
+    win.document.write("</font></body></html>");
 }
 
 function check(f) {
-  quantity=f.quantity.value;
-  title=f.title.value;
- biblio=f.biblionumber.value;
- invoice=f.purchaseordernumber.value;
-suggestionid="<!--TMPL_VAR NAME="suggestionid"-->";
-  if (title == "") {
-  	alert("Title can't be empty- Have you created the biblio?");
-	return false;
-  }
- if (biblio == "" && suggestionid=="") {
-  	alert("A biblio is not created- please create the biblio first?");
-	return false;
-  }
-  if (quantity ==0) {
-  	alert("Quantity must be >0");
-	return false;
-  }
-
-	document.frusin.submit();
+quantity=f.quantity.value
+title=f.title.value
+if (title == "") {
+    alert("Title can't be empty");
+    return false;
 }
-function AddBiblio() {
-     window.open("/cgi-bin/koha/cataloguing/addbiblio.pl?fromserials=1&popup=1&suggestionid=<!--TMPL_VAR NAME="suggestionid"-->","AddBiblio",'width=700,height=400,toolbar=no,scrollbars=yes,status=yes');
-
+if (quantity ==0) {
+    alert("Quantity must be >0");
+    return false;
+}
+    document.frusin.submit();
 }
 </script>
 <h1>
-	<!-- TMPL_IF name="ordnum" -->
-		Modify order details (line #<!-- TMPL_VAR NAME="ordnum" -->)
-	<!-- TMPL_ELSE -->
-		New order
-	<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="suggestionid" -->(defined from suggestion #<!-- TMPL_VAR NAME="suggestionid" -->)<!-- /TMPL_IF -->
+    <!-- TMPL_IF name="ordnum" -->
+        Modify order details (line #<!-- TMPL_VAR NAME="ordnum" -->)
+    <!-- TMPL_ELSE -->
+        New order
+    <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="suggestionid" -->(defined from suggestion #<!-- TMPL_VAR NAME="suggestionid" -->)<!-- /TMPL_IF -->
 </h1>
-	<div id="acqui_basket_summary">
-		<h2>Basket Details</h2>
-		<table>
-		<tr><th>Basket Number:</th><td><!-- TMPL_VAR NAME="basketno" --></td></tr>
-		<tr><th>Managed By:</th><td><!-- TMPL_VAR NAME="authorisedbyname" --></td></tr>
-		<tr><th>Open On:</th><td><!-- TMPL_VAR NAME="creationdate" --></td></tr>
-		<tr><th>For:</th><td>Supplier Id <!-- TMPL_VAR NAME="booksellerid" --></td></tr>
-		<tr><th>Invoice Number:</th><td><!-- TMPL_VAR NAME="booksellerinvoicenumber" --></td></tr>
-		<tr><th>Purchase Order Number:</th><td><!-- TMPL_VAR NAME="purchaseordernumber" --></td></tr>
-		<!-- TMPL_IF name="closedate" --><tr><th>Closed On:</th><td> <!-- TMPL_VAR name="closedate" --></td></tr><!-- /TMPL_IF -->
-		</table>
-	</div>
 
-<div id="acqui_newbiblio_edit_catalogue">
-	<h2>catalogue details</h2>
-	<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin">
-	<!-- TMPL_UNLESS name="existing" -->
-		<input type="hidden" name="existing" value="no" >
-	<!-- /TMPL_UNLESS -->
-	<input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordnum" -->" />
-	<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
-	<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
-	<input type="hidden" name="biblionumber" id="biblionumber"  value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-	<input type="hidden" name="oldtype" value="<!-- TMPL_VAR NAME="itemtype" -->" />
-	<input type="hidden" name="listinc" value="<!-- TMPL_VAR NAME="listincgst" -->" />
-	<input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="currency" -->" />
-	<input type="hidden" name="applygst" value="<!-- TMPL_VAR NAME="gstreg" -->" />
-	<input type="hidden" name="suggestionid" value="<!-- TMPL_VAR NAME="suggestionid" -->" />
-	<!-- TMPL_LOOP NAME="loop_currencies" -->
-		<input type="hidden" name="<!-- TMPL_VAR NAME="currency" -->" value="<!-- TMPL_VAR NAME="rate" -->" />
-	<!-- /TMPL_LOOP -->
-	
-	<p> 
-		<label><b>Title *</b></label>
-		
-			<input type="text" size="20" name="title" id="title" value="<!-- TMPL_VAR NAME="title" -->" READONLY/>Auto filled
-	</p>
-	<!-- TMPL_IF name="biblionumber" -->
-	<p>
-		<label>Author</label>
-			<input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
-	</p>
-	<p>
-		<label> Publisher</label>
-			<input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" -->
-	</p>
-	<p>
-		<label>Copyright Date</label>
-			<input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" /><!-- TMPL_VAR NAME="copyrightdate" -->
-		
-	</p>
-	<p>
-		<label>Format</label>
-		<!-- TMPL_VAR NAME="itemtype" -->
-	</p>
-	<p>
-		<label>ISBN</label>
-			<input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
-		
-	</p>
-	<p>
-		<label>Series</label>
-			<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
-	</p>
-	<!--TMPL_ELSE-->
-	<!--TMPL_UNLESS NAME="suggestionid"--><p><a href="#" onClick="AddBiblio()">First Create a Biblio for this order</a></p><!--/TMPL_UNLESS-->
-	<!--/TMPL_IF-->
-		
-	<h2>Accounting details</h2>
-		<p>
-		<label>Branch</label>
-		<select name="branch">
-		<!-- TMPL_LOOP name="branchloop" -->
-			<option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
-		<!-- /TMPL_LOOP -->
-		</select>
-	</p>
-		<p>
-			<label>Quantity</label>
-			
-				<input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" <!-- TMPL_IF name="close" -->readonly<!--/TMPL_IF--/>
-		
-		</p>
-		<p>
-			<label>Bookfund</label>
-			<!-- TMPL_IF name="close" -->
-				<input type="hidden" size="20" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundname" -->
-			<!-- TMPL_ELSE -->
-				<!-- TMPL_VAR NAME="CGIbookfund" -->
-		  	<!--/TMPL_IF-->
-		</p>
-		Note: All figures are in local currency, except the suppliers list price which is indicated.Currency conversion is done automatically
-		<!-- TMPL_IF NAME="gstreg" -->
-		<p>
-		 <label> Applicable Tax rate</label>
-		<input type="text" size="20" name="gstrate" value="<!--TMPL_VAR NAME="gstrate"-->" onchange="update(this.form)" />%
-		</p>
-		<!--/TMPL_IF-->
-		<p>
-			<label>Suppliers List Price</label>
-	
-				<input type="text" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" <!-- TMPL_IF name="close" -->readonly<!--/TMPL_IF-->/><!-- TMPL_VAR NAME="currency" -->
-		  	
-		</p>
-		<p>
-			<label>Replacement Cost </label>
-				<input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" <!-- TMPL_IF name="close" -->readonly<!--/TMPL_IF--> />
-		  	
-		</p>
-		<p>
-			<label>Discount Applied</label>
-			<input type="text" size="20" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" onchange="update(this.form)" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />%
-		</p>
-		<p>
-			<label>Budgeted Cost</label>
-			<input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
-		</p>
-		<!--TMPL_IF NAME="gstreg"-->
-		<p>
-			<label>Budgeted GST</label>
-			<input type="text" size="20" name="GST" value="<!-- TMPL_VAR NAME="gst" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
-		</p>
-		<!--/TMPL_IF-->
-		<p>
-			<label><b>BUDGETED TOTAL</b></label>
-			<input type="text" size="20" name="total" value="<!-- TMPL_VAR name="total"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
-		</p>
-		<p>
-			<label>Unit Cost</label>
-			<input type="text" size="20" name="unitprice" value="<!-- TMPL_VAR name="unitprice"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> /><!--TMPL_IF NAME="gstreg"-->includes any applicable tax less any discount<!--/TMPL_IF-->
-		</p>
-		<p>
-			<label>Purchase Order No </label>
-			<input type="text" size="20" name="purchaseordernumber"  value="<!-- TMPL_VAR name="purchaseordernumber" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> /> (using recommended!)
-		</p>
-		<p>
-			<label>Notes</label>
-			<input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" />
-		</p>
-		<p>The 2 following fields are available for your own usage. They can be useful for stat purposes</p>
-		<p>
-			<label>Sort field 1</label>
-			<!-- TMPL_IF Name="CGIsort1" -->
-				<!-- TMPL_VAR Name="CGIsort1" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
-			<!--/TMPL_IF -->
-		</p>
-		<p>
-			<label>Sort field 2</label>
-			<!-- TMPL_IF Name="CGIsort2" -->
-				<!-- TMPL_VAR Name="CGIsort2" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
-			<!--/TMPL_IF -->
-		</p>
-		<p>
-			<input type="button" value="OK" onclick="check(this.form)" />
-		</p>
-	</form>
+<fieldset>
+    <legend>Basket Details</legend>
+    <p>
+        <!-- TMPL_IF name="basketno" -->
+            <label>Basket Number</label><!-- TMPL_VAR NAME="basketno" -->
+        <!-- TMPL_ELSE -->
+            New basket
+        <!-- /TMPL_IF -->
+        &nbsp;
+    </p>
+    <p><label>Managed By</label><!-- TMPL_VAR NAME="authorisedbyname" -->&nbsp;</p>
+    <p><label>Open On</label><!-- TMPL_VAR NAME="creationdate" -->&nbsp;</p>
+    <p><label>For</label>Supplier Id <!-- TMPL_VAR NAME="booksellerid" -->&nbsp;</p>
+    <p><label>Invoice Number</label><!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&nbsp;</p>
+    <!-- TMPL_IF name="closedate" --><p><label>Closed On:</label> <!-- TMPL_VAR name="closedate" --></p><!-- /TMPL_IF -->
+</fieldset>
+
+<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin">
+    <fieldset>
+        <legend>Catalogue details</legend>
+        <!-- TMPL_UNLESS name="existing" -->
+            <input type="hidden" name="existing" value="no" />
+        <!-- /TMPL_UNLESS -->
+        <input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordnum" -->" />
+        <input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
+        <input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" />
+        <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+        <input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
+        <input type="hidden" name="oldtype" value="<!-- TMPL_VAR NAME="itemtype" -->" />
+        <input type="hidden" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" />
+        <input type="hidden" name="listinc" value="<!-- TMPL_VAR NAME="listincgst" -->" />
+        <input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="currency" -->" />
+        <input type="hidden" name="applygst" value="<!-- TMPL_VAR NAME="gstreg" -->" />
+        <input type="hidden" name="suggestionid" value="<!-- TMPL_VAR NAME="suggestionid" -->" />
+        <!-- TMPL_LOOP NAME="loop_currencies" -->
+            <input type="hidden" name="<!-- TMPL_VAR NAME="currency" -->" value="<!-- TMPL_VAR NAME="rate" -->" />
+        <!-- /TMPL_LOOP -->
+        <p>
+            <label><b>Title *</b></label>
+            <!-- TMPL_IF name="biblio" -->
+                <input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" /><!-- TMPL_VAR NAME="title" -->
+            <!-- TMPL_ELSE -->
+                <input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
+            <!-- /TMPL_IF -->
+        </p>
+        <p>
+            <label>Author</label>
+            <!-- TMPL_IF name="biblio" -->
+                <input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
+            <!-- TMPL_ELSE -->
+                <input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
+            <!-- /TMPL_IF -->
+        </p>
+        <p>
+            <label> Publisher</label>
+            <!-- TMPL_IF name="biblio" -->
+                <input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" -->
+            <!-- TMPL_ELSE -->
+                <input type="text" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" />
+            <!-- /TMPL_IF -->
+        </p>
+        <p>
+            <label>Copyright Date</label>
+            <!-- TMPL_IF name="biblio" -->
+                <input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" /><!-- TMPL_VAR NAME="copyrightdate" -->
+            <!-- TMPL_ELSE -->
+                <input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
+            <!-- /TMPL_IF -->
+        </p>
+        <p>
+            <label>Format</label>
+            <!-- TMPL_VAR NAME="CGIitemtype" -->
+        </p>
+        <p>
+            <label>ISBN</label>
+            <!-- TMPL_IF name="biblio" -->
+                <input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
+            <!-- TMPL_ELSE -->
+                <input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
+            <!-- /TMPL_IF -->
+        </p>
+        <p>
+            <label>Series</label>
+            <!-- TMPL_IF name="biblio" -->
+                <input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
+            <!-- TMPL_ELSE -->
+                <input type="text" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" />
+            <!-- /TMPL_IF -->
+        </p>
+        <p>
+            <label>Branch</label>
+            <select name="branch">
+            <!-- TMPL_LOOP name="branchloop" -->
+                <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
+            <!-- /TMPL_LOOP -->
+            </select>
+        </p>
+    </fieldset>
+    <fieldset>
+        <legend>Accounting details</legend>
+            <p>
+                <label>Quantity</label>
+                <!-- TMPL_IF name="close" -->
+                    <input type="hidden" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /><!-- TMPL_VAR NAME="quantity" -->
+                <!-- TMPL_ELSE -->
+                    <input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" />
+                <!--/TMPL_IF-->
+            </p>
+            <p>
+                <label>Bookfund</label>
+                <!-- TMPL_IF name="close" -->
+                    <input type="hidden" size="20" name="bookfund" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundname" -->
+                <!-- TMPL_ELSE -->
+                    <!-- TMPL_VAR NAME="CGIbookfund" -->
+                <!--/TMPL_IF-->
+            </p>
+            <p>
+                <label>Supplier price</label>
+                <!-- TMPL_IF name="close" -->
+                    <input type="hidden" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" /><!-- TMPL_VAR NAME="listprice" -->
+                <!-- TMPL_ELSE -->
+                    <input type="text" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" />
+                <!--/TMPL_IF-->
+            </p>
+            <p>
+                <label>Replacement Cost </label>
+                <!-- TMPL_IF name="close" -->
+                    <input type="hidden" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /><!-- TMPL_VAR NAME="rrp" -->
+                <!-- TMPL_ELSE -->
+                    <input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" />
+                <!--/TMPL_IF-->
+            </p>
+            <p>
+                <label>Budgeted Cost</label>
+                <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->"<!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+            </p>
+            <!-- TMPL_IF NAME="GST"-->
+            <p>
+                <label>Budgeted GST</label>
+                <input type="text" size="20" name="GST" value="" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+            </p>
+            <!-- /TMPL_IF -->
+            <p>
+                <label><b>Total</b></label>
+                <input type="text" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+            </p>
+            <p>
+                <label>Actual Cost</label>
+                <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+            </p>
+            <p>
+                <label>Invoice Number</label>
+                <input type="text" size="20" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" />(usually empty)
+            </p>
+            <p>
+                <label>Notes</label>
+                <input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" />
+            </p>
+            <p>The 2 following fields are available for your own usage. They can be useful for stat purposes</p>
+            <p>
+                <label>Sort field 1</label>
+                <!-- TMPL_IF Name="CGIsort1" -->
+                    <!-- TMPL_VAR Name="CGIsort1" -->
+                <!-- TMPL_ELSE -->
+                    <input type="text" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
+                <!--/TMPL_IF -->
+            </p>
+            <p>
+                <label>Sort field 2</label>
+                <!-- TMPL_IF Name="CGIsort2" -->
+                    <!-- TMPL_VAR Name="CGIsort2" -->
+                <!-- TMPL_ELSE -->
+                    <input type="text" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
+                <!--/TMPL_IF -->
+            </p>
+    </fieldset>
+    <p>
+        <input type="button" value="OK" onclick="check(this.form)" />
+    </p>
+</form>
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/newordersuggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/newordersuggestion.tmpl
index 48798305da..6e53f26604 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/acqui/newordersuggestion.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/newordersuggestion.tmpl
@@ -5,61 +5,62 @@
 
 <h1>Suggestions</h1>
 <div id="acqui_suggestion_select">
-	<form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
-	<table>
-		<tr>
-			<th>Suggestion</th>
-			<th>Suggested by</th>
-			<th>Accepted by</th>
-			<th>&nbsp;</th>
-		</tr>
-		<tr>
-			<th>
-				<p>Filter on :
-				title: <input type="text" name="title" value="<!-- TMPL_VAR NAME="title"-->" />
-				author: <input type="text" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
-				publisher: <input type="text" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode"-->" /></p>
-			</th>
-			<th>
-				&nbsp;
-			</th>
-			<th>
-				&nbsp;
-			</th>
-			<th>
-				<input type="submit" class="button acquisition" value="Set Filter" />
-			</th>
-		</tr>
-		<!-- TMPL_LOOP NAME="suggestions_loop" -->
-			<tr>
-				<td>
-					<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 -->
-						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR NAME="isbn" --></i> <!-- /TMPL_IF -->
-						<!-- TMPL_IF name="publishercode" --><br/>published by:<!-- TMPL_VAR NAME="publishercode" --> <!-- /TMPL_IF -->
-						<!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR NAME="publicationyear" --></i> <!-- /TMPL_IF -->
-						<!-- TMPL_IF name="place" --> at <i><!-- TMPL_VAR NAME="place" --></i> <!-- /TMPL_IF -->
-						<!-- TMPL_IF name="note" --><p><i>(<!-- TMPL_VAR NAME="note" -->)</i></p> <!-- /TMPL_IF -->
-					</p>
-				</td>
-				<td>
-					<!-- TMPL_VAR NAME="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamesuggestedby" -->
-				</td>
-				<td>
-					<!-- TMPL_VAR NAME="surnamemanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamemanagedby" -->
-				</td>
-				<td>
-					<!-- TMPL_IF name="biblionumber" -->
-						<a href="neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Order</a>
-					<!-- TMPL_ELSE -->
-						<a href="neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->" class="button acquisition">Order</a>
-					<!-- /TMPL_IF -->
-				</td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-	</form>
+    <form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get">
+    <table>
+        <tr>
+            <th>Suggestion</th>
+            <th>Suggested by</th>
+            <th>Accepted by</th>
+            <th>&nbsp;</th>
+        </tr>
+        <tr>
+            <th>
+                 Filter on :
+                <p>
+                title: <input type="text" name="title" value="<!-- TMPL_VAR NAME="title"-->" />
+                author: <input type="text" name="author" value="<!-- TMPL_VAR NAME="author" -->" />
+                publisher: <input type="text" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode"-->" /></p>
+            </th>
+            <th>
+                &nbsp;
+            </th>
+            <th>
+                &nbsp;
+            </th>
+            <th>
+                <input type="submit" class="button acquisition" value="Set Filter" />
+            </th>
+        </tr>
+        <!-- TMPL_LOOP NAME="suggestions_loop" -->
+            <tr>
+                <td>
+                    <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 -->
+                        <!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR NAME="isbn" --></i> <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="publishercode" --><br/>published by:<!-- TMPL_VAR NAME="publishercode" --> <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR NAME="publicationyear" --></i> <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="place" --> at <i><!-- TMPL_VAR NAME="place" --></i> <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="note" --><p><i>(<!-- TMPL_VAR NAME="note" -->)</i></p> <!-- /TMPL_IF -->
+                    </p>
+                </td>
+                <td>
+                    <!-- TMPL_VAR NAME="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamesuggestedby" -->
+                </td>
+                <td>
+                    <!-- TMPL_VAR NAME="surnamemanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamemanagedby" -->
+                </td>
+                <td>
+                    <!-- TMPL_IF name="biblionumber" -->
+                        <a href="neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Order</a>
+                    <!-- TMPL_ELSE -->
+                        <a href="neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->" class="button acquisition">Order</a>
+                    <!-- /TMPL_IF -->
+                </td>
+            </tr>
+        <!-- /TMPL_LOOP -->
+    </table>
+    </form>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl
index ed1c8ee8cc..a0c2d375e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/parcel.tmpl
@@ -2,171 +2,109 @@
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
-<script type="text/javascript">
-function docalculate(){
-  //collect values
-received=document.getElementsByName('received');
- actual=document.getElementsByName('actual');
- freight=document.getElementsByName('freight');
-discounts=document.getElementsByName('discount');
-gstrate=document.getElementsByName('gstrate');
-totalreceived=0;
-totalactual=0;
-totalfreight=0;
-totaldiscount=0;
-totalgst=0;
-	for (var s=0; s<received.length; s++){
-		receivedvalue =received.item(s).value;	
-		totalreceived +=(receivedvalue*1);
-		thisactual =actual.item(s).value*receivedvalue;
-		totalactual +=thisactual;
-		totalfreight +=freight.item(s).value*receivedvalue;
-		thisdiscount =thisactual*discounts.item(s).value/100;
-		totaldiscount +=thisdiscount;
-		totalgst +=(thisactual - thisdiscount)*gstrate.item(s).value/100;
-	}
- document.f.totalreceived.value=totalreceived*1;
- document.f.totalactual.value=totalactual;
- document.f.totalfreight.value=totalfreight*1;
-document.f.actualdiscount.value=totaldiscount;
-includesgst=parseInt(document.f.incgst.value);
- if(includesgst>0){
- document.f.actualgst.value="-inc.-";
- }else{
- document.f.actualgst.value=totalgst;
-}
-document.f.freightgst.value=totalfreight*document.f.freightgstrate.value/100;
-disct=0;
- if ( document.f.actualgst.value>0){
-disct= document.f.actualgst.value;
-}
-document.f.actualtotal.value=totalactual + -totaldiscount +disct*1;
-document.f.actualfreight.value=totalfreight+ document.f.freightgst.value*1;
-document.f.invoicetotal.value=document.f.actualfreight.value*1 +document.f.actualtotal.value*1;
-<!--TMPL_IF NAME="invcurrency"-->
-document.f.localtotal.value=document.f.invoicetotal.value*<!--TMPL_VAR NAME="currencyrate"-->;
-<!--/TMPL_IF-->
-  return true;
-}
-function updatetotal(){
-document.f.actualtotal.value= document.f.totalactual.value - document.f.actualdiscount.value + document.f.actualgst.value*1;
-document.f.invoicetotal.value=document.f.actualfreight.value*1+document.f.actualtotal.value*1;
-<!--TMPL_IF NAME="invcurrency"-->
-document.f.localtotal.value=document.f.invoicetotal.value*<!--TMPL_VAR NAME="currencyrate"-->;
-<!--/TMPL_IF-->
-  return true;
-}
-function checkform(){
-if (document.f.invoice.value==""){
-alert ("You need a suppliers Invoice number!");
-return false;
-}
-if ( document.f.totalreceived.value==0 || document.f.totalreceived.value==""){
-alert ("no items entered as received !");
-return false;
-}
-document.f.submit();
-}
-</script>
+
     <h1>
-                 Orders being recieved from <!-- TMPL_VAR NAME="name" -->
-      
+        <!-- TMPL_IF name="date" -->
+            Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i> <!--TMPL_IF Name="invoice"-->Parcel <i><!-- TMPL_VAR NAME="invoice" --></i><!--/TMPL_IF --> on <i><!-- TMPL_VAR NAME="date" --></i>
+        <!-- TMPL_ELSE -->
+            orders not yet recieved for <!-- TMPL_VAR NAME="name" -->
+        <!-- /TMPL_IF -->
     </h1>
- <form action="finishreceive.pl" method="post" name="orderform" id="f">
-<input type="hidden" name="supplierid" value="<!--TMPL_VAR NAME="supplierid"-->" />
-<div >
-<p>Received By: <!-- TMPL_VAR NAME="user" --></p>
-<p>   Suppliers Invoice No: <input type="text" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
-    
-    Date received:  <input type="text" name="datereceived" value="<!-- TMPL_VAR NAME="date" -->" /></p>
+<div id="acqui_recieve_summary">
+    <p>Parcel: <!-- TMPL_VAR NAME="invoice" --></p>
+    <p>Received by: <!-- TMPL_VAR NAME="loggedinusername" --></p>
+    <p>On: <!-- TMPL_VAR NAME="datereceived" --></p>
 </div>
-<div >
+<div id="acqui_recieve_recievelist">
     <h2>Recieve list</h2>
-   <input type="hidden" name="incgst" value="<!--TMPL_VAR NAME="incgst"-->" />
-  <input type="hidden" name="currencyrate" value="<!--TMPL_VAR NAME="currencyrate"-->" />
-    <table >
-	<tr>Rate of tax used for P&P:<input type="text" size="2" name="freightgstrate" value="<!--TMPL_VAR NAME="gstrate"-->" />%</td>
-        <tr> <th align="left">Basket/Order</th>
-             <th class="acquisition">ISBN</th>
-            <th class="acquisition">Title</th>
-            <th class="acquisition">Price</th>
-	  <th class="acquisition">Actual <!--TMPL_VAR NAME="invcurrency"--></th>
-            <th class="acquisition">P&amp;P <!--TMPL_VAR NAME="invcurrency"--></th>
-            <th class="acquisition">Qty</th>
-	 <th class="acquisition">Received</th>
-            
+    <form action="" method="get" name="orderform">
+    <table>
+        <tr>
+            <th class="acquisition">BASKET</th>
+            <th class="acquisition">Summary</th>
+            <th class="acquisition">QTY ordered</th>
+            <th class="acquisition">Est Cost</th>
+            <th class="acquisition">ACTUAL</th>
+            <th class="acquisition">P&amp;P</th>
+            <th class="acquisition">QTY received</th>
+            <th class="acquisition">TOTAL</th>
         </tr>
-        <!-- TMPL_LOOP NAME="loop_orders" -->
-            <tr><input type="hidden" name="ordernumber" value="<!-- TMPL_VAR NAME="ordernumber" -->" />
-	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-	<input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
-                <td ><!-- TMPL_VAR NAME="basketno" -->/<!-- TMPL_VAR NAME="ordernumber" --></td>
-                <td><!-- TMPL_VAR NAME="isbn" --></td>
-                <td><!-- TMPL_VAR NAME="title" --></td>
-                <td align="right"><!-- TMPL_VAR NAME="rrp" --></td>
-                <td align="right"> <input type="text" size="2" name="actual" value="<!-- TMPL_VAR NAME="actualrrp" -->" onChange="docalculate();"/></td>
-	  <td align="right"> <input type="text" size="2" name="freight" value="0.00" onChange="docalculate();"/></td>
+        <!-- TMPL_LOOP NAME="loop_received" -->
+            <tr>
+                <td><!-- TMPL_VAR NAME="basketno" --></td>
+                <td><a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a>
+                <!-- TMPL_IF NAME="isbn" --><br />ISBN: <!-- TMPL_VAR NAME="isbn" --><!--/TMPL_IF-->
+                <!-- TMPL_IF NAME="author" --><br />author :<!-- TMPL_VAR NAME="author" --><!--/TMPL_IF-->
+                <!-- TMPL_IF NAME="publishercode" --><br />Publisher :<!-- TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
+                </td>
                 <td><!-- TMPL_VAR NAME="quantity" --></td>
-	<td> <input type="text" size="2" name="received" value="<!-- TMPL_VAR NAME="toreceive" -->" onChange="docalculate();"/></td>
-                <input type="hidden" name="discount" value="<!--TMPL_VAR NAME="discount"-->" />
-	<input type="hidden" name="gstrate" value="<!--TMPL_VAR NAME="gst"-->" />
+                <td><!-- TMPL_VAR NAME="ecost" --></td>
+                <td><!-- TMPL_VAR NAME="unitprice" --></td>
+                <td></td>
+                <td><!-- TMPL_VAR NAME="quantityreceived" --></td>
+                <td><!-- TMPL_VAR NAME="total" --></td>
             </tr>
         <!-- /TMPL_LOOP -->
         <tr>
-            <td ></td>
-            <td></td>
-            <th class="acquisition" align="right">SubTotals</th>
-            <td align="right"><b><!-- TMPL_VAR NAME="totalprice" --></b></td>
-	<td align="right"><b><input type="text" name="totalactual" size="2" value="<!-- TMPL_VAR NAME="totalactual" -->" /></b></td>
-            <td align="right"><b><input type="text" size="2" name="totalfreight" /></b></th>
-            <td ><b><!-- TMPL_VAR NAME="totalquantity" --></b></td>
-	 <td ><b><input type="text" size="2" name="totalreceived" value="<!-- TMPL_VAR NAME="totaltoreceive" -->" READONLY /></b></td>
-          
+            <th class="acquisition" colspan="3"></th>
+            <th class="acquisition">SUBTOTALS</th>
+            <th class="acquisition"><!-- TMPL_VAR NAME="totalprice" --></th>
+            <th class="acquisition"><!-- TMPL_VAR NAME="totalfreight" --></th>
+            <th class="acquisition"><!-- TMPL_VAR NAME="totalquantity" --></th>
+            <th class="acquisition"><!-- TMPL_VAR NAME="tototal" --></th>
         </tr>
-	 <!--TMPL_IF NAME="totaldiscount"-->    <tr>
-           <td >&nbsp;</td>
-            <td>&nbsp;</td>
-  <th class="acquisition" align="right">- Discount</th>
-            <td align="right"><b><!-- TMPL_VAR NAME="totaldiscount" --></b></td>
-	<td align="right"><b><input type="text" name="actualdiscount" size="2" value="<!-- TMPL_VAR NAME="actualdiscount" -->" onChange="updatetotal();"/></b></td>
-        </tr><!--/TMPL_IF-->
-     <!--TMPL_IF NAME="gstreg"-->    <tr>
-           <td >&nbsp;</td>
-            <td>&nbsp;</td>
-  <th class="acquisition" align="right">Tax</th>
-            <td align="right"><b><!-- TMPL_VAR NAME="totalgst" --></b></td>
-	<td align="right"><b><input type="text" name="actualgst" size="2" value="<!-- TMPL_VAR NAME="actualgst" -->"/></b></td>
-	<td align="right"><b><input type="text" name="freightgst" size="2"  /></td></b>
-        </tr><!--/TMPL_IF-->
         <tr>
-	 <td >&nbsp;</td>
-            <td>&nbsp;</td>
-            <th class="acquisition" align="right">Totals</th>
-            <td align="right"><b><!-- TMPL_VAR NAME="total" --></b></td>
-	<td align="right"><b><input type="text" name="actualtotal" size="2" value="<!-- TMPL_VAR NAME="actualtotal" -->"   onChange="updatetotal();"/></b></td>
-	<td align="right"><b><input type="text" name="actualfreight" size="2"  onChange="updatetotal();"/></b></td>
-        </tr>
-	<tr>
-	<td >&nbsp;</td>
-	<td >&nbsp;</td>
-            <th class="acquisition" align="right" colspan="5">Invoice Total <!--TMPL_VAR NAME="invcurrency"--></th>         
-	<td ><b><input type="text" name="invoicetotal" size="4"  /></b></td>
+            <td colspan="5">
+            <b>HELP</b>
+                <p>The total at the bottom of the page should be within a few cents of the total for the invoice.</p>
+            </td>
+            <td colspan="2"><b>GST</b></td>
+            <td><!-- TMPL_VAR NAME="gst" --></td>
         </tr>
-	<!--TMPL_IF NAME="invcurrency"-->
-	<tr>
-	<td >&nbsp;</td>
-	<td >&nbsp;</td>
-            <th class="acquisition" align="right" colspan="5">Invoice Total </th>         
-	<td ><b><input type="text" name="localtotal" size="4"  /></b></td>
+        <tr>
+        <td colspan="5">&nbsp;</td>
+            <td colspan="2"><b>TOTAL</b></td>
+            <td><!-- TMPL_VAR NAME="grandtot" --></td>
         </tr>
-	<!--/TMPL_IF-->
     </table>
-Note: P&P is per item. If you have a total freight fill the Total P&P only.!
-	<p><input type="button" value="Receive" onClick="checkform();" /></p>
     </form>
 </div>
-<script>
-updatetotal();
-</script>
+<div id="acqui_recieve_search">
+    <h2>Add a book to the receipt</h2>
+    <form action="/cgi-bin/koha/acqui/orderreceive.pl">
+        <input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->" />
+        <input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->" />
+        <input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->" />
+        <input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
+        <p><b>Search ISBN or Title:</b> <input type="text" size="25" name="recieve" /></p>
+    </form>
+    <table> <caption>or select a pending orders</caption>
+        <tr>
+            <th class="acquisition">BASKET</th>
+            <th class="acquisition">Summary</th>
+            <th class="acquisition">Est. Cost</th>
+            <th class="acquisition">P&amp;P</th>
+            <th class="acquisition">QTY Ordered</th>
+            <th class="acquisition">QTY</th>
+            <th class="acquisition">TOTAL</th>
+        </tr>
+        <!-- TMPL_LOOP NAME="loop_orders" -->
+            <tr>
+                <td><!-- TMPL_VAR NAME="basketno" --></td>
+                <td>
+                  <a href="orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;daterecieved=<!-- TMPL_VAR NAME="datereceived" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a>
+                <!-- TMPL_IF NAME="isbn" --><br />ISBN: <!-- TMPL_VAR NAME="isbn" --><!--/TMPL_IF-->
+                <!-- TMPL_IF NAME="author" --><br />author :<!-- TMPL_VAR NAME="author" --><!--/TMPL_IF-->
+                <!-- TMPL_IF NAME="publishercode" --><br />Publisher :<!-- TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
+                </td>
+                <td><!-- TMPL_VAR NAME="unitprice" --></td>
+                <td></td>
+                <td><!-- TMPL_VAR NAME="quantity" --></td>
+                <td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
+                <td><!-- TMPL_VAR NAME="ecost" --></td>
+            </tr>
+        <!-- /TMPL_LOOP -->
+     </table>
+</div>
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
  
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl
index ba67cf9ecc..ceaa26dcde 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl
@@ -1,106 +1,128 @@
- <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Recieve <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Recieve <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
-<h1 class="acquisition">Receive parcel from supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
+<h1>Receive parcel from supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
 
 <!-- TMPL_IF NAME="count" --><p> <!-- TMPL_VAR NAME="count" --> parcels found</p><!--/TMPL_IF-->
 <div id="resultnumber">
 <!-- Row of numbers corresponding to search result pages -->
 <!-- TMPL_IF NAME="displayprev" -->
-	<a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0"></a>
+    <a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0"></a>
 <!-- TMPL_ELSE -->
-	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
+    <img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
 <!-- /TMPL_IF -->
 <!-- TMPL_LOOP NAME="numbers" -->
-	<!-- TMPL_IF NAME="highlight" -->
-	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
-	<!-- TMPL_ELSE -->
-	<a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
-	<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="highlight" -->
+    <img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+    <!-- TMPL_ELSE -->
+    <a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
+    <!-- /TMPL_IF -->
 <!-- /TMPL_LOOP -->
 <!-- TMPL_IF NAME="displaynext" -->
-	<a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
+    <a href="parcels.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
 <!-- TMPL_ELSE -->
-	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
+    <img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
 <!-- /TMPL_IF -->
 </div>
 
 <div id="resultlist">
 <!-- Search Results Table -->
-
+<!-- TMPL_IF NAME="count" -->
 <form method="post" action="parcels.pl">
-	<table class="small">
-		<tr>
-			<th class="acquisition">Line</th>
-			<th class="acquisition">Code</th>
-			<th class="acquisition">Date Received</th>
-			<th class="acquisition">Item Count</th>
-			<th class="acquisition">Biblio count</th>
-			<th class="acquisition">Items expected</th>
-		</tr>
-		<tr>
-			<th class="acquisition">
-				&nbsp;
-				<input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
-			</th>
-			<th class="acquisition">
-				<input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->">
-			</th>
-			<th class="acquisition">
-				From :<input type="text" size="9" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->"> 
-				<p>To :<input type="text" size="9" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->">
-			</th>
-			<th class="acquisition">
-				&nbsp;
-			</th>
-			<th class="acquisition">
-				Sort by :<select name="orderby" size="1">
-				<option value="aqorders.booksellerinvoicenumber"> Invoice- Ascending order</option>
-				<option value="datereceived"> Date Received</option>
-				<option value="datereceived desc"> Date Received reverse</option>
-				<option value="aqorders.booksellerinvoicenumber desc"> Invoice reverse</option>
-				</select><br />
-				Results per page :<select name="resultsperpage" value ="<!--TMPL_VAR Name="resultsperpage"-->" size="1">
-				<option value="20">20</option>
-				<option value="30">30</option>
-				<option value="50">50</option>
-				<option value="100">100</option>
-				</select>
-			</th>
-			<th class="acquisition">
-				<input type="submit" class="button acquisition" value="Filter">
-			</th>
-		</tr>
+    <table class="small">
+        <tr>
+            <th>Line</th>
+            <th>Code</th>
+            <th>Date Received</th>
+            <th>Item Count</th>
+            <th>Biblio count</th>
+            <th>Items expected</th>
+        </tr>
+        <tr>
+            <th>
+                &nbsp;
+                <input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
+            </th>
+            <th>
+                <input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->">
+            </th>
+            <th>
+                From :<input type="text" size="9" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->"> 
+                <p>To :<input type="text" size="9" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->">
+            </th>
+            <th>
+                &nbsp;
+            </th>
+            <th>
+                Sort by :<select name="orderby" size="1">
+                <option value="aqorders.booksellerinvoicenumber"> Code</option>
+                <option value="datereceived"> Date Received</option>
+                <option value="datereceived desc"> Date Received reverse</option>
+                <option value="aqorders.booksellerinvoicenumber desc"> Code reverse</option>
+                </select><br />
+                Results per page :<select name="resultsperpage" value ="<!--TMPL_VAR Name="resultsperpage"-->" size="1">
+                <option value="20">20</option>
+                <option value="30">30</option>
+                <option value="50">50</option>
+                <option value="100">100</option>
+                </select>
+            </th>
+            <th>
+                <input type="submit" class="button acquisition" value="Filter">
+            </th>
+        </tr>
 <!-- Actual Search Results -->
 <!-- TMPL_LOOP NAME="searchresults" -->
-	<tr>
-		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-			<!-- TMPL_VAR NAME="number" -->
-		</td>
-		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-			<!--TMPL_IF Name="code"--><!--TMPL_VAR Name="code" --><!--/TMPL_IF-->
-		</td>
-		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
-		<!-- /TMPL_IF -->
-			<a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&amp;datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&amp;code=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
-				<!-- TMPL_VAR NAME="datereceived" -->
-			</a>
-		</td>
-		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
-		<!-- /TMPL_IF -->
-			<!-- TMPL_VAR NAME="reccount" --> 
-		</td>
-		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-			<!-- TMPL_VAR NAME="bibcount" -->
-		</td>
-		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-			<!-- TMPL_VAR NAME="itemcount" -->
-		</td>
-	</tr>
+    <tr>
+        <!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+            <!-- TMPL_VAR NAME="number" -->
+        </td>
+        <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+            <!--TMPL_IF Name="code"--><!--TMPL_VAR Name="code" --><!--/TMPL_IF-->
+        </td>
+        <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
+        <!-- /TMPL_IF -->
+            <a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&amp;datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&amp;code=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
+                <!-- TMPL_VAR NAME="datereceived" -->
+            </a>
+        </td>
+        <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
+        <!-- /TMPL_IF -->
+            <!-- TMPL_VAR NAME="reccount" --> 
+        </td>
+        <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+            <!-- TMPL_VAR NAME="bibcount" -->
+        </td>
+        <!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+            <!-- TMPL_VAR NAME="itemcount" -->
+        </td>
+    </tr>
 <!-- /TMPL_LOOP -->
 </table>
 </form>
-
-
+<!--/TMPL_IF-->
+    <div id="parcels_new_parcel">
+    <fieldset>
+    <legend>Receive a new Parcel </legend>
+        <form method="get" action="parcel.pl">
+        <p>
+            <input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
+            <label>Parcel Code</label>
+            <input type="text" size="20" name="invoice">
+        </p>
+        <p>
+            <label>GST</label>
+            <input type="text" size="20" name="gst">
+        </p>
+        <p>
+            <label>Freight</label>
+            <input type="text" size="20" name="freight">
+        </p>
+        <p>
+            <input type="submit" class="button acquisition" value="save">
+        </p>
+        </form>
+    </fieldset>
+    </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl
index 6b8668b9a1..c7a605ac76 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl
@@ -2,140 +2,246 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
 
-	<!-- TMPL_IF name="id" -->
-		<h1>Update: <!-- TMPL_VAR NAME="name" --></h1>
-	<!-- TMPL_ELSE -->
-		<h1>Add supplier</h1>
-	<!-- /TMPL_IF -->
-	<form action="updatesupplier.pl" method="post">
-	<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
-	<div id="acqui_supplier_company">
-		<h2>COMPANY DETAILS</h2>
-		<p>
-			<label>Company Name</label>
-			<input type="text" size="40" name="company" value="<!-- TMPL_VAR NAME="name" -->" />
-		</p>
-		<p>
-			<label>Postal Address</label>
-				<textarea name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
-		</p>
-		<p>
-			<label>Physical Address</label>
-			<textarea name="physical" cols="40" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
-		</p>
-		<p>
-			<label>Phone</label>
-			<input type="text" size="20" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->" />
-		</p>
-		<p>
-			<label>Fax</label>
-			<input type="text" size="20" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->" />
-		</p>
-		<p>
-			<label>Website</label>
-			<input type="text" size="40" name="website" value="<!-- TMPL_VAR NAME="url" -->" />
-		</p>
-		<h2 class="acquisition">CONTACT DETAILS</h2>
-		<p>
-			<label>Contact Name</label>
-			<input type="text" size="40" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->" />
-		</p>
-		<p>
-			<label>Position</label>
-			<input type="text" size="40" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->" />
-		</p>
-		<p>
-			<label>Phone</label>
-			<input type="text" size="20" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->" />
-		</p>
-		<p>
-			<label>Alternative phone</label>
-			<input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->" />
-		</p>
-		<p>
-			<label>Fax</label>
-			<input type="text" size="20" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->" />
-		</p>
-		<p>
-			<label>E-mail</label>
-			<input type="text" size="40" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->" />
-		</p>
-		<p>
-			<label>Notes</label>
-			<textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
-		</p>
-	</div>
-	<div id="acqui_supplier_status">
-		<h2>CURRENT STATUS</h2>
-		<p>
-			<label>Supplier is</label>
-				<!-- TMPL_IF name="active" -->
-					<input type="radio" name="status" value="1" checked="checked" />Active
-					<input type="radio" name="status" value="0" />Inactive
-				<!-- TMPL_ELSE -->
-					<input type="radio" name="status" value="1" />Active
-					<input type="radio" name="status" value="0" checked="checked" />Inactive
-				<!-- /TMPL_IF -->
-		</p>
-	</div>
-	<div id="acqui_supplier_ordering">
-		<h2>ORDERING INFORMATION</h2>
-		<p>
-			<label>Publishers and Imprints</label>
-			<textarea name="publishers_imprints" cols="20" rows="4"><!-- TMPL_VAR NAME="specialty" --></textarea>
-		</p>
-		<p>
-			<label>List Prices are</label>
-				<select name="list_currency" size="1">
-				<!-- TMPL_LOOP NAME="loop_pricescurrency" -->
-					<!-- TMPL_VAR NAME="currency" -->
-				<!-- /TMPL_LOOP -->
-				</select>
-		</p>
-		<p>
-			<label>Invoice Prices are</label>
-				<select name="invoice_currency" size="1">
-				<!-- TMPL_LOOP NAME="loop_invoicecurrency" -->
-					<!-- TMPL_VAR NAME="currency" -->
-				<!-- /TMPL_LOOP -->
-				</select>
-		</p>
-		<p>
-			<label>GST Registered</label>
-				<!-- TMPL_IF name="gstreg" -->
-					<input type="radio" name="gst" value="1" checked="checked" /> Yes
-					<input type="radio" name="gst" value="0" /> No
-				<!-- TMPL_ELSE -->
-					<input type="radio" name="gst" value="1" /> Yes
-					<input type="radio" name="gst" value="0" checked="checked" /> No
-				<!-- /TMPL_IF -->
-		</p>
-		<p>
-			<label>List Item Price Includes GST</label>
-				<!-- TMPL_IF name="listincgst" -->
-					<input type="radio" name="list_gst" value="1" checked="checked" /> Yes
-					<input type="radio" name="list_gst" value="0" /> No
-				<!-- TMPL_ELSE -->
-					<input type="radio" name="list_gst" value="1" /> Yes
-					<input type="radio" name="list_gst" value="0" checked="checked" /> No
-				<!-- /TMPL_IF -->
-		</p>
-		<p>
-			<label>Invoice Item Price Includes GST</label>
-				<!-- TMPL_IF name="invoiceincgst" -->
-					<input type="radio" name="invoiceincgst" value="1" checked="checked" /> Yes
-					<input type="radio" name="invoiceincgst" value="0" /> No
-				<!-- TMPL_ELSE -->
-					<input type="radio" name="invoiceincgst" value="1" /> Yes
-					<input type="radio" name="invoiceincgst" value="0" checked="checked" /> No
-				<!-- /TMPL_IF -->
-		</p>
-		<p>
-			<label>Discount</label>
-			<input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->" /> %
-		</p>
-	</div>
-	<input type="submit"  name="submit" value="save" />
-	</form>
+<!--TMPL_IF Name="enter"-->
+    <form action=updatesupplier.pl method="post">
+    
+    <input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->">
+    
+    <!-- TMPL_IF name="id" -->
+        <h1>Update: <!-- TMPL_VAR NAME="name" --></h1>
+    <!-- TMPL_ELSE -->
+        <h1>Add supplier</h1>
+    <!-- /TMPL_IF -->
+        <fieldset>
+            <legend>Company details</legend>
+            <p>
+                <label>Company Name</label>
+                <input type="text" size="40" name="company" value="<!-- TMPL_VAR NAME="name" -->">
+            </p>
+            <p>
+                <label>Postal Address</label>
+                    <textarea name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
+            </p>
+            <p>
+                <label>Physical Address</label>
+                <textarea name="physical" cols="40" rows="3"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
+            </p>
+            <p>
+                <label>Phone</label>
+                <input type="text" size="20" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->">
+            </p>
+            <p>
+                <label>Fax</label>
+                <input type="text" size="20" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->">
+            </p>
+            <p>
+                <label>Website</label>
+                <input type="text" size="40" name="website" value="<!-- TMPL_VAR NAME="url" -->">
+            </p>
+        </fieldset>
+        <fieldset>
+            <legend>Contact details</legend>
+            <p>
+                <label>Contact Name</label>
+                <input type="text" size="40" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->">
+            </p>
+            <p>
+                <label>Position</label>
+                <input type="text" size="40" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->">
+            </p>
+            <p>
+                <label>Phone</label>
+                <input type="text" size="20" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->">
+            </p>
+            <p>
+                <label>Alternative phone</label>
+                <input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->">
+            </p>
+            <p>
+                <label>Fax</label>
+                <input type="text" size="20" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->">
+            </p>
+            <p>
+                <label>E-mail</label>
+                <input type="text" size="40" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->">
+            </p>
+            <p>
+                <label>Notes</label>
+                <textarea name="contact_notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
+            </p>
+        </fieldset>
+        <fieldset>
+            <legend>Ordering informations</legend>
+            <p>
+                <label>Supplier is</label>
+                    <!-- TMPL_IF name="active" -->
+                        <input type="radio" name="status" value="1" checked>Active
+                        <input type="radio" name="status" value="0">Inactive</td>
+                    <!-- TMPL_ELSE -->
+                        <input type="radio" name="status" value="1">Active
+                        <input type="radio" name="status" value="0" checked>Inactive</td>
+                    <!-- /TMPL_IF -->
+            </p>
+            <p>
+                <label>Preferred publishers</label>
+                <textarea name="publishers_imprints" cols="40" rows="3"><!-- TMPL_VAR NAME="specialty" --></textarea>
+            </p>
+            <p>
+                <label>List Prices are</label>
+                    <select name="list_currency" size="1">
+                    <!-- TMPL_LOOP NAME="loop_pricescurrency" -->
+                        <!-- TMPL_VAR NAME="currency" -->
+                    <!-- /TMPL_LOOP -->
+                    </select>
+            </p>
+            <p>
+                <label>Invoice Prices are</label>
+                    <select name="invoice_currency" size="1">
+                    <!-- TMPL_LOOP NAME="loop_invoicecurrency" -->
+                        <!-- TMPL_VAR NAME="currency" -->
+                    <!-- /TMPL_LOOP -->
+                    </select>
+            </p>
+            <!-- TMPL_IF NAME="GST" --><p>
+                <label>GST Registered</label>
+                    <input type="radio" name="gst" value="1" <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Yes
+                    <input type="radio" name="gst" value="0" <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>No
+            </p><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0"><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="GST" --><p>
+                <label>Ordering prices</label>
+                    <input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>include GST
+                    <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>don't include GST
+            </p><!-- TMPL_ELSE --><input type="hidden" name="list_gst" value="0"><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="GST" --><p>
+                <label>Invoice prices</label>
+                    <input type="radio" name="invoice_gst" value="1" <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>include GST
+                    <input type="radio" name="invoice_gst" value="0" <!-- TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>don't include GST
+            </p><!-- TMPL_ELSE --><input type="hidden" name="invoice_gst" value="0"><!-- /TMPL_IF -->
+            <p>
+                <label>Discount</label>
+                <input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->"> %
+            </p>
+            <p>
+                <label>Notes</label>
+                <textarea cols="40" rows="4" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea>
+            </p>
+        </fieldset>
+        <p><input type="submit" value="Save" /></p>
+    </form>
+<!--TMPL_ELSE-->
+    <h1>Information for : <!-- TMPL_VAR NAME="name" --></h1>
+    <div id="action">
+        <a href="supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->&op=enter">
+            Edit Supplier
+        </a>
+        <a href="booksellers.pl?supplier=<!--TMPL_VAR Name="id"-->">
+            Manage Orders
+        </a>
+        <a href="parcels.pl?supplierid=<!--TMPL_VAR Name="id"-->"> 
+            Receive Parcel
+        </a>
+    </div>
+        <fieldset>
+            <legend>Company details</legend>
+            <p>
+                <label>Company Name</label>
+                <!-- TMPL_VAR NAME="name" -->&nbsp;
+            </p>
+            <p>
+                <label>Postal Address</label>
+                    <!-- TMPL_VAR NAME="postal" -->&nbsp;
+            </p>
+            <p>
+                <label>Physical Address</label>
+                <!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" -->&nbsp;
+            </p>
+            <p>
+                <label>Phone</label>
+                <!-- TMPL_VAR NAME="phone" -->&nbsp;
+            </p>
+            <p>
+                <label>Fax</label>
+                <!-- TMPL_VAR NAME="fax" -->&nbsp;
+            </p>
+            <p>
+                <label>Website</label>
+                <!-- TMPL_VAR NAME="url" -->&nbsp;
+            </p>
+        </fieldset>
+        <fieldset>
+            <legend>Contact details</legend>
+            <p>
+                <label>Contact name</label>
+                <!-- TMPL_VAR NAME="contact" -->&nbsp;
+            </p>
+            <p>
+                <label>Position</label>
+                <!-- TMPL_VAR NAME="contpos" -->&nbsp;
+            </p>
+            <p>
+                <label>Phone</label>
+                <!-- TMPL_VAR NAME="contphone" -->&nbsp;
+            </p>
+            <p>
+                <label>Alternative phone</label>
+                <!-- TMPL_VAR NAME="contaltphone" -->&nbsp;
+            </p>
+            <p>
+                <label>Fax</label>
+                <!-- TMPL_VAR NAME="contfax" -->&nbsp;
+            </p>
+            <p>
+                <label>E-mail</label>
+                <!-- TMPL_VAR NAME="contemail" -->&nbsp;
+            </p>
+            <p>
+                <label>Notes</label>
+                <!-- TMPL_VAR NAME="contnotes" -->&nbsp;
+            </p>
+        
+        </fieldset>
+        <fieldset>
+        <legend>Ordering informations</legend>
+            <p>
+                <label>Supplier is</label>
+                    <!-- TMPL_IF name="active" -->
+                        Active
+                    <!-- TMPL_ELSE -->
+                        Inactive
+                    <!-- /TMPL_IF -->
+            </p>
+            <p>
+                <label>Publishers and Imprints</label>
+                <!-- TMPL_VAR NAME="specialty" -->&nbsp;
+            </p>
+            <p>
+                <label>List Prices are</label><!--TMPL_VAR Name="listprice"-->&nbsp;
+            </p>
+            <p>
+                <label>Invoice Prices are</label><!--TMPL_VAR Name="invoiceprice"-->&nbsp;
+            </p>
+            <p>
+                <label>GST Registered</label>
+                    <!-- TMPL_IF name="gstreg" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
+            </p>
+            <p>
+                <label>List Item Price Includes GST</label>
+                    <!-- TMPL_IF name="listincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
+            </p>
+            <p>
+                <label>Invoice Item Price Includes GST</label>
+                    <!-- TMPL_IF name= "invoiceincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
+            </p>
+            <p>
+                <label>Discount</label>
+                <!-- TMPL_VAR NAME="discount" --> %&nbsp;
+            </p>
+            <p>
+                <label>Notes</label>
+                <!-- TMPL_VAR NAME="notes" -->&nbsp;
+            </p>
+        </fieldset>
+</div>
+<!--/TMPL_IF-->
 
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl
index 896534fe34..b16d646e2a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl
@@ -3,107 +3,91 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
-<div id="main">
-<h1>NEULIS Administration</h1>
-<div class="menu">
+<h1>Koha Administration</h1>
+
 <table>
 <caption>System Preferences</caption>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></th>
+	<td><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></td>
 	<td>Change essential system preferences like MARC flavor, date format, administrator e-mail, and templates.</td>
 </tr>
 </table>
 <table>
-<caption>System parameters </caption>
+<caption>For best results, configure these parameters in the order they appear</caption>
 <tr>
-<th class="header" colspan="2">For best results, configure these parameters in the order they appear</th>
+<th colspan="2">Basic parameters</th>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/koha-news.pl">OPAC news</a></th>
-	<td>Manage the news in the OPAC main page.</td>
+	<td><a href="/cgi-bin/koha/admin/branches.pl">Library branches</a></td>
+	<td>The different branches you manage with this Koha server.</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/opac-electronic.pl">OPAC electronic</a></th>
-	<td>Manage the online OPAC databases.</td>
-</tr>
-	<tr>
-	<th><a href="/cgi-bin/koha/admin/institutions-careers.pl">Faculties-courses</a></th>
-	<td>Add courses to faculties.</td>
+	<td><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></td>
+	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/viewlog.pl">View Logs</a></th>
-	<td>View Logs.</td>
+	<td><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></td>
+	<td>Define exchange rates.</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/holidays/holidays.pl?branch=MAIN">Holiday Management</a></th>
-	<td>Set the days library is closed for circulation purposes.</td>
+	<td><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></td>
+	<td>Define item types.</td>
 </tr>
+
 <tr>
-	<th><a href="/cgi-bin/koha/admin/branches.pl">Library branches</a></th>
-	<td>The different branches you manage with this Koha server.</td>
+<th colspan="2">Patrons and circulation</th>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></th>
-	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
+	<td><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></td>
+	<td>Define the categories of borrowers.</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
-	<td>Define exchange rates.</td>
-</tr>
+	<td><a href="/cgi-bin/koha/admin/cities.pl">City</a></td>
+	<td>Define cities. Fill it to get a list of cities to create your patrons quicker.</td>
+</tr>	
 <tr>
-	<th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
-	<td>Define item types.</td>
+	<td><a href="/cgi-bin/koha/admin/roadtype.pl" >Road Type</a>
+	</td>
+	<td>Define road types. Fill this table to get a list of road types (will help Geographic stats)</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></th>
-	<td>Define the categories of borrowers.</td>
+	<td><a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></td>
+	<td>Define issuing rules for branches / borrowers / item types (nb of issues, duration, cost...)</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></th>
-	<td>Define issuing rules for branches / borrowers / item types (nb of issues, duration, cost...)</td>
+<th colspan="2">Catalogue</th>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></th>
+	<td><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></td>
 	<td>Define categories and authorised values for them. Authorised values are used in MARC form to limit and help editing MARC biblios.</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/authtypes.pl">Authorities Structure</a></th>
+	<td><a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Structure</a></td>
 	<td>Define categories and thesaurus/authority MARC structure.</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/biblios_framework.pl">Biblio framework (MARC structure)</a></th>
+	<td><a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio framework (MARC structure)</a></td>
 	<td>the frameworks defined for the MARC editor. Create frameworks, then define the MARC structure (fields &amp; subfields)</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/holdingstagstructure.pl">Holdings framework (MARC structure)</a></th>
-	<td>the frameworks defined for theholdings MARC editor. (Complements the Biblios framework)</td>
+	<td><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links Koha - MARC DB</a></td>
+	<td>Define links between the Koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage.</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/koha_attr.pl">Links MARC - ZEBRA</a></th>
-	<td>Define links between the ZEBRA DB and the MARC one. </td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th>
+	<td><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></td>
 	<td>Checks the MARC structure. USE IT before working with real data. It will show mistakes that can BREAK Koha's database!</td></tr>
 
 <tr>
-<th colspan="2" class="header">Various parameters</th>
+<th colspan="2">Various parameters</th>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
+	<td><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></td>
 	<td>Printers (UNIX paths).</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></th>
-	<td>Words deleted during searches.</td>
-</tr>
-<tr>
-	<th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></th>
+	<td><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></td>
 	<td>Servers to query for MARC data.</td>
 </tr>
 </table>
 
-
-</div>
-
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl
index adc87c2067..65f0775fca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl
@@ -71,9 +71,9 @@ Koha -- System Administration: Book Funds
       <!-- /TMPL_IF -->
     </td>
     <td>
-      <a href="<!-- TMPL_VAR name="scriptname" -->?op=add_form&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->">Edit</a>
-      <a href="<!-- TMPL_VAR name="scriptname" -->?op=delete_confirm&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->">Delete</a>
-      <a href="aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->">Add budget</a>
+      <a href="<!-- TMPL_VAR name="scriptname" -->?op=add_form&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->&amp;branchcode=<!-- TMPL_VAR name="branchcode" -->">Edit</a>
+      <a href="<!-- TMPL_VAR name="scriptname" -->?op=delete_confirm&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->&amp;branchcode=<!-- TMPL_VAR name="branchcode" -->">Delete</a>
+      <a href="aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->&amp;branchcode=<!-- TMPL_VAR name="branchcode" -->">Add budget</a>
       <!-- TMPL_IF NAME="has_budgets" -->
       <a href="aqbudget.pl?filter_bookfundid=<!-- TMPL_VAR name="bookfundid" -->">Show budgets</a>
       <!-- /TMPL_IF -->
@@ -190,8 +190,12 @@ Koha -- System Administration: Book Funds
       <td>
         <select name="branchcode">
           <option value="">None</option>
-  <!-- TMPL_LOOP NAME="branches" -->  
-          <option value="<!-- TMPL_VAR NAME="branchcode" -->"  <!-- TMPL_IF NAME="selected" -->selected="selected" <!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option>
+  <!-- TMPL_LOOP NAME="branches" -->
+    <!-- TMPL_IF NAME="selected" -->
+          <option value="<!-- TMPL_VAR NAME="branchcode" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
+    <!-- TMPL_ELSE -->
+          <option value="<!-- TMPL_VAR NAME="branchcode" -->"><!-- TMPL_VAR NAME="branchname" --></option>
+    <!-- /TMPL_IF -->
   <!-- /TMPL_LOOP -->
       </td>
     </tr>
@@ -200,7 +204,6 @@ Koha -- System Administration: Book Funds
 
   <p>
     <input type="button" value="Submit" onclick="Check(this.form); return false;" />
-    <input type="reset" value="Reset" />
   </p>
 </form>
 <!-- /TMPL_IF --> <!-- add_form -->
@@ -220,6 +223,10 @@ Koha -- System Administration: Book Funds
     <th>Book fund</th>
     <td><!-- TMPL_VAR name="bookfundid" --></td>
   </tr>
+  <tr>
+    <th>Branch</th>
+    <td><!-- TMPL_VAR name="branchcode" --></td>
+  </tr>
   <tr>
     <th>Name</th>
     <td><!-- TMPL_VAR name="bookfundname" --></td>
@@ -233,6 +240,7 @@ Koha -- System Administration: Book Funds
 <form action="<!-- TMPL_VAR name="action" -->" method="post">
   <input type="hidden" name="op" value="delete_confirmed" />
   <input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" />
+  <input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" -->" />
 
   <div id="action">
     <input type="submit" value="Delete this Fund" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/aqbudget.tmpl
index 7664ec4d80..23371440dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/aqbudget.tmpl
@@ -87,7 +87,7 @@ Koha -- System Administration: Budgets
         Calendar.setup(
           {
             inputField : "filter_startdate",
-            ifFormat : "%Y-%m-%d",
+            ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
             button : "filter_startdate_button"
           }
         );
@@ -119,7 +119,7 @@ Koha -- System Administration: Budgets
         Calendar.setup(
           {
             inputField : "filter_enddate",
-            ifFormat :"%Y-%m-%d",
+            ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
             button : "filter_enddate_button"
           }
         );
@@ -170,10 +170,6 @@ Koha -- System Administration: Budgets
     </td>
   </tr>
   <!-- /TMPL_LOOP --> <!-- budget -->
-<p>
-  <a href="aqbookfund.pl?op=add_form">Add bookfund</a>
-  <a href="aqbudget.pl">Show all budgets</a>
-</p>
 </table>
 
 <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
@@ -260,7 +256,7 @@ Koha -- System Administration: Budgets
             Calendar.setup(
               {
                 inputField : "startdate",
-                ifFormat : "%Y-%m-%d",
+                ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                 button : "startdate_button"
               }
             );
@@ -278,7 +274,7 @@ Koha -- System Administration: Budgets
             Calendar.setup(
               {
                 inputField : "enddate",
-                ifFormat : "%Y-%m-%d",
+                ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                 button : "enddate_button"
               }
             );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl
index 87ee6f2e16..82f76b1968 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl
@@ -3,42 +3,34 @@
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+
 <!-- TMPL_IF NAME="add_form" -->
 
-	<h1><!-- TMPL_IF NAME="use-heading-flags-p" -->
+	<h><!-- TMPL_IF NAME="use-heading-flags-p" -->
 	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
 	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h1>
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
 	<input type="hidden" name="op" value="add_validate" />
 	<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
 	<!-- TMPL_LOOP NAME="loop" -->
-	<div class="data <!-- TMPL_VAR NAME="toggle" -->"><h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
-	<table>
-	<caption>MARC constraints</caption>
-	<tr><th><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable:</label></th><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
-	<tr><th><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory:</label></th><td><!-- TMPL_VAR NAME="mandatory" --> </td></tr>
-	<tr><th><label for="seealso<!-- TMPL_VAR NAME="row" -->">Search also:</label></th><td><input type="text" id="seealso<!-- TMPL_VAR NAME="row" -->" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a: '200c','200d','200e'...)</td></tr>
-			</table>
-	<table>
-	<caption>Editor constaints</caption>
-	<tr><th><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian:</label></th><td><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></td></tr>
-	<tr><th><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC:</label></th><td><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></td></tr>
-	<tr><th><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab:</label></th><td><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</td></tr>
-
-	<tr><th><label for="hidden<!-- TMPL_VAR NAME="row" -->">Hidden:</label></th><td> Opac:<!-- TMPL_VAR name="ohidden" -->  Intranet:<!-- TMPL_VAR name="ihidden" --> Editor:<!-- TMPL_VAR name="ehidden" --> (see online help)</td></tr>
-
-	<tr><th><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL: </label></th><td><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked</td></tr>
-	<tr><th><label for="link<!-- TMPL_VAR NAME="row" -->">Is a Linking field: </label></th><td><!-- TMPL_VAR NAME="link" --> (if checked, it means that the subfield is used for linking authorities</td></tr>
-
-<tr><th><label>Default Options: <p>(choose one)</p></label></th><td>
-<ul>
-	<li>Authorized Value: <!-- TMPL_VAR NAME="authorised_value" --></li>
-	<li>Thesaurus: <!-- TMPL_VAR NAME="authtypecode" --></li>
-	<li>Plugin: <!-- TMPL_VAR NAME="value_builder" --></li>
-</ul>
-</td></tr>	 
-		</table>
-		</div>
+	<div class="data <!-- TMPL_VAR NAME="toggle" -->">
+	   <h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
+	   <p><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable:</label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</p>
+	   <p><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory:</label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</p>
+	   <p><label for="seealso<!-- TMPL_VAR NAME="row" -->">Search also:</label><input type="text" id="seealso<!-- TMPL_VAR NAME="row" -->" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a: '200c','200d','200e'...)</p>
+	   <p><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" /></p>
+	   <p><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" /></p>
+	   <p><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab</label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</p>
+	   <p><label for="hidden<!-- TMPL_VAR NAME="row" -->">Hidden</label> Opac:<!-- TMPL_VAR name="ohidden" -->  Intranet:<!-- TMPL_VAR name="ihidden" --> Editor:<!-- TMPL_VAR name="ehidden" --> (see online help)</p>
+	   <p><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL </label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked)</p>
+        <p><label>Help input:</label>
+        <ul>
+            <li>Authorized Value <!-- TMPL_VAR NAME="authorised_value" --></li>
+            <li>Thesaurus <!-- TMPL_VAR NAME="frameworkcode" --></li>
+            <li>Plugin <!-- TMPL_VAR NAME="value_builder" --></li>
+        </ul>
+        </p>	 
+    </div>
 	<!-- /TMPL_LOOP -->
 	<input type="submit" class="submit" value="Save Changes" />
 	<p>Note: in the last column, you can choose:
@@ -58,7 +50,7 @@
 		<th>Subfield</th>
 		<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
 	</tr>
-	<tr><th>Description</th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+	<p>Description<!-- TMPL_VAR NAME="liblibrarian" --></p>
 </table></div>
 			<form class="inline" action="<!-- TMPL_VAR NAME="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
 				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
@@ -79,6 +71,7 @@
 <!-- TMPL_IF NAME="else" -->
 <h1>Authority MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> (authority: <!--TMPL_VAR NAME="authtypecode" -->)</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 <b>Koha field</b> shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, and a Koha interface. This link ensures that both DB are synchronized</p>
 
 <table>
 <tr>
@@ -101,31 +94,44 @@
 			<i>subfield ignored</i>
 		<!-- TMPL_ELSE -->
 			<strong>Tab:</strong><!-- TMPL_VAR NAME="tab" -->,
-			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="seealso" --> | <strong>See Also:</strong> <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="authorised_value" --> | <strong>Auth value:</strong><!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="authtypecode" --> | <strong>Authority:</strong><!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="kohafield" --> | <strong>Koha field:</strong> <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
+			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,
+            <!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,
+            <!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="seealso" --> | <strong>See Also:</strong> <!-- TMPL_VAR NAME="seealso" -->,
+            <!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="hidden" -->hidden,
+            <!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="isurl" -->is an url,
+            <!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="authorised_value" --> | <strong>Auth value:</strong><!-- TMPL_VAR NAME="authorised_value" -->,
+            <!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="frameworkcode" --> | <strong>Authority:</strong><!-- TMPL_VAR NAME="frameworkcode" -->,
+            <!-- /TMPL_IF -->
 			<!-- TMPL_IF NAME="value_builder" --> | <strong>Plugin:</strong><!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="link" --> | <strong>Link:</strong><!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
-		<!-- /TMPL_IF -->
+          <!--/TMPL_IF-->
 	</td>
 	<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
-<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="edit_tagfield" -->" /><input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="edit_authtypecode" -->" /><input type="submit" class="submit" value="Edit Subfields" /></form> <form class="inline" action="auth_tag_structure.pl" method="get"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" /><input type="submit" class="submit" value="Return to Auth Structure" /></form>
-<!-- TMPL_IF NAME="previous" -->
-	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" >
-	</a><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="next" -->
+<div id="action">
+    <a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&tagfield=<!-- TMPL_VAR name="edit_tagfield" -->&authtypecode=<!-- TMPL_VAR name="edit_authtypecode" -->">Edit subfields</a>
+    <a href="auth_tag_structure.pl?searchfield=<!-- TMPl_VAR name="tagfield" -->&authtypecode=<!-- TMPL_VAR name="authtypecode"-->">Return to Auth Structure</a>
+</div>
+    <!-- TMPL_IF NAME="previous" -->
+      <input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" >
+      </a>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="next" -->
 	<!-- TMPL_VAR NAME="next" -->
-		<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0" />
-	</a>
-<!-- /TMPL_IF -->
+      <input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0" />
+      </a>
+    <!-- /TMPL_IF -->
+
 <!-- /TMPL_IF -->
 
 
+
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl
index 1902d1d4de..dc3eee6dd4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl
@@ -6,118 +6,134 @@
 
 <h1>Authority MARC framework for <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE -->default framework<!-- /TMPL_IF --></h1>
 <script language="javascript" type="text/javascript">
-	function _(s) { return s } // dummy function for gettext
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isNotNull(f,noalert) {
-		if (f.value.length ==0) {
-   return false;
-		}
-		return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function toUC(f) {
-		var x=f.value.toUpperCase();
-		f.value=x;
-		return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isNum(v,maybenull) {
-	var n = new Number(v.value);
-	if (isNaN(n)) {
-		return false;
-		}
-	if (maybenull==0 && v.value=='') {
-		return false;
-	}
-	return true;
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function isDate(f) {
-		var t = Date.parse(f.value);
-		if (isNaN(t)) {
-			return false;
-		}
-	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	function Check(f) {
-		var ok=1;
-		var _alertString="";
-		var alertString2;
-		if (f.tagfield.value.length==0) {
-			_alertString += "\n- " + _("tag number missing");
-		}
-		if (_alertString.length==0) {
-			document.Aform.submit();
-		} else {
-			alertString2  = _("Form not submitted because of the following problem(s)");
-			alertString2 += "\n------------------------------------------------------------------------------------\n";
-			alertString2 += _alertString;
-			alert(alertString2);
-		}
-	}
-	</script>
+    function _(s) { return s } // dummy function for gettext
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    function isNotNull(f,noalert) {
+        if (f.value.length ==0) {
+return false;
+        }
+        return true;
+    }
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    function toUC(f) {
+        var x=f.value.toUpperCase();
+        f.value=x;
+        return true;
+    }
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    function isNum(v,maybenull) {
+    var n = new Number(v.value);
+    if (isNaN(n)) {
+        return false;
+        }
+    if (maybenull==0 && v.value=='') {
+        return false;
+    }
+    return true;
+    }
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    function isDate(f) {
+        var t = Date.parse(f.value);
+        if (isNaN(t)) {
+            return false;
+        }
+    }
+    /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    function Check(f) {
+        var ok=1;
+        var _alertString="";
+        var alertString2;
+        if (f.tagfield.value.length==0) {
+            _alertString += "\n- " + _("tag number missing");
+        }
+        if (_alertString.length==0) {
+            document.Aform.submit();
+        } else {
+            alertString2  = _("Form not submitted because of the following problem(s)");
+            alertString2 += "\n------------------------------------------------------------------------------------\n";
+            alertString2 += _alertString;
+            alert(alertString2);
+        }
+    }
+    </script>
 
 <!-- TMPL_IF NAME="add_form" -->
 
-	<h1>
-	<!-- TMPL_IF NAME="use-heading-flags-p" -->
-	<!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF -->
-	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
-	</h1>
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-		<input type="hidden" name="op" value="add_validate" />
-		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-		<p><label>Tag<label><!-- TMPL_VAR NAME="searchfield" --></p>
-		<p><label>Text for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100" /></p>
-		<p><label>Text for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100" /></p>
-		<p><label>Repeatable</label><!-- TMPL_VAR NAME="repeatable" --></p>
-		<p><label>Mandatory</label><!-- TMPL_VAR NAME="mandatory" --></p>
-		<p><label>Authorised value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</p>
-		<p><label>&nbsp;</label><input type="button" value="OK" class="button" onclick="Check(this.form)" /></p>
-	</form>
+    <h2>
+    <!-- TMPL_IF NAME="use-heading-flags-p" -->
+    <!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF -->
+    <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
+    </h2>
+    <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+        <input type="hidden" name="op" value="add_validate" />
+        <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+        <p><label>Tag</label><!-- TMPL_VAR NAME="searchfield" --></p>
+        <p><label>Text for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="40" maxlength="100" /></p>
+        <p><label>Text for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="40" maxlength="100" /></p>
+        <p><label for="repeatable">Repeatable</label>
+            <!-- TMPL_IF NAME="repeatable" -->
+                <input type="checkbox" name="repeatable" id="repeatable" value="1" checked/>
+            <!-- TMPL_ELSE -->
+                <input type="checkbox" name="repeatable" id="repeatable" value="1"/>
+            <!-- /TMPL_IF -->
+            &nbsp;
+        </p>
+        <p><label for="mandatory">Mandatory</label>
+            <!-- TMPL_IF NAME="mandatory" -->
+                <input type="checkbox" name="mandatory" id="mandatory" value="1" checked/>
+            <!-- TMPL_ELSE -->
+                <input type="checkbox" name="mandatory" id="mandatory" value="1"/>
+            <!-- /TMPL_IF -->
+            &nbsp;
+            </p>
+        <p><label>Authorised value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</p>
+        <p><label>&nbsp;</label><input type="button" value="OK" class="button" onclick="Check(this.form)" /></p>
+    </form>
 <!-- /TMPL_IF -->
 
 
 <!-- TMPL_IF NAME="delete_confirm" -->
 
 <table>
-	<tr>
-		<td>tag</td>
-		<td><!-- TMPL_VAR NAME="searchfield" --></td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td>
-	</tr>
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="delete_confirmed" />
-		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
-		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
-	<tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="submit" /></form></td></tr>
+    <tr>
+        <td>tag</td>
+        <td><!-- TMPL_VAR NAME="searchfield" --></td>
+    </tr>
+    <tr>
+        <td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+    </tr>
+    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="hidden" name="op" value="delete_confirmed" />
+        <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
+        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+    <tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
+    <tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="submit" /></form></td></tr>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
 
-	Data deleted
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-	<input type="submit" value="OK" class="submit" />
-	</form>
+    Data deleted
+    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+    <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
+    <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+    <input type="submit" value="OK" class="submit" />
+    </form>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="authtype_create" -->
 
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="authtype_create_confirm" />
-		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-		Create authority framework for <!-- TMPL_VAR NAME="authtypecode" --> using
-		<select name="existingauthtypecode">
-			<option value="">Default</option>
-		<!-- TMPL_LOOP NAME="existingauthtypeloop" -->
-			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="authtypetext" --></option>
-		<!-- /TMPL_LOOP -->
-		</select>
-		<input type="submit" value="OK" class="submit" />
-	</form>
+    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="hidden" name="op" value="authtype_create_confirm" />
+        <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+        Create authority framework for <!-- TMPL_VAR NAME="authtypecode" --> using
+        <select name="existingauthtypecode">
+            <option value="">Default</option>
+        <!-- TMPL_LOOP NAME="existingauthtypeloop" -->
+            <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="authtypetext" --></option>
+        <!-- /TMPL_LOOP -->
+        </select>
+        <input type="submit" value="OK" class="submit" />
+    </form>
 <!-- /TMPL_IF -->
 
 
@@ -125,54 +141,54 @@
 <div id="bloc25">
 <h2>Select an authority framework</h2>
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-	<select name="authtypecode">
-		<option value="">Default</option>
-	<!-- TMPL_LOOP NAME="authtypeloop" -->
-		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->>
-			<!-- TMPL_VAR NAME="authtypetext" -->
-		</option>
-	<!-- /TMPL_LOOP -->
-	</select>
-	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-	<input type="submit" value="OK" class="submit" />
+    <select name="authtypecode">
+        <option value="">Default</option>
+    <!-- TMPL_LOOP NAME="authtypeloop" -->
+        <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->>
+            <!-- TMPL_VAR NAME="authtypetext" -->
+        </option>
+    <!-- /TMPL_LOOP -->
+    </select>
+    <input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+    <input type="submit" value="OK" class="submit" />
 </form>
 </div>
 <div id="bloc100">
-	<table>
-	<tr>
-		<th>Tag</th>
-		<th>Lib</th>
-		<th>Repeatable</th>
-		<th>Mandatory</th>
-		<th>Authorised<br />value</th>
-		<th>Subfields</th>
-		<th>Edit</th>
-		<th>Delete</th>
-	<!-- TMPL_LOOP NAME="loop" -->
-	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
-		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
-		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
-		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
-		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
-		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
-		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
-	</tr>
-	<!-- /TMPL_LOOP -->
-	</table>
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="add_form" />
-		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
-		<input type="hidden" name="op" value="add_form" />
-		<input type="submit" class="submit" value="Add Tag" />
-		<!-- TMPL_IF NAME="isprevpage" -->
-			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">Previous Page</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="nextpage" -->
-			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">Next Page</a>
-		<!-- /TMPL_IF -->
-	</form>
+    <table>
+    <tr>
+        <th>Tag</th>
+        <th>Lib</th>
+        <th>Repeatable</th>
+        <th>Mandatory</th>
+        <th>Authorised<br />value</th>
+        <th>Subfields</th>
+        <th>Edit</th>
+        <th>Delete</th>
+    <!-- TMPL_LOOP NAME="loop" -->
+    <tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
+        <td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+        <td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+        <td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+        <td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+        <td><!-- TMPL_VAR NAME="authorised_value" --></td>
+        <td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
+        <td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
+        <td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+    </tr>
+    <!-- /TMPL_LOOP -->
+    </table>
+    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="hidden" name="op" value="add_form" />
+        <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+        <input type="hidden" name="op" value="add_form" />
+        <input type="submit" class="submit" value="Add Tag" />
+        <!-- TMPL_IF NAME="isprevpage" -->
+            <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">Previous Page</a>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="nextpage" -->
+            <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">Next Page</a>
+        <!-- /TMPL_IF -->
+    </form>
 </div>
 <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl
index 844c094a29..d6b62bf278 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl
@@ -1,31 +1,39 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
-
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+
+
 
 <!-- TMPL_IF name="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
 <!-- TMPL_IF name="else" -->Authorised values admin<!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_IF name="add_form" -->
+	<h1>
+	   <!-- TMPL_IF name="action_modify" -->Modify authorised value<!-- /TMPL_IF -->
+	   <!-- TMPL_IF name="action_add_value" -->Add authorised value<!-- /TMPL_IF -->
+	   <!-- TMPL_IF name="action_add_category" -->Add category<!-- /TMPL_IF -->
+	</h1>
 	<form class="inline" action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
 	<input type="hidden" name="op" value="add_validate" />
-	<table>
-	<caption><!-- TMPL_VAR name="action" --></caption>
-	<tr>
-		<th><label for="category">Category</label></th>
-		<td><!-- TMPL_VAR name="category" --></td>
-	</tr>
-	<tr>
-		<th><label for="authorised_value">Authorised value</label></th>
-		<td><input type="text" id="authorised_value" name="authorised_value" value="<!-- TMPL_VAR name="authorised_value" -->" /></td>
-	</tr>
-	<tr>
-		<th><label for="lib">Description</label></th>
-		<td><input type="text" name="lib" id="lib" value="<!-- TMPL_VAR name="lib" -->" /></td>
-	</tr>
-	</table><input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
-			<input type="submit" value="<!-- TMPL_VAR name="action" -->" /></form> <form class="inline" action="/cgi-bin/koha/admin/authorised_values.pl" method="get"><input type="submit" value="Cancel and Return to Authorized Values" /></form>
+        <table>
+        <tr>
+            <th><label for="category">Category</label></th>
+            <td><!-- TMPL_VAR name="category" --></td>
+        </tr>
+        <tr>
+            <th><label for="authorised_value">Authorised value</label></th>
+            <td><input type="text" id="authorised_value" name="authorised_value" value="<!-- TMPL_VAR name="authorised_value" -->" /></td>
+        </tr>
+        <tr>
+            <th><label for="lib">Description</label></th>
+            <td><input type="text" name="lib" id="lib" value="<!-- TMPL_VAR name="lib" -->" /></td>
+        </tr>
+        </table>
+        <input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
+        <input type="submit" value="Save" />
+    </form>
+    <form class="inline" action="/cgi-bin/koha/admin/authorised_values.pl" method="get"><input type="submit" value="Cancel and Return to Authorized Values" /></form>
 <!-- /TMPL_IF -->
 
 
@@ -42,7 +50,7 @@
 	</table>
 	<form action="<!-- TMPL_VAR name=" script_name " -->" method="post">
 		<input type="hidden" name="op" value="delete_confirmed" />
-		<input type="hidden" name="id" value="<!-- TMPL_VAR name=" id " -->" />
+		<input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
 		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" /><input type="submit" value="Confirm Deletion" /></form> <form class="inline" action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="Do Not Delete" /></form>
 <!-- /TMPL_IF -->
 
@@ -79,12 +87,10 @@ the subfield is not entered through a free field, but though a list of authorise
 	<input type="submit" value="&lt;&lt; Previous Page" /></form>
 <!-- /TMPL_IF --> 
 
-<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-<input type="hidden" name="op" value="add_form">
-<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
-<input type="submit" value="Add Authorised value" /></form> 
-
-<form class="inline" action="/cgi-bin/koha/admin/authorised_values.pl" method="get"><input type="hidden" value="add_form" name="op" /><input type="submit" value="Add New Category" /></form>
+<div id="action">
+    <a href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form&category=<!-- TMPL_VAR NAME="category" -->">Add Authorised value for <!-- TMPL_VAR name="category" --></a>
+    <a href= "/cgi-bin/koha/admin/authorised_values.pl?op=add_form">Add New Category</a>
+</div>
 
 <!-- TMPL_IF NAME="nextpage" -->
 <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl
index f68f78a315..d68c509fac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl
@@ -77,6 +77,7 @@ function Check(f) {
 		<tr><td><label for="authtypetext">Description</label></td><td><input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authtypetext" escape=HTML -->" /></td></tr>
 		<tr><td><label for="summary">Summary</label></td><td><textarea id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" --></textarea></td></tr>
 		<tr><td><label for="auth_tag_to_report">Report tag</label></td><td><input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" />Enter here the number of the tag that will be reported in the biblio (subfield by subfield). For example, in UNIMARC, enter 200 to report every 200 subfield in the 70x biblio</td></tr></table>
+	<input type="hidden" name="op" value="add_validate" />
 	<p><input type="submit" value="OK" onclick="Check(this.form); return false;" />
 			</p>
 	</form>
@@ -111,7 +112,7 @@ function Check(f) {
 	<tr>
 		<th>Code</th>
 		<th>Description</th>
-		<th>summary</th>
+		<th>Summary</th>
 		<th>Tag reported</th>
 		<th>&nbsp;</th>
 		<th>Edit</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl
index 074649af79..088fa0c646 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl
@@ -8,235 +8,225 @@
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
 <!-- TMPL_IF name="add" -->
-<h1><!-- TMPL_VAR name="head" --></h1>
-<form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
-<input type="hidden" name="op" value="add_validate" />
-<table>
-	<tr>
-		<td>Branch code</td>
-		<td>
-			<!-- TMPL_IF name="branchcode" -->
-				<input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
-				<!-- TMPL_VAR name="branchcode" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" name="branchcode" size="5" maxlength="5" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
-			<!-- /TMPL_IF -->
-		</td>
-	</tr>
-	<tr>
-		<td>Name</td>
-		<td><input type="text" name="branchname" size="40" maxlength="80" value="<!-- TMPL_VAR name="branch_name" escape="HTML" -->" />&nbsp;</td>
-	</tr>
-<!-- TMPL_LOOP name="categoryloop" -->
-					<tr>
-						<td><!-- TMPL_VAR name="categoryname" --></td>
-						<td><input type="checkbox" name="<!-- TMPL_VAR name="categorycode" -->" <!-- TMPL_VAR name="checked" --> /><!-- TMPL_VAR name="codedescription" --></td>
-					</tr>
-				<!-- /TMPL_LOOP -->
-<tr>
-		<td>Address</td>
-		<td><input type="text" name="branchaddress1" value="<!-- TMPL_VAR name="branchaddress1" escape="HTML" -->" /></td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td><input type="text" name="branchaddress2" value="<!-- TMPL_VAR name="branchaddress2" escape="HTML" -->" /></td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td><input type="text" name="branchaddress3" value="<!-- TMPL_VAR name="branchaddress3" escape="HTML" -->" /></td>
-	</tr>
-	<tr>
-		<td>Phone</td>
-		<td><input type="text" name="branchphone" value="<!-- TMPL_VAR name="branchphone" escape="HTML" -->" /></td>
-	</tr>
-	<tr>
-		<td>Fax</td>
-		<td><input type="text" name="branchfax" value="<!-- TMPL_VAR name="branchfax" escape="HTML" -->" /></td>
-	</tr>
-	<tr>
-		<td>E-mail</td>
-		<td><input type="text" name="branchemail" value="<!-- TMPL_VAR name="branchemail" escape="HTML" -->" /></td>
-	</tr>
-	<tr>
-		<td>Branch IP</td>
-		<td><input type="text" name="branchip" value="<!-- TMPL_VAR name="branchip" escape="HTML" -->" /></td>
-	</tr>
-	<tr>
-		<td>Branch Printer</td>
-		<td>	
-			<select id="branchprinter" name="branchprinter">
-				<option value="">None</option>
-			<!-- TMPL_LOOP NAME="printerloop" -->
-				<option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchprinter" --></option>
-				<!-- /TMPL_LOOP -->
-			</select>
-		</td>
-	</tr>
-</table><p><input type="submit" value="Submit" /></p>
-</form>
+    <!-- TMPL_IF name="heading-branches-add-branch-p" -->
+        <h1>Add branch</h1>
+    <!-- TMPL_ELSE -->
+        <h1>Modify branch</h1>
+    <!-- /TMPL_IF -->
+    <form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
+        <input type="hidden" name="op" value="add_validate" />
+        <!-- TMPL_IF name="heading-branches-add-branch-p" -->
+            <input type="hidden" name="add" value="1" />
+        <!-- TMPL_ELSE -->
+            <input type="hidden" name="add" value="0" />
+        <!-- /TMPL_IF -->
+        <p>
+            <label><b>Branch code</b></label>
+            <!-- TMPL_IF name="branchcode" -->
+                <input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
+                <!-- TMPL_VAR name="branchcode" -->
+            <!-- TMPL_ELSE -->
+                <input type="text" name="branchcode" size="10" maxlength="10" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
+            <!-- /TMPL_IF -->
+        </p>
+        <p>
+            <label><b>Name</b></label>
+            <input type="text" name="branchname" size="40" maxlength="80" value="<!-- TMPL_VAR name="branch_name" escape="HTML" -->" />&nbsp;
+        </p>
+        <!-- TMPL_LOOP name="categoryloop" -->
+            <p>
+                <label><!-- TMPL_VAR name="categoryname" --></label>
+                <input type="checkbox" name="<!-- TMPL_VAR name="categorycode" -->" <!-- TMPL_VAR name="checked" --> /><!-- TMPL_VAR name="codedescription" -->
+            </p>
+        <!-- /TMPL_LOOP -->
+        <p><label>Address</label><input type="text" name="branchaddress1" value="<!-- TMPL_VAR name="branchaddress1" escape="HTML" -->" /></p>
+        <p><label>&nbsp;</label><input type="text" name="branchaddress2" value="<!-- TMPL_VAR name="branchaddress2" escape="HTML" -->" /></p>
+        <p><label>&nbsp;</label><input type="text" name="branchaddress3" value="<!-- TMPL_VAR name="branchaddress3" escape="HTML" -->" /></p>
+        <p><label>Phone</label><input type="text" name="branchphone" value="<!-- TMPL_VAR name="branchphone" escape="HTML" -->" /></p>
+        <p><label>Fax</label><input type="text" name="branchfax" value="<!-- TMPL_VAR name="branchfax" escape="HTML" -->" /></p>
+        <p><label>E-mail</label><input type="text" name="branchemail" value="<!-- TMPL_VAR name="branchemail" escape="HTML" -->" /></p>
+        <p><label>Branch IP</label><input type="text" name="branchip" value="<!-- TMPL_VAR name="branchip" escape="HTML" -->" /></p>
+        <p><label>Branch Printer</label>
+            <select id="branchprinter" name="branchprinter">
+                <option value="">None</option>
+            <!-- TMPL_LOOP NAME="printerloop" -->
+                <option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchprinter" --></option>
+                <!-- /TMPL_LOOP -->
+            </select>
+        <p><input type="submit" value="Submit" /></p>
+    </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_confirm" -->
-	<h3>Confirm deletion of <!-- TMPL_VAR NAME="branchname" --> (<!-- TMPL_VAR NAME="branchcode" -->)?</h3>
-	<span class="form"><form action="<!-- TMPL_VAR name="action" -->" method="post">
-		<input type="hidden" name="op" value="delete_confirmed" />
-		<input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
-			<input type="hidden" name="branchname" value="<!-- TMPL_VAR NAME="branchname" escape="HTML" -->">
-		<input type="submit" value="Delete Branch" />
-	</form> 
-	<form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="">
-		<input type="submit" value="Do Not Delete" />
-	</form></span>
+    <h3>Confirm deletion of <!-- TMPL_VAR NAME="branchname" --> (<!-- TMPL_VAR NAME="branchcode" -->)?</h3>
+    <span class="form"><form action="<!-- TMPL_VAR name="action" -->" method="post">
+        <input type="hidden" name="op" value="delete_confirmed" />
+        <input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
+            <input type="hidden" name="branchname" value="<!-- TMPL_VAR NAME="branchname" escape="HTML" -->">
+        <input type="submit" value="Delete Branch" />
+    </form> 
+    <form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="">
+        <input type="submit" value="Do Not Delete" />
+    </form></span>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="else" -->
-	
-	<!-- TMPL_IF NAME="message" --><div class="error"><!-- TMPL_VAR name="message" --><!-- /TMPL_IF -->
-	<table>
-	<caption><!-- TMPL_VAR name="head" --></caption>
-		<tr>
-			<th>Name</th>
-			<th>Code</th>
-			<th>Address</th>
-			<th>Category</th>
-			<th>Branch IP</th>
-			<th>Branch Printer</th>
-			<th>&nbsp;</th>
-			<th>&nbsp;</th>
-		</tr>
-		<!-- TMPL_LOOP name="branches" -->
-			<tr>
-				<td><!-- TMPL_VAR name="branch_name" escape="HTML" --></td>
-				<td><!-- TMPL_VAR name="branch_code" escape="HTML" --></td>
-				<td>
-					<!-- TMPL_IF name="address-empty-p" -->
-						(nothing entered)
-					<!-- TMPL_ELSE -->
-						<!-- TMPL_IF name="branchaddress1" -->
-							<!-- TMPL_VAR name="branchaddress1" escape="HTML" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="branchaddress2" -->
-							<br /><!-- TMPL_VAR name="branchaddress2" escape="HTML" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="branchaddress3" -->
-							<br /><!-- TMPL_VAR name="branchaddress3" escape="HTML" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name=branchphone -->
-							<br />Ph: <!-- TMPL_VAR name="branchphone" escape="HTML" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="branchfax" -->
-							<br />Fax: <!-- TMPL_VAR name="branchfax" escape="HTML" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="branchemail" -->
-							<br />Email: <!-- TMPL_VAR name="branchemail" escape="HTML" --><!-- /TMPL_IF -->
-					<!-- /TMPL_IF -->
-				</td>
-				<td>
-					<!-- TMPL_IF name="no-categories-p" -->
-						(no categories set)
-					<!-- TMPL_ELSE -->
-						<!-- TMPL_LOOP name="category_list" -->
-							<!-- TMPL_VAR name="categoryname" --><br />
-						<!-- /TMPL_LOOP -->
-					<!-- /TMPL_IF -->
-				</td>
-				<td>
-					<!-- TMPL_VAR NAME="branchip" -->
-				</td>
-				<td>
-					<!-- TMPL_VAR NAME="branchprinter" -->
-				</td>
-				<td>
-					<form action="<!-- TMPL_VAR name=action -->" method="post">
-					<input type="hidden" name="op" value="edit" />
-					<input type="hidden" name="branchcode" value="<!-- TMPL_VAR name=value escape="HTML" -->" />
-					<input type="submit" value="Edit" />
-					</form>
-				</td>
-				<td>
-					<form action="<!-- TMPL_VAR name=action -->" method="post">
-					<input type="hidden" name="branchcode" value="<!-- TMPL_VAR name=value escape="HTML" -->" />
-<input type="hidden" name="branchname" value="<!-- TMPL_VAR NAME="branch_name" escape="HTML" -->">
-					<input type="hidden" name="op" value="delete" /><input type="submit" value="Delete" />
-					</form>
-				</td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-	</table>
+    <h1><!-- TMPL_VAR name="head" --></h1>
+    <!-- TMPL_IF NAME="message" --><div class="problem">
+        <!-- TMPL_VAR name="message" --><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE1" --><div class="problem">Branch saved</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE2" --><div class="problem">Branch saved</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE3" --><div class="problem">Branch deleted</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE4" --><div class="problem">Branch category added</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE5" --><div class="problem">Branch category modified</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE6" --><div class="problem">Branch category deleted</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE7" --><div class="problem">Impossible to delete : branch is used</div><!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MESSAGE8" --><div class="problem">Category cannot be deleted because there are branches using that category.</div><!-- /TMPL_IF -->
+
+    <table>
+        <tr>
+            <th>Name</th>
+            <th>Code</th>
+            <th>Address</th>
+            <th>Category</th>
+            <th>Branch IP</th>
+            <th>Branch Printer</th>
+            <th>&nbsp;</th>
+            <th>&nbsp;</th>
+        </tr>
+        <!-- TMPL_LOOP name="branches" -->
+            <tr>
+                <td><!-- TMPL_VAR name="branch_name" escape="HTML" --></td>
+                <td><!-- TMPL_VAR name="branch_code" escape="HTML" --></td>
+                <td>
+                    <!-- TMPL_IF name="address-empty-p" -->
+                        (nothing entered)
+                    <!-- TMPL_ELSE -->
+                        <!-- TMPL_IF name="branchaddress1" -->
+                            <!-- TMPL_VAR name="branchaddress1" escape="HTML" --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="branchaddress2" -->
+                            <br /><!-- TMPL_VAR name="branchaddress2" escape="HTML" --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="branchaddress3" -->
+                            <br /><!-- TMPL_VAR name="branchaddress3" escape="HTML" --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name=branchphone -->
+                            <br />Ph: <!-- TMPL_VAR name="branchphone" escape="HTML" --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="branchfax" -->
+                            <br />Fax: <!-- TMPL_VAR name="branchfax" escape="HTML" --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="branchemail" -->
+                            <br />Email: <!-- TMPL_VAR name="branchemail" escape="HTML" --><!-- /TMPL_IF -->
+                    <!-- /TMPL_IF -->
+                </td>
+                <td>
+                    <!-- TMPL_IF name="no-categories-p" -->
+                        (no categories set)
+                    <!-- TMPL_ELSE -->
+                        <!-- TMPL_LOOP name="category_list" -->
+                            <!-- TMPL_VAR name="categoryname" --><br />
+                        <!-- /TMPL_LOOP -->
+                    <!-- /TMPL_IF -->
+                </td>
+                <td>
+                    <!-- TMPL_VAR NAME="branchip" -->
+                </td>
+                <td>
+                    <!-- TMPL_VAR NAME="branchprinter" -->
+                </td>
+                <td>
+                    <a href="<!-- TMPL_VAR name=action -->?op=edit&branchcode=<!-- TMPL_VAR name=value escape="HTML" -->">Edit</a>
+                </td>
+                <td>
+                    <a href="<!-- TMPL_VAR name=action -->?branchcode=<!-- TMPL_VAR name=value escape="HTML" -->&branchname=<!-- TMPL_VAR NAME="branch_name" escape="HTML" -->&op=delete">Delete</a>
+                    </form>
+                </td>
+            </tr>
+        <!-- /TMPL_LOOP -->
+    </table>
 <form action="<!-- TMPL_VAR name=action -->" method="post">
-		<p><input type="hidden" name="op" value="add" />
-		<input type="submit" value="Add New Branch" /></p>
-	</form>
-	
-	<table>
-	<caption>Branches Categories</caption>
-	<tr>
-		<th>Name</th>
-		<th>Code</th>
-		<th>Description</th>
-		<th>&nbsp;</th>
-		<th>&nbsp;</th>
-	</tr>
-	<!-- TMPL_LOOP name="branchcategories" -->
-		<tr>
-		<td><!-- TMPL_VAR name="categoryname" --></td>
-		<td><!-- TMPL_VAR name="categorycode" --></td>
-		<td><!-- TMPL_VAR name="codedescription" --></td>
-		<td>
-			<form action="<!-- TMPL_VAR name=action -->" method="post">
-			<input type="hidden" name="op" value="editcategory" />
-			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
-			<input type="submit" value="Edit" />
-			</form>
-		</td>
-		<td>
-			<form action="<!-- TMPL_VAR name=action -->" method="post">
-			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
-			<input type="hidden" name="op" value="delete_category" /><input type="submit" value="Delete" />
-			</form>
-		</td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-	</table><form action="<!-- TMPL_VAR name="action" -->" method="post"><p>
-		<input type="hidden" name="op" value="editcategory" />
-		<input type="submit" value="Add New Category" /></p>
-	</form>
+        <p><input type="hidden" name="op" value="add" />
+        <input type="submit" value="Add New Branch" /></p>
+    </form>
+    
+    <!-- TMPL_IF NAME="branchcategories" -->
+    <table>
+    <caption>Branches Categories</caption>
+    <tr>
+        <th>Name</th>
+        <th>Code</th>
+        <th>Description</th>
+        <th>&nbsp;</th>
+        <th>&nbsp;</th>
+    </tr>
+    <!-- TMPL_LOOP name="branchcategories" -->
+        <tr>
+        <td><!-- TMPL_VAR name="categoryname" --></td>
+        <td><!-- TMPL_VAR name="categorycode" --></td>
+        <td><!-- TMPL_VAR name="codedescription" --></td>
+        <td>
+            <form action="<!-- TMPL_VAR name=action -->" method="post">
+            <input type="hidden" name="op" value="editcategory" />
+            <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
+            <input type="submit" value="Edit" />
+            </form>
+        </td>
+        <td>
+            <form action="<!-- TMPL_VAR name=action -->" method="post">
+            <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
+            <input type="hidden" name="op" value="delete_category" /><input type="submit" value="Delete" />
+            </form>
+        </td>
+        </tr>
+    <!-- /TMPL_LOOP -->
+    </table>
+    <!-- TMPL_ELSE -->
+        <p>
+            <b>No Category defined.</b>
+        </p>
+    <!-- /TMPL_IF --> <!-- NAME="branchcategories" -->
+    <form action="<!-- TMPL_VAR name="action" -->" method="post"><p>
+        <input type="hidden" name="op" value="editcategory" />
+        <input type="submit" value="Add New Category" /></p>
+    </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="editcategory" -->
-	
-	<form action="<!-- TMPL_VAR name=action -->" name="Aform" method="post">
-	<input type="hidden" name=op value="addcategory_validate" />
-	<table>
-		<caption><!-- TMPL_VAR name="head" --></caption>
-		<tr>
-			<td>Category code</td>
-			<td>
-				<!-- TMPL_IF name="categorycode" -->
-					<input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
-					<!-- TMPL_VAR name="categorycode" -->
-				<!-- TMPL_ELSE -->
-					<input type="text" name="categorycode" size="5" maxlength="5" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
-				<!-- /TMPL_IF -->
-			</td>
-		</tr>
-		<tr>
-			<td>Name</td>
-			<td><input type="text" name="categoryname" size="40" maxlength="80" value="<!-- TMPL_VAR name=categoryname escape="HTML" -->" />&nbsp;</td>
-		</tr>
-		<tr>
-			<td>Description</td>
-			<td><input type="text" name="codedescription" size="40" maxlength="80" value="<!-- TMPL_VAR name="codedescription" escape="HTML" -->" />&nbsp;</td>
-		</tr>
-	</table><input type="submit" value="Update" />
-	</form>
+    
+    <form action="<!-- TMPL_VAR name=action -->" name="Aform" method="post">
+    <input type="hidden" name=op value="addcategory_validate" />
+    <table>
+        <caption><!-- TMPL_VAR name="head" --></caption>
+        <tr>
+            <td>Category code</td>
+            <td>
+                <!-- TMPL_IF name="categorycode" -->
+                    <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
+                    <!-- TMPL_VAR name="categorycode" -->
+                <!-- TMPL_ELSE -->
+                    <input type="text" name="categorycode" size="5" maxlength="5" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
+                <!-- /TMPL_IF -->
+            </td>
+        </tr>
+        <tr>
+            <td>Name</td>
+            <td><input type="text" name="categoryname" size="40" maxlength="80" value="<!-- TMPL_VAR name=categoryname escape="HTML" -->" />&nbsp;</td>
+        </tr>
+        <tr>
+            <td>Description</td>
+            <td><input type="text" name="codedescription" size="40" maxlength="80" value="<!-- TMPL_VAR name="codedescription" escape="HTML" -->" />&nbsp;</td>
+        </tr>
+    </table><input type="submit" value="Update" />
+    </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_category" -->
-	Confirm delete:
-	<form action="<!-- TMPL_VAR name=action -->" method="post">
-		<input type="hidden" name="op" value="categorydelete_confirmed" />
-		<input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
-		<input type="submit" value="YES" />
-	</form>
-	<form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="">
-		<input type="submit" value="NO" />
-	</form>
+    Confirm delete:
+    <form action="<!-- TMPL_VAR name=action -->" method="post">
+        <input type="hidden" name="op" value="categorydelete_confirmed" />
+        <input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
+        <input type="submit" value="YES" />
+    </form>
+    <form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="">
+        <input type="submit" value="NO" />
+    </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl
index e7a6eb7b34..295eca4026 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl
@@ -42,35 +42,40 @@
 			return false;
 		}
 	}
-	//
-	function Check(f) {
-		var ok=1;
-		var _alertString="";
-		var alertString2;
-		if (f.categorycode.value.length==0) {
+	// to check if the data are correctly entered.
+	function Check(ff) {
+	    var ok=0;
+		var _alertString="Form not submitted because of the following problem(s)\n";
+		_alertString +="-------------------------------------------------------------------\n\n";
+		if (ff.categorycode.value.length==0) {
+		    ok=1;
 			_alertString += "- categorycode missing\n";
 		}
-//		alert(window.document.Aform.description.value);
-		if (!(isNotNull(window.document.Aform.description,1))) {
+		if (!(ff.category_type.value)){
+		    ok=1;
+		    _alertString += "- category type missing\n";
+		}
+		if (!(isNotNull(ff.description,1))) {
+		    ok=1;
 			_alertString += "- description missing\n";
 		}
-		if (!isNum(f.upperagelimit,0)) {
+		if (!isNum(ff.upperagelimit,0)) {
+		    ok=1;
 			_alertString += "- upperagelimit is not a number\n";
 		}
-		if (_alertString.length==0) {
-			document.Aform.submit();
-		} else {
-			alertString2 = "Form not submitted because of the following problem(s)\n";
-			alertString2 += "------------------------------------------------------------------------------------\n\n";
-			alertString2 += _alertString;
-			alert(alertString2);
-		}
+		
+		if (ok) { // if there is a problem
+			alert(_alertString);
+            return;
+        }
+        // if all is good
+		ff.submit();
 	}
 	</script>
 
 
 	
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+	<form name="Aform" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 	<input type="hidden" name="op" value="add_validate" />
 	<input type="hidden" name="checked" value="0" />
 <!-- TMPL_IF NAME="categorycode" -->
@@ -83,12 +88,12 @@
 	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" -->
 				<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /></td></tr>
 	<!-- TMPL_ELSE -->
-	<tr><th>Category code</th><td><input type="text" name="categorycode" size="3" maxlength="2" onblur="toUC(this)" /></td></tr>
+	<tr><th>Category code</th><td><input type="text" name="categorycode" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
 	<!-- /TMPL_IF -->
 	<tr><th>Description</th><td>&nbsp; <input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
 	<tr><th>Enrolment period</th><td>&nbsp; <input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> months</td></tr>
-	<tr><th>Upperage limit</th><td>&nbsp; <input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /> years</td></tr>
 	<tr><th>Age Required</th><td>&nbsp; <input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /> years</td></tr>
+	<tr><th>Upperage limit</th><td>&nbsp; <input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /> years</td></tr>
 	<tr><th>Enrollment fee</th><td>$ <input type="text" name="enrolmentfee" size="6" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
 	<tr><th>Overdue notice required</th><td>&nbsp; <select name="overduenoticerequired" id="overduenoticerequired">
 						<option<!-- TMPL_UNLESS name="overduenoticerequired" --> selected="selected"<!-- /TMPL_UNLESS --> value="0">No</option>
@@ -99,7 +104,7 @@
 					<option value="" <!-- TMPL_VAR NAME="type_n" -->>Select a Category type</option>
      					<option value="A" <!-- TMPL_VAR NAME="type_A" -->>Adult</option>
 					<option value="C" <!-- TMPL_VAR NAME="type_C" -->>Children</option>
-					<option value="I" <!-- TMPL_VAR NAME="type_I" -->>Institution</option>
+					<option value="I" <!-- TMPL_VAR NAME="type_I" -->>Organisation</option>
 					<option value="P" <!-- TMPL_VAR NAME="type_P" -->>Professional</option>
 					</SELECT></td>
 	</tr>
@@ -127,8 +132,8 @@
 	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
 	<tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
 	<tr><th>Enrolment period</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --> months</td></tr>
-	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --> years</td></tr>
 	<tr><th>Age Required</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td></tr>
+	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --> years</td></tr>
 	<tr><th>Enrolment fee</th><td>$<!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
 	<tr><th>Overdue notice required</th><td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td></tr>
 	<tr><th>Reserve fee</th><td>$<!-- TMPL_VAR NAME="reservefee" --></td></tr>
@@ -161,23 +166,32 @@
 	</form>	
         <table>
 		<tr>
-			<th scope="col">Category Name</th>
 			<th scope="col">Code</th>
+			<th scope="col">Category Name</th>
+			<th scope="col">Type</th>
 			<th scope="col">Enrollment Period</th>
-			<th scope="col">Upper Age Limit</th>
 			<th scope="col">Age Required</th>
- 			<th scope="col">Enrollment Fee</th>
+			<th scope="col">Upper Age Limit</th>
+			<th scope="col">Enrollment Fee</th>
 			<th scope="col">Overdue</th>
  			<th scope="col">Reservation Fee</th>
 			<th scope="col" colspan="2">&nbsp; </th>
 		</tr>
 		<!-- TMPL_LOOP NAME="loop" -->
-		<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPl_IF -->
-                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="description" --></a></td><td><!-- TMPL_VAR NAME="categorycode" --></td>
-                        
+		<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+                        <td><!-- TMPL_VAR NAME="categorycode" --></td>
+                        <td>
+                            <a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="description" --></a>
+                        </td>
+                        <td>
+                            <!-- TMPL_IF NAME="type_A" -->Adult<!-- /TMPL_IF -->
+                            <!-- TMPL_IF NAME="type_C" -->Child<!-- /TMPL_IF -->
+                            <!-- TMPL_IF NAME="type_P" -->Prof.<!-- /TMPL_IF -->
+                            <!-- TMPL_IF NAME="type_I" -->Org.<!-- /TMPL_IF -->
+                        </td>
                         <td><!-- TMPL_VAR NAME="enrolmentperiod" --> months</td>
-                        <td><!-- TMPL_VAR NAME="upperagelimit" --> years</td>
                         <td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td>
+			<td><!-- TMPL_VAR NAME="upperagelimit" --> years</td>
                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
                         <td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
                         <td><!-- TMPL_VAR NAME="reservefee" --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl
index d68857c2ec..56ffac4a39 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl
@@ -1,120 +1,135 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: MARC Check: 
 <!-- TMPL_IF name="total" --><!-- TMPL_VAR name="total" --> errors found<!-- TMPL_ELSE -->Configuration OK!<!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menu.inc" -->
+
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
-<h1>MARC Checks</h1>
-<table>
-	<tr>
-		<th>Test</th>
-		<th>Result</th>
-	</tr>
-<!-- TMPL_IF name="biblionumber" -->
-	<tr>
-		<td> biblionumber</td>
-		<td>The biblio.biblionumber  and items.biblionumber fields MUST :
-			<ul><li>each be mapped to a MARC field/subfield,</li>
-			</ul></td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td>biblionumber  mapped correctly</td>
-	</tr>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF name="itemnumber" -->
-	<tr>
-		<td>itemnum</td>
-		<td><ul><li>The field itemnumber MUST be mapped </li>
-			<li>The corresponding fileld or subfield MUST be in tab 10 and may be hidden</li></ul></td>
-	</tr>
-<!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td>The field itemnumber is mapped to a  MARC field </td>
-	</tr>
-<!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="barcode" -->
-	<tr>
-		<td>itemnum</td>
-		<td><ul><li>The field barcodde MUST be mapped </li>
-			<li>The corresponding field or subfield MUST be in tab 10 and may be hidden</li></ul></td>
-	</tr>
+<h1>MARC Checking</h1>
+<table>
+    <tr>
+        <th>Test</th>
+        <th>Result</th>
+    </tr>
+<!-- -->
+<!-- TMPL_IF name="itemnum" -->
+    <tr>
+        <td>itemnum</td>
+        <td><ul><li>The field itemnum MUST be mapped </li>
+            <li>The correspounding subfield MUST be in with -1 (ignore) tab</li></ul></td>
+    </tr>
 <!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td>The field barcode is mapped to a  MARC field </td>
-	</tr>
+    <tr>
+        <td>OK</td>
+        <td>itemnum : the field itemnumber is mapped to a field in tab -1</td>
+    </tr>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="isbn" -->
-	<tr>
-		<td>ISBN NOT mapped</td>
-		<td>isbn  MUST :<br />
-			<ul><li>be mapped to a MARC subfield,</li>
-		 </ul></td>
-	</tr>
+<!-- -->
+<!-- TMPL_IF name="itemfields" -->
+    <tr>
+        <td>item fields</td>
+        <td>ALL items fields MUST :<br />
+            <ul><li>be mapped to the same tag,</li>
+            <li>and they must all be in the 10 (items) tab</li></ul></td>
+    </tr>
 <!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td>ISBN defined</td>
-	</tr>
+    <tr>
+        <td>OK</td>
+        <td>All item fields are in the same tag and in item tab</td>
+    </tr>
 <!-- /TMPL_IF -->
-
-
+<!-- -->
+    <!-- TMPL_IF NAME="itemtags" -->
+        <tr>
+            <td>Item tag</td>
+            <td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+        </tr>
+    <!-- TMPL_ELSE -->
+        <tr>
+            <td>OK</td>
+            <td>Only 1 MARC tag mapped to items</td>
+        </tr>
+    <!-- /TMPL_IF -->
+    <!--  -->
 <!-- TMPL_IF name="itemtype" -->
-	<tr>
-		<td>itemtype NOT mapped</td>
-		<td>itemtype field MUST :<br />
-			<ul><li>be mapped to a MARC subfield, </li>
-			<li>the correspounding subfield MUST have authorised_value=itemtype</li></ul></td>
-	</tr>
+    <tr>
+        <td>itemtype NOT mapped</td>
+        <td>the biblioitems.itemtype field MUST :<br />
+            <ul><li>be mapped to a MARC subfield, </li>
+            <li>the correspounding subfield MUST have authorised_value=itemtype</li></ul></td>
+    </tr>
 <!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td>itemtype mapped</td>
-	</tr>
+    <tr>
+        <td>OK</td>
+        <td>biblioitems.itemtype defined</td>
+    </tr>
 <!-- /TMPL_IF -->
 <!-- -->
 <!-- TMPL_IF name="branch" -->
-	<tr>
-		<td>homebranch NOT mapped</td>
-		<td>homebranch  MUST :<br />
-			<ul><li>be mapped to a MARC subfield,</li>
-		 </ul></td>
-	</tr>
+    <tr>
+        <td>homebranch NOT mapped</td>
+        <td>the items.homebranch field MUST :<br />
+            <ul><li>be mapped to a MARC subfield,</li>
+            <li>the correspounding subfield MUST have authorised value=branches</li></ul></td>
+    </tr>
 <!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td>homebranch defined</td>
-	</tr>
+    <tr>
+        <td>OK</td>
+        <td>homebranch defined</td>
+    </tr>
 <!-- /TMPL_IF -->
 <!-- -->
 <!-- TMPL_IF name="holdingbranch" -->
-	<tr>
-		<td>holdingbranch NOT mapped</td>
-		<td>the holdingbranch  MUST :<br />
-			<ul><li>be mapped to a MARC subfield, </li>
-			<li>the correspounding subfield MUST have authorised value=branches</li></ul></td>
-	</tr>
+    <tr>
+        <td>holdingbranch NOT mapped</td>
+        <td>the items.holdingbranch field MUST :<br />
+            <ul><li>be mapped to a MARC subfield, </li>
+            <li>the correspounding subfield MUST have authorised value=branches</li></ul></td>
+    </tr>
 <!-- TMPL_ELSE -->
-	<tr>
-		<td>OK</td>
-		<td>holdingbranch defined</td>
-	</tr>
+    <tr>
+        <td>OK</td>
+        <td>holdingbranch defined</td>
+    </tr>
 <!-- /TMPL_IF -->
 <!-- -->
+<!-- TMPL_IF name="biblionumber" -->
+    <tr>
+        <td>biblio and biblionumber</td>
+        <td>The biblio.biblionumber and biblioitems.biblioitemnumber fields be mapped to a MARC subfield,</td>
+    </tr>
+<!-- TMPL_ELSE -->
+    <tr>
+        <td>OK</td>
+        <td>biblionumber and biblioitemnumber mapped correctly</td>
+    </tr>
+<!-- /TMPL_IF -->
+
+    <!-- TMPL_IF NAME="frameworknull" -->
+        <tr>
+            <td>framework values</td>
+            <td>there is a null value in a frameworkcode. Check the following tables<br/>
+                <li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+                <li>select * from marc_tag_structure where frameworkcode is NULL</li>
+                <li>select * from marc_biblio where frameworkcode is NULL</li></td>
+        </tr>
+    <!-- TMPL_ELSE -->
+        <tr>
+            <td>OK</td>
+            <td>no NULL value in frameworkcode</td>
+        </tr>
+    <!-- /TMPL_IF -->
 
 <!-- -->
 <!-- TMPL_IF name="total" -->
-	<tr>
-		<td>TOTAL</td>
-		<td>You have <!-- TMPL_VAR name="total" --> error(s) in your MARC configuration. Please fix them before using Koha</td>
-	</tr>
+    <tr>
+        <td>TOTAL</td>
+        <td>You have <!-- TMPL_VAR name="total" --> error(s) in your MARC configuration. Please fix them before using Koha</td>
+    </tr>
 </table>
 <!-- TMPL_ELSE -->
-	</table>
-		<p>Configuration OK, you don't have errors in your MARC parameters </p>
+    </table>
+        <p><b>Configuration OK, you don't have errors in your MARC parameters table</b></p>
 <!-- /TMPL_IF -->
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl
index 022a4b1877..04e4d2b5fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl
@@ -36,9 +36,9 @@ Item Types Administration
   <feldset>
     <legend>
   <!-- TMPL_IF name="itemtype" -->
-      Modify item type
+      <h3>Modify item type</h3>
   <!-- TMPL_ELSE -->
-      Add item type
+      <h3>Add item type</h3>
   <!-- /TMPL_IF -->
     </legend>
 
@@ -59,10 +59,10 @@ Item Types Administration
   <!-- TMPL_ELSE -->
       <tr>
         <th>
-          <label for="">Item type</label>
+          <label for="itemtype">Item type</label>
         </th>
         <td>
-          <input type="text" name="itemtype" size="6" maxlength="4" onblur="toUC(this)" />
+          <input type="text" id="itemtype" name="itemtype" size="10" maxlength="10" onblur="toUC(this)" />
         </td>
       </tr>
   <!-- /TMPL_IF -->
@@ -84,9 +84,15 @@ Item Types Administration
     <!-- TMPL_IF name="checked" -->
               <input type="radio" name="image" value="<!-- TMPL_VAR name="KohaImage" -->" checked="checked" />
     <!-- TMPL_ELSE -->
+              <!-- TMPL_IF NAME="KohaImage" --> <!-- to delete the radio button if there is no image after -->
               <input type="radio" name="image" value="<!-- TMPL_VAR name="KohaImage" -->" />
+              <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
-              <img src="<!-- TMPL_VAR name="KohaImageSrc" -->">
+        <!-- TMPL_IF NAME="KohaImageSrc" -->
+              <img src="<!-- TMPL_VAR name="KohaImageSrc" -->" alt="">
+        <!-- TMPL_ELSE -->
+              <br />
+        <!-- /TMPL_IF -->
             </label>
   <!-- /TMPL_LOOP -->
           </p>
@@ -151,6 +157,16 @@ Item Types Administration
           <input type="text" id="rentalcharge" name="rentalcharge" size="10" value="<!-- TMPL_VAR name="rentalcharge" -->" />
         </td>
       </tr><!--  /Hide from NPL -->
+      <tr>
+        <th>
+          <label for="rentalcharge">Summary</label>
+        </th>
+        <td><p>Enter a summary that will overwrite the default one in search results lists</p>
+          <p><textarea id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" --></textarea></p>
+          <p>Example, for a website itemtype : </p>
+          <p><b>&lt;a href="[856u]"&gt;open site&lt;/a&gt;</b> will show the link just below the title</p>
+        </td>
+      </tr>
     </table>
 
     <p id="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl
index 29636fafe8..a22b368e2f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl
@@ -5,9 +5,9 @@
 
 <!-- TMPL_IF NAME="add_form" -->
 	<!-- TMPL_IF NAME="id_city" -->
-		<h1>Modifier un type de voie</h1>
+		<h1>Modify road type</h1>
 	<!-- TMPL_ELSE -->
-		<h1>Ajouter un type de voie</h1>
+		<h1>Add road type</h1>
 	<!-- /TMPL_IF -->
 
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl
index 64eaeaeeda..6d75af3f54 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl
@@ -7,248 +7,178 @@
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
 <script language="JavaScript" type="text/javascript">
-		function _(s) { return s } // dummy function for gettext
-		//
-		function isNotNull(f,noalert) {
-			if (f.value.length ==0) {
-	return false;
-			}
-			return true;
-		}
-		//
-		function toUC(f) {
-			var x=f.value.toUpperCase();
-			f.value=x;
-			return true;
-		}
-		//
-		function isNum(v,maybenull) {
-		var n = new Number(v.value);
-		if (isNaN(n)) {
-			return false;
-			}
-		if (maybenull==0 && v.value=='') {
-			return false;
-		}
-		return true;
-		}
-		//
-		function isDate(f) {
-			var t = Date.parse(f.value);
-			if (isNaN(t)) {
-				return false;
-			}
-		}
-		//
-		function Check(f) {
-			var ok=1;
-			var _alertString="";
-			var alertString2;
-			if (f.variable.value.length==0) {
-				_alertString += "\n- " + _("variable missing");
-			}
-			if (f.value.value.length==0) {
-				_alertString += "\n- " + _("value missing");
-			}
-			if (_alertString.length==0) {
-				document.Aform.submit();
-			} else {
-				alertString2  = _("Form not submitted because of the following problem(s)");
-				alertString2 += "\n------------------------------------------------------------------------------------\n";
-				alertString2 += _alertString;
-				alert(alertString2);
-			}
-		}
-		</script>
+        function _(s) { return s } // dummy function for gettext
+        //
+        function isNotNull(f,noalert) {
+            if (f.value.length ==0) {
+    return false;
+            }
+            return true;
+        }
+        //
+        function toUC(f) {
+            var x=f.value.toUpperCase();
+            f.value=x;
+            return true;
+        }
+        //
+        function isNum(v,maybenull) {
+        var n = new Number(v.value);
+        if (isNaN(n)) {
+            return false;
+            }
+        if (maybenull==0 && v.value=='') {
+            return false;
+        }
+        return true;
+        }
+        //
+        function isDate(f) {
+            var t = Date.parse(f.value);
+            if (isNaN(t)) {
+                return false;
+            }
+        }
+        //
+        function Check(f) {
+            var ok=1;
+            var _alertString="";
+            var alertString2;
+            if (f.variable.value.length==0) {
+                _alertString += "\n- " + _("variable missing");
+            }
+            if (f.value.value.length==0) {
+                _alertString += "\n- " + _("value missing");
+            }
+            if (_alertString.length==0) {
+                document.Aform.submit();
+            } else {
+                alertString2  = _("Form not submitted because of the following problem(s)");
+                alertString2 += "\n------------------------------------------------------------------------------------\n";
+                alertString2 += _alertString;
+                alert(alertString2);
+            }
+        }
+        </script>
 
 <!-- TMPL_IF NAME="add_form" -->
-	
-		<!-- TMPL_IF NAME="modify" -->
-			<h1>Modify a system preference</h1>
-		<!-- TMPL_ELSE -->
-			<h1>Add a system preference</h1>
-		<!-- /TMPL_IF -->
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
-		
-		
-		<table>
-			<tr><td><label for="explanation">Explanation: </label></td><td><input type="text" name="explanation" id="explanation" size="60" value="<!-- TMPL_VAR NAME="explanation" escape="HTML" -->" /><input type="hidden" name="op" value="add_validate" /></td></tr>
-			<tr><!-- TMPL_IF NAME="searchfield" --><td><label>Variable</label></td><td><!-- TMPL_VAR NAME="searchfield" --><input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->"></td>
-			<!-- TMPL_ELSE --><td><label for="variable">Variable</label></td><td><input type="text" name="variable" id="variable" size="60" /></td><!-- /TMPL_IF --></tr>
-			<tr><td><label for="value">Value</label></td><td><!-- TMPL_IF NAME="type-free" -->
-					<input type="text" id="value" name="value" value="<!-- TMPL_VAR NAME="value" escape="HTML" -->" size="<!-- TMPL_VAR NAME="fieldlength" -->" />
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF NAME="type-textarea" -->
-					<textarea name="value" id="value" rows="<!--TMPL_VAR NAME="rows" -->" cols="<!-- TMPL_VAR NAME="cols" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF NAME="type-choice" -->
-					<select name="value" id="value">
-						<!-- TMPL_LOOP NAME="options" -->
-							<option value="<!-- TMPL_VAR NAME="option" -->"<!-- TMPL_IF NAME="selected" -->selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="option" --></option>
-						<!-- /TMPL_LOOP -->
-					</select>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF NAME="type-yesno" -->
-					<!-- TMPL_IF NAME="value-yes" -->
-					<input type="radio" name="value" id="value" value="1" checked="checked"><!-- TMPL_ELSE --><input type="radio" name="value" id="value" value="1" /><!-- /TMPL_IF -->Yes
-				<!-- TMPL_IF NAME="value-no" -->	
-					<input type="radio" name="value" value="0" checked="checked" /><!-- TMPL_ELSE --><input type="radio" name="value" value="0" /><!-- /TMPL_IF -->No<!-- /TMPL_IF -->
-				</td></tr>
-		</table>
-		<p><input type="submit" value="<!-- TMPL_IF NAME="modify" -->Save Changes<!-- TMPL_ELSE -->Add this Preference<!-- /TMPL_IF -->"> <input type="button"  value="Cancel" onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" /></p>
-		
+    
+        <!-- TMPL_IF NAME="modify" -->
+            <h1>Modify a system preference</h1>
+        <!-- TMPL_ELSE -->
+            <h1>Add a system preference</h1>
+        <!-- /TMPL_IF -->
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+        
+        
+        <table>
+            <tr><td><label for="explanation">Explanation: </label></td><td><input type="text" name="explanation" id="explanation" size="60" value="<!-- TMPL_VAR NAME="explanation" escape="HTML" -->" /><input type="hidden" name="op" value="add_validate" /></td></tr>
+            <tr><!-- TMPL_IF NAME="searchfield" --><td><label>Variable</label></td><td><!-- TMPL_VAR NAME="searchfield" --><input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->"></td>
+            <!-- TMPL_ELSE --><td><label for="variable">Variable</label></td><td><input type="text" name="variable" id="variable" size="60" /></td><!-- /TMPL_IF --></tr>
+            <tr><td><label for="value">Value</label></td><td><!-- TMPL_IF NAME="type-free" -->
+                    <textarea id="value" name="value"cols="<!-- TMPL_VAR NAME="fieldlength" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="type-textarea" -->
+                    <textarea name="value" id="value" rows="<!--TMPL_VAR NAME="rows" -->" cols="<!-- TMPL_VAR NAME="cols" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="type-choice" -->
+                    <select name="value" id="value">
+                        <!-- TMPL_LOOP NAME="options" -->
+                            <option value="<!-- TMPL_VAR NAME="option" -->"<!-- TMPL_IF NAME="selected" -->selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="option" --></option>
+                        <!-- /TMPL_LOOP -->
+                    </select>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="type-yesno" -->
+                    <!-- TMPL_IF NAME="value-yes" -->
+                    <input type="radio" name="value" id="value" value="1" checked="checked"><!-- TMPL_ELSE --><input type="radio" name="value" id="value" value="1" /><!-- /TMPL_IF -->Yes
+                <!-- TMPL_IF NAME="value-no" -->	
+                    <input type="radio" name="value" value="0" checked="checked" /><!-- TMPL_ELSE --><input type="radio" name="value" value="0" /><!-- /TMPL_IF -->No<!-- /TMPL_IF -->
+                </td></tr>
+        </table>
+        <p><input type="submit" value="<!-- TMPL_IF NAME="modify" -->Save Changes<!-- TMPL_ELSE -->Add this Preference<!-- /TMPL_IF -->"> <input type="button"  value="Cancel" onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" /></p>
+        
 <h3>Koha internal</h3>		
-		Note: you should have no reasons to modify the following default values
-		<table>
-		<tr><td><label for="preftype">Variable type:</label></td><td><input type="text" name="preftype" id="preftype" value="<!--TMPL_VAR NAME="preftype" -->" size="40" maxlength="40"><span class="formfield-notes"> (Choice, YesNo, Integer, Textarea, Float, Themes, or Languages)</td></tr>
-		<tr><td><label for="prefoptions">Variable options:</label></td><td><input type="text" name="prefoptions" id="prefoptions" value="<!-- TMPL_VAR NAME="prefoptions" -->" size="60" maxlength="80" />(a choice list for Choice (separated by |) or cols|rows for Texarea)</td></tr>
-		</table>
-		</form>
-	<!-- /TMPL_IF -->
-	
-	<!-- TMPL_IF NAME="add_validate" -->
-	
+        Note: you should have no reasons to modify the following default values
+        <table>
+        <tr><td><label for="preftype">Variable type:</label></td><td><input type="text" name="preftype" id="preftype" value="<!--TMPL_VAR NAME="preftype" -->" size="40" maxlength="40"><span class="formfield-notes"> (Choice, YesNo, Integer, Textarea, Float, Themes, or Languages)</td></tr>
+        <tr><td><label for="prefoptions">Variable options:</label></td><td><input type="text" name="prefoptions" id="prefoptions" value="<!-- TMPL_VAR NAME="prefoptions" -->" size="60" maxlength="80" />(a choice list for Choice (separated by |) or cols|rows for Texarea)</td></tr>
+        </table>
+        </form>
+    <!-- /TMPL_IF -->
+    
+    <!-- TMPL_IF NAME="add_validate" -->
+    
 
-		<h3>Data recorded</h3>
-		
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="submit" value="OK" />
-		</form>
-	<!-- /TMPL_IF -->
-	
-	<!-- TMPL_IF NAME="delete_confirm" -->
-	
-	<table>
-		<caption>Confirm Deletion of <!-- TMPL_VAR NAME="searchfield" -->?</caption>
-		<tr>
-			<th>Variable Name:</th>
-			<td><!-- TMPL_VAR NAME="searchfield" --></td>
-		</tr>
-		<tr><th>Value: </th><td><!-- TMPL_VAR NAME="Tvalue" --></td></tr></table>
-		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
-		<input type="submit"  value="Yes, Delete"></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete" /></form>
-	
-	
-	<!-- /TMPL_IF -->
-	
-	<!-- TMPL_IF NAME="delete_confirmed" -->
-	
-		<h3>Data deleted</h3>
-		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="submit" value="Back to System Preferences" />
-		</form>
-	<!-- /TMPL_IF -->
-	
-	<!-- TMPL_IF NAME="else" -->
-	<h1>System preferences admin</h1>
-		<ul>
-			<li>
-				<!--TMPL_IF Name="Admin"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin" class="here">Admin
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-			<li>
-				<!--TMPL_IF Name="Acquisitions"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions" class="here">Acquisitions
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-			<li>
-				<!--TMPL_IF Name="Authorities"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities" class="here">Authorities
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-			<li>
-				<!--TMPL_IF Name="Librarian"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet" class="here">Intranet
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet">Intranet
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-			<li>
-				<!--TMPL_IF Name="Catalogue"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="here">Catalogue
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-			<li>
-				<!--TMPL_IF Name="Circulation"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation" class="here">Circulation
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-			<li>
-				<!--TMPL_IF Name="Members"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="here">Members
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-			<li>
-				<!--TMPL_IF Name="OPAC"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC" class="here">OPAC
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-			<li>
-				<!--TMPL_IF Name="Others"-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=" class="here">Others
-					</a>
-				<!--TMPL_ELSE-->
-					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others
-					</a>
-				<!--/TMPL_IF-->
-			</li>
-		</ul>
-
-	<!-- TMPL_VAR NAME="searchfield" -->
-	<table>
-	<tr>
-		<th>Variable</th>
-		<th>Value</th>
-		<th colspan="3">Explanation</th>
-	</tr>
-	<!-- TMPL_LOOP NAME="loop" -->
-	<tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
-		<td><!-- TMPL_VAR NAME="variable" --></td>
-		<td><!-- TMPL_VAR NAME="value" --></td>
-		<td><!-- TMPL_VAR NAME="explanation" --></td>
-		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
-		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
-	</tr>
-	<!-- /TMPL_LOOP -->
-	</table>
-	</form>
-	
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-		<input type="hidden" name="op" value="add_form" />
-		<input type="submit" value="Add a System Preference" />
-	</form>
-	
-	<!-- /TMPL_IF -->
+        <h3>Data recorded</h3>
+        
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="submit" value="OK" />
+        </form>
+    <!-- /TMPL_IF -->
+    
+    <!-- TMPL_IF NAME="delete_confirm" -->
+    
+    <table>
+        <caption>Confirm Deletion of <!-- TMPL_VAR NAME="searchfield" -->?</caption>
+        <tr>
+            <th>Variable Name:</th>
+            <td><!-- TMPL_VAR NAME="searchfield" --></td>
+        </tr>
+        <tr><th>Value: </th><td><!-- TMPL_VAR NAME="Tvalue" --></td></tr></table>
+        <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+        <input type="submit"  value="Yes, Delete"></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete" /></form>
+    
+    
+    <!-- /TMPL_IF -->
+    
+    <!-- TMPL_IF NAME="delete_confirmed" -->
+    
+        <h3>Data deleted</h3>
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="submit" value="Back to System Preferences" />
+        </form>
+    <!-- /TMPL_IF -->
+    
+    <!-- TMPL_IF NAME="else" -->
+    <h1>System preferences admin</h1>
+    <div id="action">
+        <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin</a>
+        <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=LOGFeatures">Log Features</a>
+        <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions</a>
+        <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities</a>
+        <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue</a>
+        <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation</a>
+        <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members</a>
+        <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC</a>
+        <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPACFeatures">OPAC Features</a>
+        <a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet">Intranet</a>
+        <a href="/cgi-bin/koha/admin/systempreferences.pl?">Others</a>
+    </div>
+    <h2>Editing preferences for <!-- TMPL_VAR name="tab" --> module</h2>
+    <!-- TMPL_VAR NAME="searchfield" -->
+    <table>
+    <tr>
+        <th>Variable</th>
+        <th>Value</th>
+        <th colspan="3">Explanation</th>
+    </tr>
+    <!-- TMPL_LOOP NAME="loop" -->
+    <tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
+        <td><!-- TMPL_VAR NAME="variable" --></td>
+        <td><!-- TMPL_VAR NAME="value" --></td>
+        <td><!-- TMPL_VAR NAME="explanation" --></td>
+        <td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
+        <td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+    </tr>
+    <!-- /TMPL_LOOP -->
+    </table>
+    </form>
+    
+    <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="hidden" name="op" value="add_form" />
+        <input type="submit" value="Add a System Preference" />
+    </form>
+    
+    <!-- /TMPL_IF -->
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl
index 0bdfec6be6..98db611167 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl
@@ -1,153 +1,156 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: Thesaurus Management
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
-<div id="main">
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+
 <!-- TMPL_IF name="detail_form" -->
-	<!-- -->
-	<h1>Thesaurus management</h1><table>
-	<tr><td>&nbsp;</td></tr>
-	<tr>
-		<td><b>Values related to <!-- TMPL_VAR name="stdlib" --> (<!-- TMPL_VAR name="category" -->)</b></td>
-	</tr>
-	</table>
-	<br/><br/>
-	<table>
-	<tr>
-		<th>Other forms</th>
-		<th>&nbsp;</th>
-		<th>&nbsp;</th>
-	</tr>
-	<!-- TMPL_LOOP name="loop" -->
-	<tr>
-		<td><!-- TMPL_VAR name="freelib" --></td>
-		<td><a href="<!-- TMPL_VAR name="edit" -->">Edit</a></td>
-		<td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
-	</tr>
-	<!-- /TMPL_LOOP -->
-	<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-	<input type="hidden" name="op" value="add_form" />
-	</table>
-	<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-	<input type="hidden" name="op" value="add_form" />
-	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->" />
-	<input type="hidden" name="stdlib" value="<!-- TMPL_VAR name="stdlib" -->" />
-	<br><input type="submit" value="Add thesaurus entry" /><br>
-	</form>
+<table>
+    <caption>Thesaurus management</caption>
+    <tr>
+        <td>Values related to <!-- TMPL_VAR name="stdlib" --> (<!-- TMPL_VAR name="category" -->)</td>
+    </tr>
+    </table>
+
+    <table>
+    <tr>
+        <th>Other forms</th>
+        <th>&nbsp;</th>
+        <th>&nbsp;</th>
+    </tr>
+    <!-- TMPL_LOOP name="loop" -->
+    <tr>
+        <td><!-- TMPL_VAR name="freelib" --></td>
+        <td><a href="<!-- TMPL_VAR name="edit" -->">Edit</a></td>
+        <td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
+    </tr>
+    <!-- /TMPL_LOOP -->
+    <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+    <input type="hidden" name="op" value="add_form" />
+    </table>
+    <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+    <input type="hidden" name="op" value="add_form" />
+    <input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->" />
+    <input type="hidden" name="stdlib" value="<!-- TMPL_VAR name="stdlib" -->" />
+    <input type="submit" value="Add thesaurus entry" />
+    </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="add_form" -->
 <!-- -->
 
-	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
-	<h1><!-- TMPL_IF name="search_category" -->Add<!-- TMPL_ELSE -->Modify<!-- /TMPL_IF --></h1><!-- TMPL_IF name="search_category" -->
-		<input type="hidden" name="op" value="add_validate" />
-	<!-- TMPL_ELSE -->
-		<input type="hidden" name="op" value="mod_validate" />
-	<!-- /TMPL_IF --><table>
-	<tr>
-		<td>Category</td>
-		<td><!-- TMPL_VAR name="category" --></td>
-	</tr>
-	<tr>
-		<td>Authority lib</td>
-		<!-- TMPL_IF name="id" -->
-			<td><!-- TMPL_VAR name="father" --><!-- TMPL_VAR name="stdlib" --><input type="hidden" name="stdlib" value="<!-- TMPL_VAR name="stdlib" -->" /></td>
-		<!-- TMPL_ELSE -->
-			<td><!-- TMPL_VAR name="father" --><input type="text" name="stdlib" value="<!-- TMPL_VAR name="stdlib" escape="HTML" -->" maxlength="80" size="80" /></td>
-		<!-- /TMPL_IF -->
-	</tr>
-	<tr>
-		<td>Other lib</td>
-		<td><!-- TMPL_VAR name="father" --><input type="text" name="freelib" value="<!-- TMPL_VAR name="freelib" escape="HTML" -->" maxlength="80" size="80" /></td>
-	</tr>
-	</table>
-	<p><input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
-			<input type="hidden" name="father" value="<!-- TMPL_VAR name="father" escape="HTML" -->" />
-			<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" escape="HTML" -->" />
-			<input type="hidden" name="search_category" value="<!-- TMPL_VAR name="search_category" -->" />
-			<input type="hidden" name="searchstring" value="<!-- TMPL_VAR name="searchstring" escape="HTML" -->" />
-			<input type="hidden" name="offset" value="<!-- TMPL_VAR name="offset" -->" />
-			<input type="submit" class="submit" value="<!-- TMPL_IF name="search_category" -->Add<!-- TMPL_ELSE -->Modify<!-- /TMPL_IF --> Value" /></p></form>
+    <form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
+    <h1><!-- TMPL_IF name="search_category" -->Add<!-- TMPL_ELSE -->Modify<!-- /TMPL_IF --></h1><!-- TMPL_IF name="search_category" -->
+        <input type="hidden" name="op" value="add_validate" />
+    <!-- TMPL_ELSE -->
+        <input type="hidden" name="op" value="mod_validate" />
+    <!-- /TMPL_IF --><table>
+    <tr>
+        <td>Category</td>
+        <td><!-- TMPL_VAR name="category" --></td>
+    </tr>
+    <tr>
+        <td>Authority lib</td>
+        <!-- TMPL_IF name="id" -->
+            <td><!-- TMPL_VAR name="father" --><!-- TMPL_VAR name="stdlib" --><input type="hidden" name="stdlib" value="<!-- TMPL_VAR name="stdlib" -->" /></td>
+        <!-- TMPL_ELSE -->
+            <td><!-- TMPL_VAR name="father" --><input type="text" name="stdlib" value="<!-- TMPL_VAR name="stdlib" escape="HTML" -->" maxlength="80" size="80" /></td>
+        <!-- /TMPL_IF -->
+    </tr>
+    <tr>
+        <td>Other lib</td>
+        <td><!-- TMPL_VAR name="father" --><input type="text" name="freelib" value="<!-- TMPL_VAR name="freelib" escape="HTML" -->" maxlength="80" size="80" /></td>
+    </tr>
+    </table>
+    <p><input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
+            <input type="hidden" name="father" value="<!-- TMPL_VAR name="father" escape="HTML" -->" />
+            <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" escape="HTML" -->" />
+            <input type="hidden" name="search_category" value="<!-- TMPL_VAR name="search_category" -->" />
+            <input type="hidden" name="searchstring" value="<!-- TMPL_VAR name="searchstring" escape="HTML" -->" />
+            <input type="hidden" name="offset" value="<!-- TMPL_VAR name="offset" -->" />
+            <!-- TMPL_IF name="search_category" -->
+                <input type="submit" value="Add Value" />
+            <!-- TMPL_ELSE -->
+                <input type="submit" value="Modify Value" />
+            <!-- /TMPL_IF -->
+            </p></form>
 <!-- /TMPL_IF -->
 
 
 <!-- TMPL_IF name="delete_confirm" -->
 <!-- -->
-		<table>
-		<tr>
-			<td><b>lib</b></td>
-			<td><b><!-- TMPL_VAR name="search_category" --></b></td>
-		</tr>
-		<tr><td>Value</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
-		<tr><td>
-			<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-				<input type="hidden" name="op" value="delete_confirmed" />
-				<input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
-				<input type="hidden" name="search_category" value="<!-- TMPL_VAR name="search_category" -->" />
-		</tr></td>
-		<tr><td colspan=2 align=center>CONFIRM DELETION of this entry <b>and all entries depending on this one</b></td></tr>
-		<tr><td><input type="submit" value="YES" /></form></td>
-				<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="NO" /></form></td></tr>
-	</table>
+        <table>
+        <tr>
+            <td>lib</td>
+            <td><!-- TMPL_VAR name="search_category" --></td>
+        </tr>
+        <tr><td>Value</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
+        <tr><td>
+            <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+                <input type="hidden" name="op" value="delete_confirmed" />
+                <input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
+                <input type="hidden" name="search_category" value="<!-- TMPL_VAR name="search_category" -->" />
+        </tr></td>
+        <tr><td colspan="2">CONFIRM DELETION of this entry and all entries depending on this one</td></tr>
+        <tr><td><input type="submit" value="YES" /></form></td>
+                <td><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="NO" /></form></td></tr>
+    </table>
 <!-- /TMPL_IF -->
 
 <!-- -->
 <!-- TMPL_IF name="else" -->
 <h1>Thesaurus management</h1>
-	<p>Manages thesaurus and authorities files.</p>
-	<ul>
-		<li><b>Dig</b>: see data dependent on this one</li>
-		<li><b>Related</b>: see other forms of this authority entry</li>
-	</ul>
-<div class="tabitem">	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="post">
-		<!-- TMPL_VAR name="tab_list" -->
-		<input type="text" name="searchstring" value="<!-- TMPL_VAR name="searchstring" -->" />
-		<input type="submit" value="OK" class="submit" /></form>
-	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="get"><input type="hidden" value="add_form" name="op" /><input type="submit" class="submit" value="New Category" /></form></div>
-	
-	<!-- TMPL_LOOP name="hierarchy_loop" -->
-		<a href="thesaurus.pl?branch=<!-- TMPL_VAR name="branch" -->&search_category=<!-- TMPL_VAR name="category" -->"><!-- TMPL_VAR name="string" --></a><br />
-	<!-- /TMPL_LOOP -->
-	
+    <p>Manages thesaurus and authorities files.</p>
+    <ul>
+        <li>Dig: see data dependent on this one</li>
+        <li>Related: see other forms of this authority entry</li>
+    </ul>
+    <form action="/cgi-bin/koha/admin/thesaurus.pl" method="post">
+        <!-- TMPL_VAR name="tab_list" -->
+        <input type="text" name="searchstring" value="<!-- TMPL_VAR name="searchstring" -->" />
+        <input type="submit" value="OK" /></form>
+    <form action="/cgi-bin/koha/admin/thesaurus.pl" method="get"><input type="hidden" value="add_form" name="op" /><input type="submit" value="New Category" /></form>
+    
+    <!-- TMPL_LOOP name="hierarchy_loop" -->
+        <a href="thesaurus.pl?branch=<!-- TMPL_VAR name="branch" -->&search_category=<!-- TMPL_VAR name="category" -->"><!-- TMPL_VAR name="string" --></a><br />
+    <!-- /TMPL_LOOP -->
+    
 <!-- TMPL_IF NAME="loop" -->
 <table>
-	<tr>
-		<th>&nbsp;</th>
-		<th>Free form</th>
-		<th>Authority</th>
-		<th>Dig</th>
-		<th>Related</th>
-		<th>Edit</th>
-		<th>Delete</th>
-	</tr>	<!-- TMPL_LOOP name="loop" -->
+    <tr>
+        <th>&nbsp;</th>
+        <th>Free form</th>
+        <th>Authority</th>
+        <th>Dig</th>
+        <th>Related</th>
+        <th>Edit</th>
+        <th>Delete</th>
+    </tr>	<!-- TMPL_LOOP name="loop" -->
 
-	<tr>
-		<td>&nbsp;</td>
-		<td><!-- TMPL_VAR name="freelib" --></td>
-		<td><!-- TMPL_VAR name="father" --> <!-- TMPL_VAR name="stdlib" --></td>
-		<td><!-- TMPL_VAR name="dig" -->Dig</a></td>
-		<td><!-- TMPL_VAR name="related" -->Related</a></td>
-		<td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0" /></a></td>
-		<td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0" /></a></td>
-	</tr>
-	<!-- /TMPL_LOOP -->
-	</table>
+    <tr>
+        <td>&nbsp;</td>
+        <td><!-- TMPL_VAR name="freelib" --></td>
+        <td><!-- TMPL_VAR name="father" --> <!-- TMPL_VAR name="stdlib" --></td>
+        <td><!-- TMPL_VAR name="dig" -->Dig</a></td>
+        <td><!-- TMPL_VAR name="related" -->Related</a></td>
+        <td><a href="<!-- TMPL_VAR name="edit" -->">Edit</a></td>
+        <td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
+    </tr>
+    <!-- /TMPL_LOOP -->
+    </table>
 <!-- /TMPL_IF -->
 <p>		<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-	<input type="hidden" name="op" value="add_form" />
+    <input type="hidden" name="op" value="add_form" />
 </p>
 <p><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
-	<input type="hidden" name="op" value="add_form" />
-	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->" />
-	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
-	<input type="hidden" name="father" value="<!-- TMPL_VAR name="father" -->" />
-	<input type="submit" class="submit"  value="Add Thesaurus entry" />
-	</form></p>
+    <input type="hidden" name="op" value="add_form" />
+    <input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->" />
+    <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
+    <input type="hidden" name="father" value="<!-- TMPL_VAR name="father" -->" />
+    <input type="submit"  value="Add Thesaurus entry" />
+    </form></p>
 <!-- TMPL_VAR name="previous" --> <!-- TMPL_VAR name="next" -->
 <!-- /TMPL_IF -->
-</div>
+
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
index 370a7e2320..de46d357bb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/auth.tmpl
@@ -1,5 +1,12 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="nopermission" -->Access Denied<!-- /TMPL_IF --><!-- TMPL_IF NAME="timed_out" -->Session Timed Out --<!-- /TMPL_IF --><!-- TMPL_IF NAME="different_ip" -->IP Change -- <!-- /TMPL_IF --><!-- TMPL_IF NAME="invalid_username_or_password" -->Invalid Username or Password -- <!-- /TMPL_IF --><!-- TMPL_IF NAME="loginprompt" -->Log in to Koha<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+    <!-- TMPL_IF NAME="nopermission" -->Access Denied<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="timed_out" -->Session Timed Out --<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="different_ip" -->IP Change -- <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="invalid_username_or_password" -->Invalid Username or Password -- <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="loginprompt" -->Log in to Koha<!-- /TMPL_IF -->
+    <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<div id="login">
+<h1><a href="" title=""><span class="hide">Log in to Koha</span></a></h1>
 <!-- TMPL_IF NAME="nopermission" -->
 <!-- This is what is displayed if user doesn"t have permission --><h3>Login Error</h3>
 <p>Sorry, Koha doesn"t think you have permission for this page.</p>
@@ -23,21 +30,20 @@
 
 <!-- TMPL_IF NAME="loginprompt" -->
 <!-- login prompt time-->
-
 <form action="<!-- TMPL_VAR NAME="url" -->" method="post" name="mainform" id="mainform">
 <!-- TMPL_LOOP NAME="INPUTS" -->
-  <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->" />
+    <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->" />
 <!-- /TMPL_LOOP -->
-
-<table>
-	<caption>Log In to Koha</caption>
-    <tr><th scope="row"><label for="userid">Cardnumber:</label></th><td><input name="userid" id="userid" /></td></tr>
-    <tr><th scope="row"><label for="password">Password:</label></th><td><input type="password" name="password" id="password" /></td></tr>
-    </table>
-<p><input type="submit" value="Submit" /></p>
+<p>
+<label>Username:<br />
+<input type="text" name="userid" id="userid" class="input" value="" size="20" tabindex="10" /></label>
+</p>
+<p>
+<label>Password:<br />
+<input type="password" name="password" id="password" class="input" value="" size="20" tabindex="20" /></label>
+</p>    
+<p class="submit"><input type="submit" value="Login &raquo;" /></p>
 </form>
 
-
 <!-- /TMPL_IF -->
-
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl
index 5e9fc31b80..94b5ef993f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl
@@ -1,53 +1,68 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+Cataloguing_Authority Report
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
+<div id="mainbloc">
 
+<h1 class="authority">Authority search</h1>
 
-
-<h1>Authority search</h1>
-
-<form name="f" method="post">
-	<input type="hidden" name="nonav" value="<!-- TMPL_VAR NAME="nonav" -->">
+<form name="f" action="/cgi-bin/koha/authorities/auth_finder.pl" method="post">
 	<input type="hidden" name="op" value="do_search">
-	<input type="hidden" name="type" value="author">
+	<input type="hidden" name="type" value="intranet">
 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
-	<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
 	<div id="bloc25">
 		<h2 class="authority">Search on</h2>
 		<p>
 			<label class="label100">Authority type</label>
 			<!-- TMPL_VAR NAME="authtypecode" -->
 			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
-		</p>
-		<p>
-			<label class="label100">Main heading(a)</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
-			<input type="hidden" name="marclist" value="mainentry">
-			<input type="hidden" name="and_or" value="and">
-			<input type="hidden" name="excluding" value="">
-			<select name="operator">
-				<option value="all">All words</option>
-				<option value="phrase">Phrase</option>
-			</select>
 			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
 		</p>
 		<p>
-			<label class="label100">Sub heading</label><input type="text" name="value">
-			<input type="hidden" name="marclist" value="">
-			<input type="hidden" name="and_or" value="and">
-			<input type="hidden" name="excluding" value="">
-			<select name="operator">
-				<option value="all">All words</option>
-				<option value="phrase">Phrase</option>
-			</select>
-			
+          <label class="label100">Main entry ($a only)</label>
+          <input type="hidden" name="marclist" value="mainmainentry">
+          <input type="hidden" name="and_or" value="and">
+          <input type="hidden" name="excluding" value="">
+          <select name="operator">
+            <option value="contains">contains</option>
+            <option value="start">starts by</option>
+            <option value="is">is exactly</option>
+          </select>
+          <input id="value_mainmainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="resultstring" -->">
 		</p>
-		<p>
+        <p>
+          <label for="value_mainentry">Main entry</label>
+          <input type="hidden" name="marclist" value="mainentry">
+          <input type="hidden" name="and_or" value="and">
+          <input type="hidden" name="excluding" value="">
+          <select name="operator">
+            <option value="contains">contains</option>
+            <option value="start">starts by</option>
+            <option value="is">is exactly</option>
+          </select>
+          <input id="value_mainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+        </p>
+        <p>
+          <label for="value_anywhere">Anywhere</label>
+          <input type="hidden" name="marclist" value="">
+          <input type="hidden" name="and_or" value="and">
+          <input type="hidden" name="excluding" value="">
+          <select name="operator">
+            <option value="contains">contains</option>
+            <option value="start">starts by</option>
+            <option value="is">is exactly</option>
+          </select>
+          <input id="value_anywhere" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+        </p>
+        <p>
+          Sort by <select name="orderby">
+         <option value="">No order</option>
+	    <option value="HeadingAsc">Heading Ascendant</option>
+	    <option value="HeadingDsc">Heading Descendant</option>
+	  </select>
 			<input type="submit" value="Start search" class="button authority">
 		</p>
 	</div>
 </form>
-
-
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</div>
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl
index e8d5bb2d41..a3f6351e20 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl
@@ -1,42 +1,128 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+Koha -- Authorities
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
 
+<fieldset id="authorities_authorities_home_search">
+  <legend>Authority search</legend>
+
+  <form name="f" action="/cgi-bin/koha/authorities/authorities-home.pl" method="post">
+    <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" -->">
+
+    <table>
+      <tr>
+        <th>
+          <label for="authtypecode">Search on</label>
+        </th>
+        <td colspan="2">
+          <select id="authtypecode" name="authtypecode">
+<!-- TMPL_LOOP NAME="authtypesloop" -->
+  <!-- TMPL_IF name="selected" -->
+            <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="authtypetext" --></option>
+  <!-- TMPL_ELSE -->
+            <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="authtypetext" --></option>
+  <!-- /TMPL_IF -->
+<!-- /TMPL_LOOP -->
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <th>
+          <label for="value_mainmainentry">Main entry ($a only)</label>
+          <input type="hidden" name="marclist" value="mainmainentry">
+        </th>
+        <td>
+          <select name="operator">
+	    <option value="contains">contains</option>
+	    <option value="start">start by</option>
+            <option value="is">is exactly</option>
+	  </select>
+        </td>
+        <td>
+          <input id="value_mainmainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+        </td>
+      </tr>
+      <tr>
+        <th>
+          <label for="value_mainentry">Main entry</label>
+          <input type="hidden" name="marclist" value="mainentry">
+          <input type="hidden" name="and_or" value="and">
+          <input type="hidden" name="excluding" value="">
+        </th>
+        <td>
+          <select name="operator">
+	    <option value="contains">contains</option>
+	    <option value="start">start by</option>
+            <option value="is">is exactly</option>
+	  </select>
+        </td>
+        <td>
+          <input id="value_mainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+        </td>
+      </tr>
+
+      <tr>
+        <th>
+          <label for="value_anywhere">Anywhere</label>
+          <input type="hidden" name="marclist" value="">
+          <input type="hidden" name="and_or" value="and">
+          <input type="hidden" name="excluding" value="">
+        </th>
+        <td>
+          <select name="operator">
+            <option value="contains">contains</option>
+            <option value="start">start by</option>
+            <option value="is">is exactly</option>
+          </select>
+        </td>
+        <td>
+          <input id="value_anywhere" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+        </td>
+      </tr>
+    </table>
+    
+    <div id="action">
+          Order by :<select name="orderby">
+         <option value="">None</option>
+	    <option value="HeadingAsc">Heading Ascendant</option>
+	    <option value="HeadingDsc">Heading Descendant</option>
+	  </select>
+      <input type="submit" value="Start search">
+    </div>
+  </form>
+</fieldset>
+    
+<fieldset id="authorities_authorities_home_add">
+  <legend>Add authority</legend>
+
+  <form name="f2" method="post" action="authorities.pl">
+    <table>
+      <tr>
+        <th>
+          <label for="add_authtypecode">Authority type</label>
+        </th>
+        <td>
+          <select id="add_authtypecode" name="authtypecode">
+<!-- TMPL_LOOP name="authtypesloop" -->
+  <!-- TMPL_IF name="selected" -->
+            <option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_VAR name="authtypetext" --></option>
+  <!-- TMPL_ELSE -->
+            <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="authtypetext" --></option>
+  <!-- /TMPL_IF -->
+<!-- /TMPL_LOOP -->
+          </select>
+        </td>
+      </tr>
+    </table>
 
-<form name="f" method="post">
-	<input type="hidden" name="op" value="do_search" />
-	<input type="hidden" name="type" value="intranet" />
-	<input type="hidden" name="stype" value="author" />
-	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
-<div class="data"><table>
-<caption>Authority search</caption>
-<tr><th><label for="authtypecode">Authority type</label></th><td><select id="authtypecode" name="authtypecode"  >
-			<!-- TMPL_LOOP NAME="authtypesloop" -->
-				<option value="<!-- TMPL_VAR NAME="value" -->" >
-					<!-- TMPL_VAR NAME="authtypetext" -->
-				</option>
-			<!-- /TMPL_LOOP -->
-			</select></td></tr>
-<tr><th><label id="mainentry">Main entry</label></th><td><select name="operator" id="mainentry">
-				<option value="all">All words</option>
-				<option value="phrase">Phrase</option>
-			</select> <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
-			<input type="hidden" name="marclist" value="mainentry" />
-			
-			</td></tr>			
-<tr><th><label for="anywhere">Anywhere</label></th><td><select name="operator" id="anywhere">
-				<option value="all">All words</option>
-				<option value="phrase">Phrase</option>
-			</select> <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
-			<input type="hidden" name="marclist" value="">
-			
-			</td></tr></table></div>
-		<p>
-			<input type="submit" value="Start search" class="submit">
-		</p>
-</form>
-
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+    <div id="action">
+      <input type="submit" value="Add" class="button authority">
+    </div>
+  </form>
+</fieldset>
 
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl
index 1c88809daf..a34bba4e2c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl
@@ -1,185 +1,115 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Authorities
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+Koha -- Authority details
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
-<!--TMPL_ELSE-->
-<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
-<!--/TMPL_UNLESS-->
-
 
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
 
+<fieldset id="authorities_authorities_add_or_modify">
+<!-- TMPL_IF name="authid" -->
+  <legend>Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</legend>
+<!-- TMPL_ELSE -->
+  <legend>Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</legend>
+<!-- /TMPL_IF -->  
+  <form method="post" name="f">
+    <input type="hidden" name="op" value="add">
+    <input type="hidden" name="addfield_field" value="">
+    <input type="hidden" name="repeat_field" value="">
+    <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
+    <input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
 
-<!-- TMPL_IF name="error" -->
-			<div class="error">
-				<!--TMPL_IF NAME="xmlerror"-->
-				<ul>
-					<li>Non UTF-8 characters present or malformed XML</li>
-					<li>Please correct and save.</li>
-				</ul>
-				<!--/TMPL_IF-->
-			</div>
+    <div id="action">
+<!-- TMPL_IF name="authid" -->
+      <input type="button" value="Save" onClick="Check(this.form)" accesskey="w">
+<!-- TMPL_ELSE -->
+      <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w">
 <!-- /TMPL_IF -->
-<form method="post" name="f" id="f" action="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->&nonav=<!-- TMPL_VAR NAME="nonav" -->&linkid="+document.form.f.linkid.value >
-	
-<div class="tabitem">
-	<h1>Authority number <!-- TMPL_VAR NAME="authid" --></h1>
-	<p><input type="hidden" name="nonav" value="<!-- TMPL_VAR NAME="nonav" -->"><input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
-		<input type="hidden" name="op" value="add">
-		<input type="hidden" name="addfield_field">
-		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
-		<input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
-	<input type="hidden" name="linkid" id="linkid" value="0000">
-		<!-- TMPL_IF name="authid" -->
-			<input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
-		<!-- TMPL_ELSE -->
-			<input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
-		<!-- /TMPL_IF -->
-	</p>
-</div>
-<br>
-	<div class="tabs">
-        <!-- TMPL_LOOP name="BIG_LOOP" -->
-            <a href="#" onclick="active(<!-- TMPL_VAR name="number"-->); return false;" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
-        <!--  /TMPL_LOOP -->
-	</div>
+    </div>
 
+<!-- TMPL_IF name="duplicateauthid" -->
+	<div class="problem">
+		<p>Duplicate suspected with <a href='javascript:openWindow("detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1", "Duplicate Authority")' class="button authority"><!-- TMPL_VAR name="duplicateauthvalue" --></a></p>
+		<p>You must either :</p>
+		<ul>
+			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
+			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
+		</ul>
+	</div>
+<!-- /TMPL_IF -->
 
-<! -- RESET PAGINATION -->
-<!-- TMPL_LOOP name="BIG_LOOP" -->
-<!-- hide every tab except the 1st -->
-<!-- TMPL_IF name="number" -->
-    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:hidden">
+<!-- TMPL_LOOP NAME="0XX" -->
+<!-- TMPL_IF name="tag" -->
+<p class="MARCtag">
+	<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
+	<!-- TMPL_UNLESS name="hide_marc" --><a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
+	<input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffffff;'" type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> -
 <!-- TMPL_ELSE -->
-    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:visible">
+<input tabindex="1" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->"><!-- /TMPL_UNLESS -->
+	<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
+    <!-- TMPL_IF name="repeatable" --><a href="#<!-- TMPL_VAR NAME="tag" -->" onclick="javascript:this.nextSibling.type='text';this.nextSibling.focus()">+</a><input type="hidden"  value="" size="2" onchange="AddField('<!-- TMPL_VAR NAME="tag" -->',this.value)" ><!-- /TMPL_IF -->
+</p>
 <!-- /TMPL_IF -->
-<!-- TMPL_UNLESS name="number" -->
-    <!-- show duplicate warning on tab 0 only -->
-<!-- TMPL_IF name="duplicateauthid" -->
-			<div class="error">
-				<p>Is this a duplicate of <a href="detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&nonav=<!-- TMPL_VAR name="nonav" -->" onclick="openWindow('detail.pl?nonav=<!-- TMPL_VAR name="nonav" -->&authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1', ''; return false;)"><!-- TMPL_VAR name="duplicateauthvalue" --></a>?</p>
-				
-				<ul>
-					
-					<li>If not, click to <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" /> <a href="#" onclick="confirmnotdup(); return false;">Confirm it's not a duplicate</a></li>
-				</ul>
-			</div>
-		<!-- /TMPL_IF -->
-  <!-- /TMPL_UNLESS -->
-    <!-- TMPL_LOOP NAME="innerloop" -->
-		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
-        <!-- TMPL_IF name="tag" -->
-        <p class="MARCtag">
-            <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-            <!-- TMPL_UNLESS name="hide_marc" -->
-                <a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-                <input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> -
-            <!-- TMPL_ELSE -->
-                <input tabindex="1" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
-            <!-- /TMPL_UNLESS -->
-            <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-            <!-- TMPL_VAR NAME="tag_lib" -->
-            <!-- /TMPL_UNLESS -->
-            <!-- TMPL_IF name="repeatable" --><a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
-        </p>
-        <!-- /TMPL_IF -->
-        <!-- TMPL_LOOP NAME="subfield_loop" -->
-            <!-- TMPL_IF NAME="visibility" -->
-                <a tabindex="1" style="color: grey; font-size: 80%; cursor: se-resize;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
-                    <!-- TMPL_VAR NAME="subfield" -->
-                </a>
-            <!-- /TMPL_IF -->
-            <div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->">
-                <p>
-                <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-                    <label <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield">
-                <!-- /TMPL_UNLESS -->
-                <!-- TMPL_UNLESS name="hide_marc" -->
-                    <img style="cursor: crosshair; color: grey; font-size: 80%;" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
-                        <input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
-                <!-- TMPL_ELSE -->
-                    <input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="subfield" -->"/>
-                <!-- /TMPL_UNLESS -->
-                <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
-                    <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
-                    <!-- TMPL_VAR NAME="marc_lib" -->
-                    <!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
-                    </label>
-                <!-- /TMPL_UNLESS -->
-                <!-- TMPL_VAR NAME="marc_value" -->
-                <!-- TMPL_IF NAME="repeatable" -->
-                    <a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
-                <!-- /TMPL_IF -->
-                <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
-                <input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
-                <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
-                <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
-                </p>
-            </div>
-        <!-- /TMPL_LOOP -->
-        </div>
-    <!-- /TMPL_LOOP -->
-    </div>
+<div><!-- TMPL_LOOP NAME="subfield_loop" -->
+<!-- TMPL_IF NAME="visibility" -->
+<a tabindex="1" style="color: grey; font-size: 80%; cursor: se-resize;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')"><!-- TMPL_VAR NAME="subfield" --></a>
+<!-- /TMPL_IF -->
+<div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->"><!-- TMPL_UNLESS NAME="advancedMARCEditor" --><label <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield"> <!-- /TMPL_UNLESS --><!-- TMPL_UNLESS name="hide_marc" --><img <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/><input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
+<!-- TMPL_ELSE --><input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/><!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label><!-- /TMPL_UNLESS -->
+<!-- TMPL_VAR NAME="marc_value" --><!-- TMPL_IF NAME="repeatable" --><a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a><!-- /TMPL_IF -->
+<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
+<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
+<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
+<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
+<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
+</div><!-- /TMPL_LOOP --></div>
 <!-- /TMPL_LOOP -->
+</div>	
 		<div name="hidden" id="hidden" class="tab">
 		<!-- TMPL_LOOP NAME="hidden_loop" -->
 				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
-				<input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="subfield" -->">
+				<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
 				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
+				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
 				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
 		<!-- /TMPL_LOOP -->
 		</div>
 		<!-- TMPL_IF name="oldauthnumtagfield" -->
 			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldauthnumtagfield" -->">
-			<input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="oldauthnumtagsubfield" -->">
+			<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldauthnumtagsubfield" -->">
 			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authid" -->">
 			<input type="hidden" name="mandatory" value="0">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
 			<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
 			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldauthtypetagfield" -->">
-			<input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="oldauthtypetagsubfield" -->">
+			<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldauthtypetagsubfield" -->">
 			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="authtypecode" -->">
-			<input type="hidden" name="mandatory" value="0">
-			<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
-
 		<!-- /TMPL_IF -->
+    <div id="action">
+<!-- TMPL_IF name="authid" -->
+      <input type="button" value="Save" onClick="Check(this.form)" accesskey="w">
+<!-- TMPL_ELSE -->
+      <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w">
+<!-- /TMPL_IF -->
+    </div>
 	</form>
+</fieldset>
+
 <script language="JavaScript" type="text/javascript">
 function _(s) { return s } // dummy function for gettext
-function confirmnotdup(){
-	document.getElementById("confirm_not_duplicate").value = 1;
-	var checkform =	document.getElementById("f");
-	Check(checkform);
-}
 function active(numlayer)
 {
-	for (i=0; i <= 9 ; i++ ) {
+	for (i=0; i < 10 ; i++ ) {
 		ong = i+"XX";
 		link = "link"+i;
 		if (numlayer==i) {
-			with(document){
-			if (document.getElementById(ong)){
-				document.getElementById(ong).style.visibility="visible";
-			}
-			if(document.getElementById(link)){
-				document.getElementById(link).style.color="#000066";
-				document.getElementById(link).style.backgroundColor="#FFFFCC";
-			}
-			}
+			document.getElementById(ong).style.visibility="visible";
 		} else {
-			with(document){
-			if (document.getElementById(ong)){
-				document.getElementById(ong).style.visibility="hidden";
-			}
-			if (document.getElementById(link)) {
-				document.getElementById(link).style.color="#669999";
-				document.getElementById(link).style.backgroundColor="#D8DEB8";
-			}
-			}
+			document.getElementById(ong).style.visibility="hidden";
 		}
 	}
 }
-active(0);
 function Check(f) {
-	document.body.style.cursor ="wait";
 	// Scan for nonempty fields
 	var field_is_nonempty_p = new Array();
 	for (i=0 ; i<f.field_value.length ; i++) {
@@ -193,50 +123,31 @@ function Check(f) {
 
 	// Scan for missing mandatory subfields
 	var total_missing_mandatory_subfields = 0;
-	var missing_mandatory_subfields = new Array();
 	for (i=0 ; i<f.field_value.length-2 ; i++) {
 		if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) {
 		    // We should not flag an error unless the tag is also
 		    // mandatory, or if something else in the tag is entered
 
 		    if (f.tag_mandatory[i].value == 1 || field_is_nonempty_p[f.tag[i].value]) {
-				f.field_value[i].style.backgroundColor="#FF0000";
-				total_missing_mandatory_subfields++;
-			if (f.field_value[i].parentNode.tagName == "B")
-			{
-				missing_mandatory_subfields.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
-			}
-			else
-			{
-				missing_mandatory_subfields.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
-			}
-
-			}
+			document.getElementById("error"+i).style.backgroundColor="#FF0000";
+			total_missing_mandatory_subfields++;
+		    }
 		} else {
-			f.field_value[i].style.backgroundColor="#FFFFFF";
+			document.getElementById("error"+i).style.backgroundColor="#FFFFFF";
 		}
 	}
 
 	// Scan for missing mandatory tags
 	var total_missing_mandatory_tags = 0;
 	var seen_mandatory_tag_p = new Array();
-	var missing_mandatory_tags = new Array();
 	for (i=0 ; i<f.field_value.length ; i++) {
 	    var j = f.tag[i].value;
 	    if (!field_is_nonempty_p[j] && f.tag_mandatory[i].value == 1) {
 		if (seen_mandatory_tag_p[j] != 1) {
 		    seen_mandatory_tag_p[j] = 1;
 		    total_missing_mandatory_tags++;
- 		    if (f.field_value[i].parentNode.tagName == "B")
-		    {
-				missing_mandatory_tags.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
-		    }
-		    else
-		    {
-				missing_mandatory_tags.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
-			}
 		}
-		f.field_value[i].style.backgroundColor="#FFFF00";
+		document.getElementById("error"+i).style.backgroundColor="#ffff00";
 	    }
 	}
 
@@ -246,63 +157,65 @@ function Check(f) {
 		alertString2  = _("Form not submitted because of the following problem(s)");
 		alertString2 += "\n------------------------------------------------------------------------------------\n";
 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
-		for (i=0; i<missing_mandatory_tags.length; i++)
-		{
-			alertString2 += "\n--->"+ missing_mandatory_tags[i];
-		}
-  		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
-		for (i=0; i<missing_mandatory_subfields.length; i++)
-		{
-			alertString2 += "\n--->"+ missing_mandatory_subfields[i];
-		}
+		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
 		alert(alertString2);
 	} else {
 		document.forms['f'].submit();
 	}
 }
-function Dopop(link,id) {
- var subf=document.getElementsByName('subfield'+id);
-var fields=document.getElementsByName('field_value'+id);
-var defaultvalue="";
-	for (var s=0; s<fields.length; s++){
-		if (subf.item(s).value == 'a'){
-		defaultvalue=fields.item(s).value;
+function Dopop(link,i) {
+	defaultvalue=document.forms['f'].field_value[i].value;
+	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
+}
+
+function PopupZ3950() {
+    var strQuery="";
+	for (i=0 ; i<document.forms['f'].field_value.length ; i++) {
+		if (document.forms['f'].kohafield[i].value == "biblioitems.isbn" && document.forms['f'].field_value[i].value.length>0) {
+		    strQuery += "&isbn="+document.forms['f'].field_value[i].value;
+		}
+		if (document.forms['f'].kohafield[i].value == "biblio.title" && document.forms['f'].field_value[i].value.length>0) {
+		    strQuery += "&title="+document.forms['f'].field_value[i].value;
+		}
+		if (document.forms['f'].kohafield[i].value == "biblio.author" &&document.forms['f'].field_value[i].value.length>0) {
+		    strQuery += "&author="+document.forms['f'].field_value[i].value;
+		}
+		if (document.forms['f'].kohafield[i].value == "biblioitems.issn" && document.forms['f'].field_value[i].value.length>0) {
+		    strQuery += "&issn="+document.forms['f'].field_value[i].value;
 		}
 	}
-
-	newin=window.open(link+"&result="+defaultvalue,"",'width=550,height=550,toolbar=false,scrollbars=yes');
-
+	newin=window.open("../z3950/search.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes');
 }
 
-
-function AddField(field) {
+function AddField(field,cntrepeatfield) {
 	document.forms['f'].op.value = "addfield";
 	document.forms['f'].addfield_field.value=field;
+	document.forms['f'].repeat_field.value=cntrepeatfield;
 	document.f.submit();
 }
 
 function cloneSubfield(index) {
- var original = document.getElementById(index);
- var clone = original.cloneNode(true);
- clone.setAttribute("id", index + index); 
-// orginput : the value of the original field (in [0] if hide_marc=1, otherwise in [1]
-// image : the up button. don't exist is hide_marc=1
- <!-- TMPL_IF name="hide_marc" -->
-	var orginput = original.getElementsByTagName('input')[0];
- <!-- TMPL_ELSE -->
- 	var orginput = original.getElementsByTagName('input')[1];
-	image = clone.getElementsByTagName('img')[0];
-	image.setAttribute("onclick","upSubfield('" + index + index + "')");
- <!-- /TMPL_IF -->
- trigger = original.getElementsByTagName('a')[0];
- if (trigger) {
- 	trigger.parentNode.removeChild(trigger);
- }
- clonetrigger = clone.getElementsByTagName('a')[0];
- clonetrigger.setAttribute("onclick","cloneSubfield('" + index + index + "')");
- clone.setAttribute("tabindex","1");
- orginput.value = '';
- original.parentNode.insertBefore( clone, original); 
+    var original = document.getElementById(index); //original <div>
+    var clone = original.cloneNode(true);
+
+    // set the attribute for the new 'div' subfields
+    clone.setAttribute('id',index + index);//set another id.
+    var NumTabIndex;
+    NumTabIndex = parseInt(original.getAttribute('tabindex'));
+    if(isNaN(NumTabIndex)) NumTabIndex = 0;
+    clone.setAttribute('tabindex',NumTabIndex+1);
+    
+    var CloneButtonPlus;
+    try{
+        CloneButtonPlus = clone.getElementsByTagName('a')[0];
+        CloneButtonPlus.setAttribute('onclick',"cloneSubfield('" + index + index + "')");
+    }
+    catch(e){
+        // do nothing if ButtonPlus & CloneButtonPlus don't exist.
+    }
+
+    // insert this line on the page
+    original.parentNode.insertBefore(clone,original.nextSibling);
 }
 
 function upSubfield(index) {
@@ -338,5 +251,7 @@ function unHideSubfield(index,labelindex) {
 	label = document.getElementById(labelindex);
 	label.style.display='none';	
 }
+
 </script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl
index addbf938a9..9b31b4bc0a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl
@@ -1,30 +1,56 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
-<body>
+<!-- TMPL_IF NAME="TemplateEncoding" -->
+    <meta http-equiv="Content-Type" content="text/html; charset=<!-- TMPL_VAR NAME="TemplateEncoding" -->">
+<!-- TMPL_ELSE -->
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- /TMPL_IF -->
 
+<body>
 <script language="JavaScript" type="text/javascript">
 
-function goforward()
+function go()
 {
-var start = <!-- TMPL_VAR NAME="index">;
-var subfields=opener.opener.document.getElementsByName('subfield'+start);
-var fields=opener.opener.document.getElementsByName('field_value'+start);
+var index_start = <!-- TMPL_VAR NAME="index" -->;
+var whichfield = opener.opener.document.f.tag[index_start].value;
+i=index_start
 // go forward, until reaching the end of the field.
-for  (var i=0; i<fields.length; i++) {
-	if ( subfields.item(i).value == '<!-- TMPL_VAR NAME="linkidsubfield">') {
-		fields.item(i).value = "<!-- TMPL_VAR NAME="authid">";
+while (i<opener.opener.document.f.field_value.length) {
+	if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '9') {
+		opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="authid" -->";
 	}
 	<!-- TMPL_LOOP NAME="0XX" -->
 		<!-- TMPL_LOOP NAME="subfield" -->
-			if (subfields.item(i).value == '<!-- TMPL_VAR NAME="marc_subfield" -->') 
+			if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR NAME="marc_subfield" -->') 
 			{
-				fields.item(i).value = "<!-- TMPL_VAR NAME="marc_value" -->";
+				opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="marc_value" -->";
 			}
 		<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
+	if (opener.opener.document.f.tag[i].value != whichfield) {
+		i=opener.opener.document.f.field_value.length;
+	}
+	i++;
+}
+// go backward until the beginning of the field
+i=index_start
+while (i>=0) {
+	if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '9') {
+		opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="authid">";
+	}
+	<!-- TMPL_LOOP NAME="0XX" -->
+		<!-- TMPL_LOOP NAME="subfield" -->
+			if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR NAME="marc_subfield" -->') 
+			{
+				opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="marc_value" -->";
+			}
+		<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+	if (opener.opener.document.f.tag[i].value != whichfield) {
+		i=0;
+	}
+	i--;
 }
-
 	opener.close();
 	self.close();
 	return false;
@@ -33,9 +59,7 @@ for  (var i=0; i<fields.length; i++) {
 }
 </script>
 <script language="javascript" type="text/javascript">
-window.onload=goforward();
+window.onload = go();
 </script>
-
-
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-linker.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-linker.tmpl
index f2d23a6949..1fa973319e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-linker.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-linker.tmpl
@@ -13,8 +13,46 @@ i=index_start
 //opener.opener.document.f.linkid.value="<!-- TMPL_VAR NAME="authid"-->";
 
 // go forward, until reaching the end of the field.
+while (i<=opener.opener.document.f.field_value.length) {
+	
+	<!-- TMPL_LOOP NAME="0XX" -->
+		<!-- TMPL_LOOP NAME="subfield" -->
+			if (opener.opener.document.f.tag[i].value == <!--TMPL_VAR NAME="linkidfield"--> && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR NAME="linkidsubfield" -->') 
+			{
 				opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="authid" -->";
-
+			}
+			if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR NAME="marc_subfield" -->') 
+			{
+				opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="marc_value" -->";
+			}
+		<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+	if (opener.opener.document.f.tag[i].value != whichfield) {
+		i=opener.opener.document.f.field_value.length;
+	}
+	i++;
+}
+// go backward until the beginning of the field
+i=index_start
+while (i>=0) {
+	
+	<!-- TMPL_LOOP NAME="0XX" -->
+		<!-- TMPL_LOOP NAME="subfield" -->
+			if (opener.opener.document.f.tag[i].value == <!--TMPL_VAR NAME="linkidfield"--> && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR NAME="linkidsubfield" -->') 
+			{
+				opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="authid" -->";
+			}
+			if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR NAME="marc_subfield" -->') 
+			{
+				opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="marc_value" -->";
+			}
+		<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+	if (opener.opener.document.f.tag[i].value != whichfield) {
+		i=0;
+	}
+	i--;
+}
 	opener.close();
 	self.close();
 	return false;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl
index e05b6d70e4..a0733fb34b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl
@@ -1,55 +1,118 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities 
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+Koha -- Authority details
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_UNLESS NAME="nonav"--><!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
-<!--TMPL_ELSE-->
+
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
-<!--/TMPL_UNLESS-->
-
-<div id="main">
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
-<div class="tabbed"><input type="hidden" name="nonav" value="<!-- TMPL_VAR NAME="nonav" -->">
-	<h1>Authority number : <!-- TMPL_VAR NAME="authid" --> in <!-- TMPL_VAR NAME="authtypetext" --></h1>
-	<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->&nonav=<!-- TMPL_VAR NAME="nonav" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->"">
-		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
-	</a>
-	<!--TMPL_UNLESS NAME="nonav"--><a href="javascript:confirm_deletion()">
-		<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
-	</a>
-	<a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')" class="button authority">
-		Print
-	</a><!--/TMPL_UNLESS--><!--TMPL_IF NAME="count"-->&nbsp;<a href="/cgi-bin/koha/catalogue/catalogue-search.pl?value=<!-- TMPL_VAR NAME="authid" -->&kohafield=authid&amp;op=do_search&amp;zoom=1" class="button authority">Used in <!-- TMPL_VAR NAME="count" --> biblio(s)</a><!--/TMPL_IF-->
+
+<!-- TMPL_IF Name="displayhierarchy"-->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/hierarchy.css">
+<script language="JavaScript" type="text/javascript">
+function showParents(mynumber) {
+  var parents=document.getElementsByName(mynumber+'p')
+  for(i=0;i<parents.length;i++){
+    if (parents[i].style.display == "none") {
+      parents[i].style.display ="block";
+    } else {
+      parents[i].style.display ="none";
+    }
+  } 
+}
+function showChildren(mynumber) {
+  var children=document.getElementsByName(mynumber+'c')
+  for(i=0;i<children.length;i++){
+    if (children[i].style.display == "none") {
+      children[i].style.display = "block";
+    } else {
+      children[i].style.display = "none";
+    }
+  }
+}
+</script>
+
+<div class="hierarchies">
+<!--TMPL_LOOP Name="loophierarchies" -->
+  <div class="hierarchy">
+  <!--TMPL_LOOP Name="loopelement" -->
+    <div id="<!--TMPL_VAR Name="loopauthid" -->" class="<!--TMPL_VAR Name="class" -->">
+    <!--TMPL_IF Name="ifparents" -->
+      <!--TMPL_LOOP Name="loopparents" -->
+        <div name="<!--TMPL_VAR Name="loopauthid" -->p" class="parent"> <a href="detail.pl?authid=<!--TMPL_VAR Name="parentauthid" -->"><!--TMPL_VAR Name="parentvalue" --></a></div>
+      <!--/TMPL_LOOP-->
+    <!--/TMPL_IF -->
+    <!-- TMPL_IF name="current_value" -->
+        <!--TMPL_VAR Name="value" -->
+    <!-- TMPL_ELSE -->
+        <a href="detail.pl?authid=<!--TMPL_VAR Name="loopauthid" -->" title="Term"><!--TMPL_VAR Name="value" --></a>
+    <!-- /TMPL_IF -->
+    <!--TMPL_IF Name="ifchildren" -->
+      <sub><a class="parents" title="Narrower terms" href="JavaScript:showChildren('<!--TMPL_VAR Name="loopauthid" -->');">+</a></sub><br/>
+      <!--TMPL_LOOP Name="loopchildren" -->
+        <div name="<!--TMPL_VAR Name="loopauthid" -->c" class="child"> <a href="detail.pl?authid=<!--TMPL_VAR Name="childauthid" -->"><!--TMPL_VAR Name="childvalue" --></a></div>
+      <!--/TMPL_LOOP-->
+    <!-- /TMPL_IF -->
+    </div>
+  <!--/TMPL_LOOP-->
+    
+  </div>
+<!--/TMPL_LOOP-->
 </div>
+<!-- /TMPL_IF -->
 
-<div name="0XX" id="0XX" class="tab" style="visibility:visible">
-	<!-- TMPL_LOOP NAME="0XX" -->
-			<p class="MARCtag">
-				<!-- TMPL_VAR NAME="tag" -->
-			</p>
-		<!-- TMPL_LOOP NAME="subfield" -->
-			<p>
-				<label class="labelsubfield">
-				<a href="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->&marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&and_or=and&excluding=&operator=all&stype=author&value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
-					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15">
-				</a>
-				<!-- TMPL_VAR NAME="marc_subfield" -->
-				<!-- TMPL_VAR NAME="marc_lib" --></label>
-				<!-- TMPL_VAR NAME="marc_value" -->
-			</p>
-		<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
+<h1 class="authority">Authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
+
+<div id="action">
+<a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">Edit</a>
+
+<!-- TMPL_UNLESS name="count" -->
+<a href="javascript:confirm_deletion()">Delete</a>
+<!-- /TMPL_UNLESS -->
+
+<a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')" class="button authority">Print</a>
+
+<a href="../catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an=<!--TMPL_VAR Name="authid" -->" class="button authority"><!-- TMPL_VAR name="count" --> biblios</a>
+</div>
+
+<div id="authorities_detail_details">
+<!-- TMPL_LOOP NAME="0XX" -->
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
+            <!-- TMPL_LOOP NAME="subfield" -->
+                <p>
+                    <label>&nbsp;
+                    <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+                    <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
+                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <!-- TMPL_IF name="link" -->
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        </a>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="authority" -->
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                    <!-- /TMPL_IF -->
+                </p>
+             <!-- /TMPL_LOOP -->
+
+<!-- /TMPL_LOOP --> <!-- tag -->
 </div>
 	
 <script language="JavaScript" type="text/javascript">
 
 function confirm_deletion() {
-	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
+	var is_confirmed = confirm('Are you sure you want to delete this authority?');
 	if (is_confirmed) {
-		window.location="authorities.pl?op=delete&authid=<!-- TMPL_VAR NAME="authid" -->&nonav=<!-- TMPL_VAR NAME="nonav" -->";
+		window.location="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->";
 	}
 }
 function Dopop(link) {
 	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
 }
 </script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/linkresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/linkresultlist-auth.tmpl
index 70aa29e85a..a0dfcfddf5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/linkresultlist-auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/linkresultlist-auth.tmpl
@@ -6,21 +6,21 @@
 		<div id="resultnumber">
 			<p>
 				<!-- TMPL_IF name="displayprev" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif"  border="0">
+					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
+						<img src="/intranet-tmpl/default/images/numbers/prev.gif"  border="0">
 					</a>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_LOOP NAME="numbers" -->
 					<!-- TMPL_IF name="highlight" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
 					<!-- TMPL_ELSE -->
-						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
-							<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
+						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
+							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_LOOP -->
 				<!-- TMPL_IF name="displaynext" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
+					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
+						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
 				<!-- /TMPL_IF -->
 			</p>
 			<p>
@@ -63,20 +63,20 @@
 			<p>
 				<!-- TMPL_IF name="displayprev" -->
 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0">
+						<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
 					</a>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_LOOP NAME="numbers" -->
 					<!-- TMPL_IF name="highlight" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
 					<!-- TMPL_ELSE -->
 						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-							<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
+							<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_LOOP -->
 				<!-- TMPL_IF name="displaynext" -->
 					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
+						<img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
 				<!-- /TMPL_IF -->
 			</p>
 		</div>	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl
index c6bdb48073..8373deedfe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl
@@ -1,93 +1,148 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+Cataloguing_Authority_choose
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
-	<h1 class="authority">Authority search results</h1>
-		<div id="resultnumber">
-			<p>
-				<!-- TMPL_IF name="displayprev" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif"  border="0">
-					</a>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP NAME="numbers" -->
-					<!-- TMPL_IF name="highlight" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
-					<!-- TMPL_ELSE -->
-						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
-							<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
-					<!-- /TMPL_IF -->
-				<!-- /TMPL_LOOP -->
-				<!-- TMPL_IF name="displaynext" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=any&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author&index=<!-- TMPL_VAR NAME="index" -->">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
-				<!-- /TMPL_IF -->
-			</p>
-			<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>
-				<!-- TMPL_ELSE -->
-					&nbsp;No results found.<br>
-				<!-- /TMPL_IF -->
-			</p>
-		</div>
-		<div id="resultlist">
-			<table>
-				<tr>
-					<th class="authority">Summary</th>
-					<th class="authority">Used</th>
-					<th class="authority">Get It!</th>
-					<th class="authority">Edit It!</th>
-				</tr>
-				<tr>
-					<td>Clear any entry</td>
-					<td>&nbsp;</td>
-					<td>
-						<a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=0&amp;index=<!-- TMPL_VAR NAME="index" -->')" class="button authority">
-							Clear
-						</a>
-					</td>
-				<!-- TMPL_LOOP NAME="result" -->
-					<tr>
-						<td><!-- TMPL_VAR NAME="summary" --></td>
-						<td><!-- TMPL_VAR NAME="used" --> times</td>
-						<td>
-							<a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=<!-- TMPL_VAR NAME="authid" -->&amp;index=<!-- TMPL_VAR NAME="index" -->')"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/arrow.gif" width="16" height="16" hspace="0" vspace="0" border="0"></a>
-						</td>
-						<td> <a href="/cgi-bin/koha/authorities/authorities.pl?nonav=<!-- TMPL_VAR NAME="nonav" -->&authid=<!-- TMPL_VAR NAME="authid" -->&index=<!-- TMPL_VAR NAME="index" -->&authtypecode=<!-- TMPL_VAR name="authtypecode" -->">Edit<a/></td>
-					</tr>
-				<!-- /TMPL_LOOP -->
-			</table>
-	
-		</div>
-		<div id="resultnumber">
-			<p>
-				<!-- TMPL_IF name="displayprev" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0">
-					</a>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP NAME="numbers" -->
-					<!-- TMPL_IF name="highlight" -->
-						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
-					<!-- TMPL_ELSE -->
-						<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-							<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
-					<!-- /TMPL_IF -->
-				<!-- /TMPL_LOOP -->
-				<!-- TMPL_IF name="displaynext" -->
-					<a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" -->&op=do_search&type=intranet&stype=author">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/numbers/next.gif" border="0"></a>
-				<!-- /TMPL_IF -->
-			</p>
-		</div><a href="auth_finder.pl?index=<!-- TMPL_VAR NAME="index" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">Search again</a>	
-	</div>
-
+<div id="mainbloc">
+    <h1 class="authority">Authority search results</h1>
+    <div id="bloc25">
+        <form name="f" method="post" action="auth_finder.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" -->">
+            <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+            <div id="bloc25">
+                <h2 class="authority">Search on</h2>
+                <p>
+                    <label class="label100">Authority type</label>
+                    <!-- TMPL_VAR NAME="authtypecode" -->
+                    <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
+                </p>
+                <p>
+                    <label class="label100">Main entry ($a only)</label>
+                    <input type="hidden" name="marclist" value="mainmainentry">
+                    <input type="hidden" name="and_or" value="and">
+                    <input type="hidden" name="excluding" value="">
+                    <select name="operator">
+                        <option value="contains">contains</option>
+                        <option value="start">starts by</option>
+                        <option value="is">is exactly</option>
+                    </select>
+                    <input type="text" name="value" value="<!-- TMPL_VAR name="mainmainstring" -->">
+                </p>
+                <p>
+                    <label class="label100">Main entry</label>
+                    <input type="hidden" name="marclist" value="mainentry">
+                    <input type="hidden" name="and_or" value="and">
+                    <input type="hidden" name="excluding" value="">
+                    <select name="operator">
+                        <option value="contains">contains</option>
+                        <option value="start">starts by</option>
+                        <option value="is">is exactly</option>
+                    </select>
+                    <input type="text" name="value" value="<!-- TMPL_VAR name="mainstring" -->">
+                </p>
+                <p>
+                    <label class="label100">Anywhere</label>
+                    <input type="hidden" name="marclist" value="">
+                    <input type="hidden" name="and_or" value="and">
+                    <input type="hidden" name="excluding" value="">
+                    <select name="operator">
+                        <option value="contains">contains</option>
+                        <option value="start">starts by</option>
+                        <option value="is">is exactly</option>
+                    </select>
+                    <input type="text" name="value" value="<!-- TMPL_VAR name="anystring" -->">
+                </p>
+                <p>
+                <input type="submit" value="Start search" class="button authority">
+                </p>
+            </div>
+        </form>
+    </div>
+    <div id="bloc25">
+        <div id="resultnumber">
+            <p>
+                <!-- TMPL_IF name="displayprev" -->
+                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+                        <<
+                    </a>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_LOOP NAME="numbers" -->
+                    <!-- TMPL_IF name="highlight" -->
+                        <!-- TMPL_VAR NAME="number" -->
+                    <!-- TMPL_ELSE -->
+                        <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+                            <!-- TMPL_VAR NAME="number" --></a>
+                    <!-- /TMPL_IF -->
+                <!-- /TMPL_LOOP -->
+                <!-- TMPL_IF name="displaynext" -->
+                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+                        >></a>
+                <!-- /TMPL_IF -->
+            </p>
+            <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>
+                <!-- TMPL_ELSE -->
+                    &nbsp;No results found.<br>
+                <!-- /TMPL_IF -->
+            </p>
+        </div>
+        <div id="resultlist">
+            <table>
+                <tr>
+                    <th class="authority">Summary</th>
+                    <th class="authority">Used</th>
+                    <th class="authority">Get It!</th>
+                </tr>
+                <tr>
+                    <td>&nbsp;</td>
+                    <td>&nbsp;</td>
+                    <td>
+                        <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=0&amp;index=<!-- TMPL_VAR NAME="index" -->')" class="button authority">
+                            Clear
+                        </a>
+                    </td>
+                <!-- TMPL_LOOP NAME="result" -->
+                    <tr>
+                        <td><!-- TMPL_VAR NAME="summary" --></td>
+                        <td><!-- TMPL_VAR NAME="used" --> times</td>
+                        <td>
+                            <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=<!-- TMPL_VAR NAME="authid" -->&amp;index=<!-- TMPL_VAR NAME="index" -->')">choose</a>
+                        </td>
+                    </tr>
+                <!-- /TMPL_LOOP -->
+            </table>
+    
+        </div>
+        <div id="resultnumber">
+            <p>
+                <!-- TMPL_IF name="displayprev" -->
+                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+                        <<
+                    </a>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_LOOP NAME="numbers" -->
+                    <!-- TMPL_IF name="highlight" -->
+                        <!-- TMPL_VAR NAME="number" -->
+                    <!-- TMPL_ELSE -->
+                        <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+                            <!-- TMPL_VAR NAME="number" --></a>
+                    <!-- /TMPL_IF -->
+                <!-- /TMPL_LOOP -->
+                <!-- TMPL_IF name="displaynext" -->
+                    <a href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->">
+                        >></a>
+                <!-- /TMPL_IF -->
+            </p>
+        </div>	
+    </div>
+</div>
 
 <script language="JavaScript" type="text/javascript">
 
 function jumpfull(page)
 {	
-	window.open(page,'','');
+    window.open(page,'','fullscreen,scrollbars');
 }
 </script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl
index 0378f219bc..c656a11edb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl
@@ -1,108 +1,64 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+Koha -- Authorities -- Search result list 
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
 
-	<h1 class="authority">Authority search results</h1>
-	<div id="resultnumber">
-		<p>
-			<!-- TMPL_IF name="displayprev" -->
-				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0">
-				</a>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="numbers" -->
-				<!-- TMPL_IF name="highlight" -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
-				<!-- TMPL_ELSE -->
-					<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0">
-					</a>
-				<!-- /TMPL_IF -->
-			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF name="displaynext" -->
-				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0">
-				</a>
-				<!-- /TMPL_IF -->
-		</p>
-		<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>
-			<!-- TMPL_ELSE -->
-			&nbsp;No results found.<br>
-			<!-- /TMPL_IF -->
-		</p>
-	</div>
-	<div id="resultlist">
-		<table>
-			<tr>
-				<th class="authority">Summary</th>
-				<th class="authority">Used in</th>
-				<th class="authority">Authid/Delete</th>
-				
-			</tr>
-			<!-- TMPL_LOOP NAME="result" -->
-				<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
-				
-					<td><!-- TMPL_VAR NAME="summary" --></td>
-					<td><a href="/cgi-bin/koha/catalogue/catalogue-search.pl?kohafield=authid&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;op=do_search&amp;zoom=1" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a></td>
-					
-					<td><!-- TMPL_VAR NAME="authid" -->&nbsp;
-						<!-- TMPL_UNLESS name="used" -->
-						<a href="javascript:do_delete('authorities-home.pl?op=delete&authid=<!-- TMPL_VAR NAME="authid" -->')">Delete</a>
-						<!-- /TMPL_UNLESS -->
-					</td>
-					
-				</tr>
-			<!-- /TMPL_LOOP -->
-		</table>
-	</div>
-	<div id="resultnumber">
-		<p>
-			<!-- TMPL_IF name="displayprev" -->
-				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0">
-				</a>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME="numbers" -->
-				<!-- TMPL_IF name="highlight" -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
-				<!-- TMPL_ELSE -->
-					<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0">
-					</a>
-				<!-- /TMPL_IF -->
-			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF name="displaynext" -->
-				<a href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;stype=author&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0">
-				</a>
-				<!-- /TMPL_IF -->
-		</p>
-	</div>	
-<form name"m" id="m">
+<h1 class="authority">Authority search results</h1>
+
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
-From:<input type="text" size="10" name="mergefrom" id="mergefrom" value=""/>&nbsp;&nbsp;To:<input type="text" size="10" id="mergeto" name="mergeto" value=""/>
-<input type="button" class="submit" value="Merge" onclick="do_merge(); return false;" /></form>
-					
+<p id="authorities_searchresultlist_current_page_info">
+<!-- TMPL_IF name="total" -->
+  Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" -->
+<!-- TMPL_ELSE -->
+  No results found.
+<!-- /TMPL_IF -->
+</p>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+<div id="authorities_searchresultlist_results">
+  <table>
+    <tr>
+      <th>Summary</th>
+<!-- TMPL_UNLESS name="isEDITORS" -->
+      <th>Used in</th>
+<!-- /TMPL_UNLESS -->
+      <th>View</th>
+      <th>Delete</th>
+    </tr>
+<!-- TMPL_LOOP NAME="result" -->
+    <tr>
+      <td><a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->"><!-- TMPL_VAR NAME="summary" --></a></td>
+  <!-- TMPL_UNLESS name="isEDITORS" -->
+      <td>
+        <a href="../catalogue/search.pl?type=intranet&amp;op=do_search&amp;q=an=<!--TMPL_VAR Name="authid" -->" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a>
+      </td>
+  <!-- /TMPL_UNLESS -->
+      <td>
+        <a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">Authority number <!-- TMPL_VAR NAME="authid" --></a>
+      </td>
+      <td>
+  <!-- TMPL_UNLESS name="used" -->
+        <a href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="authid" -->)">Delete</a>
+  <!-- /TMPL_UNLESS -->
+      </td>
+    </tr>
+<!-- /TMPL_LOOP -->
+  </table>
+</div>
 
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
 <script language="JavaScript" type="text/javascript" >
-function do_delete(page)
-{
-window.location = page;
-}
-function do_merge(page)
-{
 
-X = document.forms['m'].elements['mergefrom'].value;
-	Y = document.forms['m'].elements['mergeto'].value;
-var is_confirmed = confirm('Merging from ID:'+X+'  to ID: '+Y+' .Confirm?');
+function confirm_deletion(id) {
+	
+	var is_confirmed = confirm('Are you sure you want to delete this authority?');
 	if (is_confirmed) {
-window.location="authorities-home.pl?op=merge&mergefrom="+X+"&mergeto="+Y;
+		window.location="authorities-home.pl?op=delete&amp;authid="+id;
+	}
 }
-}
-</script>
\ No newline at end of file
+</script>
+
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/barcodes/barcodes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/barcodes/barcodes.tmpl
index 97efe01438..67907adb32 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/barcodes/barcodes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/barcodes/barcodes.tmpl
@@ -1,4 +1,7 @@
-<!-- TMPL_INCLUDE NAME="doc-head-barcodes.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Barcodes<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-barcodes.inc" -->
 
 <!--   START OF ADD COUNTRY CODE PANEL  -->
 <div class="countryPanel" id="addCountryCode">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/barcodes/printerConfig.tmpl b/koha-tmpl/intranet-tmpl/prog/en/barcodes/printerConfig.tmpl
index 5c33f998ac..b97c26da50 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/barcodes/printerConfig.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/barcodes/printerConfig.tmpl
@@ -1,4 +1,8 @@
-<!-- TMPL_INCLUDE NAME="doc-head-barcodes.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-barcodes.inc" -->Koha Printer Configuration
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-barcodes.inc" -->
+
 
 	<h1>Printer Configuration</h1>
 	<h3>Set printer configuration corresponding to your environment</h3>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/bookshelves/addbookbybiblionumber.tmpl b/koha-tmpl/intranet-tmpl/prog/en/bookshelves/addbookbybiblionumber.tmpl
index e040958f10..096b4c741f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/bookshelves/addbookbybiblionumber.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/bookshelves/addbookbybiblionumber.tmpl
@@ -1,26 +1,42 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Add to Virtual Shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-<h3>Add <i><!-- TMPL_VAR NAME="title" --></i> <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> to a Virtual Shelf</h3>
-<form>
-	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
-<div class="data">
-	<table>
-		<caption>Select an Existing Bookshelf</caption>
-		<tr><th><label>Add to virtual shelf</label></th><td><!-- TMPL_VAR NAME="CGIbookshelves" --></td></tr>
-		</table>
-</div>
-<input type="submit" value="Add to virtual shelf" class="submit" />
-<h4>...or...</h4>
-<div class="data">
-	<table>
-	<caption>Add to a New Bookshelf:</caption>
-		<tr><th><label for="newbookshelf">Shelf Name:</label> </th><td><input type="text" name="newbookshelf" id="newbookshelf" size="60" /></td></tr>
-		<tr><th><label for="category">Category:</label> </th><td><select name="category" id="category">
-			<option value="1">Private</option>
-			<option value="2">Public</option>
-		</select></td></tr>
-	</table>
-	</div>
-	<input type="submit" value="Add to virtual shelf" class="submit" />
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+Koha -- Add to Virtual Shelf
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<h1>Add 
+    <i><!-- TMPL_VAR NAME="title" --></i>
+    <!-- TMPL_IF NAME="author" -->
+        by <!-- TMPL_VAR NAME="author" -->
+    <!-- /TMPL_IF --> to a Virtual Shelf
+</h1>
+
+<form name="f1" method="POST" action="/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl">
+    <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+    
+    <b>Select an Existing Bookshelf</b>
+    <p>
+        <label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" -->
+    </p>
+    <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+    <input type="submit" value="Add to virtual shelf" class="submit" />
 </form>
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
+<p>...or...</p>
+<form name="f2" method="POST" action="/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl">
+    <b>Add to a New Bookshelf:</b>
+        <p>
+            <label for="newbookshelf">
+                Shelf Name:
+            </label>
+            <input type="text" name="newbookshelf" id="newbookshelf" size="40" />
+        </p>
+        <p>
+            <label for="category">Category:</label>
+            <select name="category" id="category">
+                <option value="1">Private</option>
+                <option value="2">Public</option>
+            </select>
+        </p>
+    <input type="submit" value="Add to virtual shelf" class="submit" /> 
+</form>
+
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl
index ce0d6e0394..d08b2f0e3b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl
@@ -1,169 +1,247 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Virtual Shelves<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+Koha -- Add to Virtual Shelf
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-<script type="text/javascript">
-	function CheckAll() { 
-	count = document.mainform.elements.length;
-    for (i=0; i < count; i++){
-	    if(document.mainform.elements[i].checked == 1){
-			document.mainform.elements[i].checked = 0;
-		} else {
-			document.mainform.elements[i].checked = 1;
-		}
-	}
-}
-</script>
-
-<!-- TMPL_IF name="edit" -->
-		<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
-			<input type="hidden" name="op" value="modifsave" />
-			<table>
-			<caption>Editing Shelf <!-- TMPL_VAR name="shelfname"--></caption>
-			<tr><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->" /><label for="shelfname">Name:</label></td><td><input id="shelfname" type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
-			<tr><td><label for="owner">Owner:</label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
-			<tr><td><label for="category">Category:</label></td><td><select id="category" name="category">
-					<!-- TMPL_IF name="category1" -->
-						<option value="1" selected>Private</option>
-					<!-- TMPL_ELSE -->
-						<option value="1">Private</option>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="category2" -->
-						<option value="2" selected>Public</option>
-					<!-- TMPL_ELSE -->
-						<option value="2">Public</option>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="category3" -->
-						<option value="3" selected>Free</option>
-					<!-- TMPL_ELSE -->
-						<option value="3">Free</option>
-					<!-- /TMPL_IF -->
-				</select></td></tr>
-			</table>
-			<ul><li>a private bookshelf is managed by you and can be seen only by you.</li>
-				<li> A public can be seen by everybody, but managed only by you.</li>
-				<li> A free can be managed by any user.</li></ul>
-			<input type="submit" value="Save Changes" /></p>
-		</form>
-<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-bookshelves.inc" -->
 
 <!-- TMPL_IF Name="viewshelf" -->
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post" name="mainform">
-			<table>
-			<caption>Contents of <!-- TMPL_VAR NAME="shelfname" --></caption>
-			<tr>
-					<!-- TMPL_IF name="manageshelf" --><th><a href="/cgi-bin/koha/shelves.pl" onclick="CheckAll(); return false;">Check All</a></th><!-- /TMPL_IF -->
-					<th>Title</th>
-					<th>Author</th>
-					<th>Item Type</th>
-					<th>&copy;</th>
-					<th>&nbsp;</th>
-				</tr><!-- TMPL_LOOP Name="itemsloop" --><!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF --><!-- TMPL_IF name="manageshelf" --><td><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->" /></td><!-- /TMPL_IF -->
-						<td><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
-						<td><!-- TMPL_VAR NAME="author" --></td> 
-						<td><!-- TMPL_VAR NAME="itemtype" --></td>
-						<td><!-- TMPL_VAR NAME="publicationyear" --></td>
-						<td><a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Reserves</a></td>
-					</tr>
-				<!-- /TMPL_LOOP -->
-			</table>
-			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
-			<input type="hidden" name="modifyshelfcontents" value="1" />
-			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
-			<!-- TMPL_IF name="manageshelf" -->
-				<input type="submit" value="Remove Selected Items" />
-			<!-- /TMPL_IF --></form><br>
 
-	<!-- TMPL_IF name="manageshelf" -->
-		<form>
-<table>
-		<caption>Add an item by barcode</caption>
-		<tr><th><label for="barcode">Barcode:</label></th><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
-			<input type="hidden" name="modifyshelfcontents" value="1" />
-			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
-			<input type="text" size="14" maxlength="14" id="barcode" name="addbarcode" />
-			<input type="hidden" name="modifyshelfcontents" value="1" />
-			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="submit" value="Save" /></td></tr></table>
-		</form>
-	<!-- /TMPL_IF -->
-		<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="submit" value="Return to Virtual Shelves" /></form>
-				
+<div id="action">
+    <a class="button" href="/cgi-bin/koha/bookshelves/shelves.pl">Back to Virtual Shelves</a>
+    <!-- TMPL_IF name="manageshelf" -->
+    <a class="button" href="/cgi-bin/koha/bookshelves/shelves.pl?op=modif&shelf=<!-- TMPL_VAR Name="shelfnumber" -->">
+        Modify this Shelf</a>
+    <!-- /TMPL_IF -->
+</div>
+
+<h3>Contents of <!-- TMPL_VAR Name="shelfname" --></h3>
+
+<form class="inline" action="/cgi-bin/koha/bookshelves/shelves.pl" method="post" name="mainform">
+    <!-- TMPL_IF NAME="itemsloop" -->
+    <table>
+        <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
+        <input type="hidden" name="modifyshelfcontents" value="1" />
+            <tr>
+                <th>
+                    <a href="javascript:CheckAll();">
+                        <small>(Un)Check All</small>
+                    </a>
+                </th>
+                <th>&nbsp;</th>
+                <th>Title</th>
+                <th>Author</th>
+                <th>Call No.</th>
+            </tr>
+        <!-- TMPL_LOOP Name="itemsloop" -->
+            <tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->>
+                    <td>
+                        <input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->" />
+                    </td>
+                    <td>
+                        <img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" />
+                    </td>
+                    <td>
+                <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+                            <a class="title" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                                <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
+                            </a>
+                        <!-- TMPL_ELSE -->
+                            <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
+                                <a class="title" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                                    <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
+                                </a>
+                            <!-- TMPL_ELSE -->
+                                <a class="title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                                    <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
+                                </a>
+                            <!-- /TMPL_IF -->
+                        <!-- /TMPL_IF -->
+                    </td>
+                    <td><!-- TMPL_VAR Name="author" --></td>
+                    <td><!-- TMPL_VAR NAME="classification" --></td>
+        </tr>
+        <!-- /TMPL_LOOP -->
+    </table>
+    <!-- TMPL_ELSE -->
+    <br />
+    <b>This shelf is empty.</b>
+    <!-- TMPL_UNLESS NAME="itemsloop" -->
+        <input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" />
+        <input type="hidden" name="shelves" value="1" />
+        <input type="submit" class="icon delete"
+               value="Delete this Shelf"
+               onclick="return confirmDelete('Are you sure you want to delete this shelf?')" />
+        <!-- /TMPL_UNLESS -->
+        <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="manageshelf" -->
+        <!-- TMPL_IF NAME="itemsloop" -->
+            <b>With selected items :</b>
+            <input type="submit"
+                   value="Remove"
+                   class="icon delete"
+                   onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')"
+                   style="display:inline;"
+                   />
+        <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+</form>
+    <!-- TMPL_IF name="manageshelf" -->
+    
+<br />
+<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="post">
+    <table>
+        <tr><th colspan="2">Add an Item to this Shelf by Barcode</th></tr>
+        <tr>
+            <td>
+                <label for="addbarcode">Barcode:</label>
+            </td>
+            <td>
+                <input name="addbarcode" type="text" id="addbarcode" size="14" maxlength="14" />
+                <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
+                <input type="hidden" name="modifyshelfcontents" value="1" />
+                <input type="submit" value="Save" />
+            </td>
+        </tr>
+    </table>
+</form>
+<!-- /TMPL_IF -->
 <!-- TMPL_ELSE -->
-	<!-- TMPL_IF Name="shelves" -->
-		<!-- TMPL_IF Name="status1" -->
-			<!-- TMPL_VAR NAME="string1" -->
-		<!-- /TMPL_IF -->
-		<!-- TMPL_LOOP Name="paramsloop" -->
-			<!-- TMPL_IF Name="status" -->
-				<!-- TMPL_VAR NAME="string" -->
-			<!-- /TMPL_IF -->
-		<!-- /TMPL_LOOP -->
-					<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">								
-					<input type="hidden" name="shelves" value="1" /><table>
-						<caption>Bookshelves</caption>
-						<th>&nbsp;</th><th>Title</th><th>Item Count</th>
-					<!-- TMPL_LOOP Name="shelvesloop" -->
-						<!-- TMPL_IF name="canmanage" -->
+    <!-- TMPL_IF Name="shelves" -->
+        <!-- TMPL_IF Name="status1" -->
+            <p class="error"><!-- TMPL_VAR Name="string1" --></p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_LOOP Name="paramsloop" -->
+            <!-- TMPL_IF Name="status" -->
+                <p class="error"><!-- TMPL_VAR Name="string" --></p>
+            <!-- /TMPL_IF -->
+        <!-- /TMPL_LOOP -->
+    <form method="post" action="/cgi-bin/koha/bookshelves/shelves.pl">
+        <input type="hidden" name="shelves" value="1">
+        <h3>Create a New a Virtual Shelf</h3>
+        <table>
+        <tr><th scope="row"><label for="addshelf">Shelf Name:</label> </th><td> <input id="addshelf" type="text" name="addshelf" size="25"></td></tr>
+        <tr><th scope="row"><label for="owner">Owner:</label> </th><td><input type="hidden" name="owner" id="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></td></tr>
+        <tr><th scope="row"><label for="category">Category:</label> </th><td><select name="category" id="category">
+                                    <option value="1">Private</option>
+                                    <option value="2">Public</option>
+                                    </select></td></tr></table>
+        <ul>
+            <li>A <b>private</b> virtual shelf is managed by you and can be seen only by you.</li>
+            <li> A <b>public</b> virtual shelf can be seen by everybody, but managed only by you.</li>
+        </ul>
+                                <p><input type="submit" value="Add New Shelf"></p>
+                    </form>
+        
+        <!-- TMPL_IF NAME="numberCanManage" -->
+        <!-- TMPL_IF NAME="shelvesloop" -->
+        <form method="post" action="/cgi-bin/koha/bookshelves/shelves.pl" name="mainform">
+                    <input type="hidden" name="shelves" value="1" />
+                    <h3>Delete Virtual Shelves</h3>
+                    <table>
+                        <tr><th>&nbsp;</th><th>Shelf Name</th><th>Contents</th></tr>
+                        <!-- TMPL_LOOP Name="shelvesloop" -->
+                        <!-- TMPL_IF name="canmanage" -->
+                        <tr>
+                            <td>
+                                <input type="checkbox" name="DEL-<!-- TMPL_VAR Name="shelf" -->" />
+                            </td>
+                            <td>
+                                <a href="/cgi-bin/koha/bookshelves/shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a>
+                            </td>
+                            <td>
+                                <!-- TMPL_VAR Name="shelfbookcount" --> item(s)
+                            </td>
+                        </tr>
+                        <!-- /TMPL_IF -->
+                        <!-- /TMPL_LOOP -->
+                    </table>
+        <input type="submit" value="Delete Shelves" /></form>
+        <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+        <br />
+        <p><form class="inline" action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="submit" value="Back to Virtual Shelves" /></form></p>
 
-						<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF --><td><!-- TMPL_IF NAME="shelfbookcount" --><input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" disabled="disabled" readonly="readonly" /><!-- TMPL_ELSE --><input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" /><!-- /TMPL_IF --></td><td><a href="shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a></td><td><!-- TMPL_IF NAME="shelfbookcount" --><!-- TMPL_VAR NAME="shelfbookcount" --> item(s)*<!-- TMPL_ELSE -->Empty<!-- /TMPL_IF --></td></tr>
-						<!-- /TMPL_IF -->
-						<!-- /TMPL_LOOP --></table>
-					
-						<input type="submit" value="Delete Selected Shelves" /> <sup>*</sup>Shelves must be empty before they can be deleted.
-					</p>
-					</form>
+    <!-- TMPL_ELSE -->
+    <!-- TMPL_IF name="edit" -->
+        <form method="post">
+            <input type="hidden" name="op" value="modifsave">
+            <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
+<h3>Modify Virtual Shelf <!-- TMPL_VAR name="shelfname"--></h3>
+            <table>
+            <tr><td><label for="shelfname">Shelf Name: </label></td><td><input type="text" id="shelfname" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
+            <tr><td><label for="owner">Owner: </label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
+            <tr><td><label for="category">Category: </label></td><td><select id="category" name="category">
+                    <!-- TMPL_IF name="category1" -->
+                        <option value="1" selected>Private</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="1">Private</option>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="category2" -->
+                        <option value="2" selected>Public</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="2">Public</option>
+                    <!-- /TMPL_IF -->
+                </select></td></tr>
+            </table>
+            <ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen <strong>only</strong> by you.</li>
+                <li> A <strong>public</strong> virtual shelf can be seen by <strong>everybody</strong>, but managed only by you.</li>
+            </ul>
+            <p><input type="submit" value="Save Changes"></p>
 
-			<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
-				<input type="hidden" name="shelves" value="1" />
-				<table>
-				<caption>Add Shelf</caption>
-				<tr><th><label>Name</label></th><td><input type="text" name="addshelf" size="25" /></td></tr>
-				<tr><th><label>Owner</label></th><td><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
-				<tr><th><label>Category</label></th>
-					<td><select name="category">
-						<option value="1">Private</option>
-						<option value="2">Public</option>
-					</select></td></tr>
-</table>
-<ul><li>A private bookshelf is managed by you and can be seen only by you.</li>
-					<li> A public shelf can be seen by everybody, but managed only by you.</li></ul>
-					<input type="submit" value="Add New Shelf" /></form>
-					<form action="shelves.pl" method="get"><input type="submit" value="Back to Shelf List" /></form>
-	<!-- TMPL_ELSE -->
-			<table>
-			<caption>Virtual Shelves</caption>
-				<tr>
-					<th>Shelf Name</th>
-					<th>Category</th>
-					<th>Content size</th>
-					<th>&nbsp;</th>
-				</tr>
-				<!-- TMPL_LOOP Name="shelvesloop" -->
-				<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-					<td>
-						<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
-							<!-- TMPL_VAR NAME="shelfname" -->
-						</a>
-					</td>
-					<td>
-						<!-- TMPL_IF NAME="category1" -->
-							Private
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF NAME="category2" -->
-							Public
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF NAME="category3" -->
-							Free
-						<!-- /TMPL_IF -->
-					</td>
-					<td>
-						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
-					</td>
-					<td><!-- TMPL_IF name="mine" --><a href="shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Edit</a><!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
-				</tr>
-				<!-- /TMPL_LOOP -->
-			</table>
-		<form action="shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" value="Add or Remove Book Shelves" />				
-	<!-- /TMPL_IF -->
+        </form>
 <!-- /TMPL_IF -->
+<h3>Virtual Shelves</h3>
 
+<table>
+<tr><th>Shelf Name</th><th>Category</th><th>Content Size</th><th>&nbsp;</th></tr>
+<!-- TMPL_LOOP Name="shelvesloop" -->
+<tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->><td><a href="/cgi-bin/koha/bookshelves/shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_IF NAME="category1" -->Private<!-- /TMPL_IF --><!-- TMPL_IF NAME="category2" -->Public<!-- /TMPL_IF --><!-- TMPL_IF NAME="category3" -->Free<!-- /TMPL_IF --></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td><td><!-- TMPL_IF name="mine" --><a href="/cgi-bin/koha/bookshelves/shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Modify</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
+            <!-- /TMPL_LOOP -->
+        </table>
+        <p><form action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" value="Add or Remove Book Shelves" /></form></p>
+    <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+<br clear="both" />
+
+<script type="text/javascript">
+	function confirmDelete(s){
+		if (window.confirm(s))
+			return true;
+		return false;
+	}
+	/**
+	 * this function checks all checkbox 
+	 * or uncheck all if there are already checked.
+	 */
+	function CheckAll(){
+		var checkboxes = document.getElementsByTagName('input');
+		var nbCheckbox = checkboxes.length;
+		var check = areAllChecked();
+		check = !check;
+		for(var i=0;i<nbCheckbox;i++){
+			if(checkboxes[i].getAttribute('type') == "checkbox" ){
+				checkboxes[i].checked = check;
+			}
+		}
+	}
+	/**
+	 * this function return true if all checkbox are checked
+	 */
+	function areAllChecked(){
+		var checkboxes = document.getElementsByTagName('input');
+		var nbCheckbox = checkboxes.length;
+		for(var i=0;i<nbCheckbox;i++){
+			if(checkboxes[i].getAttribute('type') == "checkbox" ){
+				if(checkboxes[i].checked == 0){
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+	
+</script>
 
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc"-->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/ISBDdetail.tmpl
index 1712fc3227..c52a2d43c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/catalogue/ISBDdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/ISBDdetail.tmpl
@@ -1,18 +1,29 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: ISBD View<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="search-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalogue MARC detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-<div id="main">
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
-<div class="tabitem"><form action="MARCdetail.pl" method="get">
-<input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
-<input type="submit" class="submit" value="View MARC" /></form> <form action="/cgi-bin/koha/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" /><input type="submit" class="submit" value="Item Details" /></form> <form action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="bib" /> <input type="submit" value="Place Reserve" class="submit" /></form> <form action="acqui.simple/addbiblio.pl"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Edit this Record" class="submit" /></form><!-- /TMPL_IF -->
-</div>
 
-	<div class="isbd">
-		<p><!-- TMPL_VAR NAME="ISBD" --></p>
+<h1 class="catalogue">MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --></h1>
+
+<!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
+
+	<div id="catalogue_ISBDdetail">
+		<!-- TMPL_VAR NAME="ISBD" -->
 	</div>
 </div>
 
+<script language="javascript" type="text/javascript">
+function Dopop(link) {
+    newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
+}
+function confirm_deletion() {
+    var is_confirmed = confirm('Are you sure you want to delete this biblio?');
+    if (is_confirmed) {
+        window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
+    }
+}
+
+</script>
+
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl
index 8d587cf2ba..35a4e1b63b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl
@@ -1,250 +1,389 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: MARC Record View<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_UNLESS NAME="popup"-->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalogue MARC detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
-<h2>MARC Record for number <em><!-- TMPL_VAR name="biblionumber" --><!-- TMPL_VAR NAME="biblio_title" --><!-- TMPL_IF NAME="biblio_subtitle" -->: <!-- TMPL_VAR NAME="biblio_subtitle" --><!-- /TMPL_IF --></em></h2>
-<div class="tabitem"><form action="detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Brief Display" /></form><!-- TMPL_IF NAME="norequests" -->&nbsp;<!-- TMPL_ELSE --> <form action="/cgi-bin/koha/reserve/request.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <input type="submit" class="submit" value="Place Reserve" /></form>
-		<!-- /TMPL_IF --><form action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Simple Print View" /></form> <!-- TMPL_IF name="subscriptionid" --><form action="/cgi-bin/koha/bull/subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Subscription" class="submit" /></form>
-<form action="/cgi-bin/koha/bull/serial-issues.pl" method="get"><input type="hidden" name="subscriptionid" value="!-- TMPL_VAR NAME="subscriptionid" -->" /><input type="submit" value="Serial Issues" class="submit" /></form><!-- /TMPL_IF -->  <form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit MARC" /></form> <form action="/cgi-bin/koha/cataloguing/additem.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber"-->" /><input type="submit" class="submit" value="Edit Items" /></form> <form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get"><input type="hidden" name="op" value="delete" /><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="cancel" value="Delete Record" onclick="confirm_deletion(); return false;" /></form></div>
 
-<!-- TMPL_IF NAME="0XX" -->
-<table class="marc">
-	<!-- TMPL_LOOP NAME="0XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-<td><!-- TMPL_IF name="link" -->
-						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- 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" -->">
-						</a>
-					<!-- /TMPL_IF --></td> 
-	</tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME="1XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="1XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-<td><!-- TMPL_IF name="link" -->
-						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- 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" -->">
-						</a>
-					<!-- /TMPL_IF --></td> 
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-	 <!-- /TMPL_IF -->
-	 
-<!-- TMPL_IF NAME="2XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="2XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-<td><!-- TMPL_IF name="link" -->
-						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- 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" -->">
-						</a>
-					<!-- /TMPL_IF --></td> 
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-	 <!-- /TMPL_IF -->
-	 
-<!-- TMPL_IF NAME="3XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="3XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-<td><!-- TMPL_IF name="link" -->
-						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- 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" -->">
-						</a>
-					<!-- /TMPL_IF --></td> 
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-	 <!-- /TMPL_IF -->
+<!-- TMPL_UNLESS name="popup" -->
+    <h1>
+        MARC biblio : <!-- TMPL_VAR NAME="biblionumber" -->
+    </h1>
+    
+<!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
 
-<!-- TMPL_IF NAME="4XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="4XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-<td><!-- TMPL_IF name="link" -->
-						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- 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" -->">
-						</a>
-					<!-- /TMPL_IF --></td> 
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-	 <!-- /TMPL_IF -->
+<!-- /TMPL_UNLESS -->
 
-<!-- TMPL_IF NAME="5XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="5XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-<td><!-- TMPL_IF name="link" -->
-						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- 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" -->">
-						</a>
-					<!-- /TMPL_IF --></td> 
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-	 <!-- /TMPL_IF -->
+    <p><b>With Framework :<!--TMPL_VAR Name="framework" --></b></p>
+    
+    <div id="tabs">
+        <!-- TMPL_IF NAME="0XX" -->
+            <a href="javascript:active(0)" class="tab_active" id="link0">0</a>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="1XX" -->
+            <a href="javascript:active(1)" class="tab_inactive" id="link1">1</a>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="2XX" -->
+            <a href="javascript:active(2)" class="tab_inactive" id="link2">2</a>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="3XX" -->
+            <a href="javascript:active(3)" class="tab_inactive" id="link3">3</a>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="4XX" -->
+            <a href="javascript:active(4)" class="tab_inactive" id="link4">4</a>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="5XX" -->
+            <a href="javascript:active(5)" class="tab_inactive" id="link5">5</a>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="6XX" -->
+            <a href="javascript:active(6)" class="tab_inactive" id="link6">6</a>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="7XX" -->
+            <a href="javascript:active(7)" class="tab_inactive" id="link7">7</a>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="8XX" -->
+            <a href="javascript:active(8)" class="tab_inactive" id="link8">8</a>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="9XX" -->
+            <a href="javascript:active(9)" class="tab_inactive" id="link9">9</a>
+        <!-- /TMPL_IF -->
+        <a href="javascript:active(10)" class="tab_inactive" id="link10">Items</a>
+    </div>
 
-<!-- TMPL_IF NAME="6XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="6XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-<td><!-- TMPL_IF name="link" -->
-						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- 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" -->">
-						</a>
-					<!-- /TMPL_IF --></td> 
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-	 <!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="7XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="7XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-<td><!-- TMPL_IF name="link" -->
-						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- 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" -->">
-						</a>
-					<!-- /TMPL_IF --></td> 
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-	 <!-- /TMPL_IF -->
-
-	 
-<!-- TMPL_IF NAME="8XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="8XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-<td><!-- TMPL_IF name="link" -->
-						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- 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" -->">
-						</a>
-					<!-- /TMPL_IF --></td> 
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="9XX" -->
-    <table class="marc">
-	<!-- TMPL_LOOP NAME="9XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
-	<!-- TMPL_LOOP NAME="subfield" -->
-	<tr>
-         <td>&nbsp;</td>
-	    <td><!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS --></td>
-		<td class="label"><!-- TMPL_VAR NAME="marc_lib" --></td>
-		<td class="data"><!-- TMPL_VAR NAME="marc_value" --></td>
-<td><!-- TMPL_IF name="link" -->
-						<a href="catalogue-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;zoom=1&amp;type=intranet&amp;value=<!-- 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" -->">
-						</a>
-					<!-- /TMPL_IF --></td> 
-       </tr>
-	<!-- /TMPL_LOOP -->
-	<!-- /TMPL_LOOP -->
-     </table>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME="item_loop" -->    <table>
-		<tr>
-			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
-		</tr>
-		<!-- TMPL_LOOP NAME="item_loop" -->
-			<tr>
-					<!-- TMPL_VAR NAME="item_value" -->
-			</tr>
-		<!-- /TMPL_LOOP -->
-     </table><!-- /TMPL_IF -->
+    <div name="0XX" id="0XX" class="content_visible">
+        <!-- TMPL_LOOP NAME="0XX" -->
+                <!-- TMPL_IF name="tag" -->
+                    <p class="tag">
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
+            <!-- TMPL_LOOP NAME="subfield" -->
+                <p class="subfield">
+                    <label>&nbsp;
+                    <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+                    <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
+                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <!-- TMPL_IF name="link" -->
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        </a>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="authority" -->
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                    <!-- /TMPL_IF -->
+                </p>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
+    </div>
+    
+    <div id="1XX" class="content_hidden">
+        <!-- TMPL_LOOP NAME="1XX" -->
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
+            <!-- TMPL_LOOP NAME="subfield" -->
+                <p>
+                    <label>&nbsp;
+                    <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+                    <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
+                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <!-- TMPL_IF name="link" -->
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        </a>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="authority" -->
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                    <!-- /TMPL_IF -->
+                </p>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
+    </div>
+    
+    <div id="2XX" class="content_hidden">
+        <!-- TMPL_LOOP NAME="2XX" -->
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
+            <!-- TMPL_LOOP NAME="subfield" -->
+                <p>
+                    <label>&nbsp;
+                    <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+                    <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
+                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <!-- TMPL_IF name="link" -->
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        </a>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="authority" -->
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                    <!-- /TMPL_IF -->
+                </p>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
+    </div>
+    
+    <div id="3XX" class="content_hidden">
+        <!-- TMPL_LOOP NAME="3XX" -->
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
+            <!-- TMPL_LOOP NAME="subfield" -->
+                <p>
+                    <label>&nbsp;
+                    <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+                    <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
+                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <!-- TMPL_IF name="link" -->
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        </a>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="authority" -->
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                    <!-- /TMPL_IF -->
+                </p>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
+    </div>
+    
+    <div id="4XX" class="content_hidden">
+        <!-- TMPL_LOOP NAME="4XX" -->
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
+            <!-- TMPL_LOOP NAME="subfield" -->
+                <p>
+                    <label>&nbsp;
+                    <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+                    <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
+                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <!-- TMPL_IF name="link" -->
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        </a>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="authority" -->
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                    <!-- /TMPL_IF -->
+                </p>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
+    </div>
+    
+    <div  id="5XX" class="content_hidden">
+        <!-- TMPL_LOOP NAME="5XX" -->
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
+            <!-- TMPL_LOOP NAME="subfield" -->
+                <p>
+                    <label>&nbsp;
+                    <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+                    <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
+                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <!-- TMPL_IF name="link" -->
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        </a>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="authority" -->
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                    <!-- /TMPL_IF -->
+                </p>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
+    </div>
+    
+    <div id="6XX" class="content_hidden">
+        <!-- TMPL_LOOP NAME="6XX" -->
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
+            <!-- TMPL_LOOP NAME="subfield" -->
+                <p>
+                    <label>&nbsp;
+                    <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+                    <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
+                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <!-- TMPL_IF name="link" -->
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        </a>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="authority" -->
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                    <!-- /TMPL_IF -->
+                </p>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
+    </div>
+    
+    <div  id="7XX" class="content_hidden">
+        <!-- TMPL_LOOP NAME="7XX" -->
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
+            <!-- TMPL_LOOP NAME="subfield" -->
+                <p>
+                    <label>&nbsp;
+                    <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+                    <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
+                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <!-- TMPL_IF name="link" -->
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        </a>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="authority" -->
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                    <!-- /TMPL_IF -->
+                </p>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
+    </div>
+    
+    <div id="8XX" class="content_hidden">
+        <!-- TMPL_LOOP NAME="8XX" -->
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
+            <!-- TMPL_LOOP NAME="subfield" -->
+                <p>
+                    <label>&nbsp;
+                    <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+                    <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
+                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <!-- TMPL_IF name="link" -->
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        </a>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="authority" -->
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                    <!-- /TMPL_IF -->
+                </p>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
+    </div>
+    
+    <div id="9XX" class="content_hidden">
+        <!-- TMPL_LOOP NAME="9XX" -->
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
+            <!-- TMPL_LOOP NAME="subfield" -->
+                <p>
+                    <label>&nbsp;
+                    <!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+                    <span title="<!-- TMPL_VAR name="long_desc" -->"><!-- TMPL_VAR NAME="short_desc" --></span></label>
+                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <!-- TMPL_IF name="link" -->
+                        <a href="/cgi-bin/koha/catalogue/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+                            <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+                        </a>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="authority" -->
+                        <a href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+                    <!-- /TMPL_IF -->
+                </p>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
+    </div>
+    
+    <div id="10XX" class="content_hidden">
+        <br/>
+        <table class="noborder">
+                <tr>
+                    <!-- TMPL_LOOP NAME="item_header_loop" -->
+                        <th class="noborder">
+                            <!-- TMPL_VAR NAME="header_value" -->
+                        </th>
+                    <!-- /TMPL_LOOP -->
+                </tr>
+                <!-- TMPL_LOOP NAME="item_loop" -->
+                    <tr>
+                        <!-- TMPL_VAR NAME="item_value" -->
+                    </tr>
+                <!-- /TMPL_LOOP -->
+        </table>
+    </div>
+<script language="JavaScript" type="text/javascript">
+function active(numlayer)
+{
+    for (i=0; i <= 10 ; i++ ) {
+        var tab = document.getElementById(i+'XX');
+        if (numlayer==i) {
+            tab.setAttribute("class","content_visible");
+            var tabactive=document.getElementById('link'+i);
+            tabactive.removeAttribute("class");
+            tabactive.setAttribute("class","tab_active");
+        } else {
+            tab.setAttribute("class","content_hidden");
+            try {
+                var tabactive=document.getElementById('link'+i);
+                tabactive.removeAttribute("class");
+                tabactive.setAttribute("class","tab_inactive");
+            }
+            catch(e){};
+        }
+    }
+}
 
-	
-	<script language="JavaScript" type="text/javascript">
 function confirm_deletion() {
-	var is_confirmed = confirm('Are you sure you want to delete this record and all the attached items?');
-	if (is_confirmed) {
-		window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
-	}
+    var is_confirmed = confirm('Are you sure you want to delete this biblio?');
+    if (is_confirmed) {
+        window.location="../cataloguing/addbiblio.pl?op=delete&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
+    }
+}
+function Dopop(link) {
+    newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
 }
 function Changefwk(FwkList) {
-  var fwk = FwkList.options[FwkList.selectedIndex].value;
-  window.location = "MARCdetail.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->&frameworkcode="+fwk;
+var fwk = FwkList.options[FwkList.selectedIndex].value;
+window.location = "MARCdetail.pl?biblionumber=<!--TMPL_VAR Name="biblionumber"-->&frameworkcode="+fwk;
 }
 function Addbiblio(op) {
-  var fwk = document.forms['duplicate'].Frameworks.options[document.forms['duplicate'].Frameworks.selectedIndex].value;
-  window.location = "/cgi-bin/koha/cataloguing/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
+var fwk = document.forms['f'].Frameworks.options[document.forms['f'].Frameworks.selectedIndex].value;
+window.location = "../cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
 }
 </script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl
index fdaf06e623..37bd02b9b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl
@@ -1,103 +1,225 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Details for <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalogue MARC detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-<h3 class="title"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR NAME="author" -->)<!-- /TMPL_IF --></h3>
 
-	<div class="tabitem">
-<form action="MARCdetail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View MARC" /></form>
-<form action="moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="View Item Details" /></form> 	
-<form action="/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Add to Shelf" onclick="openWindow('/cgi-bin/koha/bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->', 'popped'); return false;" /></form> 
-<form action="detailprint.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Print" onclick="openWindow('detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','printview'); return false;" /></form>
-<!-- TMPL_UNLESS NAME="norequests" --> <form action="/cgi-bin/koha/reserve/request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="biblionumber" /> <input type="submit" value="Reserves" class="submit" /></form><!-- /TMPL_UNLESS -->
-	 </div>
-<!-- TMPL_IF NAME="isbn" --><div >
-<img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01.MZZZZZZZ.jpg" alt="Book Cover Image" />
-</div><!-- /TMPL_IF -->
-<div class="details">
-			
-<ul>
-			<!-- TMPL_IF NAME="subtitle" --><li><b>Subtitle:</b> <!-- TMPL_VAR NAME="subtitle" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="author" --><li><b>Author:</b> <a href="catalogue-search.pl?kohafield=author&op=do_search&value=<!--TMPL_VAR NAME="author" ESCAPE=URL>&and_or=@and&order=author,1&zoom=1"><!-- TMPL_VAR NAME="author" --></a></li><!--/TMPL_IF-->
-			<!-- TMPL_IF NAME="additionalauthor" --><li><b>Additional Author:</b> <!-- TMPL_VAR NAME="additionalauthor" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="isbn" --><li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="classification" --><li><strong>Classification:</strong> <!-- TMPL_VAR NAME="classification" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="seriestitle" --><li><b>Series Title:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="subject" --><li><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="copyrightdate" --><li><b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="notes" --><li><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="unititle" --><li><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --></li><!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="serial" --><li><b>Serial:</b> <!-- TMPL_VAR NAME="serial" --></li><!-- /TMPL_IF --> 
-			<!-- TMPL_IF name="url" --><li><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!--TMPL_VAR NAME="url" --></a></li><!-- /TMPL_IF -->
-			
-<!-- /TMPL_LOOP -->
-			<!-- TMPL_LOOP NAME="MARCSUBJCTS" --><!-- TMPL_IF NAME="MARCSUBJCT" --><li><b>Subjects:</b><!-- TMPL_VAR NAME="MARCSUBJCT" --><!--/TMPL_IF--><!-- /TMPL_LOOP -->
-			<!-- TMPL_LOOP NAME="MARCURLS" --><!-- TMPL_IF NAME="MARCURL" --><li><b>URLs:</b><!-- TMPL_VAR NAME="MARCURL" --><!--/TMPL_IF--><!-- /TMPL_LOOP -->
-			<!-- TMPL_LOOP NAME="MARCNOTES" --><!-- TMPL_IF NAME="MARCNOTE" --><li><b>Abstract:</b><!-- TMPL_VAR NAME="MARCNOTE" --><!--/TMPL_IF--><!-- /TMPL_LOOP -->
+    <h1><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></h1>
+    
+<!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
+    
+    <div id="catalogue_detail_biblio">
+        <h2>Biblio detail</h2>
+        <!-- TMPL_IF name="subtitles" -->
+            <p><label><b>Subtitle(s):</b></label>
+                <!-- TMPL_LOOP name="subtitles" -->
+                    <!-- TMPL_VAR NAME="subtitle" --> ;
+                <!-- /TMPL_LOOP -->
+                &nbsp;
+            </p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="author" -->
+            <p><label><b>Author: </b></label>
+                <a href="/cgi-bin/koha/catalogue/search.pl?q=au:<!-- TMPL_VAR NAME="author" -->">
+                    <!-- TMPL_VAR NAME="author" -->&nbsp;
+                </a>
+            </p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="MARCAUTHORS" -->
+            <p><label><b>Additional Author:</b></label>
+                <!-- TMPL_LOOP NAME="MARCAUTHORS" -->
+                <a href="/cgi-bin/koha/catalogue/search.pl?q=Koha-Auth-Number:<!-- TMPL_VAR NAME="link" -->">
+                    <!-- TMPL_VAR NAME="value" -->
+                </a>&nbsp;
+                <!-- /TMPL_LOOP -->
+            </p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="illus" -->
+            <p><label><b>Illus:</b></label><!-- TMPL_VAR name="illus" -->&nbsp;</p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="publishercode" -->
+            <p><label><b>Published by :</b></label>
+                <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:<!-- TMPL_VAR NAME="publishercode"">
+                    <!-- TMPL_VAR NAME="publishercode" -->
+                </a>&nbsp;
+            </p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="publicationyear" -->
+            <p><label><b>in</b></label><!-- TMPL_VAR NAME="publicationyear" -->&nbsp;</p>
+        <!-- /TMPL_IF -->
+        <p>
+            <label>&nbsp;</label>
+                <!-- TMPL_IF name="pages" --> <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+                <!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" -->&nbsp;
+        </p>
+        <!-- TMPL_IF name="isbn" -->
+            <p><label><b>ISBN: </b></label><!-- TMPL_VAR NAME="isbn" -->&nbsp;</p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="issn" -->
+            <p><label><b>ISSN:</b></label><!-- TMPL_VAR NAME="issn" -->&nbsp;</p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="seriestitle" -->
+            <p><label><b>Collection: </b></label>
+                <!-- TMPL_VAR NAME="seriestitle" --> 
+                <!-- TMPL_IF name="volume" -->vol. <!-- TMPL_VAR name="volume" --> <!-- TMPL_VAR name="volumedate" --><!-- /TMPL_IF -->
+                <!-- TMPL_VAR name="volumedesc" -->&nbsp;
+            </p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="MARCSUBJCTS" -->
+            <p><label><b>Subjects: </b></label></p>
+            <p>
+                <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
+                    <a href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_VAR NAME="link" ESCAPE="URL"-->"><!-- TMPL_VAR NAME="label" --></a>
+                    &nbsp;
+                <!-- /TMPL_LOOP -->
+            </p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="copyrightdate" -->
+            <p><label><b>Year : </b></label><!-- TMPL_VAR NAME="copyrightdate" --></p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="MARCNOTES" -->
+            <p><label><b>Notes: </b></label></p>
+            <p>
+                <!-- TMPL_LOOP NAME="MARCNOTES" -->
+                    <p>- <!-- TMPL_VAR NAME="marcnote" --></p>
+                <!-- /TMPL_LOOP -->
+            </p>
+        <!-- TMPL_ELSE -->
+            <!-- TMPL_IF name="notes" -->
+                <p><label><b>Notes: </b></label><!-- TMPL_VAR NAME="notes" --></p>
+            <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="unititle" -->
+            <p><label><b>Alt title: </b></label><!-- TMPL_VAR NAME="unititle" --></p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="classification" -->
+            <p><label><b>classification:</b></label><!-- TMPL_VAR name="subclass" --><!-- TMPL_VAR name="classification" --></p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="dewey" -->
+            <p><label><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --></p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="URLS" -->
+            <p><label><b>URL: </b></label>
+                <!-- TMPL_LOOP name="URLS" -->
+                    <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a>&nbsp;
+                <!-- /TMPL_LOOP -->
+            </p>
+        <!-- /TMPL_IF -->
+        <p><label><b>Item type : </b></label>
+            <!-- TMPL_IF name="description" -->
+                <!-- TMPL_VAR name="description" -->
+            <!-- TMPL_ELSE -->
+                <!-- TMPL_VAR NAME="itemtype" -->
+            <!-- /TMPL_IF -->
+        </p>
+    </div>
 
-			<li><b>Biblio Record</b> <!-- TMPL_VAR NAME="biblionumber" --></li>
-			<li><b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" --></li>
-			</ul>
-
-<br clear="both" /></div><div class="tabitem">
-		<form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Edit Record" /></form>
-		<form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="op" value="duplicate" /><input type="submit" class="submit" value="Duplicate Record" /></form>
-		<form action="/cgi-bin/koha/cataloguing/additem.pl" method="get" ><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber"-->" /><input type="submit" class="submit" value="Edit Items" /></form>
-		</div>
-
-
-<div class="table"><table>
-	<tr>
-		<th>Item Type</th>
-		<th>LC Classifiction</th>
-		<th>Location</th>
-		<th>Date Due</th>
-		<th>Last Seen</th>
-		<th>Barcode</th>
-		<th>Volume</th>
-	</tr>
-	
-<!-- TMPL_IF NAME="ITEM_RESULTS" -->
-<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
-		<tr>
-			<td><!-- TMPL_VAR NAME="itemtype" --></td>
-			<td><!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="classification" --><!-- /TMPL_IF --></td>
-			<td><!-- TMPL_VAR NAME="branchname" -->-<!-- TMPL_VAR NAME="shelf" --></td>
-			<td><!-- TMPL_VAR NAME="datedue" --></td>
-			<td><!-- TMPL_VAR NAME="datelastseen" --></td>
-			<td><a href="moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;barcode=<!-- TMPL_VAR NAME="barcode" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
-			 <td><!-- TMPL_IF NAME="volumedesc" --><!-- TMPL_VAR NAME="volumeddesc" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td> 
-		
-		</tr>
-	<!-- /TMPL_LOOP --><!-- TMPL_ELSE --><tr><td colspan="6">This record has no items.</td></tr><!-- /TMPL_IF -->
-	
-</table></div>
-
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-<!-- TMPL_IF NAME="abstract -->
-<table>
-<caption>Abstract</caption>
-<tr>
-<td><!-- TMPL_VAR NAME="abstact" --></td>
-</tr>
-</table>
+<!-- TMPL_IF name="count" -->
+    <div id="catalogue_detail_items">
+        <h2><!-- TMPL_VAR NAME="count" --> items</h2>
+        <table>
+            <tr>
+                <th>Item type</th>
+                <th>Location</th>
+                <th>Status</th>
+                <th>Date Due</th>
+                <th>Last seen</th>
+                <th>Barcode</th>
+                <th>Volume</th>
+            </tr>
+            <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+                <tr>
+                    <td><!-- TMPL_VAR NAME="description" --></td>
+                    <td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --></td>
+                    <td>
+                        <!-- TMPL_IF name="datedue" -->
+                            On issue to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>
+                        <!-- TMPL_ELSE -->
+                            <!-- TMPL_IF name="notforloan" -->
+                                <!-- TMPL_VAR name="notforloan" -->
+                            <!-- TMPL_ELSE -->
+                                <!-- TMPL_IF name="itemlost"-->
+                                    Item lost
+                                <!-- TMPL_ELSE -->
+                                <!-- TMPL_IF NAME="wthdrawn" -->Item Cancelled<!-- TMPL_ELSE -->Available<!-- /TMPL_IF -->
+                                <!-- /TMPL_IF -->
+                            <!-- /TMPL_IF -->
+                        <!-- /TMPL_IF -->
+                    </td>
+                    <td><!-- TMPL_VAR NAME="datedue" --></td>
+                    <td><!-- TMPL_VAR NAME="datelastseen" --></td>
+                    <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+                    <td><!-- TMPL_VAR NAME="volumeddesc" --></td>
+                    <!-- 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 -->
+                </tr>
+            <!-- /TMPL_LOOP -->
+        </table>
+    </div>
+<!-- TMPL_ELSE -->
+    <p>we don't have any physical item for this document</p>
 <!-- /TMPL_IF -->
-<!-- /TMPL_LOOP -->
-
-<!-- TMPL_IF NAME="SITE_RESULTS" -->
-<table>
-<caption>Links to Associated Web Sites</caption>
-<!-- TMPL_LOOP NAME="SITE_RESULTS" -->
-<tr>
-<td><b>Title:</b> <!-- TMPL_VAR name="title" --><br>
-<b>Description:</b> <!-- TMPL_VAR name="description" --><br>
-<b>URL:</b><a href="http://<!-- TMPL_VAR name="url" -->">http://<!--TMPL_VAR name="url"></a><br>
-</td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
+<!-- TMPL_IF name="subscriptionsnumber" -->
+<div id="catalogue_detail_subscriptions">
+    <h2>This is a serial subscription</h2>
+    <p> (We have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions associated with this title).</p> 
+    <!-- TMPL_LOOP Name="subscriptions" -->
+            <!-- TMPL_IF NAME="subscriptionnotes" --><p><!--TMPL_VAR NAME="subscriptionnotes"--> </p><!-- /TMPL_IF -->
+            <!--TMPL_IF NAME="latestserials"-->
+            <p> The three latest issues related to this subscription:</p>
+            <table>
+                <tr>
+                    <th>Issue #</th>
+                    <th>Date</th>
+                    <th>Status</th>
+                    <th>Note</th>
+            <!--TMPL_LOOP Name="latestserials"-->
+                <tr>
+                    <td>
+                        <!--TMPL_VAR Name="serialseq"-->
+                    </td>
+                    <td>
+                        <!--TMPL_VAR Name="planneddate"-->
+                    </td>
+                    <td>
+                        <!--TMPL_IF Name="status1"-->Waited
+                        <!--TMPL_ELSE -->
+                            <!-- TMPL_IF Name="status2"-->Arrived
+                            <!--TMPL_ELSE -->
+                                <!-- TMPL_IF Name="status3"-->Late
+                                <!--TMPL_ELSE -->
+                                    <!-- TMPL_IF Name="status4"-->Missing
+                                    <!--TMPL_ELSE -->
+                                        <!-- TMPL_IF Name="status5"-->Not Issued
+                                        <!--/TMPL_IF-->
+                                    <!--/TMPL_IF-->
+                                <!--/TMPL_IF-->
+                            <!--/TMPL_IF-->
+                        <!--/TMPL_IF-->
+                    </td>
+                    <td>
+                        <!--TMPL_VAR Name="notes"-->
+                    </td>
+                </tr>
+            <!--/TMPL_LOOP -->
+            </table>
+            <!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP -->
+</div>
 <!-- /TMPL_IF -->
 
+<script language="javascript" type="text/javascript">
+function Dopop(link) {
+    newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
+}
+function confirm_deletion() {
+    var is_confirmed = confirm('Are you sure you want to delete this biblio?');
+    if (is_confirmed) {
+        window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
+    }
+}
+</script>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl
index 33c9580879..0fc229227a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl
@@ -1,87 +1,75 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Item Details for <!-- TMPL_LOOP NAME="BIBITEM_DATA" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main">
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalogue MARC detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-<!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
-<!-- TMPL_IF NAME="error" --><div id="error" class="error"><!-- TMPL_VAR NAME="error" -->
-<form class="inline" method="get" action="moredetail.pl">
-<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR name="itemnumber" -->" />
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-<input type="hidden" name="lost" value="<!-- TMPL_VAR name="lost" -->" />
-<input type="hidden" name="withdrawn" value="<!-- TMPL_VAR name="withdrawn" -->" />
-<input type="hidden" name="override" value="yes" />
-<input type="hidden" name="op" value="update" />
-<input type="submit" value="Confirm Change" class="submit" accesskey="y" /></form><form class="inline" method="get" action="moredetail.pl"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="cancel" value="Don't Change" accesskey="n" /></form>
-</div><!--/TMPL_IF-->
-
-<!-- BIBLIO ITEM  -->
-<h1><!-- TMPL_VAR NAME="title" -->
-<!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></h1>
-<div class="tabitem"><form action="/cgi-bin/koha/reserve/request.pl" method="post"><input type="hidden" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" /><input type="submit" class="submit" value="Reserves" /></form> <form action="detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" value="intra" name="type" /><input type="submit" class="submit" value="Return to Brief Display" /></form><form action="MARCdetail.pl" method="get">
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
-<input type="submit" class="submit" value="View MARC" /></form></div>
-<div class="data-main"><table>
-	<caption>Bibliographic Details</caption>
-	<!-- TMPL_IF NAME="biblionumber" --><tr><th>Biblionumber:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="itemtype" --><tr><th>Item Type:</th><td><!-- TMPL_VAR NAME="itemtype" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="url" --><tr><th>URL:</th><td><!-- <!-- TMPL_VAR NAME="url" --> --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="loanlength" --><tr><th>Loan Length:</th><td><!-- TMPL_VAR NAME="loanlength" --> days</td></tr><!-- /TMPL_IF -->
-	<!-- <tr><th>Rental Charge:</th><td><!-- TMPL_VAR NAME="rentalcharge" --></td></tr> -->
-	<!-- TMPL_IF NAME="dewey" --><tr><th>Classification:</th><td><!-- TMPL_VAR NAME="classification" --><!-- TMPL_VAR NAME="subclass" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="isbn" --><tr><th>ISBN:</th><td> <!-- TMPL_VAR NAME="isbn" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="publishercode" --><tr><th>Publisher:</th><td><!-- TMPL_VAR NAME="publishercode" --></td> </tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="place" --><tr><th>Place:</th><td><!-- TMPL_VAR NAME="place" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="publicationyear" --><tr><th>Date:</th><td><!-- TMPL_VAR NAME="publicationyear" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="volumedesc" --><tr><th>Volume:</th><td><!-- TMPL_VAR NAME="volumeddesc" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="pages" --><tr><th>Pages:</th><td><!-- TMPL_VAR NAME="pages" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="illus" --><tr><th>Illus:</th><td><!-- TMPL_VAR NAME="illus" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="size" --><tr><th>Size:</th><td><!-- TMPL_VAR NAME="size" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="bnotes" --><tr><th>Notes:</th><td><!-- TMPL_VAR NAME="bnotes" --></td></tr><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="count" --><tr><th>No. of Items:</th><td><!-- TMPL_VAR NAME="count" --></td></tr><!-- /TMPL_IF -->
-</table></div>
-
-
-<!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
 
+<div id="catalogue_detail_biblio">
+	<div id="bloc25">
+	<!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
+		<h2 class="catalogue">
+			<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra">
+				<!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)
+			</a>
+		</h2>
+		<p>
+		<p><!-- TMPL_VAR NAME="biblioitemnumber" --> GROUP - <!-- TMPL_VAR NAME="description" --> </p>
+		<p><b>Biblionumber:</b> <!-- TMPL_VAR NAME="biblionumber" --></p>
+		<p><b>Item type:</b> <!-- TMPL_VAR NAME="itemtype" --></p>
+		<p><b>URL:</b> <!-- TMPL_VAR NAME="url" --></p>
+		<p><b>Loan length:</b> <!-- TMPL_VAR NAME="loanlength" --></p>
+		<p><b>Rental charge:</b> <!-- TMPL_VAR NAME="rentalcharge" --></p>
+		<p><b>Classification:</b> <!-- TMPL_VAR NAME="classification" --><!-- TMPL_VAR NAME="dewey" --><!-- TMPL_VAR NAME="subclass" --></p>
+		<p><b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --></p>
+		<p><b>Publisher:</b> <!-- TMPL_VAR NAME="publishercode" --> </p>
+		<p><b>Place:</b> <!-- TMPL_VAR NAME="place" --></p>
+		<p><b>Date:</b> <!-- TMPL_VAR NAME="publicationyear" --></p>
+		<p><b>Volume:</b> <!-- TMPL_VAR NAME="volumeddesc" --></p>
+		<p><b>Pages:</b> <!-- TMPL_VAR NAME="pages" --></p>
+		<p><b>Illus:</b> <!-- TMPL_VAR NAME="illus" --></p>
+		<p><b>Size:</b> <!-- TMPL_VAR NAME="size" --></p>
+		<p><b>Notes:</b> <!-- TMPL_VAR NAME="bnotes" --></p>
+		<p><b>No. of Items:</b> <!-- TMPL_VAR NAME="count" --></p>
+		<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Modify</a> |
+               <a href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&biblionumber=<!--TMPL_VAR NAME="biblionumber"-->&itemnumber=<!--TMPL_VAR NAME="itemnumber"-->">Delete</a> |
+               <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Requests</a>
+         <br />      
+	<!-- /TMPL_LOOP -->
+	</div>
 <!-- TMPL_LOOP NAME="ITEM_DATA" -->
-<div class="data">
-<table>
-<caption><a name="<!-- TMPL_VAR NAME="barcode" -->" id="<!-- TMPL_VAR NAME="barcode" -->">Barcode: <!-- TMPL_VAR NAME="barcode" --></a></caption>
-<!-- TMPL_IF NAME="homebranch" --><tr><th>Home Branch:</th><td> <!-- TMPL_VAR NAME="homebranch" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="holdingbranch" --><tr><th>Current Branch:</th><td> <!-- TMPL_VAR NAME="holdingbranch" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="datelastseen" --><tr><th>Last seen:</th><td> <!-- TMPL_VAR NAME="datelastseen" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="issue" --><tr><th>Item Status:</th><td> Due <!-- TMPL_VAR NAME="date_due" --> (Issued to <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>)</td></tr><!-- TMPL_ELSE --><tr><th>Item Status</th><td>Available</td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="datelastborrowed" --><tr><th>Last borrowed:</th><td> <!-- TMPL_VAR NAME="datelastborrowed" --></td></tr><!-- /TMPL_IF -->
-<!-- on issue bit -->
-<!-- TMPL_IF NAME="card0" --><tr><th>Last Borrower 1:</th><td> <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="card0" -->"><!-- TMPL_VAR NAME="card0" --></a></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="card1" --><tr><th>Last Borrower 2:</th><td> <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="card1" -->"><!-- TMPL_VAR NAME="card1" --></a></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="replacementprice" --><tr><th>Replacement Price:</th><td> $<!-- TMPL_VAR NAME="replacementprice" --></td></tr><!-- /TMPL_IF -->
-<tr><th>Lost Status:</th><td><!-- TMPL_IF NAME="itemlost" -->Lost<!-- TMPL_ELSE -->Not Lost<!-- /TMPL_IF -->
-<form class="inline" action="moredetail.pl" method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
-<input type="hidden" name="op" value="update">
-<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
-<!-- TMPL_IF NAME="itemlost" --><input type="hidden" value="0" name="lost" /><!-- TMPL_ELSE --><input type="hidden" value="1" name="lost" /><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="wthdrawn" --><input type="hidden" name="withdrawn" value="1" /><!-- TMPL_ELSE --><input type="hidden" name="withdrawn" value="0" /><!-- /TMPL_IF -->
-<input type="submit" name="submit" class="submit" value="<!-- TMPL_IF NAME="itemlost" -->Make Found<!-- TMPL_ELSE -->Make Lost<!-- /TMPL_IF -->" /></form></td></tr>
-<tr><th>Withdrawn: </th><td><!-- TMPL_IF NAME="wthdrawn" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --> 
-<form class="inline" action="moredetail.pl" method="post"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
-<input type="hidden" name="op" value="update">
-<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
-<!-- TMPL_IF NAME="itemlost" --><input type="hidden" value="1" name="lost" /><!-- TMPL_ELSE --><input type="hidden" value="0" name="lost" /><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="wthdrawn" --><input type="hidden" name="withdrawn" value="0" /><!-- TMPL_ELSE --><input type="hidden" name="withdrawn" value="1" /><!-- /TMPL_IF -->
-
-<input type="submit" name="submit" class="submit" value="<!-- TMPL_IF NAME="wthdrawn" -->Restore<!-- TMPL_ELSE -->Make Withdrawn<!-- /TMPL_IF -->" /></form></td></tr>
-<!-- TMPL_IF NAME="paidfor" --><tr><th>Paid for:</th><td> <!-- TMPL_VAR NAME="paidfor" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="itemnotes" --><tr><th>Notes:</th><td> <!-- TMPL_VAR NAME="itemnotes" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="renewals" --><tr><th>Renewals:</th><td> <!-- TMPL_VAR NAME="renewals" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="dateaccessioned" --><tr><th>Accession Date:</th><td><!-- TMPL_VAR NAME="dateaccessioned" --> (<a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&amp;catview=yes">View Receipt Summary</a>)</td></tr><!-- /TMPL_IF -->
-
-<tr><th>Total Issues:</th><td><!-- TMPL_VAR NAME="issues" --> (<a href="bookcount.pl?&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">View Circulation History</a>)</td></tr>
-</table></div>
-
+<div id="bloc25">
+	<h2 class="catalogue">BARCODE <!-- TMPL_VAR NAME="barcode" --></h2>
+ 	<a href="/cgi-bin/koha/cataloguing/additem.pl?op=edititem&biblionumber=<!-- TMPL_VAR
+NAME="biblionumber"-->&itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Modify</a> |
+        <a href="/cgi-bin/koha/cataloguing/additem.pl?op=delitem&biblionumber=<!--TMPL_VAR NAME="biblionumber"-->&itemnumber=<!--TMPL_VAR NAME="itemnumber"-->">Delete</a>
+	<br />
+	<b>Home Branch:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
+	<b>Current Branch:</b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
+	<b>Last seen:</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
+	<b>Last borrowed:</b> <!-- TMPL_VAR NAME="datelastborrowed" --><br>
+	<b>Item Status:</b> <!-- TMPL_IF NAME="issue" -->On issue to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a><!-- TMPL_ELSE -->Available <!-- /TMPL_IF --><br>
+	<!-- TMPL_IF NAME="issue" --><b>Date Due:</b> <!-- TMPL_VAR NAME="date_due" --><br><!-- /TMPL_IF -->
+	<b>Last Borrower 1:</b> <!-- TMPL_VAR NAME="card0" --><br>
+	<b>Last Borrower 2:</b> <!-- TMPL_VAR NAME="card1" --><br>
+	<b>Replacement Price:</b> <!-- TMPL_VAR NAME="replacementprice" --><br>
+	<b>Item lost:</b> <!-- TMPL_IF NAME="itemlost" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --><br>
+	<b>Paid for:</b> <!-- TMPL_VAR NAME="paidfor" --><br>
+	<b>Notes:</b> <!-- TMPL_VAR NAME="itemnotes" --><br>
+	<b>Renewals:</b> <!-- TMPL_VAR NAME="renewals" --><br>
+	<b><a href="/cgi-bin/koha/acqui/orderreceive.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&catview=yes">
+	Accession
+	Date:</a></b> <!-- TMPL_VAR NAME="dateaccessioned" --><br>
+	<b>Cancelled:</b> <!-- TMPL_IF NAME="wthdrawn" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --><br>
+	<b><a
+	href="/cgi-bin/koha/circ/bookcount.pl?&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;itm=<!-- TMPL_VAR NAME="itemnumber" -->">Total
+	Issues:</a></b> <!-- TMPL_VAR NAME="issues" --><br>
+	<b>Group Number:</b> <!-- TMPL_VAR NAME="biblioitemnumber" --> <br>
+	<b>Biblio number:</b> <!-- TMPL_VAR NAME="biblionumber" --> <br>
+	</h2>
+</div>
 <!-- /TMPL_LOOP -->
 
+<p>
+</form>
+</center>
 
-</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl
index 633c793110..b031e0ff8f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl
@@ -1,68 +1,54 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: <!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_UNLESS NAME="fromserials" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: <!-- TMPL_IF NAME="biblionumber" -->Edit MARC Record Number <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
-<!--/TMPL_UNLESS-->
-
-
-<!-- TMPL_IF name="error" -->
-			<div class="error">
-				<!--TMPL_IF NAME="onloan"-->
-				<ul>
-					<li>Item currenly onloan you can not DELETE!</li>
-					<li><a href="/cgi-bin/koha/mainpage.pl">Return to home page</a></li>
-				</ul>
-				<!--/TMPL_IF-->
-				<!--TMPL_IF NAME="xmlerror"-->
-				<ul>
-					<li>Non UTF-8 characters present or malformed XML</li>
-					<li>Please correct and save.</li>
-				</ul>
-				<!--/TMPL_IF-->
-			</div>
-<!-- /TMPL_IF -->
-<!--TMPL_UNLESS NAME="onloan"-->
-	<form method="post" name="f" id="f" action="addbiblio.pl">
-<h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="oldbiblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --> With Framework : <!--TMPL_VAR Name="framework" --></h1>
+	
+<form method="post" name="f" id="f" action="addbiblio.pl">
+<h1><!-- TMPL_IF NAME="biblionumtagfield" -->Edit MARC Record Number <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF --></h1>
 
-<div class="tabitem">
-		<input type="hidden" name="fromserials" value="<!-- TMPL_VAR NAME="fromserials" -->" />
-		<input type="hidden" name="op" value="addbiblio" />
-		<input type="hidden" name="addfield_field" /><input type="hidden" name="duplicateok" value="<!-- TMPL_VAR NAME="duplicateok" -->" />
-		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
-		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->" />
-		<!-- TMPL_IF name="biblionumber" -->
-			<input type="button" value="Save Bibliographic Record and go to Items" onclick="Check(this.form);" accesskey="w" class="submit" />
+<div id="action">
+    <!-- TMPL_IF name="biblionumber" -->
+        <input type="button" value="Save Bibliographic Record and go to Items" onclick="Check(this.form)" accesskey="w" />
 		<!-- TMPL_ELSE -->
-			<!--TMPL_UNLESS NAME="fromserials" -->
-			<input type="button" value="Add Bibliographic Record and go to Items" onclick="Check(this.form);" accesskey="w" class="submit" />
-			<!-- TMPL_ELSE -->
-			<input type="button" value="Add Bibliographic Record" onclick="Check(this.form);" accesskey="w" class="submit" />
-			<!--/TMPL_UNLESS-->
-		<!-- /TMPL_IF -->
-	<input type="button" value="z39.50 Search" class="submit" onclick="PopupZ3950(); return false;" / >
+        <input type="button" value="Add Bibliographic Record and go to Items" onclick="Check(this.form)" accesskey="w" />
+        <!-- /TMPL_IF -->
+    <input type="button" value="z39.50 Search" onclick="PopupZ3950(); return false;" />
 </div>
+<br />
+ Change framework : <!--TMPL_VAR Name="framework" -->
+
+        <input type="hidden" name="op" value="addbiblio" />
+		<input type="hidden" name="repeat_field" />
+        <input type="hidden" name="addfield_field" />
+        <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+        <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+        <input type="hidden" name="breedingid" value="<!-- TMPL_VAR NAME="breedingid" -->" />
 
-<br>
-	<div class="tabs">
+
+	<div id="tabs">
         <!-- TMPL_LOOP name="BIG_LOOP" -->
-            <a href="#" onclick="active(<!-- TMPL_VAR name="number"-->); return false;" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
+            <!-- TMPL_IF name="number" -->
+                <a href="JavaScript:active(<!-- TMPL_VAR name="number"-->)" class="tab_inactive" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
+            <!-- TMPL_ELSE -->
+                <a href="JavaScript:active(<!-- TMPL_VAR name="number"-->)" class="tab_active" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
+            <!-- /TMPL_IF -->
         <!--  /TMPL_LOOP -->
 	</div>
 
-<! -- RESET PAGINATION -->
+<!-- RESET PAGINATION -->
 <!-- TMPL_LOOP name="BIG_LOOP" -->
 <!-- hide every tab except the 1st -->
 <!-- TMPL_IF name="number" -->
-    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:hidden">
+    <div id="<!-- TMPL_VAR name="number" -->XX" class="content_hidden">
 <!-- TMPL_ELSE -->
-    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:visible">
+    <div id="0XX" class="content_visible">
 <!-- /TMPL_IF -->
 <!-- TMPL_UNLESS name="number" -->
     <!-- show duplicate warning on tab 0 only -->
         <!-- TMPL_IF name="duplicatebiblionumber" -->
                     <div class="error">
-                        <p>Is this a duplicate of <a href="../catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->" onclick="openWindow('../catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->&popup=1', 'Duplicate_biblio'; return false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
+                        <p class="problem">Is this a duplicate of <a href="../cataloguing/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->" onclick="openWindow('../MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->&popup=1', 'Duplicate biblio'; return false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
                         <p>You must either :</p>
                         <ul>
                             <li>If it <em>is</em> a duplicate, <a href="additem.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->">Edit Items</a> of the existing record.</li>
@@ -74,21 +60,31 @@
     <!-- TMPL_LOOP NAME="innerloop" -->
 		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
         <!-- TMPL_IF name="tag" -->
-        <p class="MARCtag">
+        <p class="tag">
             <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
             <!-- TMPL_UNLESS name="hide_marc" -->
                 <a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
-                <input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"  class="flat"> -
+                <!-- TMPL_IF NAME="fixedfield" -->
+                <input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text"  style="display:none;"  name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> 
+                <!-- TMPL_ELSE -->
+                <input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text"  name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> 
+                <!-- /TMPL_IF --> -
             <!-- TMPL_ELSE -->
-                <input tabindex="1" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
+                <!-- TMPL_IF NAME="fixedfield" -->
+                <input tabindex="1" type="hidden" style="display:none;" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
+                <!-- TMPL_ELSE -->
+                <input tabindex="1" type="hidden" name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
+                <!-- /TMPL_IF -->
             <!-- /TMPL_UNLESS -->
             <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
             <!-- TMPL_VAR NAME="tag_lib" -->
             <!-- /TMPL_UNLESS -->
-            <!-- TMPL_IF name="repeatable" --><a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
+            <!-- TMPL_IF name="repeatable" -->
+            <a href="#<!-- TMPL_VAR NAME="tag" -->" onclick="javascript:this.nextSibling.type='text';this.nextSibling.focus()">+</a><input type="hidden" value="" size="2" onchange="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->',this.value)" ><!-- /TMPL_IF -->
         </p>
         <!-- /TMPL_IF -->
         <!-- TMPL_LOOP NAME="subfield_loop" -->
+            <p class="subfield">
             <!-- TMPL_IF NAME="visibility" -->
                 <a tabindex="1" style="color: grey; font-size: 80%; cursor: se-resize;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
                     <!-- TMPL_VAR NAME="subfield" -->
@@ -101,9 +97,9 @@
                 <!-- /TMPL_UNLESS -->
                 <!-- TMPL_UNLESS name="hide_marc" -->
                     <img style="cursor: crosshair; color: grey; font-size: 80%;" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
-                        <input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->"  value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
+                        <input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" tabindex=-1 />
                 <!-- TMPL_ELSE -->
-                    <input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="subfield" -->"/>
+                    <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/>
                 <!-- /TMPL_UNLESS -->
                 <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
                     <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
@@ -115,10 +111,10 @@
                 <!-- TMPL_IF NAME="repeatable" -->
                     <a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
                 <!-- /TMPL_IF -->
-	<input type="hidden" name="tagindex" value="<!-- TMPL_VAR NAME="id" -->"/>
                 <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
                 <input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
                 <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
+                <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
                 <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
                 </p>
             </div>
@@ -130,29 +126,27 @@
 		<div name="hidden" id="hidden" class="tab">
 		<!-- TMPL_LOOP NAME="hidden_loop" -->
 				<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
-				<input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="subfield" -->">
+				<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
 				<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
+				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
 				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
 		<!-- /TMPL_LOOP -->
 		</div>
-		<!-- TMPL_IF name="oldbiblionumtagfield" -->
-			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldbiblionumtagfield" -->">
-			<input type="hidden" name="subfield" id="subfield<!--TMPL_VAR NAME="id"-->" value="<!-- TMPL_VAR NAME="oldbiblionumtagsubfield" -->">
-			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->">
+		<!-- TMPL_IF name="biblionumtagfield" -->
+			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="biblionumtagfield" -->">
+			<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="biblionumtagsubfield" -->">
+			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="biblionumber" -->">
 			<input type="hidden" name="mandatory" value="0">
-				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="biblioitemnumtagfield" -->">
+			<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="biblioitemnumtagsubfield" -->">
+			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+			<input type="hidden" name="mandatory" value="0">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+			<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
 		<!-- /TMPL_IF -->
 	</form>
-
-
-
 <script language="JavaScript" type="text/javascript">
-	<!--TMPL_IF name="exit"-->
-
-var	finished=CloseMe(<!--TMPL_VAR NAME="biblionumber"-->,'<!--TMPL_VAR NAME="title"-->');
-
-	<!--/TMPL_IF-->
-
 function loading(){
 	document.getElementById("loading").style.display = "none";
 }
@@ -162,35 +156,34 @@ function confirmnotdup(){
 	var checkform =	document.getElementById("f");
 	Check(checkform);
 }
-function active(numlayer)
-{
-	for (i=0; i <= 9 ; i++ ) {
-		ong = i+"XX";
-		link = "link"+i;
-		if (numlayer==i) {
-			with(document){
-			if (document.getElementById(ong)){
-				document.getElementById(ong).style.visibility="visible";
-			}
-			if(document.getElementById(link)){
-				document.getElementById(link).style.color="#000066";
-				document.getElementById(link).style.backgroundColor="#FFFFCC";
-			}
-			}
-		} else {
-			with(document){
-			if (document.getElementById(ong)){
-				document.getElementById(ong).style.visibility="hidden";
-			}
-			if (document.getElementById(link)) {
-				document.getElementById(link).style.color="#669999";
-				document.getElementById(link).style.backgroundColor="#D8DEB8";
-			}
-			}
-		}
+
+function active(numlayer){
+    for (i=0; i <= 10 ; i++ ) {
+	var tab;
+	try{
+		tab = document.getElementById(i+'XX');
+		tab.getAttribute('id'); // do not remove this line. It throws an execption.
 	}
+	catch(e){
+		continue;
+	}
+        if (numlayer==i) {
+            tab.setAttribute("class","content_visible");
+            var tabactive=document.getElementById('link'+i);
+            tabactive.removeAttribute("class");
+            tabactive.setAttribute("class","tab_active");
+        } else {
+            tab.setAttribute("class","content_hidden");
+            try {
+                var tabactive=document.getElementById('link'+i);
+                tabactive.removeAttribute("class");
+                tabactive.setAttribute("class","tab_inactive");
+            }
+            catch(e){};
+        }
+    }
 }
-active(0);
+
 function Check(f) {
 	document.body.style.cursor ="wait";
 	// Scan for nonempty fields
@@ -273,104 +266,98 @@ function Check(f) {
 		document.forms['f'].submit();
 	}
 }
-function Dopop(link,id) {
- var subf=document.getElementsByName('subfield'+id);
-var fields=document.getElementsByName('field_value'+id);
-var defaultvalue="";
-	for (var s=0; s<fields.length; s++){
-		if (subf.item(s).value == 'a'){
-		defaultvalue=fields.item(s).value;
-		}
-	}
-
-	newin=window.open(link+"&result="+defaultvalue,"",'width=550,height=550,toolbar=false,scrollbars=yes');
-
+function Dopop(link,i) {
+	defaultvalue=document.forms['f'].field_value[i].value;
+	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=700,height=550,toolbar=false,scrollbars=yes');
 }
 
 function PopupZ3950() {
     var strQuery="";
 	var error = 0;
 	for (i=0 ; i<document.forms['f'].field_value.length ; i++) {
-		if (document.forms['f'].tag[i].value == "<!--TMPL_VAR NAME="isbntag"-->"){
-		     if (document.forms['f'].subfieldYYY[i].value =="<!--TMPL_VAR NAME="isbnsub"-->"){
+		if (document.forms['f'].kohafield[i].value == "biblioitems.isbn"){
 			if(document.forms['f'].field_value[i].value.length>0) {
-		    	strQuery += "&isbn="+document.forms['f'].field_value[i].value;			
-			} else {
+		    strQuery += "&isbn="+document.forms['f'].field_value[i].value;
+		} else {
 			error++;
-			}
-		    }
 		}
-		if (document.forms['f'].tag[i].value == "<!--TMPL_VAR NAME="titletag"-->"){
-		    if (document.forms['f'].subfieldYYY[i].value == "<!--TMPL_VAR NAME="titlesub"-->"){
+		}
+		if (document.forms['f'].kohafield[i].value == "biblio.title"){
 			if(document.forms['f'].field_value[i].value.length>0) {
-		 	   strQuery += "&title="+document.forms['f'].field_value[i].value;
-			} else {
+		    strQuery += "&title="+document.forms['f'].field_value[i].value;
+		} else {
 			error++;
-			}
-		    }
 		}
-		if (document.forms['f'].tag[i].value == "<!--TMPL_VAR NAME="authortag"-->"){
-		   if (document.forms['f'].subfieldYYY[i].value == "<!--TMPL_VAR NAME="authorsub"-->"){
+		}
+		if (document.forms['f'].kohafield[i].value == "biblio.author"){
 			if(document.forms['f'].field_value[i].value.length>0) {
-		  	  strQuery += "&author="+document.forms['f'].field_value[i].value;
-			} else { 
+		    strQuery += "&author="+document.forms['f'].field_value[i].value;
+		} else { 
 			error++;
-			}
-		    }
 		}
-		if (document.forms['f'].tag[i].value == "<!--TMPL_VAR NAME="issntag"-->"){
-		     if (document.forms['f'].subfieldYYY[i].value == "<!--TMPL_VAR NAME="issnsub"-->"){
-		             if(document.forms['f'].field_value[i].value.length>0) {
-		   	 strQuery += "&issn="+document.forms['f'].field_value[i].value;
-			} else {
+		}
+		if (document.forms['f'].kohafield[i].value == "biblioitems.issn"){
+			if(document.forms['f'].field_value[i].value.length>0) {
+		    strQuery += "&issn="+document.forms['f'].field_value[i].value;
+		} else {
 			error++;
-			}
-		      }
+		}
 		}
 	}
 	if(error < 4){
-	newin=window.open("../z3950/search.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"+strQuery,"z3950search",'width=640,height=400,location=yes,toolbar=no,scrollbars=yes');
+	newin=window.open("z3950_search.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->"+strQuery,"z3950search",'width=640,height=400,location=yes,toolbar=no,scrollbars=yes');
 	} else {
 		alert("To perform a z39.50 search, you must enter at least one of the following: \n\n ISBN\n ISSN\n Title\n Author\n");
 	}
 }
 
-
 function Changefwk(FwkList) {
   var fwk = FwkList.options[FwkList.selectedIndex].value;
-  window.location = "addbiblio.pl?oldbiblionumber=<!--TMPL_VAR Name="oldbiblionumber"-->&frameworkcode="+fwk;
+  window.location = "addbiblio.pl?biblionumber=<!--TMPL_VAR Name="oldbiblionumber"-->&breedingid=<!-- TMPL_VAR name="breedingid" -->&frameworkcode="+fwk;
 }
 
+function openAuth(tagid,authtype,X) {
+// 	defaultid=document.getElementById(subfieldid);
+//     alert("X"+X);
+    Y=X.parentNode.getAttribute("id");
+//     alert("tagid"+Y);
+	newin=window.open("../authorities/auth_finder.pl?authtypecode="+  authtype+ "&tagid="+Y, "value builder",'width=700,height=550,toolbar=false,scrollbars=yes');
+}
 
 
-function AddField(field) {
+function AddField(field,cntrepeatfield) {
 	document.forms['f'].op.value = "addfield";
 	document.forms['f'].addfield_field.value=field;
+	document.forms['f'].repeat_field.value=cntrepeatfield;
+	//alert(document.forms['f'].repeat_field.value);
 	document.f.submit();
 }
 
 function cloneSubfield(index) {
- var original = document.getElementById(index);
- var clone = original.cloneNode(true);
- clone.setAttribute("id", index + index); 
-// orginput : the value of the original field (in [0] if hide_marc=1, otherwise in [1]
-// image : the up button. don't exist is hide_marc=1
- <!-- TMPL_IF name="hide_marc" -->
-	var orginput = original.getElementsByTagName('input')[0];
- <!-- TMPL_ELSE -->
- 	var orginput = original.getElementsByTagName('input')[1];
-	image = clone.getElementsByTagName('img')[0];
-	image.setAttribute("onclick","upSubfield('" + index + index + "')");
- <!-- /TMPL_IF -->
- trigger = original.getElementsByTagName('a')[0];
- if (trigger) {
-// 	trigger.parentNode.removeChild(trigger);
- }
- clonetrigger = clone.getElementsByTagName('a')[0];
- clonetrigger.setAttribute("onclick","cloneSubfield('" + index + index + "')");
- clone.setAttribute("tabindex","1");
- orginput.value = '';
- original.parentNode.insertBefore( clone, original); 
+    var original = document.getElementById(index); //original <div>
+    var clone = original.cloneNode(true);
+
+    // set the attribute for the new 'div' subfields
+    clone.setAttribute('id',index + index);//set another id.
+    var NumTabIndex;
+    NumTabIndex = parseInt(original.getAttribute('tabindex'));
+    if(isNaN(NumTabIndex)) NumTabIndex = 0;
+    clone.setAttribute('tabindex',NumTabIndex+1);
+    
+    var CloneButtonPlus;
+    try{
+        CloneButtonPlus = clone.getElementsByTagName('a')[0];
+        CloneButtonPlus.setAttribute('onclick',"cloneSubfield('" + index + index + "')");
+        var buttonUp = clone.getElementsByTagName('img')[0];
+//         alert(buttonUp.getAttribute('id'));
+        buttonUp.setAttribute('onclick',"upSubfield('" + index + index + "')");
+    }
+    catch(e){
+        // do nothig if ButtonPlus & CloneButtonPlus don't exist.
+    }
+
+    // insert this line on the page
+    original.parentNode.insertBefore(clone,original.nextSibling);
 }
 
 function upSubfield(index) {
@@ -406,15 +393,5 @@ function unHideSubfield(index,labelindex) {
 	label = document.getElementById(labelindex);
 	label.style.display='none';	
 }
-function CloseMe(biblionumber,title) {
-	var myfield = opener.document.getElementById('biblionumber');
-	 myfield.value = biblionumber;
-	var myfield = opener.document.getElementById('title');
-	 myfield.value = title;
-	self.close();
-return false;
-	}
 </script>
-<!--/TMPL_UNLESS-->
-</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl
index 5ce629a24e..349039f760 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl
@@ -1,41 +1,119 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging Home<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
+
 	<h1>Catalog Maintenance</h1>
 	<!-- TMPL_IF name="noitemsfound" -->
-		<font color="red" size="4">No items found</font>
+		No items found
 	<!-- /TMPL_IF -->
 	
-	<div class="data">
-		<form action="isbnsearch.pl">
-		<table>
-		<caption>Search Existing Records</caption>
-		<tr><th><label for="title">Title</label></th>
-		<td>		<input type="text" name="title" id="title"size="35" /></td></tr>
-		<tr><th><label for="isbn">ISBN</label></th>
-		<td><input type="text" name="isbn" id="isbn"size="35" /></td></tr>		
-		</table></div>
-				<p><input type="submit" value="Search" class="submit" /></p>
-				<div class="help"><ul class="notes"><li>If the ISBN is found into the database, that record will be retrieved and can be modified.</li>
-	<li>If the ISBN is found in the reservoir, it will be retrieved and a full record added.</li>
-	<li>Otherwise, a record can be added from scratch.</li></ul></div>
+<h2>Search Existing Records</h2>
+<div id="addbooks_search">
+	<form name="search" action="addbooks.pl">
+        <label for="q">Search the catalog: </label>
+        <input id="q" type="text"  size="25"   name="q" />
+        <input type="submit" value="search">
+	</form>
+</div>
+<div id="addbooks_add_without_search">
+	<!-- TMPL_IF NAME="NOTMARC" -->
+		<form action="addbiblio.pl">
+			<input type="submit" value="Add Record Without Search" />
+		</form>
+	<!-- TMPL_ELSE -->
+		<form name="f" action="addbiblio.pl" method="post">
+		<h2>Create a Blank Bibliographic Record</h2>
+		<p>
+			<label for="frameworkcode">Choose a Framework:</label>
+			<select name="frameworkcode" id="frameworkcode">
+				<option value="">Default</option>
+				<!-- TMPL_LOOP NAME="frameworkcodeloop" -->
+					<option value="<!-- TMPL_VAR NAME="value" -->">
+						<!-- TMPL_VAR NAME="frameworktext" -->
+					</option>
+				<!-- /TMPL_LOOP -->
+			</select>
+			<input type="submit" value="Add Record Without Search" />
+		</p>
 		</form>
+			<!-- /TMPL_IF -->
+</div>
 
-		<!-- TMPL_IF name="noitemsfound" -->
-				<form action="addbiblio.pl" method="post">
-		<div class="data"><table>
-		<caption>Create a Blank Bibliographic Record</caption>
-		<tr><th><label for="frameworkcode">Choose a Framework:</label></th><td><select name="frameworkcode" id="frameworkcode">
-						<option value="">Default</option>
-						<!-- TMPL_LOOP NAME="frameworkcodeloop" -->
-							<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
-						<!-- /TMPL_LOOP -->
-					</select> <input type="submit" value="Add Record Without Search" class="submit" /></td></tr>
-		</table></div></form>
-			
-		<!-- /TMPL_IF -->
 
+<!-- display the search results -->
 
+<!-- TMPL_IF NAME="total"-->
+<!-- TMPL_VAR NAME="total"--> Results found in catalogue.
+<div class="searchresults">
+    <table>
+    <tr>
+       <th>Title</th>
+       <th>Author</th>
+       <th>publisher</th>
+       <th>Publication year</th>
+    </tr>
+    <!-- TMPL_LOOP NAME="resultsloop" -->
+        <tr>
+            <td>
+                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+                    <!-- TMPL_VAR NAME="title" -->
+                </a>
+                <br />
+                <small><!-- TMPL_VAR NAME="subtitle" --></small>
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="author" -->
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="publishercode" -->
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="publicationyear" -->
+            </td>
+        </tr>
+    <!-- /TMPL_LOOP -->
+    </table>
+</div>
+<!-- TMPL_ELSE -->
+    <b>No Result found in catalogue.</b>
+    <!-- TMPL_IF NAME="error" -->
+        Error: <span class="error"><!-- TMPL_VAR NAME="error" --></span>
+    <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
 
+<div id="searchresult-breeding">
+    <h2>Biblios in reservoir</h2>
+    <!-- TMPL_IF name="breeding_loop" -->
+        <table>
+            <tr>
+                <th>Title</th>
+                <th>Author</th>
+                <th>ISBN</th>
+                <th>coming from</th>
+                <th>&nbsp;</th>
+                <th>&nbsp;</th>
+            </tr>
+            <!-- TMPL_LOOP NAME="breeding_loop" -->
+            <!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
+                <td><!-- TMPL_VAR NAME="title" --></a>
+                <td><!-- TMPL_VAR NAME="author" --></td>
+                <td><!-- TMPL_VAR NAME="isbn" --></td>
+                <td><!-- TMPL_VAR NAME="file" --></td>
+                <!-- TMPL_IF NAME="NOTMARC" -->
+                                    
+                <!-- TMPL_ELSE -->
+                <td><a href="addbiblio.pl?breedingid=<!-- TMPL_VAR NAME="id" -->">Add biblio</a></td>
+                <!-- /TMPL_IF -->
+            </tr>
+            <!-- /TMPL_LOOP -->
+        </table>
+    <!-- TMPL_ELSE -->
+    <p>None</p>
+    <!-- /TMPL_IF -->
+</div>
+<script type="text/JavaScript">
+    document.search.q.focus();
+</script>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl
index 769a9e2e65..cff6940eca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl
@@ -1,161 +1,130 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: Items for Bibliographic Record <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_UNLESS NAME="fromserials"-->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-catalogue.inc" -->
-<!--/TMPL_UNLESS-->
-<h1>Items for Record <!-- TMPL_VAR name="biblionumber" -->:</h1><h2><!-- TMPL_VAR name="title" -->, <!-- TMPL_VAR name="author" --></h2>
-	
-<!--TMPL_UNLESS NAME="fromserials"-->	
-<div class="tabitem">
-<form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"><input type="submit" class="submit" value="Edit Bibliographic Record"></form> <form action="addbiblio.pl" method="get"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="op" value="duplicate" /><input type="submit" class="submit" value="Duplicate this Record" /></form></div> <div class="tabitem"><form action="/cgi-bin/koha/catalogue/detail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View in Catalog"></form> <form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View MARC in Catalog"></form>  <form action="/cgi-bin/koha/catalogue/ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->"> <input type="submit" class="submit" value="View ISBD in Catalog"></form></div>
-<!--/TMPL_UNLESS-->
-<!-- TMPL_IF name="book_on_loan" -->
- 	         <div class="error">ERROR: This book is on LOAN DO NOT DELETE!</div>
- 	 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="non_utf8" -->
- 	         <div class="error">ERROR: This record contains non UTF-8 chatacters correct and resave!!</div>
- 	 <!-- /TMPL_IF -->
- <!-- TMPL_IF name="barcode_not_unique" -->
- 	         <div class="error">ERROR: Barcode already exists!</div>
- 	 <!-- /TMPL_IF -->
-<!--TMPL_UNLESS NAME="fromserials"-->
-	<!-- TMPL_IF name="item_loop" -->
-			<div name="10XX" id="10XX">
-			<table class="editing">
-			<caption>Existing Items</caption>
-				<tr>
-					<!-- TMPL_LOOP NAME="item_header_loop" -->
-						<th><!-- TMPL_VAR NAME="header_value" --></th>
-					<!-- /TMPL_LOOP -->
-					<th colspan="2">&nbsp;</th>
-				</tr>
-					<!-- TMPL_LOOP NAME="item_loop" -->
-					<tr>
-						<!-- TMPL_VAR NAME="item_value" -->
-						<td><a href="additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Edit</a></td>
-						<td><a href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="biblionumber" -->,<!-- TMPL_VAR NAME="itemnumber" -->)">Delete</a></td>
-					</tr>
-					<!-- /TMPL_LOOP -->
-			</table>
-			</div>
 
-	<!-- /TMPL_IF -->
-<!--/TMPL_UNLESS-->
-	<form method="post" action="additem.pl" name="f">
-	<input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->">
-	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">	
-	<input type="hidden" name="fromserials" value="<!--TMPL_VAR NAME="fromserials"-->">
-	<input type="hidden" name="serialid" value="<!--TMPL_VAR NAME="serialid"-->">
-	<input type="hidden" name="itemnumber" value="<!--TMPL_VAR NAME="itemnumber"-->">
-	<div class="data">
-	<table>
-		<caption><!-- TMPL_IF name="opisadd" -->Add New Item<!-- TMPL_ELSE -->Update Item<!-- /TMPL_IF --></caption>
-	<!-- TMPL_LOOP NAME="item" -->
-			<tr style="<!-- TMPL_VAR NAME='hidden' -->;">
-					<th><label><!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR NAME="subfield" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label></th>
-					<td><!-- TMPL_VAR NAME="marc_value" -->
-					<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" -->"></td>
-			</tr>		
-<!-- /TMPL_LOOP -->
-		</table>
-	<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
-	 <!-- TMPL_IF name="barcode_not_unique" -->
- 	         <div class="error">ERROR: Barcode already exists!</div>
- 	 <!-- /TMPL_IF -->
-	
-	<!-- TMPL_IF name="opisadd" -->
-	<input type="button" value="Add item" onClick="Check(this.form)" accesskey="w" class="submit">
-	<!-- TMPL_ELSE -->
-	<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="itemtagfield" -->">
-	<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="itemtagsubfield" -->">
-	<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="itemnumber" -->">
-	<input type="button" value="Save Changes" onClick="Check(this.form)" accesskey="w" class="submit">
-	<!-- /TMPL_IF -->
-	</form>
+
+<h1>Items for <!-- TMPL_VAR name="title" --> <!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> (Record #<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
+
+<div id="action">
+    <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">
+        Edit Bibliographic Record
+    </a>
+    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">
+        Normal view
+    </a>
+    <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">
+        View MARC in Catalog
+    </a>
+    <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">
+        View ISBD in Catalog
+    </a>
 </div>
 
-<script language="JavaScript" type="text/javascript">
+<div id="cataloguing_additem_itemlist">
+    <form method="post" action="additem.pl" name="f">
+    <input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->" />
+    <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+    <!-- TMPL_IF name="item_loop" -->
+        <h2>Existing items</h2>
+        <table>
+            <tr>
+                <!-- TMPL_LOOP NAME="item_header_loop" -->
+                    <th>
+                        <!-- TMPL_VAR NAME="header_value" -->
+                    </th>
+                <!-- /TMPL_LOOP -->
+                <th colspan="2">&nbsp;</th>
+            </tr>
+                <!-- TMPL_LOOP NAME="item_loop" -->
+                <tr>
+                    <!-- TMPL_VAR NAME="item_value" -->
+                    <td><a href="additem.pl?op=edititem&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Edit</a></td>
+                    <td><a href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="biblionumber" -->,<!-- TMPL_VAR NAME="itemnumber" -->)">Delete</a></td>
+                </tr>
+                <!-- /TMPL_LOOP -->
+        </table>
+    <!-- /TMPL_IF -->
+</div>
 
-	
-	<!--TMPL_IF name="exit"-->
-var	finished=CloseMe(<!--TMPL_VAR NAME="serialid"-->,<!--TMPL_VAR NAME="itemnumber"-->,"<!--TMPL_VAR NAME="holdingbranch"-->");
-	<!--/TMPL_IF-->
+<div id="cataloguing_additem_newitem">
+    <!-- TMPL_IF name="opisadd" -->
+        <h2>Add Item</h2>
+    <!-- TMPL_ELSE -->
+        <h2>Edit Item</h2>
+    <!-- /TMPL_IF -->	
+        <!-- TMPL_LOOP NAME="item" -->
+            <p>
+                <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" -->
+                <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" -->" />
+            </p>
+        <!-- /tmpl_loop -->
+    <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
+    <!-- TMPL_IF name="barcode_not_unique" -->
+        ERROR : Barcode already exists !
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="opisadd" -->
+    <input type="button" value="Add item"  onClick="Check(this.form)" accesskey="w" />
+    <!-- TMPL_ELSE -->
+    <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="itemtagfield" -->" />
+    <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="itemtagsubfield" -->" />
+    <input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
+    <input type="button" value="Save Changes" onClick="Check(this.form)" accesskey="w" />
+    <!-- /TMPL_IF -->
+    </form>
 
+<script language="JavaScript" type="text/javascript">
 function _(s) { return s } // dummy function for gettext
 function active(numlayer)
 {
-	for (i=10; i < 11 ; i++ ) {
-		ong = i+"XX";
-			link = "link"+i;
-		if (numlayer==i) {
-			document.getElementById(ong).style.visibility="visible";
-			document.getElementById(link).style.backgroundColor="#11AA11";
-			document.getElementById(link).style.backgroundImage="url(<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif)";
-		} else {
-			document.getElementById(ong).style.visibility="hidden";
-			document.getElementById(link).style.backgroundColor="#FFFFFF";
-			document.getElementById(link).style.backgroundImage="";
-		}
-	}
+    for (i=10; i < 11 ; i++ ) {
+        ong = i+"XX";
+            link = "link"+i;
+        if (numlayer==i) {
+            document.getElementById(ong).style.visibility="visible";
+            document.getElementById(link).style.backgroundColor="#11AA11";
+            document.getElementById(link).style.backgroundImage="url(<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif)";
+        } else {
+            document.getElementById(ong).style.visibility="hidden";
+            document.getElementById(link).style.backgroundColor="#FFFFFF";
+            document.getElementById(link).style.backgroundImage="";
+        }
+    }
 }
 function Check(f) {
-	var total_errors=0;
+    var total_errors=0;
 //	alert(f.field_value.length);
-	for (i=0 ; i<f.field_value.length ; i++) {
+    for (i=0 ; i<f.field_value.length ; i++) {
 //	alert (f.field_value[i].value);
-		if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) {
-			document.getElementById("error"+i).style.backgroundColor="#FF0000";
-			total_errors++;
-		} else {
+        if (f.field_value[i].value.length==0 && f.mandatory[i].value==1) {
+            document.getElementById("error"+i).style.backgroundColor="#FF0000";
+            total_errors++;
+        } else {
 //			document.getElementById("error"+i).style.backgroundColor="#FFFFFF";
-		}
-	}
-	var alertString2;
-	if (total_errors==0) {
-		document.f.submit();
-	} else {
-		alertString2  = _("Form not submitted because of the following problem(s)");
-		alertString2 += "\n------------------------------------------------------------------------------------\n";
-		alertString2 += "\n- "+ total_errors+_(" mandatory fields empty (see bold subfields)");
-		alert(alertString2);
-	}
+        }
+    }
+    var alertString2;
+    if (total_errors==0) {
+        document.f.submit();
+    } else {
+        alertString2  = _("Form not submitted because of the following problem(s)");
+        alertString2 += "\n------------------------------------------------------------------------------------\n";
+        alertString2 += "\n- "+ total_errors+_(" mandatory fields empty (see bold subfields)");
+        alert(alertString2);
+    }
 }
 function Dopop(link,i) {
-	defaultvalue=document.forms[0].field_value[i].value;
-	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes');
+    defaultvalue=document.forms[0].field_value[i].value;
+    newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes');
 }
 function confirm_deletion(biblionumber,itemnumber) {
-	var is_confirmed = confirm(_('Do you confirm item deletion?'));
-	if (is_confirmed) {
-	window.location = "additem.pl?op=delitem&biblionumber="+biblionumber+"&itemnumber="+itemnumber;
-	}
+    var is_confirmed = confirm(_('Are you sure you want to delete this item?'));
+    if (is_confirmed) {
+    window.location = "additem.pl?op=delitem&biblionumber="+biblionumber+"&itemnumber="+itemnumber;
+    }
 }
-function CloseMe(serialid,itemnumber,holdingbranch) {
-	if( serialid==000){
-	 itemcount = opener.document.getElementsByName('itemcount');
-	bibliocount=opener.document.getElementsByName('bibliocount');
-	addcount=opener.document.getElementById(<!--TMPL_VAR NAME="biblionumber"-->);
-	      for (var s=0; s<itemcount.length; s++){
-		 if  (bibliocount.item(s).value==<!--TMPL_VAR NAME="biblionumber"-->){
-		 itemcount.item(s).value=itemcount.item(s).value -1;
-			if ( itemcount.item(s).value==0){
-			addcount.style.display= "none";
-			self.close();
-			return false;
-			}
-		}
-	     }
-	return true;
-	}
-	var myfield = opener.document.getElementById('serial'+serialid);
-	 myfield.value = itemnumber;
-	var myfield = opener.document.getElementById('holdingbranch'+serialid);
-	 myfield.value = holdingbranch;
-	self.close();
-return false;
-	}
 </script>
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl
index 08393251d9..3e059b93d2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl
@@ -30,6 +30,7 @@
 	<!-- /TMPL_IF -->
 	<!-- TMPL_UNLESS NAME="message" -->
 	<div id="resultlist">
+	    <!-- TMPL_IF NAME="reserveloop" -->
 		<table>
 		<tr>
 			<th class="circulation" colspan="5">Reserves of your library</th>
@@ -46,13 +47,13 @@
 					<td><p><!-- TMPL_VAR NAME="waitingdate" --></p> <!-- TMPL_IF NAME="messcompa" --> Reserve Over <!-- /TMPL_IF --></td>
 					<td>
 						<p>
-							<a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+							<a href="/cgi-bin/koha/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
 							&nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --></b>)
 							<br />Barcode : <!-- TMPL_VAR NAME="barcode" -->
 						</p>
 					</td>
 					<td>
-						<p><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> &nbsp; <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
+						<p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> &nbsp; <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
 					<!-- TMPL_IF NAME="borrowermail" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
 		<!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
 						</p>
@@ -64,18 +65,19 @@
 							<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" -->">
-							<input type="submit" 
-								<!-- TMPL_IF NAME="dotransfer" -->
-							value="Cancel reserve and return this document" 
+							<!-- TMPL_IF NAME="dotransfer" -->
+							<input type="submit" value="Cancel reserve and return to : <!-- TMPL_VAR NAME="homebranch" -->"> 
 							<!-- TMPL_ELSE -->
-							value="Cancel reserve" 
+							<input type="submit" value="Cancel reserve" >
 						<!-- /TMPL_IF -->
-						>
 						</form>
 					</td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
+		<!-- TMPL_ELSE -->
+		    <b>No reserve found.</b>
+		<!-- /TMPL_IF -->
 	</div>
 	<!-- /TMPL_UNLESS -->
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl
index 25140d76e2..5dcbdbe013 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl
@@ -1,18 +1,19 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Transfers<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Circulation: Transfers<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+
+
 <h1>Circulation: Transfers</h1>
 
 <!-- TMPL_IF Name="found" -->
-	<h3 class="alert">Reserve Found</h3>
+	<h3>Reserve Found</h3>
 		
-	<div class="form">
 		<table>
-		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
+		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
 		<!-- TMPL_IF Name="waiting" -->
-    Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
+    Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
 		<tr><th>
-			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
+			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <!-- TMPL_VAR Name="branchname" -->: <!-- /TMPL_IF -->
 			<!-- TMPL_IF Name="waiting" -->Cancel reservation and then attempt transfer: <!-- /TMPL_IF -->
 		</th>
 		<td>
@@ -23,13 +24,13 @@
 					<input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->" />
 				<!-- /TMPL_LOOP -->
 				<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
-				<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="bornum" -->" />
+				<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
 				<!-- TMPL_IF Name="waiting" --><input type="hidden" name="barcode" value="<!-- TMPL_VAR Name="barcode" -->" />
 					<input type="hidden" name="request" value="KillWaiting" />
-					<input type="submit" value="Cancel" class="cancel" />
+					<input type="submit" value="Cancel" />
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting" />
-					<input type="submit" value="Waiting" class="submit" /><!-- /TMPL_IF -->
+					<input type="submit" value="Waiting" /><!-- /TMPL_IF -->
 			</form>
 		</td></tr>
 		<!-- TMPL_IF Name="reserved" --><tr><th>Cancel reservation and then attempt transfer:</th>
@@ -43,12 +44,11 @@
 			<!-- /TMPL_LOOP -->
 
 			<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->" />
-			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="bornum" -->" />
+			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
 			<input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR Name="tobranchcd" -->" />
 			<input type="hidden" name="barcode" value=<!-- TMPL_VAR Name="barcode" --> />
-			<input type="hidden" name="loggedinuser" value=<!-- TMPL_VAR Name="loggedinusername" --> />
 			<input type="hidden" name="request" value="KillReserved" />
-			<input type="submit" class="cancel" value="Cancel" />
+			<input type="submit" value="Cancel" />
 			</form>
 		<!-- /TMPL_IF -->
 		</td></tr>
@@ -62,13 +62,13 @@
 				<input type="hidden" name="fb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="frombrcd" -->" />
 				<input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->" />
 			<!-- /TMPL_LOOP -->
-			<input type="submit" value="Ignore" class="submit" />
+			<input type="submit" value="Ignore" />
 			</form>
 			</td>
-		</tr></table></div>
+		</tr></table>
 
 <!-- TMPL_ELSE -->
-	<div class="table"><table>
+	<table>
 	<caption>Messages</caption>
 	<tr><td>
 	<!-- TMPL_IF Name="reqmessage" -->
@@ -78,9 +78,11 @@
 		<!-- TMPL_IF Name="setwaiting" -->
 			Item should now be waiting at branch: <!-- TMPL_VAR Name="reqbrchname" --><br>
 		<!-- /TMPL_IF -->
+	<!-- TMPL_ELSE -->
+	    No message.
 	<!-- /TMPL_IF -->
+	
 	<!-- TMPL_LOOP Name="errmsgloop" -->
-		<font color='red' size='+2'>
 		<!-- TMPL_IF Name="errbadcode" -->
 			No Item with barcode: <!-- TMPL_VAR Name="msg" -->
 		<!-- /TMPL_IF -->
@@ -91,22 +93,22 @@
 			Item is already at destination branch.
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF Name="errwasreturned" -->
-			Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>
+			Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a>
 <!-- TMPL_VAR Name="name" --> and has been returned.
 		<!-- /TMPL_IF -->
-		</font>
-		<br />
+
 	<!-- /TMPL_LOOP -->
-	</td></tr></table></div>
+	</td></tr></table>
+	
 	<form method="post" name="mainform" id="mainform" action="/cgi-bin/koha/circ/branchtransfers.pl">
-	<h3>Transfer</h3><div class="form">
-	<input type="hidden" name="loggedinuser" value=<!-- TMPL_VAR Name="loggedinusername" --> />
-	<table><tr><th>Destination Branch:</th><td><select name="tobranchcd">
+	<table>
+	<caption>Transfer</caption>
+	<tr><th scope="row">Destination Branch:</th><td><select name="tobranchcd">
 			<!-- TMPL_LOOP Name="branchoptionloop" -->
 				<option value="<!-- TMPL_VAR Name="code" -->" <!-- TMPL_VAR Name="selected" -->><!-- TMPL_VAR Name="name" --></option>
 			<!-- /TMPL_LOOP -->
 		</select></td></tr>
-<tr><th>Enter Book Barcode</th><td><input name="barcode" size="15" /></td></tr>
+<tr><th scope="row">Enter Book Barcode</th><td><input name="barcode" size="15" /></td></tr>
 </table>
 	<input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR Name="tobrancd" -->" />
 	<!-- TMPL_LOOP Name="trsfitemloop" -->
@@ -114,25 +116,25 @@
 		<input type="hidden" name="fb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="frombrcd" -->" />
 		<input type="hidden" name="tb-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="tobrcd" -->" />
 	<!-- /TMPL_LOOP -->
-	<input type="submit" class="submit" value="Transfer" />
-
-	<div class="form"><table>
+	<input type="submit" value="Do transfer" />
+	</form>
+	
+	<!-- TMPL_IF Name="transferred" -->
+		<table>
 		<caption>Transfered Items</caption>
-		<tr><th >Bar Code</th><th>Title</th><th>From</th><th>To</th></tr>
+		<tr><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>
 		<!-- TMPL_LOOP Name="trsfitemloop" -->
-			<tr><td align="left" width="20">
+			<tr><td>
 			<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
-			<td align="center"  width="200"><!-- TMPL_VAR Name="title" --></td>
-			
-		
-			<td align="left"  width="100"><!-- TMPL_VAR Name="frbrname" --></td>
-			<td align="left"  width="100"><!-- TMPL_VAR Name="tobrname" --></td>
+			<td><!-- TMPL_VAR Name="title" --></td>
+			<td><!-- TMPL_VAR Name="author" --></td>
+			<td><!-- TMPL_VAR Name="ccode" --></td>
+			<td><!-- TMPL_VAR Name="frbrname" --></td>
+			<td><!-- TMPL_VAR Name="tobrname" --></td>
 			</tr>
 		<!-- /TMPL_LOOP -->
-		</table></div>
-	</div>
-	</form>
-		
+		</table>
+	<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
 <!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
index d90cc5ec0e..8dd70b1c01 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl
@@ -1,283 +1,897 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation<!-- TMPL_IF Name="borrowernumber" -->: Issuing to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname" -->  (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation
+<!-- TMPL_IF Name="borrowernumber" -->
+: Issuing to <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR name="firstname" -->
+(<!-- TMPL_VAR NAME="cardnumber" -->)
+<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
-<h1>Circulation: Issues  <!-- TMPL_VAR NAME="today" --></h1>
 
+<!-- TMPL_IF NAME="borrowernumber" -->
+    <h1>Issues</h1>
+<!-- TMPL_ELSE -->
+    <h1>Circulation issues</h1>
+<!-- /TMPL_IF -->
 
-	
 <!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
-	
-	
-	<!-- RESULT OF ISSUING REQUEST -->
-	
-		<!-- TMPL_IF NAME="IMPOSSIBLE" -->
-		<div class="error">
-		<h3>Error Issuing:</h3>
-			<ul>
-			<!-- TMPL_IF NAME="INVALID_DATE" -->
-				<li>Invalid date</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="TOO_EARLY" -->
-				
-				<li>Too early to renew. <!-- TMPL_VAR NAME="barcode" --> </li>				
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
-				
-				<li>Barcode Unkown</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
-				
-				<li>NOT FOR LOAN</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="WTHDRAWN" -->
-				<li>Item is cancelled</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="GNA" -->
-				<li>Patron's address is in doubt</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="CARD_LOST" -->
-				<li>Patron's card is lost</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="DEBARRED" -->
-				<li>Patron is debarred</li>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="NO_MORE_RENEWALS" -->
-				<li>No more renewals possible</li>
-			<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="EXPIRED" -->
-				<li>Borrower card expired</li>
-			<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="IN_RESERVE" -->
-				<li>This is a Reserve Section book. Use Reserve issue</li>
-			<!-- /TMPL_IF -->
-			</ul>
-		</div>
-		<!-- TMPL_ELSE -->
-		
-		<!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
-		
-		<div class="error">
-		<h3>Please Confirm Issue:</h3>
-		
-			<!-- TMPL_IF NAME="DEBT" -->
-				<p>The patron has a debt of <!-- TMPL_VAR name="DEBT" --> YTL</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="RENEW_ISSUE" -->
-				<p>You are trying RE-ISSUE.  USE RENEW</p>
-			<!-- /TMPL_IF -->	
-			<!-- TMPL_IF NAME="SUCCESFUL_RENEW" -->
-				<p>Succesfully renewd items</p>
-			<!-- /TMPL_IF -->	
-			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
-				<p>Item is consigned for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="RESERVED" -->
-				<p>Item is on reserve for <!-- TMPL_VAR NAME="RESERVED" --></p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
-				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return and issue?</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="TOO_MANY" -->
-				<p>Too many issues (already issued / max : <!-- TMPL_VAR name="TOO_MANY" -->)</p>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
-			<div class="action"><form class="inline" method="post" action="/cgi-bin/koha/circ/circulation.pl">
-				<!-- TMPL_IF NAME="RESERVED" -->
-					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
-				<!-- /TMPL_IF -->
-				
-			
-				
-				<!-- TMPL_IF NAME="RESERVE_WAITING" -->
-					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
-				<!-- /TMPL_IF -->
-				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
-				
-		
-				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-				<input type="hidden" name="issueconfirmed" value="1" />
-				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
-				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
-				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
-			 	<!-- TMPL_UNLESS name="RENEW_ISSUE" --><input type="submit" value="Confirm Issue" class="submit" accesskey="y" /></form><form class="inline" method="get" action="/cgi-bin/koha/circ/circulation.pl"><input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="submit" class="cancel" value="Don't Issue" accesskey="n" /><!--/TMPL_UNLESS--></form></div>
-			</div>
-			<!-- /TMPL_UNLESS -->
-		<!-- /TMPL_IF -->
-		<!-- /TMPL_IF -->
-		
-		<!-- TMPL_IF NAME="issued" -->
-			<div class="error"><p>Item issued</p></div>
-		<!-- /TMPL_IF -->
-	
-	<div class="details">
-	<!-- TMPL_IF NAME="message" -->
-	<div class="details">
-	No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span> <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">Add a new patron</a>
-	</div>
-	<!-- /TMPL_IF -->
-	
-	<!-- TMPL_IF NAME="CGIselectborrower" -->
-	<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform">
-		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-		<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
-	<label for="borrnumber">Select a borrower: </label>
-		<style type="text/css">
-		option:hover {
-			background-color : #f0f0f0;
-			color : #000099;
-		}
-	</style>
-	<p><!-- TMPL_VAR name="CGIselectborrower" --></p>
-	<p><input type="submit" class="submit" value="Select" /></p>
-	<p>Patron not found? <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">Add a new patron</a></p>
-	</form>
-	<!-- TMPL_ELSE -->
-		<!-- TMPL_IF NAME="borrowernumber" -->
-	<div id="notes">                                							
-	<ul>
-	<li><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --></li>
-	<!-- TMPL_IF NAME="phone" --><li><!-- TMPL_VAR NAME="phone" --></li><!--/TMPL_IF-->
-	<!-- TMPL_IF NAME="emailaddress" --><li><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a></li><!-- /TMPL_IF -->
-	<li>Category: <!-- TMPL_VAR name="categorycode" --></li>
-	<li>(<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">details</a> / <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ">edit</a>)</li>
-	</ul>
-	</div><table width= "70%"><tr><td>
-
-	<h3><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h3>
-	<h4> &nbsp; &nbsp; <!-- TMPL_VAR NAME="issuecount" --> out<!-- TMPL_IF NAME="overduecount" -->, <span class="error"><!-- TMPL_VAR name="overduecount" --> overdue</span><!-- /TMPL_IF --></h4><br clear="right" />
-	</td><td><img src="<!-- TMPL_VAR NAME="borrowerphoto" -->" alt="Photo" hspace="0" vspace="0" border="0" width="100px" heigth="100px" style="clear:both;float:right;position:relative;">
-	</td></tr></table>
-									
-						
-
-
-<!-- TMPL_IF NAME="flagged" -->
-</div><div class="details">
+<!-- Branch: <a href="/cgi-bin/koha/circ/selectbranchprinter.pl" title="change"><!-- TMPL_VAR NAME="branchname"--></a>
+<!-- TMPL_IF name="printername" --> | Printer: <!-- TMPL_VAR NAME="printername" --><!-- /TMPL_IF -->-->
+
+<!-- TMPL_IF NAME="borrowernumber" -->
+
+<div id="BorrowerDetails">
+        <fieldset>
+            <legend><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
+            </legend>
+            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">details</a>
+                / <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ&categorycode=<!-- TMPL_VAR name="categorycode" -->">edit</a>
+        <p>
+        <!--TMPL_IF Name="warndeparture"--><p class="problem"> Patron will leave soon.</p><!--/TMPL_IF-->
+        <!-- TMPL_IF NAME="streetaddress"-->
+            <!-- TMPL_VAR NAME="streetaddress" -->,
+        <!-- TMPL_ELSE -->
+            <span class="problem">No address stored for borrower.</span>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="city" -->
+            <!-- TMPL_VAR NAME="city" -->
+        <!-- TMPL_ELSE -->
+            No city stored.
+        <!-- /TMPL_IF -->
+<!--TMPL_IF NAME="phone" -->
+        <!-- TMPL_VAR NAME="phone" -->
+    <!-- TMPL_ELSE -->
+        <span class="problem">No phone stored.</span>
+    <!-- /TMPL_IF -->
+    </p>
+    <!-- TMPL_IF NAME="emailaddress" -->
+    <a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a>
+    <!-- /TMPL_IF -->
+    <p>Category: <!-- TMPL_VAR name="categorycode" --></p>
+    </fieldset>
+    <!-- TMPL_IF NAME="overduecount" -->
+        <span class="problem"><b><big>This borrower has <!-- TMPL_VAR name="overduecount" --> overdue(s) items</big></b></span>
+    <!--/TMPL_IF-->
+    <!-- TMPL_IF NAME="flagged" -->
+        <fieldset>
+            <legend class="problem">Warning</legend>
+            <!-- TMPL_IF NAME="gna" -->
+                <p>Address: Patron's address in doubt</p>
+            <!-- /TMPL_IF -->
+        
+            <!-- TMPL_IF NAME="lost" -->
+                <p>Lost: Patron's card is lost</p>
+            <!-- /TMPL_IF -->
+        
+            <!-- TMPL_IF NAME="dbarred" -->
+                <p>
+                Debarred: Patron is debarred <a href="/cgi-bin/koha/members/setdebar.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&destination=circ&status=0">Lift Debarment</a>
+                </p>
+            <!-- /TMPL_IF -->
+        
+            <!-- TMPL_IF name="odues" -->
+            <p>
+                <!-- TMPL_IF name="nonreturns" -->
+            Overdues: See highlighted items <a href="JavaScript:active(1)">below</a>
+                <!-- /TMPL_IF -->
+            </p>
+            <!-- /TMPL_IF --> <!-- odues -->
+        
+            <!-- TMPL_IF NAME="charges" -->
+            <p>
+            Fines: Patron has 
+            <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a>.
+            Make <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a>
+            </p>
+            <!-- /TMPL_IF -->
+            <!-- this part must be removed if we keep the new waiting infos display-->
+            <!-- TMPL_IF NAME="waiting" -->
+            <p>
+            Reserves waiting:
+                <!-- TMPL_LOOP name="itemswaiting" -->
+                <li>
+                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR name="title" --></a>
+                (<!-- TMPL_VAR name="barcode" --> -- <!-- TMPL_VAR name="branchname" -->)
+                </li>
+                <!-- /TMPL_LOOP --> <!-- itemswaiting -->
+            </p>
+            <!-- /TMPL_IF --> <!-- waiting -->
+            <!-- end of this part must be removed if we keep the new waiting infos display-->
+        
+            <!-- TMPL_IF name="notes" -->
+            <p>Notes: <!-- TMPL_VAR name="notesmsg" --></p>
+            <!-- /TMPL_IF --> <!-- notes -->
+        </fieldset>
+    <!-- /TMPL_IF --> <!-- flagged -->
+
+</div> <!-- id=BorrowerDetails -->
+<!-- TMPL_ELSE --> <!-- borrowernumber -->
+
+<!-- TMPL_UNLESS NAME="CGIselectborrower"-->
+<!-- No card entered yet -->
+<form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform" id="mainform">
+<fieldset id="circ_circulation_borrower_search">
+    <legend>Search for a borrower</legend>
+
+    <p>
+    <label for="findborrower">Enter borrower card number or partial last name: </label>
+    <input name="findborrower" type="text" size="40";/>
+    </p>
+
+    <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
+    <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
+    <input type="submit" value="Submit" />
+</fieldset>
+</form>
+<!-- /TMPL_UNLESS -->
+<!-- /TMPL_IF --> <!-- borrowernumber -->
+
+<!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
+<fieldset id="circ_circulation_needsconfirmation">
+<legend>Please Confirm Issue</legend>
+
 <ul>
-<!-- TMPL_IF NAME="gna" -->
-<li><span class="error">Address:</span> Patron's address in doubt</li>
+<!-- TMPL_IF NAME="DEBT" -->
+    <li>The patron has a debt of $<!-- TMPL_VAR name="DEBT" --></li>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="lost" -->
-<li><span class="error">Lost:</span> Patron's card is lost</li>
+
+<!-- TMPL_IF NAME="RENEW_ISSUE" -->
+    <li>Item is currently issued to this patron.  Renew?</li>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="dbarred" -->
-<li><span class="error">Debarred:</span> Patron is debarred <form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" value="circ" name="destination" /><input type="hidden" name="status" value="0" /><input type="submit" class="submit" value="Lift Debarment" /></form></li>
+
+<!-- TMPL_IF NAME="RESERVE_WAITING" -->
+    <li>Item is consigned for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></li>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="odues" -->	<li><!-- TMPL_IF name="nonreturns" -->
-					<span class="error">Overdues:</span> Patron has <span class="error">ITEMS OVERDUE</span> See highlighted items <a href="#previous">below</a>
-				<!-- /TMPL_IF --></li><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="noissues" -->
-<!-- TMPL_IF NAME="charges" --><li><span class="error">Fines:</span> Patron has <a href="/cgi-bin/koha/members/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a>. Make <a href="/cgi-bin/koha/members/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
-<!-- TMPL_ELSE -->
-	<!-- TMPL_IF name="charges" --><li>Fines: Patron has <a href="/cgi-bin/koha/members/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a>. Make <a href="/cgi-bin/koha/members/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="RESERVED" -->
+    <li>Item is on reserve for <!-- TMPL_VAR NAME="RESERVED" --></li>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
+    <li>Item ( <!-- TMPL_VAR NAME="getTitleMessageIteminfo" --> ) issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return and issue?</li>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="TOO_MANY" -->
+    <li>Too many issues (already issued / max : <!-- TMPL_VAR name="TOO_MANY" -->)</li>
 <!-- /TMPL_IF -->
 </ul>
 
-<dl>
-		
-<!-- TMPL_IF name="waiting" -->
-		<dt>Reserves waiting:</dt>
-			<dd><ul><!-- TMPL_LOOP name="itemswaiting" -->
-				<li><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR name="title" --></a> (<!-- TMPL_VAR name="barcode" --> -- <!-- TMPL_VAR name="branchname" -->)</li>
-			<!-- /TMPL_LOOP -->
-			</ul></dd>
-		<!-- /TMPL_IF -->
-
-		<!-- TMPL_IF name="notes" -->
-					<dt>Notes:</dt> <dd class="error"><!-- TMPL_VAR name="notesmsg" --></dd>
-				<!-- /TMPL_IF -->
-</dl>
+<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+    
+<!-- TMPL_IF NAME="RESERVED" -->
+    <p>
+    <input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" />
+    <label for="cancelreserve">Cancel Reserve</label>
+    </p>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="RESERVE_WAITING" -->
+    <p>
+    <input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" />
+    <label for="cancelreserve">Cancel Reserve</label>
+    </p>
+<!-- /TMPL_IF -->
+
+    <input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
+    <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+    <input type="hidden" name="issueconfirmed" value="1" />
+    <input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
+    <input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
+    <input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
+    <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
+
+    <div id="action">
+    <input type="submit" value="Confirm Issue" accesskey="y" />
+    </div>
+
+</form>
+
+<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
+    <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+
+    <div id="action">
+    <input type="submit" value="Don't Issue" accesskey="n" />
+    </div>
+</form>
+
+</fieldset>
+
+<!-- /TMPL_IF --> <!-- NEEDSCONFIRMATION -->
+
+<!-- TMPL_IF NAME="issued" -->
+<p>Item issued</p>
 <!-- /TMPL_IF -->
-	<!-- TMPL_ELSE -->
-	<!-- No card entered yet -->
-	<form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform" id="mainform">
-<label for="findborrower">Enter borrower card number or partial last name: </label>
-				<input name="findborrower" type="text" size="40" />
-					<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-					<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
-				<input type="submit" class="submit" value="Submit" />
-				</form>
-		<!-- /TMPL_IF -->
-	<!-- /TMPL_IF -->
-	</div>
+
+<!-- TMPL_IF NAME="message" -->
+<p>
+No patron matched <!-- TMPL_VAR name="message" -->
+<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A"/>Add adult</a>
+<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C"/>Add child</a>  
+</p>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF NAME="CGIselectborrower" -->
+<form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform">
+<fieldset id="circ_circulation_selectborrower">
+    <legend>Borrower selection</legend>
+
+    <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
+    <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
+
+    <p>
+    <label for="borrowernumber">Select a borrower: </label>
+    <!-- TMPL_VAR name="CGIselectborrower" -->
+    </p>
+
+    <p><input type="submit" value="Select" /></p>
+
+    <p>
+    Patron not found?
+    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A"/>Add adult</a>
+    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C"/>Add child</a>
+    or <a href="JavaScript:back();">try another search</a>
+    </p>
+</fieldset>
+</form>
+<!-- TMPL_ELSE --> <!-- CGIselectborrower -->
 
 <!-- BARCODE ENTRY -->
 
 <!-- TMPL_IF NAME="borrowernumber" -->
-	<div class="details">
-	<form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform">
-<label for="barcode">Enter Item Barcode: </label><input name="barcode" size="14" maxlength="14"class="unfocus" onfocus="this.className='focus'" onblur="this.className='unfocus'" /> <input type="submit" value="Issue" class="submit" /><!-- Display for NPL <input type="hidden" name="day" value="0" /><input type="hidden" name="month" value="0" /><input type="hidden" name="year" value="0" /> /Display for NPL -->
-	<p><input type="hidden" name="day" value="0" /><input type="hidden" name="month" value="0" /><input type="hidden" name="year" value="0" />
-	<!--/TMPL_IF-->		
-		<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
-		<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
-		<input type="hidden" name="print" value="maybe" />
-		<!-- TMPL_IF NAME="CHARGES" -->
-			<input type="hidden" name="charges" value="yes" />
-			<input type="hidden" name="oldamount" value="<!-- TMPL_VAR NAME="amountold" -->" />
-		<!-- /TMPL_IF -->
-		</p>
-	</form>
-	</div>
+<form method="post" action="/cgi-bin/koha/circ/circulation.pl" name="mainform">
+<fieldset id="circ_circulation_issue">
+    <legend>Issue an item</legend>
 
+    <p>
+    <label for="barcode">Enter Item Barcode: </label><input type="text" name="barcode" size="14" />
+    
+        <!-- RESULT OF ISSUING REQUEST -->
+        <!-- TMPL_IF NAME="IMPOSSIBLE" -->
+        <ul>
+        <!-- TMPL_IF NAME="INVALID_DATE" -->
+            <li><span class="problem">The due date is invalid</span></li>
+        <!-- /TMPL_IF -->  
+        <!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
+            <li><span class="problem">The barcode was not found</span></li>
+        <!-- /TMPL_IF -->
 
+        <!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
+            <li><span class="problem">Item not for loan</span></li>
+        <!-- /TMPL_IF -->
 
+        <!-- TMPL_IF NAME="WTHDRAWN" -->
+            <li><span class="problem">Item is cancelled</span></li>
+        <!-- /TMPL_IF -->
 
+        <!-- TMPL_IF NAME="GNA" -->
+            <li><span class="problem">Patron's address is in doubt</span></li>
+        <!-- /TMPL_IF -->
 
+        <!-- TMPL_IF NAME="CARD_LOST" -->
+            <li><span class="problem">Patron's card is lost</span></li>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="DEBARRED" -->
+            <li><span class="problem">Patron is debarred</span></li>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="NO_MORE_RENEWALS" -->
+            <li><span class="problem">No more renewals possible</span></li>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="EXPIRED" -->
+            <li><span class="problem">Patron's card is expired</span></li>
+        <!-- /TMPL_IF -->
+        </ul>
+</p>
+    <!-- TMPL_IF NAME="memberofinstution" -->
+    <p><!-- TMPL_VAR NAME="CGIorganisations" --></p>
+    <!-- /TMPL_IF -->
+
+    <!--/TMPL_IF --> <!-- impossible -->
+    <p><label for="day">Specify due date: </label>
+        <select name="day" id="day">
+            <option value="0">Day</option>
+            <!-- TMPL_IF NAME="day1" -->
+                <option value="1" selected="selected">1</option>
+            <!-- TMPL_ELSE -->
+                <option value="1">1</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day2" -->
+                <option value="2" selected="selected">2</option>
+            <!-- TMPL_ELSE -->
+                <option value="2">2</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day3" -->
+                <option value="3" selected="selected">3</option>
+            <!-- TMPL_ELSE -->
+                <option value="3">3</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day4" -->
+                <option value="4" selected="selected">4</option>
+            <!-- TMPL_ELSE -->
+                <option value="4">4</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day5" -->
+                <option value="5" selected="selected">5</option>
+            <!-- TMPL_ELSE -->
+                <option value="5">5</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day6" -->
+                <option value="6" selected="selected">6</option>
+            <!-- TMPL_ELSE -->
+                <option value="6">6</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day7" -->
+                <option value="7" selected="selected">7</option>
+            <!-- TMPL_ELSE -->
+                <option value="7">7</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day8" -->
+                <option value="8" selected="selected">8</option>
+            <!-- TMPL_ELSE -->
+                <option value="8">8</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day9" -->
+                <option value="9" selected="selected">9</option>
+            <!-- TMPL_ELSE -->
+                <option value="9">9</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day10" -->
+                <option value="10" selected="selected">10</option>
+            <!-- TMPL_ELSE -->
+                <option value="10">10</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day11" -->
+                <option value="11" selected="selected">11</option>
+            <!-- TMPL_ELSE -->
+                <option value="11">11</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day12" -->
+                <option value="12" selected="selected">12</option>
+            <!-- TMPL_ELSE -->
+                <option value="12">12</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day13" -->
+                <option value="13" selected="selected">13</option>
+            <!-- TMPL_ELSE -->
+                <option value="13">13</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day14" -->
+                <option value="14" selected="selected">14</option>
+            <!-- TMPL_ELSE -->
+                <option value="14">14</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day15" -->
+                <option value="15" selected="selected">15</option>
+            <!-- TMPL_ELSE -->
+                <option value="15">15</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day16" -->
+                <option value="16" selected="selected">16</option>
+            <!-- TMPL_ELSE -->
+                <option value="16">16</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day17" -->
+                <option value="17" selected="selected">17</option>
+            <!-- TMPL_ELSE -->
+                <option value="17">17</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day18" -->
+                <option value="18" selected="selected">18</option>
+            <!-- TMPL_ELSE -->
+                <option value="18">18</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day19" -->
+                <option value="19" selected="selected">19</option>
+            <!-- TMPL_ELSE -->
+                <option value="19">19</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day20" -->
+                <option value="20" selected="selected">20</option>
+            <!-- TMPL_ELSE -->
+                <option value="20">20</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day21" -->
+                <option value="21" selected="selected">21</option>
+            <!-- TMPL_ELSE -->
+                <option value="21">21</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day22" -->
+                <option value="22" selected="selected">22</option>
+            <!-- TMPL_ELSE -->
+                <option value="22">22</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day23" -->
+                <option value="23" selected="selected">23</option>
+            <!-- TMPL_ELSE -->
+                <option value="23">23</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day24" -->
+                <option value="24" selected="selected">24</option>
+            <!-- TMPL_ELSE -->
+                <option value="24">24</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day25" -->
+                <option value="25" selected="selected">25</option>
+            <!-- TMPL_ELSE -->
+                <option value="25">25</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day26" -->
+                <option value="26" selected="selected">26</option>
+            <!-- TMPL_ELSE -->
+                <option value="26">26</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day27" -->
+                <option value="27" selected="selected">27</option>
+            <!-- TMPL_ELSE -->
+                <option value="27">27</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day28" -->
+                <option value="28" selected="selected">28</option>
+            <!-- TMPL_ELSE -->
+                <option value="28">28</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day29" -->
+                <option value="29" selected="selected">29</option>
+            <!-- TMPL_ELSE -->
+                <option value="29">29</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day30" -->
+                <option value="30" selected="selected">30</option>
+            <!-- TMPL_ELSE -->
+                <option value="30">30</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day31" -->
+                <option value="31" selected="selected">31</option>
+            <!-- TMPL_ELSE -->
+                <option value="31">31</option>
+            <!-- /TMPL_IF -->
+            </select>
+        
+        <select name="month">
+            <option value="0">Month</option>
+            <!-- TMPL_IF NAME="month1" -->
+                <option value="1" selected="selected">Jan</option>
+            <!-- TMPL_ELSE -->
+                <option value="1">Jan</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="month2" -->
+                <option value="2" selected="selected">Feb</option>
+            <!-- TMPL_ELSE -->
+                <option value="2">Feb</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="month3" -->
+                <option value="3" selected="selected">Mar</option>
+            <!-- TMPL_ELSE -->
+                <option value="3">Mar</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="month4" -->
+                <option value="4" selected="selected">Apr</option>
+            <!-- TMPL_ELSE -->
+                <option value="4">Apr</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="month5" -->
+                <option value="5" selected="selected">May</option>
+            <!-- TMPL_ELSE -->
+                <option value="5">May</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="month6" -->
+                <option value="6" selected="selected">Jun</option>
+            <!-- TMPL_ELSE -->
+                <option value="6">Jun</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="month7" -->
+                <option value="7" selected="selected">Jul</option>
+            <!-- TMPL_ELSE -->
+                <option value="7">Jul</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="month8" -->
+                <option value="8" selected="selected">Aug</option>
+            <!-- TMPL_ELSE -->
+                <option value="8">Aug</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="month9" -->
+                <option value="9" selected="selected">Sep</option>
+            <!-- TMPL_ELSE -->
+                <option value="9">Sep</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="month10" -->
+                <option value="10" selected="selected">Oct</option>
+            <!-- TMPL_ELSE -->
+                <option value="10">Oct</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="month11" -->
+                <option value="11" selected="selected">Nov</option>
+            <!-- TMPL_ELSE -->
+                <option value="11">Nov</option>
+            <!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="month12" -->
+                <option value="12" selected="selected">Dec</option>
+            <!-- TMPL_ELSE -->
+                <option value="12">Dec</option>
+            <!-- /TMPL_IF -->
+        </select>
+            
+        <select name="year">
+            <option value="0">Year</option>
+            <!-- TMPL_IF NAME="year2007" -->
+                <option value="2007" selected="selected">2007</option>
+            <!-- TMPL_ELSE -->
+                <option value="2007">2007</option>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="year2008" -->
+                <option value="2008" selected="selected">2008</option>
+            <!-- TMPL_ELSE -->
+                <option value="2008">2008</option>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="year2009" -->
+                <option value="2009" selected="selected">2009</option>
+            <!-- TMPL_ELSE -->
+                <option value="2009">2009</option>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="year2010" -->
+                <option value="2010" selected="selected">2010</option>
+            <!-- TMPL_ELSE -->
+                <option value="2010">2010</option>
+            <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="year2011" -->
+                <option value="2011" selected="selected">2011</option>
+            <!-- TMPL_ELSE -->
+                <option value="2011">2011</option>
+            <!-- /TMPL_IF --> 	
+        </select>
+        
+        <label for="stickyduedate">
+            <input type="checkbox" id="stickyduedate" name="stickyduedate" <!-- TMPL_VAR NAME="selected" --> />
+            Remember due date for this borrower
+            </label>
+        </p>
+
+    <input type="hidden" name="day" value="0" />
+    <input type="hidden" name="month" value="0" />
+    <input type="hidden" name="year" value="0" />
+    <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+    <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
+    <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
+    <input type="hidden" name="print" value="maybe" />
+    <!-- TMPL_IF NAME="CHARGES" -->
+    <input type="hidden" name="charges" value="yes" />
+    <input type="hidden" name="oldamount" value="<!-- TMPL_VAR NAME="amountold" -->" />
+    <!-- /TMPL_IF -->
+
+    <div id="action">
+    <input type="submit" value="Issue" />
+    </div>
+
+</fieldset>
+</form>
+
+<!-- TMPL_IF NAME="WaitingReserveLoop" -->	
+<fieldset id="circ_circulation_issue">
+    <legend class="problem">Waiting reserves</legend>
+        This borrower has a waiting reservation : 
+        <!-- TMPL_LOOP NAME="WaitingReserveLoop" -->
+        <p>
+            <ul> 
+                <li> <!-- TMPL_VAR NAME="title"--> (<!-- TMPL_VAR NAME="itemtype"-->), author : <!-- TMPL_VAR NAME="author"-->, reserved the : <!-- TMPL_VAR NAME="reservedate"--> 
+            <!-- TMPL_IF NAME="waitingat" -->
+                document waiting at : <!-- TMPL_VAR NAME="waitingat" -->	
+            <!-- /TMPL_IF -->
+                </li>
+            </ul>
+        </p>
+    <!-- /TMPL_LOOP -->
+</fieldset>
 
-<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
-<!-- TMPL_IF NAME="borrowernumber" -->
-<div class="table"><form class="inline" action="/cgi-bin/koha/circ/renewscript.pl" method="post"><input type="hidden" value="circ" name="destination" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-	<table>
-		<caption>Issues <span class="print"><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page">(Print Page)</a> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip">(Print Slip)</a></span></caption>
-		<tr><th>Format</th>
-			<th>Due Date</th>
-			<th>Title</th>
-			<th>Author</th>
-			<th>Call No</th>
-			<th>Barcode</th>
-			<th>Renew?</th>
-		</tr>
-	<!-- TMPL_IF NAME="todayissues" -->
-		<!-- TMPL_LOOP NAME="todayissues" -->
-		<!-- TMPL_IF NAME="tcolor" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
-			
-			<td><!-- TMPL_VAR NAME="itemtype" --></td>
-			<td><!-- TMPL_VAR NAME="dd" --></td>
-			<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a><br/><i><!-- TMPL_VAR name="itemnotes" --></i></td>
-			<td><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="additionalauthor" --><!-- /TMPL_IF --></td>
-			<td><!-- TMPL_VAR NAME="classification" --></td>
-			<td><!-- TMPL_VAR NAME="barcode" --></td>
-		</tr>
-		<!-- /TMPL_LOOP -->
-	
 <!-- /TMPL_IF -->
 
+<div id="tabs">
+    <h2><!-- TMPL_VAR NAME="firstname"--> <!-- TMPL_VAR NAME="surname"--> (<!-- TMPL_VAR NAME="cardnumber"-->) has</h2>
+    <!-- TMPL_IF NAME="countreserv"-->
+        <a href="javascript:active(0)" class="tab_inactive" id="link0">
+            <!--TMPL_VAR NAME="countreserv"--> reserve(s)
+        </a>
+    <!-- TMPL_ELSE -->
+        <a href="#" class="tab_inactive">
+            0 reserves
+        </a>
+    <!-- /TMPL_IF -->
+    
+    <!--TMPL_IF NAME="issuecount"-->
+        <a href="javascript:active(1)" class="tab_inactive" id="link1">
+            <!-- TMPL_VAR NAME="issuecount"--> issue(s)
+        </a>
+    <!-- TMPL_ELSE -->
+        <a href="#" class="tab_inactive">
+            0 issue(s)
+        </a>
+    <!-- /TMPL_IF -->
+</div>
+
+<!-- TMPL_IF NAME="reservloop" -->
+<div id="0XX" class="content_hidden">
+    <table>
+        <tr>
+            <th>Reserve date</th>
+            <th>Barcode</th>
+            <th>Title</th>
+            <th>Author</th>
+            <th>Localisation</th>
+        </tr>
+        <!-- TMPL_LOOP NAME="reservloop" -->
+        <tr class="<!-- TMPL_VAR NAME="color" -->">
+                    <td>
+                        <!-- TMPL_VAR NAME="reservedate" -->
+                    </td>
+                    <td>
+                        <!-- TMPL_IF name="barcodereserv" -->
+                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR NAME="barcodereserv" --></a>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF NAME="waitingposition" -->
+                        Waiting position for this document :
+                        <b> <!-- TMPL_VAR NAME="waitingposition" --> </b>
+                        <!-- /TMPL_IF -->
+                    </td>
+                    <td>
+                        <!-- TMPL_VAR NAME="title" --> (<b> <!-- TMPL_VAR NAME="itemtype" --> </b>) 
+
+                        <!-- TMPL_IF name="waiting" -->
+                        <br/>
+                        <i>This document is available</i>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="transfered" -->
+                        <br/>
+                        <i>This document has been transfered from library : 
+                        <!-- TMPL_VAR NAME="frombranch" --> the : <!-- TMPL_VAR NAME="datesent" --> </i>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="nottransfered" -->
+                        <br/>
+                        <i>This document hasn't been transfered yet from library : <!-- TMPL_VAR NAME="nottransferedby" --></i>
+                        <!-- /TMPL_IF -->
+                
+                    </td>
+                    <td><!-- TMPL_VAR NAME="author" --></td>
+                    <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
+            </tr>
+        <!-- /TMPL_LOOP -->
+    </table>
+</div>
+<!-- /TMPL_IF --> <!-- reservesloop -->
+
+<!-- /TMPL_IF --> <!-- borrowernumber -->
+
+<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
+<!-- TMPL_IF NAME="borrowernumber" -->
+<div id="1XX">
+    <form action="/cgi-bin/koha/reserve/renewscript.pl" method="post">
+    <p>
+    <a href="JavaScript:window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page')">Print Page</a>
+    / <a href=# onclick="javascript:window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip')">Print Slip</a>
+    </p>
+    
+    <input type="hidden" value="circ" name="destination" />
+    <input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
+    <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+    
+<!-- TMPL_IF NAME="todayissues" -->
+    <table>
+    <tr>
+        <th>Title</th>
+        <th>Due date</th>
+        <th>Itemtype</th>
+        <th>Call no</th>
+        <th>Barcode</th>
+        <th>Renew?</th>
+    </tr>
+    
+    <tr>
+        <th colspan="6"><a name="today" id="today">Today issues</a></th>
+    </tr>
+    <!-- TMPL_LOOP NAME="todayissues" -->
+    <!-- TMPL_IF NAME="togglecolor" -->
+    <tr>
+    <!-- TMPL_ELSE -->
+    <tr class="highlight">
+    <!-- /TMPL_IF -->
+        <td>
+        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a>
+        <br /><!-- TMPL_VAR NAME="author" -->
+        - <!-- TMPL_VAR name="itemnotes" -->
+        </td>
+        <td><!-- TMPL_VAR NAME="dd" --></td>
+        <td>
+            <!-- TMPL_VAR NAME="itemtype" -->
+            <!-- TMPL_IF NAME="itemtype_image" -->
+            <img src="<!-- TMPL_VAR NAME="itemtype_image" -->" />
+            <!-- /TMPL_IF -->
+        </td>
+        <td><!-- TMPL_VAR NAME="classification" --></td>
+        <td><!-- TMPL_VAR NAME="barcode" --></td>
+        <td>
+        <input type="checkbox"
+                name="items[]"
+                value="<!-- TMPL_VAR NAME="itemnumber" -->"
+    <!-- TMPL_IF NAME="od" -->
+            checked="checked"
+    <!-- /TMPL_IF -->
+        />
+        <input type="checkbox"
+                name="all_items[]"
+                value="<!-- TMPL_VAR NAME="itemnumber" -->"
+            checked="checked"
+                style="display: none;"
+        />
+        </td>
+    </tr>
+    <!-- /TMPL_LOOP --> <!-- todayissues -->
+    <!-- /TMPL_IF --> <!-- todayissues -->
 <!-- TMPL_IF NAME="previssues" -->
-		<tr><th colspan="7"><a name="previous" id="previous">Previous Issues</a></th></tr>
-		<!-- TMPL_LOOP NAME="previssues" -->
-			<!-- TMPL_IF NAME="tcolor" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
-			
-			<td><!-- TMPL_VAR NAME="itemtype" --></td>
-			<td><!-- TMPL_IF NAME="od" --><span class="error"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="dd" --><!-- TMPL_IF NAME="od" --></span><!-- /TMPL_IF --></td>
-			<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a><br/><i><!-- TMPL_VAR name="itemnotes" --></i></td>
-			<td><!-- TMPL_VAR NAME="author" --></td>
-			<td><!-- TMPL_VAR NAME="classification" --></td>
-			<td><!-- TMPL_VAR NAME="barcode" --></td>
-			<td><input type="checkbox" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> checked="checked"<!-- /TMPL_IF --> /></td></tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-	
-	<p><input type="submit" class="submit" value="Renew Checked Items" /></p>
-<!-- /TMPL_IF -->
-</form>
+    <table>
+    <tr>
+        <th>Title</th>
+        <th>Due date</th>
+        <th>Itemtype</th>
+        <th>Call no</th>
+        <th>Barcode</th>
+        <th>Renew?</th>
+    </tr>
+    <tr>
+        <th colspan="6"><a name="previous" id="previous">Previous issues</a></th>
+    </tr>
+    <!-- TMPL_LOOP NAME="previssues" -->
+    <!-- TMPL_IF NAME="togglecolor" -->
+        <tr>
+    <!-- TMPL_ELSE -->
+        <tr class="highlight">
+    <!-- /TMPL_IF -->
+        <td>
+        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a>
+        <br/><!-- TMPL_VAR NAME="author" --> - <!-- TMPL_VAR name="itemnotes" -->
+        </td>
+        <td>
+        <!-- TMPL_VAR NAME="dd" -->
+        </td>
+        <td>
+            <!-- TMPL_VAR NAME="itemtype" -->
+            <!-- TMPL_IF NAME="itemtype_image" -->
+            <img src="<!-- TMPL_VAR NAME="itemtype_image" -->" />
+            <!-- /TMPL_IF -->
+        </td>
+        <td><!-- TMPL_VAR NAME="classification" --></td>
+        <td><!-- TMPL_VAR NAME="barcode" --></td>
+        <td>
+        <input type="checkbox"
+                name="items[]"
+                value="<!-- TMPL_VAR NAME="itemnumber" -->"
+    <!-- TMPL_IF NAME="od" -->
+            checked="checked"
+    <!-- /TMPL_IF -->
+        />
+        <input type="checkbox"
+                name="all_items[]"
+                value="<!-- TMPL_VAR NAME="itemnumber" -->"
+            checked="checked"
+                style="display: none;"
+        />
+        </td>
+    </tr>
+    <!-- /TMPL_LOOP --> <!-- previssues -->
+<!-- /TMPL_IF --> <!-- previssues -->
+    </table>
 
-	
+    <div id="action">
+    <input type="submit" name="renew_checked" value="Renew Checked Items" />
+    <input type="submit" name="renew_all" value="Renew All" />
+    </div>
+</form>
 </div>
+<!-- /TMPL_IF --> <!-- borrowernumber -->
+<!--/TMPL_IF -->
 
-<!-- /TMPL_IF -->
+<script type="text/JavaScript" language="JavaScript">
+    
+    /**
+    *  _(s)
+    *  This function is used to localised.
+    */
+    function _(s) {
+        return s;
+    }
+    /**
+    *  MoreBorrowerDetails();
+    *  This function displays or not borrower information.
+    */
+    function MoreBorrowerDetails() {
+        var div = document.getElementById('BorrowerDetails');
+        if(div.getAttribute('class') == "content_visible"){
+            div.removeAttribute('class');
+            div.setAttribute('class',"content_hidden");
+        }
+        else {
+            div.setAttribute('class',"content_visible");
+            div.setAttribute('style',"height:180px;");
+        }
+    }
+    /**
+    *  active(numlayer)
+    *  This function activate the numlayer div.
+    */
+    function active(numlayer){
+        for (i=0; i <= 1 ; i++ ) {
+            var tab;
+            try{
+                tab = document.getElementById(i+'XX');
+                tab.getAttribute('id'); // that throw an exception.
+            }
+            catch(e){
+                continue; // go to the next step.
+            }
+            if (numlayer==i) {
+                tab.setAttribute("class","content_visible");
+                var tabactive=document.getElementById('link'+i);
+                tabactive.removeAttribute("class");
+                tabactive.setAttribute("class","tab_active");
+            } else {
+                tab.setAttribute("class","content_hidden");
+                try {
+                    var tabactive=document.getElementById('link'+i);
+                    tabactive.removeAttribute("class");
+                    tabactive.setAttribute("class","tab_inactive");
+                }
+                catch(e){};
+            }
+        }
+    }
 
+    <!-- TMPL_IF NAME="borrowernumber" -->
+        document.mainform.barcode.focus(); // set the focus to the barcode entry.
+    <!-- TMPL_ELSE -->
+        document.mainform.findborrower.focus(); // set the focus to te form to search a borrower
+    <!-- /TMPL_IF -->
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</script>
 
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl
index 5894759e78..b13787eee7 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl
@@ -24,14 +24,14 @@
 				<td><p><!-- TMPL_VAR NAME="datetransfer" --></p> <!-- TMPL_IF NAME="messcompa" --> check this transfer<!-- /TMPL_IF --></td>
 				<td>
 					<p>
-						<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+						<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
 						&nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --> </b>)
 						<br />Barcode : <!-- TMPL_VAR NAME="barcode" -->
 					</p>
 				</td>
 				<td>
 				<!-- TMPL_IF NAME="borrowername" -->
-					<p><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> &nbsp; <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
+					<p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> &nbsp; <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
 				<!-- TMPL_IF NAME="borrowermail" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
 	<!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
 					</p>
@@ -43,10 +43,10 @@
 				</td>
 				<td><p><!-- TMPL_VAR NAME="homebranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
 				<td>
-				<form name="dotransfer" action="currenttransfers.pl" method="post">
+				<!--<form name="dotransfer" action="currenttransfers.pl" method="post">
 						<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
 				<input type="submit" value="Cancel this transfer">
-				</form>
+				</form>-->
 				</td>	
 			</tr>
 		<!-- /TMPL_LOOP -->	
diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl
index d211ab9918..dfc9af40bc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl
@@ -1,161 +1,278 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Returns<!-- TMPL_IF Name="returned" -->: <!-- TMPL_VAR Name="itemtitle" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation: Returns<!-- TMPL_IF Name="returned" -->: <!-- TMPL_VAR Name="itemtitle" --><!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
+
+<!-- case of a mistake in transfert loop -->
+
+	<!-- TMPL_IF Name="WrongTransfer" -->
+        	<h3 class="problem">This item was not transfered initialy to this library !</h3>
+        
+        <table>
+        <tr>
+		<th>Title : </th>
+		<td>        	
+			<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="witemtitle" --></a>
+		</td>
+	</tr>
+        <tr><th>Reserved for: </th>
+        <td>
+        <!-- TMPL_IF Name="wborcnum"-->
+            <ul>
+                        <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="wborcnum" --></a></li>
+            <li><!-- TMPL_VAR Name="wborsurname" -->, <!-- TMPL_VAR Name="wborfirstname" --> </li>
+            <li><!-- TMPL_VAR Name="wborstraddress" --><br />
+            <!-- TMPL_VAR Name="wborcity" -->  <!-- TMPL_VAR NAME="wborzip" --></li>
+            <li><!-- TMPL_VAR Name="wborphone" --></li>
+            </ul>
+        <!-- TMPL_ELSE-->
+        	No reservation linked
+        <!-- /TMPL_IF -->
+         </td>
+         </tr>
+         <tr><th>Action : </th>
+         	<td class="problem">
+         	 this document must be transfered to : <!-- TMPL_VAR Name="TransferWaitingAt" -->
+         	</td>
+         </tr>
+        </table>
+        <form method="post" action="returns.pl" name="mainform" id="mainform">
+                <input type="hidden" name="WT-itemNumber" value="<!-- TMPL_VAR Name="WrongTransferItem" -->" />
+                <input type="hidden" name="WT-waitingAt" value="<!-- TMPL_VAR Name="TransferWaitingAt" -->" />
+                <input type="hidden" name="WT-From" value="<!-- TMPL_VAR Name="wtransfertFrom" -->" />
+         <input type="submit" value="Send this document" />
+        </form>
+            
+<!-- /TMPL_IF -->
+        
 <!-- TMPL_IF Name="found" -->
-		<h3 class="alert">Reserve Found<!-- TMPL_IF Name="waiting" --> (item is already <em>consigned</em>) <!-- /TMPL_IF --></h3>
-		<!-- TMPL_IF Name="waiting" -->
-		<div class="items">
-		<table>
-		<caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
-		<tr><th>Patron: </th><td>
-			<ul>
-						<li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
-			<li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
-			<li><!-- TMPL_VAR Name="borstraddress" --><br />
-			<!-- TMPL_VAR Name="borcity" -->  <!-- TMPL_VAR NAME="borzip" --></li>
-			<li><!-- TMPL_VAR Name="borphone" --></li>
-			
-			</ul></td></tr>
-	<tr><th>Transfer to:</th><td><!-- TMPL_VAR Name="branchname" --></td></tr>
-		</table></div><form method="post" action="returns.pl" name="mainform" id="mainform">
-			<input type="submit" value="Confirm" class="submit" /><!-- TMPL_LOOP Name="inputloop" -->
-				<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-				<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
-				<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
-			<!-- /TMPL_LOOP -->
-			<input type="hidden" name="barcode" value="0" />
-			</form>
-		
-			
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF Name="diffbranch" -->
-			<h3>Item Consigned:</h3><br>
-    	<div class="item">
-		<table>
-		<caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
-		<tr><th>Patron:</th><td><!-- TMPL_VAR Name="name" --></td></tr>
-		</table></div><form method="post" action="returns.pl" name="mainform" id="mainform"><input type="submit" value="OK" />
-			<!-- TMPL_LOOP Name="inputloop" -->
-				<!-- TMPL_UNLESS Name="first" -->
-					<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-					<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
-					<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
-				<!-- /TMPL_UNLESS -->
-			<!-- /TMPL_LOOP -->
-			<input type="hidden" name="barcode" value="0" />
-			
-			</form>
-		
+<!-- case of a reservation found, and display info -->
+
+	<!-- TMPL_IF Name="waiting" -->
+        <h3>Waiting Reserve Found in your library</h3>
+        <table>
+        <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
+        <tr><th>Patron: </th><td>
+            <ul>
+                        <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
+            <li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
+            <li><!-- TMPL_VAR Name="borstraddress" --><br />
+            <!-- TMPL_VAR Name="borcity" -->  <!-- TMPL_VAR NAME="borzip" --></li>
+            <li><!-- TMPL_VAR Name="borphone" --></li>
+            </ul></td></tr>
+        </table><form method="post" action="returns.pl" name="mainform" id="mainform">
+            <input type="submit" value="Confirm" /><!-- TMPL_LOOP Name="inputloop" -->
+                <input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
+                <input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
+                <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
+            <!-- /TMPL_LOOP -->
+            <input type="hidden" name="barcode" value="0" />
+            </form>
+<!-- /TMPL_IF -->
 
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF Name="reserved" -->
-			<div class="items">
-			<table>
-			<caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
-			<tr><th>Patron: </th><td>
-			<ul>
-						<li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
-			<li><!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" --></li>
-			<li><!-- TMPL_VAR Name="borstraddress" --><br />
-			<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
-			<li><!-- TMPL_VAR Name="borphone" --></li>
-			<!-- Display for NPL // <!-- TMPL_IF NAME="boremail" --><li><a href="/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->" onclick="window.open('/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->','notify','width=650,height=450,location=no,menubar=no,toolbar=no,scrollbars=yes'); return false;"><!-- TMPL_VAR Name="boremail" --></a></li><!-- /TMPL_IF --> // Display for NPL -->
-			</ul></td></tr>
-			<tr><th>Transfer to: </th><td><!-- TMPL_VAR Name="branchname" --></td></tr></table>
-			</div> <form method="post" action="returns.pl" name="mainform" id="mainform">
-			<input type="submit" class="submit" value="Confirm" />
-			<!-- TMPL_LOOP Name="inputloop" -->
-				<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-				<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
-				<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
-			<!-- /TMPL_LOOP -->
-			<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
-			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="bornum" -->" />
-			<input type="hidden" name="resbarcode" value="<!-- TMPL_VAR Name="barcode" -->" /></form>
-		<!-- /TMPL_IF -->
-	
+	<!-- TMPL_IF Name="diffbranch" -->
+	<h3>Reserve With necesary transfert Found</h3>
+        <table>
+        <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
+        <tr><th>Patron: </th><td>
+            <ul>
+                        <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
+            <li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
+            <li><!-- TMPL_VAR Name="borstraddress" --><br />
+            <!-- TMPL_VAR Name="borcity" -->  <!-- TMPL_VAR NAME="borzip" --></li>
+            <li><!-- TMPL_VAR Name="borphone" --></li>
+            </ul></td></tr>
+	<!-- TMPL_IF name="transfertodo" -->
+    <tr><th>Transfer to:</th><td><!-- TMPL_VAR Name="destbranchname" --></td></tr>
+	<!-- /TMPL_IF -->
+        </table><form method="post" action="returns.pl" name="mainform" id="mainform">
+            <input type="submit" value="Confirm" /><!-- TMPL_LOOP Name="inputloop" -->
+                <input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
+                <input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
+                <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
+            <!-- /TMPL_LOOP -->
+            <input type="hidden" name="diffBranch" value="<!-- TMPL_VAR Name="destbranch" -->" />
+            <input type="hidden" name="barcode" value="0" />
+            </form>			
+        <!-- /TMPL_IF -->
+        
+<!-- case of a return of item, but with no reservation after, if the document must return to his homebranch -->
+        <!-- TMPL_IF Name="transfer" -->
+            <h2>This item must return to his homebranch :</h2>
+            <p><span class="problem">The document <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) Must be returned to his homebranch(<b><!-- TMPL_VAR NAME="itemhomebranch" --></b>)</span></p>
+                <form method="post" action="returns.pl">
+                    <!-- TMPL_LOOP Name="inputloop" -->
+                        <input type="hidden" name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+                        <input type="hidden" name="dd-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="duedate" -->">
+                        <input type="hidden" name="bn-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+                    <!-- /TMPL_LOOP -->
+                    <input type="hidden" name="barcode" value="0">
+                    <input type="submit" value="OK">
+                </form>
+        <!-- /TMPL_IF -->
+        
+        
+        <!-- TMPL_IF Name="diffbranch" -->
+            <h3>Item Consigned:</h3>
+        
+        <table>
+        <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
+        <tr><th>Patron:</th><td><!-- TMPL_VAR Name="name" --></td></tr>
+        </table><form method="post" action="returns.pl" name="mainform" id="mainform"><input type="submit" value="OK" />
+            <!-- TMPL_LOOP Name="inputloop" -->
+                <!-- TMPL_UNLESS Name="first" -->
+                    <input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
+                    <input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
+                    <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
+                <!-- /TMPL_UNLESS -->
+            <!-- /TMPL_LOOP -->
+            <input type="hidden" name="barcode" value="0" />
+            
+            </form>
+        <!-- /TMPL_IF -->
+        
+<!-- case of simple return no issue or transfer but with a reservation  -->
+
+        <!-- TMPL_IF Name="reserved" -->
+        	<!-- TMPL_IF Name="transfertodo"-->
+        	<h3>Reserve With necesary transfert Found</h3>
+        	<!-- TMPL_ELSE -->
+        	<h3>Waiting Reserve Found in your library</h3>
+        	<!-- /TMPL_IF -->
+        	
+            <table>
+            <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=<!-- TMPL_VAR NAME="itembiblionumber" -->"><!-- TMPL_VAR Name="itemtitle" --></a></caption>
+            <tr><th>Patron: </th><td>
+            <ul>
+                        <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
+            <li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
+            <li><!-- TMPL_VAR Name="borstraddress" --><br />
+            <!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
+            <li><!-- TMPL_VAR Name="borphone" --></li>
+            </ul></td></tr>
+    		<!-- TMPL_IF name="transfertodo" -->
+   		 <tr><th>Transfer to:</th><td><!-- TMPL_VAR Name="destbranchname" --></td></tr>
+		<!-- /TMPL_IF -->     
+
+	    </table>
+            <form method="post" action="returns.pl" name="mainform" id="mainform">
+		<input type="submit" value="Confirm" />
+		<!-- TMPL_LOOP Name="inputloop" -->
+			<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
+			<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
+			<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
+		<!-- /TMPL_LOOP -->
+		<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR Name="itemnumber" -->" />
+		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
+		<input type="hidden" name="resbarcode" value="<!-- TMPL_VAR Name="barcode" -->" />
+		<input type="hidden" name="diffBranch" value="<!-- TMPL_VAR Name="destbranch" -->" />
+            </form>
+        <!-- /TMPL_IF -->
+    
 <!-- TMPL_ELSE -->
 <h1>Circulation: Returns</h1>
-	<div class="details">
-	<form method="post" action="/cgi-bin/koha/circ/returns.pl"  name="mainform" id="mainform">
-			<label for="barcode">Enter Item Barcode</label>
-			<input name="barcode" id="barcode" size="14" maxlength="14" class="unfocus" onfocus="this.className='focus'" onblur="this.className='unfocus'" />
-			<input type="submit" class="submit" value="Submit" />
-			<!-- TMPL_LOOP Name="inputloop" -->
-				<input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
-				<input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
-				<input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="bornum" -->" />
-			<!-- /TMPL_LOOP -->
-		</form><!-- TMPL_IF NAME="errmsgloop" --><!-- TMPL_LOOP Name="errmsgloop" -->
-				<div class="error">
-				<!-- TMPL_IF Name="badbarcode" -->
-					No Item with barcode: <!-- TMPL_VAR Name="msg" -->
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF Name="ispermanent" -->
-					Please return to  <!-- TMPL_VAR Name="msg" -->
-				<!-- /TMPL_IF -->
-				
-				<!-- TMPL_IF Name="reserveissued" -->
-					Issued from RESERVE Section-  Use RESERVE return.
-				<!-- TMPL_ELSE -->
-				<!-- TMPL_IF Name="notissued" -->
-					Not On Issue.
-				<!-- /TMPL_IF --><!-- /TMPL_IF -->
-				<!-- TMPL_IF Name="waslost" -->
-					Item was lost, now found.
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF Name="withdrawn" -->
-					Item Cancelled
-				<!-- /TMPL_IF -->
-				</div>
-			<!-- /TMPL_LOOP --><!-- /TMPL_IF -->
-</div>
+    
+    <form method="post" action="/cgi-bin/koha/circ/returns.pl"  name="mainform" id="mainform">
+            <fieldset>
+            <legend>Enter Item Barcode</legend>
+            <p>
+                <input name="barcode" id="barcode" size="14" maxlength="14" />
+                <input type="submit" value="Submit" />
+            </p>
+            <!-- TMPL_LOOP Name="inputloop" -->
+                <input type="hidden" name="ri-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
+                <input type="hidden" name="dd-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="duedate" -->" />
+                <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
+            <!-- /TMPL_LOOP -->
+            </fieldset>
+        </form>
+    <!-- TMPL_IF NAME="errmsgloop" -->
+    <fieldset>
+        <legend>Error</legend>
+        <!-- TMPL_LOOP Name="errmsgloop" -->
+                    <!-- TMPL_IF Name="badbarcode" -->
+                        <p class="problem">No Item with barcode: <!-- TMPL_VAR Name="msg" --></p>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="ispermanent" -->
+                        <p class="problem">Please return to  <!-- TMPL_VAR Name="msg" --></p>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="notissued" -->
+                        <p class="problem">Not On Issue.</p>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="waslost" -->
+                        <p class="problem">Item was lost, now found.</p>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="withdrawn" -->
+                        <p class="problem">Item Cancelled</p>
+                    <!-- /TMPL_IF -->
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_IF -->
+    </fieldset>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF Name="returned" -->
-<div class="table"><table>
-		<tr><th>Item Information</th><th>Patron Information</th></tr>
-		<tr><td><!-- TMPL_VAR Name="itemtitle" -->
-		</td><td><div class="flags">
-<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="ribornum" -->"><!-- TMPL_VAR Name="riborcnum" --></a>
-		<!-- TMPL_VAR Name="riborsurname" -->, <!-- TMPL_VAR Name="ribortitle" --> <!-- TMPL_VAR Name="riborfirstname" -->
+<table>
+        <tr><th>Item Information</th><th>Patron Information</th></tr>
+        <tr><td><!-- TMPL_VAR Name="itemtitle" -->
+        </td><td>
+<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="riborrowernumber" -->"><!-- TMPL_VAR Name="riborcnum" --></a>
+        <!-- TMPL_VAR Name="riborsurname" -->, <!-- TMPL_VAR Name="ribortitle" --> <!-- TMPL_VAR Name="riborfirstname" -->
 
-<!-- removed: removed-from-returns.tmpl -->
 <!-- TMPL_IF Name="flagset" -->
- (<!-- TMPL_LOOP Name="flagloop" -->
-<span class="error"><!-- TMPL_VAR Name="flag" -->, </span>
-<!-- /TMPL_LOOP -->)<!-- /TMPL_IF --></div>
+(<!-- TMPL_LOOP Name="flagloop" -->
+<!-- TMPL_VAR Name="flag" -->, 
+<!-- /TMPL_LOOP -->)<!-- /TMPL_IF -->
 </td></tr></table>
-</div>
+
 <!-- /TMPL_IF -->
 
 
 
 <!-- TMPL_IF Name="riloop" -->
-<div class="table">
-		<table>
-		<caption>Returned Items</caption>
-		<tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>Patron</th></tr>
-		<!-- TMPL_LOOP Name="riloop" -->
-			<tr><td><!-- TMPL_IF Name="duedate" --><!-- TMPL_IF Name="early" --><span class="error"><!-- /TMPL_IF --><!-- TMPL_VAR Name="day" -->/<!-- TMPL_VAR Name="month" -->/<!-- TMPL_VAR Name="year" --><!-- TMPL_IF Name="early" --></span><!-- /TMPL_IF --><!-- TMPL_ELSE -->Not on Issue.<!-- /TMPL_IF --></td>
-			<td>
-			<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
-			<td><!-- TMPL_VAR Name="itemtitle" --></td>
-			<td><!-- TMPL_VAR Name="itemauthor" --></td>
-			<td><!-- TMPL_VAR Name="itemtype" --></td>
-			<td>
-			<!-- TMPL_IF Name="duedate" -->
-				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->">
-					<!-- TMPL_VAR Name="borcnum" -->
-				</a> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
-			<!-- TMPL_ELSE -->
-								<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
-			<!-- /TMPL_IF -->
-			</td></tr>
-		<!-- /TMPL_LOOP -->
-		</table>
-	</div>
+        <h2>Returned Items</h2>
+        <table>
+        <tr>
+            <th>Title</th>
+            <th>Itemtype</th>
+            <th>Due Date</th>
+            <th>Barcode</th>
+            <th>Patron</th>
+        </tr>
+        <!-- TMPL_LOOP Name="riloop" -->
+            <tr>
+            <td>
+                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR Name="itembiblionumber" -->">
+                    <!-- TMPL_VAR Name="itemtitle" --></a>
+                    <br /><!-- TMPL_VAR Name="itemauthor" -->
+            </td>
+            <td><!-- TMPL_VAR Name="ccode" --></td>
+            <td>
+            <!-- TMPL_IF Name="duedate" -->
+                <!-- TMPL_IF Name="early" --><!-- /TMPL_IF --><!-- TMPL_VAR Name="month" -->/<!-- TMPL_VAR Name="day" -->/<!-- TMPL_VAR Name="year" --><!-- TMPL_IF Name="early" --></span><!-- /TMPL_IF -->
+            <!-- TMPL_ELSE -->
+                Not on Issue.
+            <!-- /TMPL_IF -->
+            </td>
+            <td>
+                <!-- TMPL_VAR Name="barcode" -->
+            </td>
+            <td>
+            <!-- TMPL_IF Name="duedate" -->
+                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="borrowernumber" -->">
+                    <!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" -->
+                </a>
+            <!-- TMPL_ELSE -->
+                                Not on issue.
+            <!-- /TMPL_IF -->
+            </td></tr>
+        <!-- /TMPL_LOOP -->
+        </table>
+        
 <!-- /TMPL_IF -->
 
+<script type="text/JavaScript" language="JavaScript">
+	document.mainform.barcode.focus();
+</script>
 
 <!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl
index 0c582d2a52..fcf46caec0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl
@@ -17,18 +17,19 @@
 	</select>
 
 
-<label for="printer">Choose a Network Printer:</label>
-<!--printerselection-->
-<select name="printer" id="printer">
-	<!-- TMPL_LOOP Name="printerloop" -->
-		<option value="<!-- TMPL_VAR Name="value" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR Name="name" -->
-	<!-- /TMPL_LOOP -->
-	</select>
-<input type="hidden" name="setcookies" value="1" />
-<input type="submit" value="Submit" name="changesettings" />
+<!-- TMPL_IF Name="printerloop" -->
+    <label for="printer">Choose a Network Printer:</label>
+    <!--printerselection-->
+    <select name="printer" id="printer">
+        <!-- TMPL_LOOP Name="printerloop" -->
+            <option value="<!-- TMPL_VAR Name="value" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR Name="name" -->
+        <!-- /TMPL_LOOP -->
+        </select>
+<!-- /TMPL_IF -->
+    <input type="hidden" name="setcookies" value="1" />
+    <input type="submit" value="Submit" name="changesettings" />
 </form>
 
 
-
 <!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl
index 3d4443c5b3..0a9d8bd949 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl
@@ -8,8 +8,6 @@
 <!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
 
-<h1>Circulation: Transfers To do</h1>
-
 <div id="mainbloc">
 	<h1>Transfers to do <!-- TMPL_VAR NAME="show_date" --></h1>
 	<div id="resultlist">
@@ -31,13 +29,13 @@
 				<td><p><!-- TMPL_VAR NAME="reservedate" --></p> <!-- TMPL_IF NAME="messcompa" --> Reserve over <!-- /TMPL_IF --></td>
 				<td>
 					<p>
-						<a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+						<a href="/cgi-bin/koha/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
 						&nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --> </b>)
 						<br />Barcode : <!-- TMPL_VAR NAME="barcode" -->
 					</p>
 				</td>
 				<td>
-					<p><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> &nbsp; <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
+					<p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" --> &nbsp; <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
 				<!-- TMPL_IF NAME="borrowermail" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Reservation: <!-- TMPL_VAR NAME="title" -->">
 	<!-- TMPL_VAR NAME="borrowermail" --></a><!--/TMPL_IF-->
 					</p>
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 ad09699a82..c2a8e04ed2 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
@@ -1,9 +1,17 @@
 </title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
-<style type="text/css"> 
-	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+<link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/includes/intranet-print.css" />
+<style type="text/css" media="screen"> 
+	<!-- TMPL_IF NAME="intranetstylesheet" -->
+	   @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetstylesheet" -->);
+    <!-- TMPL_ELSE -->
+        @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+    <!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="intranetcolorstylesheet" -->
+	   @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/<!-- TMPL_VAR NAME="intranetcolorstylesheet" -->);
+    <!-- /TMPL_IF -->
 </style>
 </head>
 
-<body>
\ No newline at end of file
+<body>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc
index 1d761d57be..1926fccac5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc
@@ -50,6 +50,7 @@
 
 	// This function shows the "Show Holiday" panel //
 	function showHoliday (exceptionPosibility, dayName, day, month, year, weekDay, title, description) {
+		
 		var panel = document.getElementById('showHoliday');
 		panel.style.display = 'inline';
 		document.getElementById('newHoliday').style.display = 'none';
@@ -60,9 +61,10 @@
 		document.getElementById('showDay').value = day;
 		document.getElementById('showMonth').value = month;
 		document.getElementById('showYear').value = year;
-		document.getElementById('showTitle').value = title;
 		document.getElementById('showDescription').value = description;
 		document.getElementsByName('showWeekday')[0].value = weekDay;
+		document.getElementById('showTitle').value = title;
+		
 		if (exceptionPosibility == 1) {
 			document.getElementById('exceptionPosibility').style.display = 'inline';
 		} else {
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 691287b6e3..0f7d808eac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
@@ -1,2 +1,3 @@
-</body>
+        </div>
+    </body>
 </html>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
index ae500b30e4..7217a9c78a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
@@ -1,55 +1,93 @@
 body {
-	font-family : Verdana, Geneva, Arial, sans-serif;
-	font-size : .9em;
+    font-family : Verdana, Geneva, Arial, sans-serif;
+    font-size : .9em;
 }
 
+h2 {
+    display:block;
+    clear:left;
+/*     float:none; */
+}
 table {
-	border-collapse : collapse;
-	border-top : 1px solid #CCCCCC;
-	border-right : 1px solid #CCCCCC;
-	margin : 1em 0;
+    border-collapse : inherit;
+    border : 1px solid #CCCCCC;
+    margin : 1em 0;
 }
 
 caption {
-	font-size : 140%;
-	text-align : left;
-	font-weight : bold;
+    font-size : 140%;
+    text-align : left;
+    font-weight : bold;
 }
 
 td,th {
-	border-left : 1px solid #CCCCCC;
-	border-bottom : 1px solid #CCCCCC;
-	padding : 5px;
+    /*border-left : 1px solid #CCCCCC;
+    border-bottom : 1px solid #CCCCCC;*/
+    border : 1px solid #CCCCCC;
+    padding : 5px;
 }
 
 th {
-	background-color : #CCCCCC;
-	border-left : 1px solid #999999;
-	border-bottom : 1px solid #999999;
+    background-color : #CCCCCC;
+    border-left : 1px solid #999999;
+    border-bottom : 1px solid #999999;
 }
 
 th[scope=row] {
-	background-color : #EEEEEE;
-	text-align : right;
+    background-color : #EEEEEE;
+    text-align : right;
 }
 
+p {
+    margin:0px 0px 0px 0px;
+}
 input {
-	font-size:0.9em;
+    font-size:0.9em;
 }
 
 select {
-	font-size:0.9em;
+    font-size:0.9em;
 }
 
 input[type=submit], input[type=button], input[type=reset] {
-	background-color : #6699cc;
-	color : #FFFFFF;
-	font-size : 1em;
-	font-weight : bold;
+    background: url( /intranet-tmpl/prog/images/fade-butt.png );
+    border: 3px double #999;
+    border-left-color: #ccc;
+    border-top-color: #ccc;
+    color: #333;
+    padding: 0.25em;
+}
+
+label {
+    font-style:italic;
+    vertical-align:top;
+    display:block;
+    float:left;
+/*     text-align:right; */
+    width:10em;
+    margin-right:0.2em;
+}
+
+p {
+clear:left;
+}
+.searchresults table tr:hover{
+    background-color: #CCFFFF;
 }
 
 tr.highlight td, tr.highlight th {
-	background-color : #EEEEEE;
+    background-color : #EEEEEE;
+}
+
+.here {
+    color: black;
+    text-decoration:none;
+}
+
+#problem {
+    color: red;
+    background-color:white;
+    font-weight : bold;
 }
 
 #admin_stopwords_select UL {
@@ -61,34 +99,52 @@ tr.highlight td, tr.highlight th {
 }
 
 legend {
-	font-size:120%;
-	font-weight:bold;
+    font-size:120%;
+    font-weight:bold;
 }
 
 .problem {
-	color: white;
-	background-color:red;
+    color: white;
+    background-color:red;
+    font-weight : bold;
 }
 
 /* css styles for reserves color alerts */
 .onloan {
-	background-color: #FFED3D;
+    background-color: #FFED3D;
 }
 
 .reserved {
-	background-color: #8EBAFF;
+    background-color: #8EBAFF;
 }
 
 .transfered {
-	background-color: #F9FF9A;
+    background-color: #F9FF9A;
 }
 
 .inwait {
-	background-color: #33CC99;
+    background-color: #33CC99;
 }
 
 .other {
-	background-color: #FF0000;
+    background-color: #FF0000;
+}
+
+.available {
+    background-color: white;
+}
+
+.unavailable {
+    background-color: #FFED3D;
+}
+
+.hasexpirated {
+    text-decoration: line-through;
+}
+
+/* style for search terms in catalogsearch */
+.term {
+    background-color:yellow;
 }
 
 /* end of css styles for reserves color alerts */
@@ -96,37 +152,183 @@ legend {
 /* MAIN MENU STYLES */
 #mainmenu {
     display:block;
-    float:left;
-    margin-right:2px;
+    position:fixed;
+/*     float:left; */
+    font-weight : normal;
+    margin-right: 5px;
+    padding-right: 5px;
     border-right:1px solid black;
+    font-size:0.9em;
 }
 
 #mainmenu a {
     display:block;
-    margin:5px;
+    margin-bottom:0px;
+    padding-left :5px;
     text-decoration:none;
+    font-weight:bold;
     color:black;
 }
+
+
 #mainmenu a:hover {
     display:block;
-    margin:5px;
-    background-color:#6699cc;
+    margin-bottom:0px;
+    padding-left :5px;
+    text-decoration:none;
+    font-weight:bold;
+    background-color:#6699CC;
+    color:white;
+}
+
+#mainmenu ul a {
+    display:block;
+    margin-bottom:5px;
+    padding-left :5px;
+    text-decoration:none;
+    font-weight:normal;
+    color:black;
+}
+
+#mainmenu ul a:hover {
+    display:block;
+    margin-bottom:5px;
+    padding-left :5px;
+    text-decoration:none;
+    font-weight:normal;
+    background-color:#6699CC;
     color:white;
 }
 
+#mainmenu ul {
+    list-style-type: none;
+    padding-left:20px;
+    margin-bottom:0px;
+    margin-top:0px;
+}
+
+#mainmenu li {
+    list-style-type: none;
+    padding-left:0px;
+    margin-left:0px;
+    margin-bottom:0px;
+    margin-top:0px;
+}
+
+#mainmenu label {
+    width:4em;
+}
+
 /* submenus styles */
 #submenu {
-    margin-left:10%;
+    margin-left:25%;
 }
+
 #submenu a {
     margin:5px;
     text-decoration:none;
-    color:black;
+    color:#6699CC;
 }
+
 #submenu a:hover {
     margin:5px;
-    background-color:#6699cc;
+    background-color:#6699CC;
+    color:white;
+}
+
+/*Action button*/
+#action {
+    /*float:right;*/
+}
+
+#action a {
+    background-color: #6699CC;
     color:white;
+    font-size : 0.8em;
+    border: 2px outset;
+    font-weight : bold;
+    margin:5px 0px 0px 0px;
+    padding:3px;
+    text-decoration:none;
+    display:inline;
+}
+
+#action a:hover {
+    border: 2px inset;
+    color: #6699CC;
+    background-color:white;
+}
+
+/*edit action*/
+#action .edit {
+	display:inline;
+	margin-right:5px;
+}
+
+#action .edit a {
+    background-color : #6699CC;
+    color : white;
+    margin-top: 1px;
+}
+
+#action .edit a:hover {
+    border: 2px inset;
+    color: #6699CC;
+    background-color:white;
+}
+
+#action .view {
+	display:inline;
+	margin-right:5px;
+}
+
+#action .view a {
+    background-color : #CECEFF;
+    color : white;
+    margin-top: 1px;
+}
+
+#action .view a:hover {
+    border: 2px inset;
+    color: #CECEFF;
+    background-color:white;
+}
+
+#action .others {
+	display:inline;
+	margin-right:5px;
+}
+
+#action .others a {
+    background-color : #6699AA;
+    color : white;
+    margin-top: 1px;
+}
+
+#action .others a:hover {
+    border: 2px inset;
+    color: #6699AA;
+    background-color:white;
+}
+
+/* Main body style */
+#main {
+    margin-left:25%;
+}
+
+/* facets bloc */
+#facets {
+    float:right;
+    margin-top: 15px;
+    margin-left: 15px;
+    border:1px solid #CCCCCC;
+}
+
+#facets h2 {
+    background-color:#CCCCCC;
+    margin:0px;
+    padding:0px;
+    font-size:1.1em;
 }
 
 /* the USER information block */
@@ -136,41 +338,125 @@ legend {
     font-size:10pt;
 }
 
-#main {
-	background-color : #C2CED3;
-	border-left : 1px solid #000000;
-	margin-left : 20%;
-	margin-right : 1%;
-	margin-top : 2%;
-	padding : 10px;
-}
-
-#facetsmenu {
-position : absolute;
-left : 1px;
-width : 15%;
+/* css style for reregistration alert */
+
+.reregistrinfo {
+    color: #6699cc;
+    font-weight : bold;
+    background-color : #eeeeee;
+}
+/* MARC editor */
+
+/* styles for the 11 buttons that the user can click on */
+/* the design of the active tab button (only 1 at a given time)*/
+.tab_active {
+    color: #6699CC;
+    background-color : #CCCCCC;
+    font-size : 1em;
+    border: 2px inset;
+    font-weight : bold;
+    text-decoration:none;
+    display: inline;
+    text-decoration:none;
+    margin-left:10px;
+}
+
+#onlinehelp {
+    float:right;
+}
+
+/* the design of the INactives tab buttons (all other tabs) */
+.tab_inactive {
+    background-color : #6699CC;
+    color : #FFFFFF;
+    font-size : 1em;
+    font-weight : bold;
+    display:inline;
+    border: 2px outset;
+    text-decoration:none;
+    margin-left:10px;
+}
+
+/* the button of INactive tabs : we need this one to have white color on links, otherwise, default a look will be choosen */
+#tabs a {
+    color:white;
+    text-decoration:none;
+    padding-right:10px;
+    padding-left:10px;
+}
+
+/* specify that we to do when the mouse is on 1 button */
+#tabs a:hover {
+    border: 2px inset;
+}
+
+#tabs {
+    margin-top:45px;
+    margin-bottom:5px;
+}
+
+/* styles for the 11 content blocks */
+/* the property for hidden tabs */
+.content_hidden {
+    height:0px; /* you propably don't need to change this one */
+    visibility:hidden; /* you propably don't need to change this one */
+    display:none;
+}
+
+/* the property for the displayed tab */
+.content_visible {
+    height:0px; /* you propably don't need to change this one */
+    visibility:visible; /* you propably don't need to change this one */
     display:block;
-    float:left;
-    margin-right:2px;
-    margin-top:2%;
-    border-right:1px solid black;
 }
-#facetsmenu ul {
-	background-color : #C4C6C7;
-	border-bottom : 1px solid #FFFFCC;
-	border-left : 0px solid #FFFFCC;
-	border-right : 0px solid #006699;
-	border-top : 0px solid #FFFFCC;
-	font-size : .8em;
-	list-style : none;
-	padding : 2px;
-	text-align : left;
-	width : 100%;
-}
-#facetsmenu ul li {
-	
-	list-style : none;
-	padding : 1px;
-	text-align : right;
-	
+
+/* the style of tag description */
+p.tag {
+    font-weight:bold;
+}
+/* the style of subfield paragraph */
+p.subfield {
+    
+}
+
+
+
+.lineSelected {
+    background-color:yellow;
+}
+
+
+/* display more informations with css layer */
+a.info {
+    position: relative;
+    text-decoration: none;
+    color: black;
+    border-bottom: 1px gray dotted;
+}
+
+a.info span {
+    display: none;
+    width:300px;
+}
+
+a.info:hover {
+    background: none; /* correcting IE bug*/
+    z-index: 500;
+}
+a.info:hover span {
+    display: inline;
+    position: absolute;
+    top: 2em;
+    right: 1em;
+    background: orange;
+    text-align: center;
+    color: white;
+    padding: 2px;
+}
+
+fieldset {
+        border : 1px solid #374b73;
+        display: inline;
+        float:left;
+        vertical-align:top;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc
index 0703fc9dae..f3488bf3f4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc
@@ -1,8 +1,10 @@
 <div id="submenu">
     <a href="/cgi-bin/koha/acqui/acqui-home.pl">Main page</a>
-    <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=0">Add supplier</a>
+    <a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Add supplier</a>
     <a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a>
     <a href="/cgi-bin/koha/acqui/histsearch.pl">History search</a>
-    <a href="/cgi-bin/koha/suggestion/acceptorreject.pl">Manage suggestions</a>
+    <a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=aorr_confirm">Manage suggestions</a>
     <a href="/cgi-bin/koha/admin/aqbookfund.pl">Parameters</a>
 </div>
+
+<div id="main">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
index 92466866a9..71fc1e2741 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
@@ -1,18 +1,23 @@
 <div id="submenu">
-	<a href="/cgi-bin/koha/admin/systempreferences.pl">System pref</a>
-	<a href="/cgi-bin/koha/admin/branches.pl">Branches</a>
-	<a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds</a>
-	<a href="/cgi-bin/koha/admin/currency.pl">Currencies</a>
-	<a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a>
-	<a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a>
-	<a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a>
-	<a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a>
-	<a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus</a>
-	<a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio Framework</a>
-	<a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links Koha-MARC DB</a>
-	<a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a>
-	<a href="/cgi-bin/koha/admin/printers.pl">Printers</a>
-	<a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a>
-	<a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a>
-	<a href="/cgi-bin/koha/import/breeding.pl">Reservoir</a>
-</div>
\ No newline at end of file
+    <p>
+        <a href="/cgi-bin/koha/admin/systempreferences.pl">System pref</a>
+        <a href="/cgi-bin/koha/admin/branches.pl">Branches</a>
+        <a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds</a>
+        <a href="/cgi-bin/koha/admin/currency.pl">Currencies</a>
+    </p>
+    <p>
+        <a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a>
+        <a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a>
+        <a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a>
+        <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a>
+    </p>
+    <p>
+        <a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio Framework</a>
+        <a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Framework</a>
+        <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a>
+        <a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links Koha-MARC DB</a>
+        <a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a>
+    </p>
+</div>
+
+<div id="main">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-authorities.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-authorities.inc
index 55c5a6efc0..eedee7c68f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-authorities.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-authorities.inc
@@ -13,3 +13,5 @@ function searchauthority() {
 	window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
 }
 </script>
+
+<div id="main">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
index a85aec775b..8c27e062c2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
@@ -1,7 +1,10 @@
 <div id="submenu">
-	<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Search</a>
-	<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet">Add biblio</a>
-	<a class="submenu serial" href="/cgi-bin/koha/serials/serials-home.pl">Subscriptions</a>
-	<a href="/cgi-bin/koha/serials/lateissues.pl">Late issues</a>
-	<a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a>
-</div>
\ No newline at end of file
+    <a href="/cgi-bin/koha/catalogue/search.pl?type=intranet">Search</a>
+    <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
+    <a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add Full MARC Record</a>
+    <a class="submenu serial" href="/cgi-bin/koha/serials/serials-home.pl">Subscriptions</a>
+    <a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a>
+    <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Manage reviews</a>
+</div>
+
+<div id="main">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
index a89a64fcbf..d93aecac6c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
@@ -1,10 +1,21 @@
 <div id="submenu">
-    <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
+    <li>
     <a href="/cgi-bin/koha/circ/circulation.pl">Issues</a>
     <a href="/cgi-bin/koha/circ/returns.pl">Returns</a>
     <a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a>
     <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set branch</a>
-    <a href="/cgi-bin/koha/circ/branchreserves.pl">Waiting reserves</a>
-    <a href="/cgi-bin/koha/circ/waitingreservestransfers.pl">Transfers to do</a>
-    <a href="/cgi-bin/koha/circ/currenttransfers.pl">Transfers to recieve</a>
-</div>
\ No newline at end of file
+    </li>
+    <li>
+    Reserves <a href="/cgi-bin/koha/circ/reserve.pl">Pending</a>
+    <a href="/cgi-bin/koha/circ/branchreserves.pl">Waiting</a>
+    Transfers <a href="/cgi-bin/koha/circ/waitingreservestransfers.pl">to do</a>
+    <a href="/cgi-bin/koha/circ/currenttransfers.pl">to recieve</a>
+    </li>
+    <li>
+	Overdues <a href="/cgi-bin/koha/circ/overdue.pl">Items</a>
+    <a href="/cgi-bin/koha/circ/branchoverdues.pl">Claims</a>
+    Daily <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Reconciliation</a>
+    </li>
+</div>
+
+<div id="main">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
index e98c41b1e5..1cb4c18a21 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
@@ -1,7 +1,10 @@
+<!-- TMPL_INCLUDE NAME="javascript/members.js" -->
 <div id="submenu">
  	<a href="/cgi-bin/koha/members/members-home.pl">Search</a>
  	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A"/>Add adult</a>
  	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C"/>Add child</a>
  	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P"/>Add prof</a>
  	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I"/>Add org</a>
-</div>
\ No newline at end of file
+</div>
+
+<div id="main">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc
index 3a245f4027..8ae384b69b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc
@@ -1,10 +1,8 @@
 <div id="submenu">
-        <a href="/cgi-bin/koha/serials/serials-home.pl">home</a>
-        <a href="/cgi-bin/koha/serials/serial-issues.pl">Serials issues</a>
-        <a href="/cgi-bin/koha/serials/acqui-search.pl">Supplier search</a>
-        <a href="/cgi-bin/koha/serials/subscription-bib-search.pl">Subscription search</a>
-        <a href="/cgi-bin/koha/serials/subscription-bib-search.pl">Search subscription</a>
-        <a href="/cgi-bin/koha/serials/lateissues.pl">Late issue</a>
-        <a href="/cgi-bin/koha/serials/subscription-add.pl">Add a subscription</a>
-        <a href="/cgi-bin/koha/serials/viewalerts.pl">View alerts</a>
+        <a href="/cgi-bin/koha/serials/serials-home.pl">Home</a>
+        <a href="/cgi-bin/koha/serials/claims.pl">Claims</a>
+        <a href="/cgi-bin/koha/serials/subscription-add.pl">Add Subscription</a>
+        <a href="/cgi-bin/koha/serials/checkexpiration.pl">Check Expiration</a>
 </div>
+
+<div id="main">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc
index 1771b385cb..2c107dc721 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc
@@ -1,7 +1,17 @@
 <div id="submenu">
-    <a href="/cgi-bin/koha/tools/cities.pl">Cities</a>
+    <a href="/cgi-bin/koha/tools/tools-home.pl">Home</a>
     <a href="/cgi-bin/koha/tools/holidays.pl">Holidays</a>
-    <a href="/cgi-bin/koha/tools/marc.pl">Export</a>
-    <a href="/cgi-bin/koha/import/breeding.pl">Reservoir</a>
+    <a href="/cgi-bin/koha/tools/koha-news.pl">News</a>
+    <a href="/cgi-bin/koha/tools/inventory.pl">Inventory/stocktaking</a>
+    <a href="/cgi-bin/koha/tools/cleanborrowers.pl">Clean borrowers</a>
+    <a href="/cgi-bin/koha/tools/itemslost.pl">Items lost</a>
+    <a href="/cgi-bin/koha/tools/export.pl">Export</a>
+    <a href="/cgi-bin/koha/tools/import.pl">Import</a>
+    <a href="/cgi-bin/koha/tools/letter.pl">Letters</a>
+    <a href="/cgi-bin/koha/tools/breeding.pl">Reservoir</a>
     <a href="/cgi-bin/koha/tools/barcodes.pl">Barcodes</a>
-</div>
\ No newline at end of file
+    <a href="/cgi-bin/koha/tools/overduerules.pl">overdue rules</a>
+    <a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a>
+</div>
+
+<div id="main">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
index df7b37b7c9..642cd75ca9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
@@ -1,23 +1,102 @@
-<script language="JavaScript" type="text/javascript">
-function _(s) { return s } // dummy function for gettext
-function Help() {
-	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
-}
-</script>
+<div id="onlinehelp">
+    <a href="#" onclick="javascript:window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[?]</a>
+</div>
 <div id="mainmenu">
-	<a href="/cgi-bin/koha/mainpage.pl">Koha</a>
-	<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
-	<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>
-	<a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-	<a href="/cgi-bin/koha/members/members-home.pl">Members</a>
-	<a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
-	<a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a>
-	<a href="/cgi-bin/koha/admin/admin-home.pl">Parameters</a>
-	<a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
-	<a href="/cgi-bin/koha/about.pl">About</a>
-	<a href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
+<h3><a href="/cgi-bin/koha/mainpage.pl">Koha
+intranet</a></h3>
+    <!-- TMPL_IF NAME="CAN_user_circulate" -->
+    <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
+    <ul>
+       <li>
+       <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+        <label for="navfindborrower">Iss<span class="accesskey">u</span>e to:</label>
+            <input id="navfindborrower" name="findborrower" type="text" size="10" accesskey="u" />
+            <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
+            <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" />
+            <input type="submit" class="submit" value="OK" />
+       </form>
+       </li>
+       <li>
+        <a accesskey="r" href="/cgi-bin/koha/circ/returns.pl"><span class="accesskey">R</span>eturns</a>
+       </li>
+        <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li>
+     </ul>
+     </li>
+     <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_borrowers" -->
+    <a href="/cgi-bin/koha/members/members-home.pl">Borrowers</a>
+    <ul>
+        <li><form action="/cgi-bin/koha/members/member.pl" method="post">
+           <label for="navmember">Sear<span class="accesskey">c</span>h:&nbsp;</label>
+           <input id="navmember" type="text" size="10" name="member" />
+           <input type="submit" value="OK" class="submit" />
+            </form>
+        </li>
+    </ul>
+    <!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="CAN_user_catalogue" -->
+                <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>
+                <ul>
+                    <li>
+                        <form name="searchform" method="get" action="/cgi-bin/koha/catalogue/search.pl" id="searchform">
+                        <input type="hidden" name="idx" value="" />
+                        <label for="navkeyword">
+                            <span class="accesskey">S</span>earch:&nbsp;
+                        </label><input type="text" id="navkeyword" name="q" size="10" accesskey="s" />
+                        <input type="submit" value=" OK " class="submit" />
+                        </form>
+                     </li>
+                    <li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual Shelves</a></li>
+                    <li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Reviews</a></li>
+                </ul>
+                <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
+    <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a>
+    <ul>
+        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
+        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
+        <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
+    </ul>
+    </li>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_catalogue" -->
+    <li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_parameters" -->
+    <li><a href="/cgi-bin/koha/admin/admin-home.pl">Koha Administration</a>
+        <ul>
+            <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li>
+        </ul>
+    </li>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_tools" -->
+            <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a></li>
+    <!-- /TMPL_IF -->
+    <li>
+        <a href="/cgi-bin/koha/about.pl">About Koha</a>
+    </li>
+    <!-- TMPL_IF NAME="loggedinusername" -->
+    <br />
+    <li>
+        <b> Librarian Informations </b> :
+    </li>
+    </ul>
+    <ul>
+     <li>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b></li>
+        <li> Library : <b><!-- TMPL_VAR NAME="LoginBranchname" --></b></li>
+        <!-- TMPL_IF NAME="AutoLocation" -->
+            <li>autolocate activated</li>
+    <!-- TMPL_ELSE -->
+        <li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Change Settings</a></li>
+    <!-- /TMPL_IF -->
+    </ul>
+    
+    <ul>
+        <li><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a></li>
+    </ul>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="IntranetNav" -->
+        <!-- TMPL_VAR NAME="IntranetNav" -->
+    <!-- /TMPL_IF -->
 </div>
-
-<div id="librarian_information">
-<p><!-- TMPL_VAR name="loggedinusername" -->, from <!-- TMPL_VAR name="branchname" --></p>
-</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/prog/en/intranet-main.tmpl
index b1f3da4ba6..5d78fa6898 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/intranet-main.tmpl
@@ -1,99 +1,25 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha Intranet Home<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<h1>Koha Intranet Home</h1>
-<ul>
-	<li>Circulation
-		<ul>
-			<li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></li>
-			<li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a></li>
-			<li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a></li>
-			<li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li>
-			<li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set branch</a></li>
-			<li><a href="/cgi-bin/koha/circ/branchreserves.pl">Waiting reserves</a></li>
-			<li><a href="/cgi-bin/koha/circ/waitingreservestransfers.pl">Transfers to do</a></li>
-			<li><a href="/cgi-bin/koha/circ/currenttransfers.pl">Transfers to recieve</a></li>
-		</ul>
-	</li>
-	<li>Members
-		<ul>
-			<li><a href="/cgi-bin/koha/members/members-home.pl">Search</a></li>
- 			<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A"/>Add adult</a></li>
- 			<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C"/>Add child</a></li>
- 			<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P"/>Add prof</a></li>
- 			<li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I"/>Add org</a></li>
-		</ul>
-	</li>
-	<li>Catalogue
-		<ul>
-			<li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Advanced Search</a></li>
-			<li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual Shelves</a></li>
-		</ul>
-	</li>
-	<li>Cataloging
-<ul>
-			<li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></li>
-			<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add Full MARC Record</a></li>
-</ul></li>
-<li>Acquisitions<ul>
-<li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li><li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></li>
-<li><a href="/cgi-bin/koha/acqui/histsearch.pl">Search Order History</a></li>
-<li><a href="/cgi-bin/koha/import/breeding.pl">Import to reservoir</a></li><li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li></ul>
-	</li>
-	<li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
-	<li>Accounts and Reports
-		<ul>
-			<li>Catalogue Statistics
-				<ul>
-					<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></li>
-					<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>
-				</ul>
-			</li>
-			<li>Circulation Statistics
-				<ul>
-					<li><a href="/cgi-bin/koha/reports/stats.pl?time=yesterday">Till Reconcipation: Daily Report (yesterday)</a></li>
-					<li><a href="/cgi-bin/koha/reports/stats.pl?time=today">Till Reconcipation: Daily Report (today)</a></li>
-					<li><a href="/cgi-bin/koha/reports/overdue.pl">Overdue items</a></li>
-				</ul>
-			</li>
-			<li>Statistics Wizards
-				<ul>
-					<li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
-					<li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Borrowers</a></li>
-					<li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue</a></li>
-					<li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li>
-				</ul>
-			</li>
-			<li>Top Lists
-				<ul>
-					<li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Most issuing Borrowers</a></li>
-					<li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most issued items</a></li>
-				</ul>
-			</li>
-		</ul>
-	</li>
-	<li>Koha Administration
-		<ul>
-		<li><a href="/cgi-bin/koha/admin/admin-home.pl">Tools</a></li>
-		<li><a href="/cgi-bin/koha/admin/admin-home.pl">System Administration Home</a></li>
-		<li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li>
-		<li><a href="/cgi-bin/koha/barcodes/barcodes.pl">Barcodes generator</a></li>
-		</ul>
-	</li>
-</ul>
-<div id="news">
-	<h1>News</h1>
-	<!-- TMPL_LOOP name="koha_news" -->
-			<table>
-				<tr>
-				<th>
-					<!-- TMPL_VAR NAME="title" --></th>
-					<td>
-					<!-- TMPL_VAR NAME="new" -->
-					</td>
-				<td>
-						<!-- TMPL_VAR NAME="newdate" --> 
-					</td>
-				</tr>
-			</table>
-	<!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+    Koha Intranet Home
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+
+<div id="main">
+    <h1>Welcome to Koha</h1>
+    
+        <!-- TMPL_IF name="koha_news_count" -->
+            <p><!-- TMPL_VAR name="koha_news_count" --> recent news</p>
+            <table>
+            <!-- TMPL_LOOP name="koha_news" -->
+                <tr>
+                <th>
+                    on <!-- TMPL_VAR name="newdate" -->, <!-- TMPL_VAR name="title" -->
+                </th>
+                <tr><td>
+                    <p><!-- TMPL_VAR name="new" --></p>
+                </td></tr>
+            <!-- /TMPL_LOOP -->
+            </table>
+        <!-- /TMPL_IF -->
 </div>
+
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl
index ef38576108..1c8cdc22b7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl
@@ -1,12 +1,15 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->KOHA -- Account for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Account for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
-<div class="table"><table>
-<caption>Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></caption>
+<!-- The table with the account items -->
+
+<h1>Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
+
+<table>
   <tr>
   	<th>Date</th>
-	<th>Click to credit</th>
     <th>Description of Charges</th>
     <th>Amount</th>
     <th>Still Owed</th>
@@ -16,23 +19,26 @@
 
    <!-- TMPL_IF NAME="toggle" --> <tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
       <td><!-- TMPL_VAR NAME="date" --></td>
-   <td>  <!-- TMPL_IF NAME="amountoutstandingcredit" --><!-- TMPL_VAR NAME="itemnum" --><!-- TMPL_ELSE --><a href="mancredit.pl?itemnum=<!-- TMPL_VAR NAME="itemnum" -->&accountid=<!-- TMPL_VAR NAME="accountid" -->&bornum=<!-- TMPL_VAR NAME="bornum" -->&accounttype=<!-- TMPL_VAR NAME="accounttype" -->&amount=<!-- TMPL_VAR NAME="amountoutstanding" -->&user=<!-- TMPL_VAR NAME="firstname" -->%20<!-- TMPL_VAR NAME="surname" -->"><!--TMPL_IF NAME="itemnum"--><!-- TMPL_VAR NAME="itemnum" --><!--TMPL_ELSE-->Click<!--/TMPL_IF--></a><!-- /TMPL_IF --></td>
       <td><!-- TMPL_VAR NAME="description" --><!-- TMPL_IF NAME="printtitle" --> <!-- 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" --> YTL</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>
 
   <!-- /TMPL_LOOP -->
 <tfoot>
   <tr>
-    <td colspan="4">Total Due</td>
-    <!-- TMPL_IF NAME="totalcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="total" --> YTL</td>
+    <td colspan="3">Total Due</td>
+    <!-- TMPL_IF NAME="totalcredit" --><td class="credit"><!-- TMPL_ELSE --><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="total" --></td>
   </tr>
   </tfoot>
-</table></div>
+</table>
 <!-- The manual invoice and credit buttons -->
-<div class="tabitem">
-<form action="maninvoice.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /><input type="submit" class="submit" value="Create Manual Invoice" /></form><form action="moremember.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" value="Return to User Record" class="submit" /></form>
-</div>
+
+<form action="/cgi-bin/koha/members/maninvoice.pl" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="submit" value="Create Manual Invoice" /></form>
+
+<form action="/cgi-bin/koha/members/mancredit.pl" method="get"> <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> <input type="submit" value="Create Manual Credit" /></form>
+
+<form action="/cgi-bin/koha/members/moremember.pl" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> <input type="submit" value="Return to Patron Record" /></form>
+
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl
index 0ec8e373b8..460df6c604 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Cannot Delete Member<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 	<h3>Cannot Delete Member</h3>
 		<!-- TMPL_IF name="ItemsOnIssues" -->
 			Member has <!-- TMPL_VAR name="ItemsOnIssues" --> item(s) checked out.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl
index dfd0d775b9..b8947f0808 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl
@@ -28,7 +28,7 @@
 				<tr bgcolor="white">
 			<!-- /TMPL_IF -->
 				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
-				<td><p><a href="javascript:window.opener.document.form.guarantorid.value=<!-- TMPL_VAR NAME="borrowernumber" -->;self.close();"><!-- TMPL_VAR NAME="surname" --></a></p>
+				<td><p><a href="javascript:window.opener.document.form.guarantorid.value=<!-- TMPL_VAR NAME="borrowernumber" -->;window.opener.document.form.guarantorsearch.value='Modify Guarantor';window.opener.document.form.guarantorinfo.value='<!-- TMPL_VAR NAME="guarantorinfo" -->';self.close();"><!-- TMPL_VAR NAME="surname" --></a></p>
 				<td><b><!-- TMPL_VAR NAME="firstname" --></b></td> 
 				<td><!-- TMPL_VAR NAME="dateofbirth" --></td>
 				<td><p><!-- TMPL_VAR NAME="address" --> <!-- TMPL_VAR NAME="city" --></p></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/mancredit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/mancredit.tmpl
index c57b5f6925..eb0e387eb2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/mancredit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/mancredit.tmpl
@@ -1,38 +1,28 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->KOHA -- Users: Create Manual Credit<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<h3>Manual Credit</h3>
-<!-- TMPL_IF NAME="error" -->
-		<div class="error">
-		<h3>Error Crediting User: Either no such invoice exists or no amount given</h3>
-		
-</div><!--/TMPL_IF-->
-<form class="inline" action="mancredit.pl" method="post" name="manualcredit">
-<input type="hidden" name="bornum" value="<!-- TMPL_VAR Name="bornum" -->" />
-<input type="hidden" name="loggedinuser" value="<!-- TMPL_VAR NAME="loggedinusername" -->">
-<input type="hidden" name="accounttype" value=  "<!-- TMPL_VAR NAME="accounttype" -->"/>
-<input type="hidden" name="itemnum" value=  "<!-- TMPL_VAR NAME="itemnum" -->"/>
-<input type="hidden" name="accountid" value=  "<!-- TMPL_VAR NAME="accountid" -->"/>
-<input type="hidden" name="user" value=  "<!-- TMPL_VAR NAME="user" -->"/>
-<input type="hidden" name="add" value=  "add"/>
-<div class="data">
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Patrons: Create Manual Credit<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-members.inc" -->
+
+<h2>Manual Credit</h2>
+<form action="/cgi-bin/koha/members/mancredit.pl" method="post">
+<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
+
 <table>
-	<tr><th>Fine Details</th><td><div class="error">User:<!-- TMPL_VAR Name="user" -->&nbsp;&nbsp;&nbsp;Amount:<!-- TMPL_VAR NAME="amount" --> </div></td></tr>
-	<tr><th>Description</th><td><input type="text" name="desc" size="50" /></td></tr>
-	<tr><th>Amount</th><td><input type="text" name="amount" /></td></tr>
+	<tr><th scope="row">Patron Number</th><td><!-- TMPL_VAR Name="borrowernumber" --></td></tr>
+	<tr><th scope="row">Credit Type</th><td><select name="type">
+<option value="C">Credit</option>
+<option value="F">Forgiven</option>
+</select></td></tr>
+	<tr><th scope="row">Itemnumber</th><td><input type="text" name="itemnum" /></td></tr>
+	<tr><th scope="row">Description</th><td><input type="text" name="desc" size="50" /></td></tr>
+	<tr><th scope="row">Amount</th><td>$<input type="text" name="amount" /></td></tr>
 </table>
-</div>
-<input type="button"  onclick="AddCredit(this.form)" value="Add Credit" />
-</form> <form class="inline" action="boraccount.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR Name="bornum" -->" name="bornum" /><input type="submit" class="cancel" value="Cancel" /></form>
 
-<script type="text/javascript">
-function AddCredit(f){
-if (f.amount.value==""){
-alert("No amount given");
-return false;
-}
-document.manualcredit.submit();
+<input type="submit" name="add" value="Add Credit" />
+</form>
+
+<form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR Name="borrowernumber" -->" name="borrowernumber" /><input type="submit" value="Cancel" /></form>
 
 
 
-}
-</script>
 <!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl
index 47142f8829..27cc5d891c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl
@@ -1,12 +1,14 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->NEULIS -- Users: Create Manual Invoice<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Patrons: Create Manual Invoice<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
-<form class="inline" action="maninvoice.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR Name="bornum" -->" />
-	<div class="data"><table>
+
+
+<form action="/cgi-bin/koha/members/maninvoice.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
+	<table>
 	<caption>Manual Invoice</caption>
-	<tr><th>User</th><td><!-- TMPL_VAR Name="user" --></td></tr>
-	<tr><th>Type</th><td><select name="type">
+	<tr><th scope="row">Borrowernumber</th><td><!-- TMPL_VAR Name="borrowernumber" --></td></tr>
+	<tr><th scope="row">Type</th><td><select name="type">
 <option value="L">Lost Item</option>
 <option value="F">Fine</option>
 <option value="A">Account Management Fee</option>
@@ -14,11 +16,14 @@
 <option value="M">Sundry</option>
 <option value="REF">Cash Refund</option>
 </select></td></tr>
-	<tr><th>Description</th><td><input type="text" name="desc" size="50" /></td></tr>
-	<tr><th>Amount</th><td>YTL<input type="text" name="amount" /></td></tr>
-	</table></div>
-<input type="submit" name="add" value="Add Charge" class="submit" />
-</form> <form class="inline" action="boraccount.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR Name="bornum" -->" /><input type="submit" class="cancel" value="Cancel" /></form>
+	<tr><th scope="row">Itemnumber</th><td><input type="text" name="itemnum" /></td></tr>
+	<tr><th scope="row">Description</th><td><input type="text" name="desc" size="50" /></td></tr>
+	<tr><th scope="row">Amount</th><td>$<input type="text" name="amount" /></td></tr>
+	</table>
+<input type="submit" name="add" value="Add Charge" />
+</form>
+
+<form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" /><input type="submit" value="Cancel" /></form>
 
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl
index f2f3451ca2..75ae627cc9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl
@@ -4,25 +4,25 @@
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
 <form method="post" action="/cgi-bin/koha/members/member-flags.pl">
-	<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->" />
-	<input type="hidden" name="newflags" value="1" />
+    <input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->" />
+    <input type="hidden" name="newflags" value="1" />
+    <h1>Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></h1>
 <table>
-	<caption>Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></caption>
-	<tr><th scope="col">Flag</th><th scope="col">Name</th><th scope="col">Description</th></tr>
-	<!-- TMPL_LOOP NAME="loop" -->
-		<tr>
-			<td>
-				<input type="checkbox" id="flag-<!-- TMPL_VAR NAME="bit" -->" name="flag-<!-- TMPL_VAR NAME="bit" -->" <!-- TMPL_VAR NAME="checked" --> />
-			</td>
-			<td>
-				<label for="flag-<!-- TMPL_VAR NAME="bit" -->"><!-- TMPL_VAR NAME="flag" --></label>
-			</td>
-			<td>
-				<!-- TMPL_VAR NAME="flagdesc" -->
-			</td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-	</table>
+    <tr><th scope="col">Flag</th><th scope="col">Name</th><th scope="col">Description</th></tr>
+    <!-- TMPL_LOOP NAME="loop" -->
+        <tr>
+            <td>
+                <input type="checkbox" id="flag-<!-- TMPL_VAR NAME="bit" -->" name="flag-<!-- TMPL_VAR NAME="bit" -->" <!-- TMPL_VAR NAME="checked" --> />
+            </td>
+            <td>
+                <label for="flag-<!-- TMPL_VAR NAME="bit" -->"><!-- TMPL_VAR NAME="flag" --></label>
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="flagdesc" -->
+            </td>
+        </tr>
+    <!-- /TMPL_LOOP -->
+    </table>
 
 <input type="submit" value="Set Flags" />
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl
index 28397f2946..3051628910 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl
@@ -2,22 +2,23 @@
 
 <script type="text/javascript">
   // Set the value of the form field to the passed value and optionally shift
-	// focus and close the popup.
-	function FillForm(val,formname,formfield) {
-	
-		document.forms[formname].elements[formfield].value = val;
+    // focus and close the popup.
+    function FillForm(val,formname,formfield) {
+    
+        document.forms[formname].elements[formfield].value = val;
 
-		// Uncomment below to shift focus after clicking link in popup.
-		document.forms[formname].elements[formfield].focus();
-		
-		// Uncomment below to close popup after clicking link.
-		newwin.close();
-	}
+        // Uncomment below to shift focus after clicking link in popup.
+        document.forms[formname].elements[formfield].focus();
+    
+        // Uncomment below to close popup after clicking link.
+        newwin.close();
+    }
 </script>
 
+<div class="searchresults">
 <table>
   <tr>
-  	<th>&nbsp;</th>
+      <th>&nbsp;</th>
     <th>Card</th>
     <th>Name (Cat.)</th>
     <th>Address</th>
@@ -29,12 +30,14 @@
     <!-- TMPL_ELSE -->
     <tr>
     <!-- /TMPL_IF -->
-	 <td><form action="member-search-results.pl" method="get"><input type="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
+     <td><form action="member-search-results.pl" method="get"><input type="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
       <td><!-- TMPL_VAR NAME="cardnumber" --></td>
-      <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
+      <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
       <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
     </tr>
-  <!-- /TMPL_LOOP --></table>
+  <!-- /TMPL_LOOP -->
+  </table>
+  </div>
   <!-- TMPL_ELSE -->No results found<!-- /TMPL_IF -->
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch.tmpl
index 2f94c61e88..0095492839 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch.tmpl
@@ -1,8 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patron Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-	<form action="/cgi-bin/koha/members/member.pl" method="post" id="mainform" class="mainform">
-	<label for="member">Patron Search:</label><input id="member" type="text" size="25" name="member" /><input type="hidden" name="quicksearch" value="1" />
-	<input type="submit" value="Search" />
-	</form>
+    <form action="/cgi-bin/koha/members/member.pl" method="post" id="mainform" class="mainform">
+    <label for="member">Patron Search:</label><input id="member" type="text" size="25" name="member" /><input type="hidden" name="quicksearch" value="1" />
+    <input type="submit" value="Search" />
+    </form>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
index e78ad6b5f1..562f1440c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
@@ -3,31 +3,83 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
-<h1>Member Search Results</h1>
+<h1>Borrowers search results</h1>
 
+    <form name="f" action="/cgi-bin/koha/members/member.pl" method="post">
+        <label for="member">Name or Barcode</label>
+        <input id="member" type="text" size="25" name="member" />
+        <select name="orderby" id="orderby">
+            <option value="surname,firstname">Order by Last Name</option>
+            <option value="cardnumber">Order by Card Number</option>
+        </select>
+        <input type="submit" value="Search" />
+    </form>
+    <div>
+        <a href="/cgi-bin/koha/members/member.pl?member=a">A</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=b">B</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=c">C</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=d">D</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=e">E</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=f">F</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=g">G</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=h">H</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=i">I</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=j">J</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=k">K</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=l">L</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=m">M</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=n">N</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=o">O</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=p">P</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=q">Q</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=r">R</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=s">S</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=t">T</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=u">U</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=v">V</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=w">W</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=x">X</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=y">Y</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=z">Z</a>
+    </div>
 <!-- TMPL_IF NAME="resultsloop" -->
+<div class="searchresults">
 	<table>
 	<tr>
 		<th>Card</th>
 		<th>Name</th>
 		<th>Cat</th>
-		<th>Address</th>
 		<th>OD/Issues</th>
-		<th>Charges</th>
+		<th>Fines</th>
 		<th>Notes</th>
 	</tr>
 	<!-- TMPL_LOOP NAME="resultsloop" -->
-	<tr>
+	<!-- TMPL_IF EXPR="odissue+fines > 0" -->
+	   <tr class="problem">
+	<!-- TMPL_ELSE -->
+	   <tr>
+	<!-- /TMPL_IF -->
 		<td><!-- TMPL_VAR NAME="cardnumber" --></td>
-		<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> </td>
-		<td><!-- TMPL_VAR NAME="categorycode" --></td>
-		<td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
+		<td><p><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a></p>
+		<p><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></p> </td>
+		<td><!-- TMPL_VAR NAME="category_description" --> (<!-- TMPL_VAR name="category_type" -->)</td>
 		<td><!-- TMPL_VAR NAME="odissue" --></td>
 		<td><!-- TMPL_VAR NAME="fines" --></td>
 		<td><!-- TMPL_VAR NAME="borrowernotes" --></td>
 	</tr>
     <!-- /TMPL_LOOP -->
 </table>
-<!-- TMPL_ELSE --><p>No results found</p><!-- /TMPL_IF -->
+</div>
+<!-- TMPL_ELSE -->
+    <p>
+        <br />
+        <b>No results found</b>
+    </p>
+<!-- /TMPL_IF -->
+
+    <script type="text/javascript">
+		//set the focus to the input text.    
+    	document.f.member.focus();
+    </script>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
index 849aaa23bc..0837b7917d 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
@@ -3,15 +3,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
-<!-- TMPL_INCLUDE NAME="javascript/members.js" -->
-
 	<!-- TMPL_IF NAME="opadd" -->
 	<h1>
-		Add adult member (step <!-- TMPL_VAR NAME="step" -->)
+		Add adult member (step <!-- TMPL_VAR NAME="step" -->) <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
 	</h1>
 	<!-- TMPL_ELSE -->
 	<h1 >
-		Modify adult member
+		Modify adult member <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
 	</h1>
 	<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="check_member" -->
@@ -19,7 +17,7 @@
 		<p>
 		<form name="form_double">
 			<div id="problem">
-				Duplicate suspected 
+				Duplicate suspected
 				<a href="javascript:Dopop('borrowers_details.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->');" >Detail</a>
 				Duplicate ?
 				<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->&category_type=<!--TMPL_VAR NAME="check_categorytype"-->">Yes</a> 
@@ -36,7 +34,7 @@
 	<!--/TMPL_IF-->
 		
 		<!-- TMPL_IF Name="nok" -->
-		<!--<h1>ERREUR</h1>-->
+		<!--<h1>ERROR</h1>-->
 		<div id="problem">
 			<p>The following fields are wrong. Please fix it/them</p>
 			<!-- TMPL_IF NAME="ERROR_login_exist" -->
@@ -47,11 +45,12 @@
                         <!-- /TMPL_IF -->
 		</div>
 	<!-- /TMPL_IF -->
+	
 
 	<!-- TMPL_IF NAME="step_1"-->
 <form name="form"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
 <!-- 		field always hidden in different form (1,2,3) -->
-	<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+	<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
 	<input type="hidden" name="FormFieldList" value="surname|select_city|othernames|initials|title|cardnumber|firstname|dateofbirth|sort1|sort2">
 	<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
 	<input type="hidden" name="type" value="borrowers">
@@ -61,7 +60,6 @@
 	<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
 	<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="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
 	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
 	<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 	
@@ -126,14 +124,10 @@
 		<!-- TMPL_ELSE -->
 			<label>
 		<!-- /TMPL_IF-->
-		Title</label>
-		<select  name="title" >
-			<option <!-- TMPL_VAR NAME="title_selected_ " --> value="" >Select a value</option>
-			<option value="Mlle" <!-- TMPL_VAR NAME="title_Mlle" -->>Mlle</option>
-			<option value="Mme" <!-- TMPL_VAR NAME="title_Mme" -->>Mme</option>
-			<option value="Mr" <!-- TMPL_VAR NAME="title_Mr" --> >M.</option>
-		</select>
+		Civility</label>
+		<!-- TMPL_VAR NAME="borrotitlepopup" -->
 		</p>
+
 		<p>
 		<!-- TMPL_IF NAME="mandatorysurname" -->
 		<label style="font-weight:bold">
@@ -159,7 +153,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Date of Birth</label>
-			<input type="text" name="dateofbirth" size="20" onBlur="CheckDate(document.form.dateofbirth.value);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
+			<input type="text" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryinitials" -->
@@ -183,8 +177,13 @@
 	<fieldset id="memberentry_identity">
 		<legend>Borrower type</legend>
 		<p>
-		<label>Select a category</label>
-		<!-- TMPL_VAR NAME="catcodepopup" -->
+		<!-- TMPL_IF NAME="catcodepopup" -->
+			    <label>Category</label>
+			    <!-- TMPL_VAR NAME="catcodepopup" -->
+			<!-- TMPL_ELSE -->
+			    <span class="problem">There is no category type to add an Adult.</span>
+			        <a href="/cgi-bin/koha/admin/categorie.pl">Please create one</a>
+			<!-- /TMPL_IF -->
 		</p>
 		<!-- TMPL_IF NAME="city_cgipopup" -->	
 		<p>
@@ -234,7 +233,7 @@
 <!-- TMPL_IF NAME="step_2"-->
 <form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
 	<!-- 		field always hidden in different form (1,2,3) -->
-	<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+	<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
 	<input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|B_address|B_zipcode|B_city|phone|phonepro|mobile|email|emailpro|fax">
 	<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
 	<input type="hidden" name="type" value="borrowers">
@@ -244,7 +243,6 @@
 	<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
 	<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="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
 	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
 	<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 
@@ -460,7 +458,7 @@
 <!-- TMPL_IF NAME="step_3"-->
 <form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
 	<!-- 		field always hidden in different form (1,2,3) -->
-	<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+	<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
 	<input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
 	<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
 	<input type="hidden" name="type" value="borrowers">
@@ -470,7 +468,6 @@
 	<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
 	<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="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
 	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
 	<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 
@@ -520,7 +517,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Arrival date</label>
-			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onblur="CheckDate(document.form.dateenrolled.value);" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorydateexpiry" -->
@@ -530,7 +527,7 @@
 			<!-- /TMPL_IF-->
 			Expiry date</label>
 			<input type="text" name="dateexpiry" maxlength="10"  size="10"
-							onblur="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+							onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryopacnote" -->
@@ -539,7 +536,7 @@
 				<label>
 			<!-- /TMPL_IF-->	
 			OPAC note</label>
-			<textarea  name="opacnote" cols="70" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
+			<textarea  name="opacnote" cols="40" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryborrowernotes" -->	
@@ -548,7 +545,7 @@
 				<label>
 			<!-- /TMPL_IF-->
 			Library note</label>
-			<textarea name="borrowernotes" cols="70" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
+			<textarea name="borrowernotes" cols="40" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
 		</p>
 	</fieldset>
 	<fieldset id="memberentry_userid">
@@ -581,7 +578,7 @@
 		</p>
 		<!--this zones are not necessary in modif mode -->
 		<!-- TMPL_UNLESS NAME="opadd" -->
-			<h1>Warning</h1>
+			<h2>Warning</h2>
 			<!-- TMPL_LOOP NAME="flagloop" -->
 			<p>
 				<label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
index d6712c3e56..e4cb61e95d 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
@@ -3,15 +3,16 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
-<!-- TMPL_INCLUDE NAME="javascript/members.js" -->
-
+<script language="javascript" type="text/javascript">
+    function _(s) { return s } // dummy function for gettext
+</script>
 	<!-- TMPL_IF NAME="add" -->
 	<h1>
-		Add children member (step <!-- TMPL_VAR NAME="step" -->)
+		Add children member (step <!-- TMPL_VAR NAME="step" -->) <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
 	</h1>
 	<!-- TMPL_ELSE -->
 	<h1 >
-		Modify children member
+		Modify children member <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
 	</h1>
 	<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="check_member" -->
@@ -31,7 +32,7 @@
 		</p>	
 		<!--/TMPL_IF-->
 	<!--/TMPL_IF-->
-	<!-- TMPL_IF Name="NOK" -->
+	<!-- TMPL_IF Name="nok" -->
 		<h1>ERROR</h1>
 		<div id="problem">
 			<p>The following fields are wrong. Please fix it/them</p>
@@ -48,7 +49,7 @@
 <!-- TMPL_IF NAME="step_1"-->
 		<form name="form"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
 		<!-- 		field always hidden in different form (1,2,3) -->		
-			<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+			<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
 			<input type="hidden" name="FormFieldList" value="cardnumber|title|surname|firstname|dateofbirth|initials|othernames|select_city|sort1|sort2">
 			<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
 			<input type="hidden" name="type" value="borrowers">
@@ -58,9 +59,8 @@
 			<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
 			<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="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
 			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-			<input type="hidden" name="nodouble" "  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
+			<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
 	
 			<!-- 		input from form 2 -->
 			<input type="hidden" name="contacttitle" size="20" value="<!-- TMPL_VAR NAME="contacttitle" -->">
@@ -102,7 +102,7 @@
 		<!-- TMPL_VAR NAME="member" -->
 			<p>
 				<!-- TMPL_IF NAME="mandatorycardnumber" -->
-				<label  class="borrowers_mandafield">
+				<label style="font-weight:bold">
 				<!--TMPL_ELSE-->
 				<label>
 				<!-- /TMPL_IF-->
@@ -126,13 +126,8 @@
 		<!-- TMPL_ELSE -->
 			<label>
 		<!-- /TMPL_IF-->
-		Title</label>
-		<select  name="title" >
-			<option <!-- TMPL_VAR NAME="title_selected_ " --> value="" >Select a value</option>
-			<option value="Mlle" <!-- TMPL_VAR NAME="title_Mlle" -->>Mlle</option>
-			<option value="Mme" <!-- TMPL_VAR NAME="title_Mme" -->>Mme</option>
-			<option value="Mr" <!-- TMPL_VAR NAME="title_Mr" --> >M.</option>
-		</select>
+		Civility</label>
+		<!-- TMPL_VAR NAME="borrotitlepopup" -->
 		</p>
 		<p>
 		<!-- TMPL_IF NAME="mandatorysurname" -->
@@ -159,7 +154,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Date of Birth</label>
-			<input type="text" name="dateofbirth" size="20" onBlur="CheckDate(document.form.dateofbirth.value);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
+			<input type="text" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryinitials" -->
@@ -180,20 +175,28 @@
 			<input style="text-transform:uppercase;" type="text" name="othernames" size="20"  value="<!-- TMPL_VAR NAME="othernames" -->" >
 		</p>
 	
-	<!-- TMPL_UNLESS NAME="add"-->	
-	<p><a href="javascript:Dopopguarantor('guarantor_search.pl');">Modify guarantor</a></p>
-	<!-- /TMPL_UNLESS -->
-	<!-- TMPL_IF NAME="add" -->
-	<!-- TMPL_UNLESS NAME="guarantorid"-->	
-	<p><a href="javascript:Dopopguarantor('guarantor_search.pl');">Find guarantor</a></p>
-	<!-- /TMPL_UNLESS -->
+	<p>
+	<input name="guarantordelete" type="button" value="Delete Guarantor" onClick="javascript:document.form.guarantorid.value='';document.form.guarantorinfo.value='',document.form.guarantorsearch.value='Find guarantor';">
+	<!-- TMPL_IF NAME="guarantorid"-->	
+		
+		<input name="guarantorsearch" type="button" value="Modify Guarantor" onClick="javascript:Dopopguarantor('guarantor_search.pl');">
+	<!-- TMPL_ELSE -->
+		<input name="guarantorsearch" type="button" value="Find guarantor" onClick="javascript:Dopopguarantor('guarantor_search.pl');">
 	<!-- /TMPL_IF -->
+	<input name="guarantorinfo" type="text"  size="20"  value="<!-- TMPL_VAR NAME="guarantorinfo" -->" disabled readOnly >
+	</p>
 	</fieldset>
 	<fieldset id="memberentry_identity">
 		<legend>Borrower type</legend>
 		<p>
-		<label>Select a category</label>
-		<!-- TMPL_VAR NAME="catcodepopup" -->
+		    <!-- TMPL_IF NAME="catcodepopup" -->
+			    <label>Category</label>
+			    <!-- TMPL_VAR NAME="catcodepopup" -->
+			<!-- TMPL_ELSE -->
+			    <span class="problem">There is no category type to add a Child.</span>
+			        <a href="/cgi-bin/koha/admin/categorie.pl">Please create one</a>
+			     
+			<!-- /TMPL_IF -->
 		</p>
 		<!-- TMPL_IF NAME="city_cgipopup" -->	
 		<p>
@@ -234,7 +237,7 @@
 		</p>
 	</fieldset>
 	<div>
-		<input type="button" name="next_step" value="Next Step" onclick="check_form_borrowers(1);">
+		<input type="button" name="next_step" value="Next Step" onclick="if(document.form.guarantorinfo.value){check_form_borrowers(1)} else{alert(_('You must define a guarantor'));};">
 	</div>
 </form>
 <!-- ************************ STEP_1 *********************** -->
@@ -243,7 +246,7 @@
 <!-- TMPL_IF NAME="step_2"-->
 	<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
 <!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+		<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
 		<input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|contacttitle|city|contactname|contactfirstname|phone|phonepro|mobile|email|emailpro|B_email|B_phone|relationship|fax">
 		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
 		<input type="hidden" name="type" value="borrowers">
@@ -253,9 +256,8 @@
 		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
 		<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="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
 		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="nodouble" "  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
+		<input type="hidden" name="nodouble"   value="<!-- TMPL_VAR NAME="nodouble" -->"/>
 
 <!-- 		input from form 1 		-->
 		<input type="hidden" name="title" size="10" value="<!-- TMPL_VAR NAME="title" -->">
@@ -269,6 +271,7 @@
 		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">	
 		<input type="hidden" name="sort1"  value="<!-- TMPL_VAR NAME="sort1" -->">
 		<input type="hidden" name="sort2"  value="<!-- TMPL_VAR NAME="sort2" -->">
+		<input name="guarantorinfo" type="hidden"  size="20"  value="<!-- TMPL_VAR NAME="guarantorinfo" -->" readOnly >
 
 <!-- 		input from form3		 -->
 		<input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
@@ -290,7 +293,7 @@
 		<!-- TMPL_VAR NAME="member" -->
 		<p>
 			<!-- TMPL_IF NAME="mandatorycardnumber" -->
-			<label class="borrowers_mandafield">
+			<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 			<label>
 			<!-- /TMPL_IF-->
@@ -301,7 +304,7 @@
 		<legend>Guarantor</legend>
 		<p>
 			<!-- TMPL_IF NAME="mandatorycontacttitle" -->
-				<label  class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -315,7 +318,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorycontactname" -->
-				<label  class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -324,7 +327,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorycontactfirstname" -->
-				<label  class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -333,7 +336,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorybranchcode" -->
-				<label  class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -342,7 +345,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorystreetnumber" -->
-				<label  class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->	
@@ -352,7 +355,7 @@
 			<!-- TMPL_IF NAME="road_cgipopup" -->
 				<p>
 				<!-- TMPL_IF NAME="mandatorystreettype" -->
-					<label  class="borrowers_mandafield">
+					<label style="font-weight:bold">
 				<!--TMPL_ELSE-->
 					<label>
 				<!-- /TMPL_IF-->
@@ -362,7 +365,7 @@
 			<!--/TMPL_IF-->
 		<p>
 			<!-- TMPL_IF NAME="mandatoryaddress" -->
-				<label  class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -371,7 +374,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryaddress2" -->	
-				<label  class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -380,7 +383,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryzipcode" -->
-				<label  class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->	
@@ -389,7 +392,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorycity" -->
-				<label  class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -398,7 +401,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryrelationship" -->
-				<label  class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -411,11 +414,11 @@
 		</p>
 	</fieldset>
 	<fieldset>
-		<legend>Guarantor contact</legend>
+		<legend>Contact</legend>
 		<h2>Guarantor</h2>
 	<p>
 		<!-- TMPL_IF NAME="mandatoryphone" -->
-			<label  class="borrowers_mandafield">
+			<label style="font-weight:bold">
 		<!--TMPL_ELSE-->
 			<label>
 		<!-- /TMPL_IF-->
@@ -424,7 +427,7 @@
 	</p>
 	<p>
 		<!-- TMPL_IF NAME="mandatoryphonepro" -->
-			<label  class="borrowers_mandafield">
+			<label style="font-weight:bold">
 		<!--TMPL_ELSE-->
 			<label>
 		<!-- /TMPL_IF-->
@@ -433,7 +436,7 @@
 	</p>
 	<p>
 		<!-- TMPL_IF NAME="mandatorymobile" -->
-			<label  class="borrowers_mandafield">
+			<label style="font-weight:bold">
 		<!--TMPL_ELSE-->
 			<label>
 		<!-- /TMPL_IF-->
@@ -442,7 +445,7 @@
 	</p>
 	<p>
 		<!-- TMPL_IF NAME="mandatoryemail" -->
-			<label  class="borrowers_mandafield">
+			<label style="font-weight:bold">
 		<!--TMPL_ELSE-->
 			<label>
 		<!-- /TMPL_IF-->
@@ -451,7 +454,7 @@
 	</p>
 	<p>
 		<!-- TMPL_IF NAME="mandatoryemailpro" -->
-			<label  class="borrowers_mandafield">
+			<label style="font-weight:bold">
 		<!--TMPL_ELSE-->
 			<label>
 		<!-- /TMPL_IF-->
@@ -460,7 +463,7 @@
 	</p>
 	<p>
 		<!-- TMPL_IF NAME="mandatoryfax" -->
-			<label  class="borrowers_mandafield">
+			<label style="font-weight:bold">
 		<!--TMPL_ELSE-->
 			<label>
 		<!-- /TMPL_IF-->
@@ -470,14 +473,14 @@
 	<h2>Member</h2>
 	<p>	
 		<!-- TMPL_IF NAME="mandatoryB_email" -->
-			<label  class="borrowers_mandafield">
+			<label style="font-weight:bold">
 		<!--TMPL_ELSE-->
 			<label>
 		<!-- /TMPL_IF-->
 		E-mail (home)</label>
 		<input type="text" name="B_email" value="<!-- TMPL_VAR NAME="B_email" -->" >	
 		<!-- TMPL_IF NAME="mandatoryB_phone" -->
-			<label  class="borrowers_mandafield">
+			<label style="font-weight:bold">
 		<!--TMPL_ELSE-->
 			<label>
 		<!-- /TMPL_IF-->
@@ -495,7 +498,7 @@
 <!-- TMPL_IF NAME="step_3"-->
 	<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
 <!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+		<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
 		<input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
 		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
 		<input type="hidden" name="type" value="borrowers">
@@ -505,9 +508,8 @@
 		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
 		<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="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
 		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
-		<input type="hidden" name="nodouble" "  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
+		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
 
 <!-- 		input from form 1 		-->
 		<input type="hidden" name="title" size="10" value="<!-- TMPL_VAR NAME="title" -->">
@@ -521,6 +523,7 @@
 		<input type="hidden" name="select_city" value="<!-- TMPL_VAR NAME="select_city" -->">	
 		<input type="hidden" name="sort1"  value="<!-- TMPL_VAR NAME="sort1" -->">
 		<input type="hidden" name="sort2"  value="<!-- TMPL_VAR NAME="sort2" -->">
+		<input name="guarantorinfo" type="hidden"  size="20"  value="<!-- TMPL_VAR NAME="guarantorinfo" -->" readOnly >
 <!-- 		input from form 2 -->
 		<input type="hidden" name="contacttitle" size="20" value="<!-- TMPL_VAR NAME="contacttitle" -->">
 		<input type="hidden" name="contactname" size="35" value="<!-- TMPL_VAR NAME="contactname" -->">
@@ -549,7 +552,7 @@
 		<!-- /TMPL_IF -->
 		<p>
 			<!-- TMPL_IF NAME="mandatorycardnumber" -->
-			<label  class="borrowers_mandafield">
+			<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 			<label>
 			<!-- /TMPL_IF-->
@@ -565,7 +568,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Arrival date</label>
-			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onblur="CheckDate(document.form.dateenrolled.value);" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorydateexpiry" -->
@@ -575,7 +578,7 @@
 			<!-- /TMPL_IF-->
 			Expiry date</label>
 			<input type="text" name="dateexpiry" maxlength="10"  size="10"
-							onblur="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+							onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryopacnote" -->
@@ -584,7 +587,7 @@
 				<label>
 			<!-- /TMPL_IF-->	
 			OPAC note</label>
-			<textarea  name="opacnote" cols="70" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
+			<textarea  name="opacnote" cols="40" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryborrowernotes" -->	
@@ -593,7 +596,7 @@
 				<label>
 			<!-- /TMPL_IF-->
 			Library note</label>
-			<textarea name="borrowernotes" cols="70" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
+			<textarea name="borrowernotes" cols="40" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
 		</p>
 	</fieldset>
 	<fieldset id="memberentry_userid">
@@ -626,7 +629,7 @@
 		</p>
 		<!--this zones are not necessary in modif mode -->
 		<!-- TMPL_UNLESS NAME="opadd" -->
-			<h1>Warning</h1>
+			<h2>Warning</h2>
 			<!-- TMPL_LOOP NAME="flagloop" -->
 			<p>
 				<label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
index f1e01c9394..85061a322b 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl
@@ -3,15 +3,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
-<!-- TMPL_INCLUDE NAME="javascript/members.js" -->
 
 	<!-- TMPL_IF NAME="opadd" -->
 	<h1>
-		Add organisation member (step <!-- TMPL_VAR NAME="step" -->)
+		Add organisation member (step <!-- TMPL_VAR NAME="step" -->) <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
 	</h1>
 	<!-- TMPL_ELSE -->
 	<h1 >
-		Modify organisation member
+		Modify organisation member <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
 	</h1>
 	<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="check_member" -->
@@ -31,7 +30,7 @@
 		<!--/TMPL_IF-->
 	<!--/TMPL_IF-->
 
-	<!-- TMPL_IF Name="NOK" -->
+	<!-- TMPL_IF Name="nok" -->
 		<h1>ERROR</h1>
 		<div id="problem">
 			<p>The following fields are wrong. Please fix it/them</p>
@@ -43,7 +42,7 @@
 <!-- TMPL_IF NAME="step_1"-->
 <form name="form"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
 	<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+		<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
 		<input type="hidden" name="FormFieldList" value="cardnumber|surname|contactname|contactfirstname|select_city">
 		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
 		<input type="hidden" name="type" value="borrowers">
@@ -53,7 +52,6 @@
 		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
 		<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="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
 		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
 		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 
@@ -67,7 +65,7 @@
 		<input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
 		<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
 		<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-		<textarea style="display:none;" name="contactnotes" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnotes" --></textarea>
+		<textarea style="display:none;" name="contactnote" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnote" --></textarea>
 		<input type="hidden" name="fax"   value="<!-- TMPL_VAR NAME="fax" -->"	
 
 <!-- 		from form 3	 -->
@@ -87,7 +85,7 @@
 	<!-- /TMPL_IF -->
 	<p>
 		<!-- TMPL_IF NAME="mandatorycardnumber" -->
-		<label class="borrowers_mandafield">
+		<label style="font-weight:bold">
 		<!--TMPL_ELSE-->
 		<label>
 		<!-- /TMPL_IF-->
@@ -98,7 +96,7 @@
 		<legend>organisation identity</legend>
 		<p>
 			<!-- TMPL_IF NAME="mandatorysurname" -->
-			<label class="borrowers_mandafield">
+			<label style="font-weight:bold">
 			<!-- TMPL_ELSE-->
 			<label>
 			<!-- /TMPL_IF-->
@@ -106,11 +104,18 @@
 			<input style="text-transform:uppercase;" type="text" name="surname" size="20"  value="<!-- TMPL_VAR NAME="surname" -->" >	
 		</p>
 		<p>
-			<label>Select a category</label>
-			<!-- TMPL_VAR NAME="catcodepopup" -->
+		    <!-- TMPL_IF NAME="catcodepopup" -->
+			    <label>Category</label>
+			    <!-- TMPL_VAR NAME="catcodepopup" -->
+			<!-- TMPL_ELSE -->
+			    <span class="problem">There is no category type to add an Institution.</span>
+			        <a href="/cgi-bin/koha/admin/categorie.pl">Please create one</a>
+			     
+			<!-- /TMPL_IF -->
+		</p>
 			<!-- TMPL_IF NAME="city_cgipopup" -->	
 					<!-- TMPL_IF NAME="mandatoryselect_city" -->
-					<label   class="borrowers_mandafield">
+					<label style="font-weight:bold">
 					<!-- TMPL_ELSE -->
 					<label>
 					<!-- /TMPL_IF-->
@@ -122,7 +127,7 @@
 		<legend>Personal identity</legend>
 		<p>
 			<!-- TMPL_IF NAME="mandatorycontactname" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -131,7 +136,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorycontactfirstname" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -151,8 +156,8 @@
 <!-- TMPL_IF NAME="step_2"-->
 <form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
 		<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
-		<input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|phonepro|emailpro|fax|contactnotes">
+		<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
+		<input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|phonepro|emailpro|fax|contactnote">
 		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
 		<input type="hidden" name="type" value="borrowers">
 		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
@@ -161,7 +166,6 @@
 		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
 		<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="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
 		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
 		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 
@@ -192,7 +196,7 @@
 	
 	<p>
 		<!-- TMPL_IF NAME="mandatorycardnumber" -->
-		<label class="borrowers_mandafield">
+		<label style="font-weight:bold">
 		<!-- TMPL_ELSE -->
 		<label>
 		<!-- /TMPL_IF-->
@@ -203,7 +207,7 @@
 		<legend>Organisation address</legend>
 		<p>
 			<!-- TMPL_IF NAME="mandatorystreetnumber" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -213,7 +217,7 @@
 		<!-- TMPL_IF NAME="road_cgipopup" -->
 			<p>
 			<!-- TMPL_IF NAME="mandatorystreettype" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -223,7 +227,7 @@
 		<!--/TMPL_IF-->
 		<p>
 			<!-- TMPL_IF NAME="mandatoryaddress" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->	
@@ -231,8 +235,8 @@
 			<input type="text" name="address" size="34" value="<!-- TMPL_VAR NAME="address" -->">
 		</p>
 		<p>
-			<!-- TMPL_IF NAME="mandatoryaddress2" -->
-				<label class="borrowers_mandafield">
+			<!-- TMPL_IF NAME="mandatoryaddress2s" -->
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -241,7 +245,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryzipcode" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -250,7 +254,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorycity" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -258,7 +262,7 @@
 			<input style="text-transform:uppercase;" type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
 		</p>
 			<!-- TMPL_IF NAME="mandatorybranchcode" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -267,7 +271,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryphonepro" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -276,7 +280,7 @@
 		<p>
 		</p>
 			<!-- TMPL_IF NAME="mandatoryemailpro" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->	
@@ -284,8 +288,8 @@
 			<input type="text" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
 		</p>
 		<p>
-			<!-- TMPL_IF NAME="mandatoryfax" -->
-				<label class="borrowers_mandafield">
+			<!-- TMPL_IF NAME="mandatoryefax" -->
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -296,13 +300,13 @@
 	<fieldset>
 		<legend>Member list</legend>
 		<p>
-			<!-- TMPL_IF NAME="mandatorycontactnotes" -->
-				<label class="borrowers_mandafield">
+			<!-- TMPL_IF NAME="mandatorycontactnote" -->
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
 			Persons that can issue books</label>
-			<textarea  name="contactnotes" cols="70" rows="2"   ><!-- TMPL_VAR NAME="contactnotes" --></textarea>	
+			<textarea  name="contactnote" cols="70" rows="2"   ><!-- TMPL_VAR NAME="contactnote" --></textarea>	
 		</p>
 	<fieldset>
 	<div id="action">
@@ -316,7 +320,7 @@
 <!-- TMPL_IF NAME="step_3"-->
 	<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
 		<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+		<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
 		<input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
 		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
 		<input type="hidden" name="type" value="borrowers">
@@ -326,7 +330,6 @@
 		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
 		<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="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
 		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
 		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
 
@@ -347,7 +350,7 @@
 		<input type="hidden" name="branchcode"  value="<!-- TMPL_VAR NAME="branchcode" -->">
 		<input type="hidden" name="phonepro" value="<!-- TMPL_VAR NAME="phonepro" -->" >
 		<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
-		<textarea style="display:none;" name="contactnotes" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnotes" --></textarea>
+		<textarea style="display:none;" name="contactnote" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnote" --></textarea>
 		<input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->">
 		
 		<!-- TMPL_IF NAME="opadd" -->
@@ -358,7 +361,7 @@
 	
 	<p>
 		<!-- TMPL_IF NAME="mandatorycardnumber" -->
-		<label class="borrowers_mandafield">
+		<label style="font-weight:bold">
 		<!-- TMPL_ELSE -->
 		<label>
 		<!-- /TMPL_IF-->
@@ -374,7 +377,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Arrival date</label>
-			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onblur="CheckDate(document.form.dateenrolled.value);" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorydateexpiry" -->
@@ -384,7 +387,7 @@
 			<!-- /TMPL_IF-->
 			Expiry date</label>
 			<input type="text" name="dateexpiry" maxlength="10"  size="10"
-							onblur="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+							onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryopacnote" -->
@@ -393,7 +396,7 @@
 				<label>
 			<!-- /TMPL_IF-->	
 			OPAC note</label>
-			<textarea  name="opacnote" cols="70" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
+			<textarea  name="opacnote" cols="40" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryborrowernotes" -->	
@@ -402,13 +405,13 @@
 				<label>
 			<!-- /TMPL_IF-->
 			Library note</label>
-			<textarea name="borrowernotes" cols="70" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
+			<textarea name="borrowernotes" cols="40" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
 		</p>
 	</fieldset>
 	<fieldset id="memberentry_userid">
 		<legend>OPAC login</legend>
 		<p>
-			<!-- TMPL_IF NAME="mandatoryuserid" -->
+			<!-- TMPL_IF NAME="mandatorylogin" -->
 			<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 			<label>
@@ -435,7 +438,7 @@
 		</p>
 		<!--this zones are not necessary in modif mode -->
 		<!-- TMPL_UNLESS NAME="opadd" -->
-			<h1>Warning</h1>
+			<h2>Warning</h2>
 			<!-- TMPL_LOOP NAME="flagloop" -->
 			<p>
 				<label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
index f0270a88ba..115af5a14c 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
@@ -3,15 +3,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
-<!-- TMPL_INCLUDE NAME="javascript/members.js" -->
 
 	<!-- TMPL_IF NAME="opadd" -->
 	<h1>
-		Add professional member (step <!-- TMPL_VAR NAME="step" -->)
+		Add professional member (step <!-- TMPL_VAR NAME="step" -->) <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
 	</h1>
 	<!-- TMPL_ELSE -->
 	<h1 >
-		Modify professional member
+		Modify professional member <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
 	</h1>
 	<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="check_member" -->
@@ -31,7 +30,7 @@
 		</p>	
 		<!--/TMPL_IF-->
 	<!--/TMPL_IF-->
-	<!-- TMPL_IF Name="NOK" -->
+	<!-- TMPL_IF Name="nok" -->
 		<h1>ERROR</h1>
 		<div id="problem">
 			<p>The following fields are wrong. Please fix it/them</p>
@@ -47,7 +46,7 @@
 <!-- TMPL_IF NAME="step_1"--><!--BEGIN OF TEST IF NOT collectivity BUT IN 1 STEP-->
 <form name="form"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
 		<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+		<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
 		<input type="hidden" name="FormFieldList" value="surname|select_city|othernames|initials|title|cardnumber|firstname|dateofbirth|sort1|sort2">
 		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
 		<input type="hidden" name="type" value="borrowers">
@@ -57,7 +56,6 @@
 		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
 		<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="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
 		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
 		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->"/>
 
@@ -81,7 +79,7 @@
 		<input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">
 		<input type="hidden" name="B_phone"  value="<!-- TMPL_VAR NAME="B_phone" -->"> 
 		<input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->"> 	
-		<textarea style="display:none;" name="contactnotes" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnotes" --></textarea>
+		<textarea style="display:none;" name="contactnote" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnote" --></textarea>
 
 <!-- 		from form 3 -->
 		<input type="hidden" name="dateenrolled"  value="<!-- TMPL_VAR NAME="dateenrolled" -->">
@@ -101,7 +99,7 @@
 	<!-- TMPL_VAR NAME="member" -->
 	<p>
 		<!-- TMPL_IF NAME="mandatorycardnumber" -->
-		<label class="borrowers_mandafield">
+		<label style="font-weight:bold">
 		<!--TMPL_ELSE-->
 		<label>
 		<!-- /TMPL_IF-->
@@ -125,13 +123,8 @@
 		<!-- TMPL_ELSE -->
 			<label>
 		<!-- /TMPL_IF-->
-		Title</label>
-		<select  name="title" >
-			<option <!-- TMPL_VAR NAME="title_selected_ " --> value="" >Select a value</option>
-			<option value="Mlle" <!-- TMPL_VAR NAME="title_Mlle" -->>Mlle</option>
-			<option value="Mme" <!-- TMPL_VAR NAME="title_Mme" -->>Mme</option>
-			<option value="Mr" <!-- TMPL_VAR NAME="title_Mr" --> >M.</option>
-		</select>
+		Civility</label>
+		<!-- TMPL_VAR NAME="borrotitlepopup" -->
 		</p>
 		<p>
 		<!-- TMPL_IF NAME="mandatorysurname" -->
@@ -158,7 +151,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Date of Birth</label>
-			<input type="text" name="dateofbirth" size="20" onBlur="CheckDate(document.form.dateofbirth.value);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
+			<input type="text" name="dateofbirth" size="20" onBlur="CheckDate(document.form.dateofbirth);" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryinitials" -->
@@ -182,8 +175,14 @@
 	<fieldset id="memberentry_identity">
 		<legend>Borrower type</legend>
 		<p>
-		<label>Select a category</label>
-		<!-- TMPL_VAR NAME="catcodepopup" -->
+    <!-- TMPL_IF NAME="catcodepopup" -->
+			    <label>Category</label>
+			    <!-- TMPL_VAR NAME="catcodepopup" -->
+			<!-- TMPL_ELSE -->
+			    <span class="problem">There is no category type to add a Professional.</span>
+			        <a href="/cgi-bin/koha/admin/categorie.pl">Please create one</a>
+			     
+			<!-- /TMPL_IF -->
 		</p>
 		<!-- TMPL_IF NAME="city_cgipopup" -->	
 		<p>
@@ -235,8 +234,8 @@
 	
 <form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
 		<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
-		<input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|contactname|phone|phonepro|mobile|email|emailpro|B_zipcode|B_phone|B_address|B_city|relationship|fax|contactnotes">
+		<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
+		<input type="hidden" name="FormFieldList" value="cardnumber|streetnumber|streettype|address|address2|zipcode|city|contactname|phone|phonepro|mobile|email|emailpro|B_zipcode|B_phone|B_address|B_city|relationship|fax|contactnote">
 		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
 		<input type="hidden" name="type" value="borrowers">
 		<input type="hidden" name="step" value="<!-- TMPL_VAR NAME="step" -->">
@@ -245,7 +244,6 @@
 		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
 		<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="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
 		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
 		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 	
@@ -284,7 +282,7 @@
 
 	<p>
 		<!-- TMPL_IF NAME="mandatorycardnumber" -->
-		<label class="borrowers_mandafield">
+		<label style="font-weight:bold">
 		<!-- TMPL_ELSE -->
 		<label>
 		<!-- /TMPL_IF-->
@@ -295,7 +293,7 @@
 		<legend>Professional address</legend>
 		<p>
 			<!-- TMPL_IF NAME="mandatorystreetnumber" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->	
@@ -305,7 +303,7 @@
 			<!-- TMPL_IF NAME="road_cgipopup" -->
 				<p>
 				<!-- TMPL_IF NAME="mandatorystreettype" -->
-					<label class="borrowers_mandafield">
+					<label style="font-weight:bold">
 				<!--TMPL_ELSE-->
 					<label>
 				<!-- /TMPL_IF-->
@@ -315,7 +313,7 @@
 			<!--/TMPL_IF-->	
 		<p>
 			<!-- TMPL_IF NAME="mandatoryaddress" -->
-			<label class="borrowers_mandafield">
+			<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->	
@@ -323,8 +321,8 @@
 			<input type="text" name="address" size="34" value="<!-- TMPL_VAR NAME="address" -->">
 		</p>
 		<p>
-			<!-- TMPL_IF NAME="mandatoryaddress2" -->
-				<label class="borrowers_mandafield">
+			<!-- TMPL_IF NAME="mandatoryaddress2s" -->
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
@@ -333,7 +331,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryzipcode" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
@@ -342,7 +340,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorycity" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
@@ -351,7 +349,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorybranchcode" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
@@ -363,7 +361,7 @@
 		<legend>Professional contact</legend>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryphone" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
@@ -372,7 +370,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryphonepro" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
@@ -381,7 +379,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorymobile" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
@@ -391,7 +389,7 @@
 		<p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryemail" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
@@ -400,7 +398,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryemailpro" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
@@ -409,7 +407,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryefax" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
@@ -421,7 +419,7 @@
 		<legend>Structure</legend>
 		<p>
 			<!-- TMPL_IF NAME="mandatorycontactname" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
@@ -430,20 +428,21 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryrelationship" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 				<label>
 			<!-- /TMPL_IF-->
 			Relation</label>
 			<select name="relationship" size="1">
-						<!-- TMPL_LOOP NAME="relshiploop" -->
-							<option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
-						<!-- /TMPL_LOOP -->
+				<option> </option>
+				<!-- TMPL_LOOP NAME="relshiploop" -->
+					<option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
+				<!-- /TMPL_LOOP -->
 			</select>
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryB_address" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
@@ -452,7 +451,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryB_zipcode" -->
-			<label class="borrowers_mandafield">
+			<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 			<label>
 			<!-- /TMPL_IF-->	
@@ -460,7 +459,7 @@
 			<input type="text" maxlength="5" name="B_zipcode" size="5" value="<!-- TMPL_VAR NAME="B_zipcode" -->">
 		</p>
 			<!-- TMPL_IF NAME="mandatoryB_city" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
@@ -469,7 +468,7 @@
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryB_phone" -->
-				<label class="borrowers_mandafield">
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
@@ -477,18 +476,18 @@
 			<input type="text" name="B_phone" size="20" value="<!-- TMPL_VAR NAME="B_phone" -->">
 		</p>
 		<p>
-			<!-- TMPL_IF NAME="mandatorycontactnotes" -->
-				<label class="borrowers_mandafield">
+			<!-- TMPL_IF NAME="mandatorycontactnote" -->
+				<label style="font-weight:bold">
 			<!-- TMPL_ELSE -->
 				<label>
 			<!-- /TMPL_IF-->
 			Notes</label>
-			<textarea  name="contactnotes" cols="70" rows="2"   ><!-- TMPL_VAR NAME="contactnotes" --></textarea>
+			<textarea  name="contactnote" cols="70" rows="2"   ><!-- TMPL_VAR NAME="contactnote" --></textarea>
 		</p>
 	</fieldset>
 		<div>
-		<input type="button" class="borrowers_button" name="etapeprec1" value="Etape precedente" onclick="check_form_borrowers(0);">
-		<input type="button" class="borrowers_button" name="etapesuiv3" onclick="check_form_borrowers('3')" value="Etape suivante"></div>
+		<input type="button" class="borrowers_button" name="etapeprec1" value="previous step" onclick="check_form_borrowers(0);">
+		<input type="button" class="borrowers_button" name="etapesuiv3" onclick="check_form_borrowers('3')" value="next step"></div>
 	</p>
 </form>
 <!-- ############################END FORM PROFESSIONAL############################################"-->
@@ -497,7 +496,7 @@
 <!-- TMPL_IF NAME="step_3"-->
 	<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post">
 		<!-- 		field always hidden in different form (1,2,3) -->
-		<input type="hidden" name="BorrowerMandatoryfield" value="<!--TMPL_VAR NAME="BorrowerMandatoryfield"-->">
+		<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->">
 		<input type="hidden" name="FormFieldList" value="cardnumber|dateenrolled|dateexpiry|opacnote|borrowernotes|userid|password">
 		<input type="hidden" name="category_type" value="<!-- TMPL_VAR name="category_type" -->">
 		<input type="hidden" name="type" value="borrowers">
@@ -507,7 +506,6 @@
 		<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->">
 		<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="flags" value="<!-- TMPL_VAR NAME="flags" -->" />
 		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
 		<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 		
@@ -545,7 +543,7 @@
 		<input type="hidden" name="B_city"  value="<!-- TMPL_VAR NAME="B_city" -->">
 		<input type="hidden" name="B_phone"  value="<!-- TMPL_VAR NAME="B_phone" -->"> 
 		<input type="hidden" name="fax"  value="<!-- TMPL_VAR NAME="fax" -->"> 	
-		<textarea style="display:none;" name="contactnotes" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnotes" --></textarea>
+		<textarea style="display:none;" name="contactnote" cols="70" rows="3"  ><!-- TMPL_VAR NAME="contactnote" --></textarea>
 	
 		<!-- TMPL_IF NAME="opadd" -->
 			<input type="hidden" name="op" value="add">
@@ -554,7 +552,7 @@
 		<!-- /TMPL_IF -->
 		<p>
 			<!-- TMPL_IF NAME="mandatorycardnumber" -->
-			<label  class="borrowers_mandafield">
+			<label style="font-weight:bold">
 			<!--TMPL_ELSE-->
 			<label>
 			<!-- /TMPL_IF-->
@@ -570,7 +568,7 @@
 			<label>
 			<!-- /TMPL_IF-->
 			Arrival date</label>
-			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onblur="CheckDate(document.form.dateenrolled.value);" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
+			<input type="text" name="dateenrolled"  maxlength="10"	  size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatorydateexpiry" -->
@@ -580,7 +578,7 @@
 			<!-- /TMPL_IF-->
 			Expiry date</label>
 			<input type="text" name="dateexpiry" maxlength="10"  size="10"
-							onblur="CheckDate(document.form.dateexpiry.value);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
+							onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="<!-- TMPL_VAR NAME="dateexpiry" -->">
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryopacnote" -->
@@ -589,7 +587,7 @@
 				<label>
 			<!-- /TMPL_IF-->	
 			OPAC note</label>
-			<textarea  name="opacnote" cols="70" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
+			<textarea  name="opacnote" cols="40" rows="2"   ><!-- TMPL_VAR NAME="opacnote" --></textarea>
 		</p>
 		<p>
 			<!-- TMPL_IF NAME="mandatoryborrowernotes" -->	
@@ -598,7 +596,7 @@
 				<label>
 			<!-- /TMPL_IF-->
 			Library note</label>
-			<textarea name="borrowernotes" cols="70" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
+			<textarea name="borrowernotes" cols="40" rows="2"   ><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
 		</p>
 	</fieldset>
 	<fieldset id="memberentry_userid">
@@ -631,7 +629,7 @@
 		</p>
 		<!--this zones are not necessary in modif mode -->
 		<!-- TMPL_UNLESS NAME="opadd" -->
-			<h1>Warning</h1>
+			<h2>Warning</h2>
 			<!-- TMPL_LOOP NAME="flagloop" -->
 			<p>
 				<label class="borrowers_labels_title"><!-- TMPL_VAR NAME="html" --></label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl
index 49f41cb85c..f1486242ad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl
@@ -3,15 +3,47 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
-<h1>Member Search</h1>
-
-	<form action="/cgi-bin/koha/members/member.pl" method="post">
-	<label for="member">Name or Barcode</label><input id="member" type="text" size="25" name="member" />
- <select name="orderby" id="orderby">
-			<option value="surname,firstname">Order by Last Name</option>
-			<option value="cardnumber">Order by Card Number</option>
-		</select>
-	<input type="submit" value="Search" />
-	</form>
+<h1>Borrowers search</h1>
 
+    <form name="f" action="/cgi-bin/koha/members/member.pl" method="post">
+        <label for="member">Name or Barcode</label>
+        <input id="member" type="text" size="25" name="member" />
+        <select name="orderby" id="orderby">
+            <option value="surname,firstname">Order by Last Name</option>
+            <option value="cardnumber">Order by Card Number</option>
+        </select>
+        <input type="submit" value="Search" />
+    </form>
+    <div>
+        <a href="/cgi-bin/koha/members/member.pl?member=a">A</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=b">B</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=c">C</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=d">D</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=e">E</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=f">F</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=g">G</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=h">H</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=i">I</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=j">J</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=k">K</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=l">L</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=m">M</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=n">N</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=o">O</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=p">P</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=q">Q</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=r">R</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=s">S</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=t">T</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=u">U</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=v">V</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=w">W</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=x">X</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=y">Y</a>
+        <a href="/cgi-bin/koha/members/member.pl?member=z">Z</a>
+    </div>
+    <script type="text/javascript">
+		//set the focus to the input text.    
+    	document.f.member.focus();
+    </script>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/moremember-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/moremember-print.tmpl
index 1cd05aa956..7007d70db4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/moremember-print.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/moremember-print.tmpl
@@ -1,4 +1,7 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Summary for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_INCLUDE NAME="doc-head-close-print.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Summary for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+</head>
+<body>
 
 <!-- main site -->
 
@@ -23,7 +26,7 @@
 	<tr<!-- TMPL_IF name="red" --> class="overdue"</TMPL_IF>>
 		<td>
 		<!-- TMPL_VAR NAME="title" -->
-		<a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+		<a href="/cgi-bin/koha/catalogue/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
 		</a>
 		</td>
 		<td><!-- TMPL_VAR NAME="author" --></td>
@@ -45,7 +48,7 @@
 
 <!-- TMPL_loop name="reserveloop" -->
 	<tr>
-		<td><a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a></td>
+		<td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a></td>
 		<td><!-- TMPL_VAR NAME="author" --></td>
 		<td><!-- TMPL_VAR NAME="description" --></td>
 		<td><!-- TMPL_VAR NAME="reservedate2" --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/moremember-receipt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/moremember-receipt.tmpl
index a939d3d6a1..28d76cc4a7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/moremember-receipt.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/moremember-receipt.tmpl
@@ -1,4 +1,7 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --><!-- TMPL_INCLUDE NAME="doc-head-close-receipt.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Print Receipt for <!-- TMPL_VAR NAME="cardnumber" -->
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+</head>
+<body>
 
 <!-- main site -->
 
@@ -17,7 +20,7 @@ Issued To <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR
 	<!-- TMPL_IF name="red" --><!-- TMPL_ELSE -->
 		<tr>
 		<td><!-- TMPL_VAR NAME="date_due" --></td>
-		<td><a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+		<td><a href="/cgi-bin/koha/catalogue/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
 		</tr>
 	<!-- /TMPL_IF -->
 	<!-- /TMPL_LOOP -->
@@ -32,7 +35,7 @@ Issued To <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR
 	<!-- TMPL_LOOP NAME="issueloop" -->
 	<!-- TMPL_IF NAME="red" --><tr>
 	<td><!-- TMPL_VAR NAME="date_due" --></td>
-	<td><a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+	<td><a href="/cgi-bin/koha/catalogue/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
 	</tr>
 	<!-- /TMPL_IF -->
 	<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
index 30177045b0..4a58c7aac1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
@@ -1,245 +1,368 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Member Details<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Borrower's Details<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
-<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h1>
 
-<ul>
-	<!-- TMPL_IF name="adultborrower" -->
-	<a href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&category_type=C">Add child</a> 
-	<!-- /TMPL_IF -->
-	
-	<a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="bornum" -->&category_type=<!-- TMPL_VAR NAME="category_type"-->">Edit this Record</a> 
-	<a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME=bornum -->">
-		Change Member's Password
-	</a> 
-	<a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME=bornum -->">
-		Modify Member's Privileges
-	</a> 
-	<a href="javascript:confirm_deletion()">
-		Delete this Member
-	</a> 
-	<a href="/cgi-bin/koha/members/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
-		View Account
-	</a> 
-	<a href="/cgi-bin/koha/members/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
-		Pay Fines
-	</a> 
-	<a href="/cgi-bin/koha/members/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
-		Member's Reading Record
-	</a>
-</ul>
+<!-- TMPL_IF NAME="unknowuser" -->
+    <p>
+        <b>
+            This borrower doesn't exist anymore.
+        </b>
+        <br /><br />
+        <a href="javascript:back();">Go Back</a>
+    </p>
+<!-- TMPL_ELSE -->
 
+<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h1>
+	<form name="form">
+	<input type="hidden" name="reregistration" value="<!-- TMPL_VAR NAME="reregistration"-->"> 
+	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+	</form>
+<div id="action">
+    <div class="edit">
+        <!-- TMPL_IF name="adultborrower" -->
+            <a href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&category_type=C">
+            Add child
+            </a> 
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="category_type" -->
+            <!--TMPL_IF NAME="guarantor"-->
+                <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&guarantorid=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->&category_type=<!-- TMPL_VAR NAME="category_type"-->">
+            <!--TMPL_ELSE-->
+            <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&category_type=<!-- TMPL_VAR NAME="category_type"-->">
+            <!--/TMPL_IF-->
+        Edit
+            </a>
+        <!-- TMPL_ELSE --> <!-- try with categorycode if no category_type -->
+            <!-- TMPL_IF NAME="categorycode" -->
+            <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&categorycode=<!-- TMPL_VAR NAME="categorycode"-->">
+                Edit
+            </a>
+            <!-- TMPL_ELSE --> <!-- if no categorycode, set category_type to A by default -->
+                <a href="/cgi-bin/koha/members/memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&category_type=A">
+                    Edit
+                </a>
+            <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+        
+        <a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME=borrowernumber -->">
+            Set password
+        </a>
+        <a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME=borrowernumber -->">
+            Privileges
+        </a> 
+        <a href="javascript:confirm_deletion();">
+            Delete
+        </a> 
+    </div>
+    <div class="view">
+        <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
+            Account
+        </a> 
+        <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
+            Pay Fines
+        </a> 
+        <a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
+            Reading Record
+        </a>
+        <a href="javascript:confirm_reregistration();" onclick="javascript:document.form.value='y'" class="gest_borro_op">
+        Renew
+        </a>
+    </div>
+    <div class="others">
+        <!-- TMPL_IF NAME="CAN_user_parameters"-->
+        <a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&module=MEMBERS&action=MODIFY&object=<!-- TMPL_VAR NAME="borrowernumber"-->">Modification Log</a>
+        <!-- /TMPL_IF -->
+    </div>
+</div>
+<br />
 <!-- TMPL_IF NAME="flagged" -->
-	<ul>
-		<!-- TMPL_IF NAME="debarred" -->
-			<li>Patron is debarred 
-			<form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post">
-				<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-				<input type="hidden" name="status" value="0" />
-				<input type="submit" value="Lift Debarment" />
-			</form>
-			</li>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="gonenoaddress" --><li>Patron's address is in doubt.</li><!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="lost" --><li>Patron's card has been reported lost.</li><!-- /TMPL_IF -->
-	</ul>
+    <ul>
+        <!-- TMPL_IF NAME="debarred" -->
+            <li>Borrower is debarred 
+            <form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post">
+                <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+                <input type="hidden" name="status" value="0" />
+                <input type="submit" value="Lift Debarment" />
+            </form>
+            </li>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="gonenoaddress" --><li>Borrower's address is in doubt.</li><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="lost" --><li>Borrower's card has been reported lost.</li><!-- /TMPL_IF -->
+    </ul>
 
 <!-- /TMPL_IF -->
 
 <fieldset>
 <legend>Borrower Information</legend>
-	<p><label>Title:</label><!-- TMPL_VAR NAME="title" --></p>
-	<p><label>First Name:</label><!-- TMPL_VAR NAME="firstname" --></p>
-	<p><label>Last Name: </label><!-- TMPL_VAR NAME="surname" --></p>
-	<p><label>Othernames: </label><!-- TMPL_VAR NAME="othernames" --></p>
-	<p><label>Initials: </label><!-- TMPL_VAR NAME="initials" --></p>
-	<p><label>Address: </label><!-- TMPL_VAR NAME="address" --></p>
-	<p><label>City: </label><!-- TMPL_VAR NAME="city" --></p>
-	<p><label>Zip Code: </label><!-- TMPL_VAR NAME="zipcode" --></p>
-	<!-- TMPL_UNLESS NAME="I"-->
+    <!-- TMPL_UNLESS NAME="I" --> <p><label>Civility:</label><!-- TMPL_VAR NAME="title" -->&nbsp;</p> 
+    <p><label>First Name:</label><!-- TMPL_VAR NAME="firstname" --></p><!-- /TMPL_UNLESS -->
+    <p>
+	<!-- TMPL_IF NAME="I" --><label>Organisation Name: </label><!-- TMPL_ELSE --><label>Last Name: </label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="surname" -->
+    </p>
+    <!-- TMPL_UNLESS NAME="I" --><p><label>Othernames: </label><!-- TMPL_VAR NAME="othernames" --></p>
+    <p><label>Initials: </label><!-- TMPL_VAR NAME="initials" --></p><!-- /TMPL_UNLESS -->
+    <p>
+        <label>Address: </label>
+        <!-- TMPL_VAR NAME="streetnumber" -->
+        <!--TMPL_IF NAME="roaddetails"-->
+         <!-- TMPL_VAR NAME="roaddetails" -->,
+        <!-- /TMPL_IF -->
+        <!-- TMPL_VAR NAME="address" -->
+    </p>
+    <p>
+        <label>Address2: </label>
+        <!-- TMPL_VAR NAME="address2"-->
+    </p>
+    <p><label>City: </label><!-- TMPL_VAR NAME="city" --></p>
+    <p><label>Zip Code: </label><!-- TMPL_VAR NAME="zipcode" --></p>
+    <!-- TMPL_UNLESS NAME="I"-->
+    	<!-- TMPL_UNLESS NAME="C"-->
 	<p><label>alt address: </label><!-- TMPL_VAR NAME="B_address" --></p>
-	<p><label>alt city: </label><!-- TMPL_VAR NAME="B_city" --></p>
-	<p><label>alt zipcode: </label><!-- TMPL_VAR NAME="B_zipcode" --></p>
-	<!-- /TMPL_UNLESS -->
-	<p><label>Home Phone: </label><!-- TMPL_VAR NAME="phone" --></p>
-	<p><label>Cell phone: </label><!-- TMPL_VAR NAME="mobile" --></p>
-	<p><label>Fax: </label><!-- TMPL_VAR NAME="fax" --></p>
-	<p><label>E-mail Address:</label><!-- TMPL_VAR NAME="email" --></p>
-	<!-- TMPL_UNLESS name="I" -->
-	<p><label>Date of Birth:</label><!-- TMPL_VAR NAME="dateofbirth" --></p>
-	<p><label>Sex:</label><!-- TMPL_VAR NAME="sex" --></p>
+    	<p><label>alt city: </label><!-- TMPL_VAR NAME="B_city" --></p>
+    	<p><label>alt zipcode: </label><!-- TMPL_VAR NAME="B_zipcode" --></p>
 	<!-- /TMPL_UNLESS -->
+    <!-- /TMPL_UNLESS -->
+    <!-- TMPL_IF NAME="I" -->
+	<p><label>Organisation  Phone: </label><!-- TMPL_VAR NAME="phonepro" --></p>
+	<p><label>Organisation  Email: </label><!-- TMPL_VAR NAME="emailpro" --></p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_UNLESS NAME="I"-->
+    <p><label>Home Phone: </label><!-- TMPL_VAR NAME="phone" --></p>
+    <p><label>Cell phone: </label><!-- TMPL_VAR NAME="mobile" --></p>
+    <p><label>Professional phone: </label><!-- TMPL_VAR NAME="phonepro" --></p>
+    <!-- /TMPL_UNLESS -->
+    <!-- TMPL_IF NAME="P"-->
+    <p><label>Professional  Phone: </label><!-- TMPL_VAR NAME="phone" --></p>
+    <p><label>Professionnal Email: </label><!-- TMPL_VAR NAME="mobile" --></p>
+    <!-- /TMPL_IF -->  	
+    <p><label>Fax: </label><!-- TMPL_VAR NAME="fax" --></p>
+    <!-- TMPL_UNLESS NAME="I"-->
+    <p><label>E-mail Address:</label><!-- TMPL_VAR NAME="email" --></p>
+    <p><label>Date of Birth:</label><!-- TMPL_VAR NAME="dateofbirth" --></p>
+    <p><label>Sex:</label><!-- TMPL_VAR NAME="sex" --></p>
+    <!-- /TMPL_UNLESS -->
+	
 </fieldset>
 <fieldset>
-	<legend>Library use</legend>
-	<p><label>Member Number:</label><!-- TMPL_VAR NAME="borrowernumber" --></p>
-	<p><label>Category:</label><!-- TMPL_VAR NAME="categorycode" --></p>
-	<p><label>Registration Date:</label><!-- TMPL_VAR NAME="dateenrolled" --></p>
-	<p><label>Expiration Date: </label><!-- TMPL_VAR NAME="dateexpiry" --></p>
-	<p><label>Registration Branch:</label><!-- TMPL_VAR NAME="branchname" --></p>
+    <legend>Library use</legend>
+    <p><label>Borrower Number:</label><!-- TMPL_VAR NAME="borrowernumber" --></p>
+    <p><label>Category:</label><!-- TMPL_VAR NAME="categorycode" --></p>
+    <p><label>Registration Date:</label><!-- TMPL_VAR NAME="dateenrolled" --></p>
+    <p><label>Relation:</label><!-- TMPL_VAR NAME="relationship" --></p>
+    
+    <p><label>Expiration Date: </label>
+    <!-- TMPL_IF NAME="reregistration" -->
+            <label class="reregistrinfo"><!-- TMPL_VAR NAME="dateexpiry" --></label>
+    <!--TMPL_ELSE-->
+            <!-- TMPL_VAR NAME="dateexpiry" -->
+    <!-- /TMPL_IF -->
+    </p>
+    
+    <p><label>Registration Branch:</label><!-- TMPL_VAR NAME="branchname" --> &nbsp;</p>
 
-	<!-- TMPL_IF NAME="printethnicityline" -->
-	<p><label>Ethnicity:</label><!-- TMPL_VAR NAME="ethnicity" --></p>
-	<p><label>Ethnicity Notes: </label><!-- TMPL_VAR NAME="ethnotes" --></p>
-	<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="printethnicityline" -->
+    <p><label>Ethnicity:</label><!-- TMPL_VAR NAME="ethnicity" --> &nbsp;</p>
+    <p><label>Ethnicity Notes: </label><!-- TMPL_VAR NAME="ethnotes" --> &nbsp;</p>
+    <!-- /TMPL_IF -->
 
-	<p><label>Sort field 1: </label><!-- TMPL_VAR NAME="sort1" --></p>
-	<p><label>Sort field 2:</label><!-- TMPL_VAR NAME="sort2" --></p>
-	<p><label>OPAC login: </label><!-- TMPL_VAR name="userid" --></p>
-	<p><label>OPAC Password: </label><!-- TMPL_VAR NAME="password" --></p> 
-	<p><label>Circulation Notes:</label><!-- TMPL_VAR name="borrowernotes" --></p>
-	<p><label>Patron Message:</label><!-- TMPL_VAR NAME="opacnote" --></p>
+    <p><label>Sort field 1: </label><!-- TMPL_VAR NAME="sort1" --> &nbsp;</p>
+    <p><label>Sort field 2:</label><!-- TMPL_VAR NAME="sort2" --> &nbsp;</p>
+    <p><label>OPAC login: </label><!-- TMPL_VAR name="userid" --> &nbsp;</p>
+    <!-- TMPL_IF NAME="password" -->
+	<p><label>OPAC Password: </label>*******</p>
+   <!--TMPL_ELSE -->
+	<p><label>OPAC Password: </label><span class="problem">Undefined &nbsp;</span></p> 
+   <!--/TMPL_IF --> 
+	<p><label>Circulation Notes:</label><!-- TMPL_VAR name="borrowernotes" --> &nbsp;</p>
+    <p><label>Borrower Message:</label><!-- TMPL_VAR NAME="opacnote" --> &nbsp;</p>
 </fieldset>
+<!-- TMPL_UNLESS NAME="P" -->
+<!-- TMPL_UNLESS NAME="I" -->
 <fieldset>
-	<legend>Alternate contact</legend>
-	<!-- TMPL_UNLESS name="I" -->
-	<p><label>Name:</label><!-- TMPL_VAR NAME="contactname" --></p>
-	<p><label>Phone: </label><!-- TMPL_VAR NAME="B_phone" --></p>
-	<p><label>Relationship:</label><!-- TMPL_VAR NAME="relationship" --></p>
-	<p><label>Notes: </label><!-- TMPL_VAR NAME="contactnote" --></p>
-	<!-- /TMPL_UNLESS -->
-	<!-- TMPL_UNLESS name="I" -->
-		<!-- TMPL_IF name="isguarantee" -->
-			<!-- TMPL_IF NAME="guaranteeloop" -->
-				<p><label>Guarantees:</label><ul><!-- tmpl_loop name="guaranteeloop" --><li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name --> - <!-- TMPL_VAR NAME="cardnumber" --></a></li><!-- /tmpl_loop --></ul></p>
-			<!-- /TMPL_IF -->
-		<!-- TMPL_ELSE -->
-			<!-- TMPL_IF name="guarantorborrowernumber" -->
-				<p><label>Guarantor:</label><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorcardnumber" --></a></p>
-			<!-- /TMPL_IF -->
-		<!-- /TMPL_IF -->
-	<!-- /TMPL_UNLESS -->
+    
+    <legend>Alternate contact</legend>
+     <!-- TMPL_IF NAME="C" -->
+    <p><label>Name: </label><!-- TMPL_VAR NAME="contactname" --> &nbsp;</p>
+    <p><label>Firstname: </label><!-- TMPL_VAR NAME="firstname" --> &nbsp;</p>  	
+    <p><label>Phone: </label><!-- TMPL_VAR NAME="phone" --> &nbsp;</p>
+    <p><label>Email: </label><!-- TMPL_VAR NAME="email" --> &nbsp;</p>
+    <p><label>Relationship: </label><!-- TMPL_VAR NAME="relationship" --> &nbsp;</p>
+   <!-- /TMPL_IF -->
+       
+	 <!-- TMPL_IF name="isguarantee" -->
+            <!-- TMPL_IF NAME="guaranteeloop" -->
+                <p><label>Guarantees:</label><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></p>
+            <!-- /TMPL_IF -->
+        <!-- TMPL_ELSE -->
+            <!-- TMPL_IF name="guarantorborrowernumber" -->
+                <p><label>Guarantor:</label><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorsurname" --> <!-- TMPL_VAR NAME="guarantorfirstname" --></a></p>
+            <!-- /TMPL_IF -->
+       <!-- /TMPL_IF  -->
+    
 </fieldset>
+
+<!-- /TMPL_UNLESS-->
+<!-- /TMPL_UNLESS-->
 <fieldset>
-	<legend>Fines &amp; Charges</legend>
-	<!-- TMPL_IF name="totaldue" -->
-		<p>Total Due: <!-- TMPL_VAR NAME="totaldue" --></p>
-	<!-- TMPL_ELSE -->
-		<p>No Outstanding Charges</p>
-	<!-- /TMPL_IF -->
+    <legend>Fines &amp; Charges</legend>
+    <!-- TMPL_IF name="totaldue" -->
+        <p>Total Due: <!-- TMPL_VAR NAME="totaldue" --></p>
+    <!-- TMPL_ELSE -->
+        <p>No Outstanding Charges</p>
+    <!-- /TMPL_IF -->
 </fieldset>
-<fieldset>
-	<legend>Items On Loan</legend>
-	<form action="/cgi-bin/koha/reserve/renewscript.pl" method="post">
-		<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" />
+    <div>
+    <h2>Items On Loan</h2>
+    <form action="/cgi-bin/koha/reserve/renewscript.pl" method="post">
+        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+    <table>
+        <tr>
+            <th scope="col">Title</th>
+            <th scope="col">Due</th>
+            <th scope="col">Itemtype</th>
+            <th scope="col">Charge</th>
+            <th scope="col">Price</th>
+            <th scope="col">Renew</th>
+            <th scope="col">Return</th>
+        </tr>
+    
+        <!-- tmpl_loop name="issueloop" -->
+                <!-- TMPL_IF NAME="toggle" -->
+        <tr class="highlight">
+                <!-- TMPL_ELSE -->
+                <tr>
+                <!-- /TMPL_IF -->
+            <td>
+                <!-- TMPL_IF name="red" --><span class="overdue"><!-- /TMPL_IF -->
+                <!-- TMPL_IF name="red" --></span><!-- /TMPL_IF -->
+                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+                    <!-- TMPL_VAR NAME="title" -->
+                </a>
+                <br /><!-- TMPL_VAR name="author" -->
+            </td>
+            <td><!-- TMPL_VAR NAME="date_due" --></td>
+            <td>
+                <!-- TMPL_VAR NAME="itemtype_description" -->
+                <!-- TMPL_IF NAME="itemtype_image" -->
+                <img src="<!-- TMPL_VAR NAME="itemtype_image" -->" />
+                <!-- /TMPL_IF -->
+            </td>
+            <td><!-- TMPL_VAR NAME="charge" --></td>
+            <td><!-- TMPL_VAR NAME="replacementprice" --></td>
+            <td>
+            <!-- TMPL_IF name="norenew" -->
+                <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Reserved</a>
+            <!-- TMPL_ELSE -->
+            <!-- TMPL_IF NAME="red" -->
+            <input type="checkbox"
+                    name="items[]"
+                    value="<!-- TMPL_VAR NAME="itemnumber" -->"
+                    checked="checked"
+                        />
+            <!-- TMPL_ELSE -->
+            <input type="checkbox"
+                    name="items[]"
+                    value="<!-- TMPL_VAR NAME="itemnumber" -->"
+                        />
+            <!-- /TMPL_IF -->
+            <input type="checkbox"
+                    name="all_items[]"
+                    value="<!-- TMPL_VAR NAME="itemnumber" -->"
+                checked="checked"
+                    style="display: none;"
+            />
+            <!-- /TMPL_IF -->
+            </td>
+            <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Return</a></td>
+        </tr>
+        <!-- /tmpl_loop -->
+        <tr>
+            <td colspan="3">Total Replacement Cost:</td>
+            <td><!-- TMPL_VAR NAME="totalprice" --></td>
+            <td colspan="3">&nbsp;</td>
+        </tr>
+        </table>
+            <div id="action">
+            <input type="submit" name="renew_checked" value="Renew Checked Items" />
+            <input type="submit" name="renew_all" value="Renew All" />
+            </div>
+    </form>
+    </div>
+<!-- TMPL_IF NAME="reservloop" -->
+<div id="circ_circulation_issue">
+	<h2>Borrower current reserves</h2>
 	<table>
 		<tr>
-			<th scope="col">Title</th>
-			<th scope="col">Due</th>
-			<th scope="col">Itemtype</th>
-			<th scope="col">Charge</th>
-			<th scope="col">Price</th>
-			<th scope="col">Renew</th>
-			<th scope="col">Return</th>
+			<th>Reserve date</th>
+			<th>Barcode</th>
+			<th>Title</th>
+			<th>Author</th>
+			<th>Localisation</th>
+			<th>Details</th>
 		</tr>
-	
-		<!-- tmpl_loop name="issueloop" -->
-                  <!-- TMPL_IF NAME="toggle" -->
-		<tr class="highlight">
-                  <!-- TMPL_ELSE -->
-                <tr>
-                  <!-- /TMPL_IF -->
-			<td>
-				<!-- TMPL_IF name="red" --><span class="overdue"><!-- /TMPL_IF -->
-				<!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="red" --></span><!-- /TMPL_IF -->
-				<a href="/cgi-bin/koha/catalogue/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
-					<!-- TMPL_VAR NAME="barcode" -->
-				</a>
-			</td>
-			<td><!-- TMPL_VAR NAME="date_due" --></td>
-			<td>
-					<!-- TMPL_VAR NAME="itemtype_description" -->
-					<!-- TMPL_IF NAME="itemtype_image" -->
-					<img src="<!-- TMPL_VAR NAME="itemtype_image" -->" />
-					<!-- /TMPL_IF -->
+		<!-- TMPL_LOOP NAME="reservloop" -->
+		<tr class="<!-- TMPL_VAR NAME="color" -->">
+					<td>
+						<!-- TMPL_VAR NAME="reservedate" -->
 					</td>
-			<td><!-- TMPL_VAR NAME="charge" --></td>
-			<td><!-- TMPL_VAR NAME="replacementprice" --></td>
-			<td>
-			<!-- TMPL_IF name="norenew" -->
-				<a href="/cgi-bin/koha/reserve/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Reserved</a>
-			<!-- TMPL_ELSE -->
-			<input type="checkbox"
-							name="items[]"
-							value="<!-- TMPL_VAR NAME="itemnumber" -->"
-					<!-- TMPL_IF NAME="red" -->
-						checked="checked"
-					<!-- /TMPL_IF -->
-			/>
-			<input type="checkbox"
-					name="all_items[]"
-					value="<!-- TMPL_VAR NAME="itemnumber" -->"
-				checked="checked"
-					style="display: none;"
-			/>
-			<!-- /TMPL_IF -->
-			</td>
-			<td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Return</a></td>
-		</tr>
-		<!-- /tmpl_loop -->
-		<tr><td colspan="3">Total Replacement Cost:</td><td><!-- TMPL_VAR NAME="totalprice" --></td><td colspan="2">&nbsp;</td></tr>
-		</table>
-			<div id="action">
-			<input type="submit" name="renew_checked" value="Renew Checked Items" />
-			<input type="submit" name="renew_all" value="Renew All" />
-			</div>
-	</form>
-</fieldset>
-<fieldset>
-	<legend>Reserves</legend>
-	<form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
-		<input type="hidden" name="from" value="borrower" />
-		<table>
-		<tr>
-			<th scope="row">Title</th>
-			<th scope="row">Requested</th>
-			<th scope="row">Remove</th>
-		</tr>
-	
-		<!-- TMPL_LOOP name="reserveloop" -->
-                  <!-- TMPL_IF NAME="toggle" -->
-		<tr class="highlight">
-                  <!-- TMPL_ELSE -->
-                <tr>
-                  <!-- /TMPL_IF -->
-			<td>
-				<a href="/cgi-bin/koha/reserve/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
-				<!-- TMPL_IF name="volumeddesc" -->
-					<!-- TMPL_VAR NAME="volumeddesc" -->
-					<!-- TMPL_VAR NAME="itemtype" -->
-				<!-- /TMPL_IF -->
-			</td>
-			<td><!-- TMPL_VAR NAME="reservedate2" --></td>
-			<td>
-				<select name="rank-request">
-				<option value="n">No</option>
-				<option value="del">Yes</option>
-				</select>
-			</td>
-			<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" />
-		</tr>
-		<!-- /tmpl_loop -->
+					<td>
+						<!-- TMPL_IF name="barcodereserv" -->
+						<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR NAME="barcodereserv" --></a>
+						<!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="waitingposition" -->
+						Waiting position for this document :
+						<b> <!-- TMPL_VAR NAME="waitingposition" --> </b>
+						<!-- /TMPL_IF -->
+					</td>
+					<td>
+						<!-- TMPL_VAR NAME="title" --> (<b> <!-- TMPL_VAR NAME="itemtype" --> </b>) 
+
+						<!-- TMPL_IF name="waiting" -->
+						<br/>
+						<i>This document is available</i>
+						<!-- /TMPL_IF -->
+						<!-- TMPL_IF name="transfered" -->
+						<br/>
+						<i>This document has been transfered from library : 
+						<!-- TMPL_VAR NAME="frombranch" --> the : <!-- TMPL_VAR NAME="datesent" --> </i>
+						<!-- /TMPL_IF -->
+
+						<!-- TMPL_IF name="nottransfered" -->
+						<br/>
+						<i>This document hasn't been transfered yet from library : <!-- TMPL_VAR NAME="nottransferedby" --></i>
+						<!-- /TMPL_IF -->
+				
+					</td>
+					<td><!-- TMPL_VAR NAME="author" --></td>
+					<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
+					<td>
+					    <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">view reserves </a>
+					</td>
+			</tr>
+		<!-- /TMPL_LOOP -->
 	</table>
-	<!-- TMPL_IF name="reserveloop" -->
-		<input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" />
 	<!-- /TMPL_IF -->
-	</form>
-</fieldset>
+</div>
+
 <script language="JavaScript" type="text/javascript">
 function confirm_deletion() {
-	var is_confirmed = confirm('Do you confirm deletion ?');
-	if (is_confirmed) {
-			window.location="/cgi-bin/koha/members/deletemem.pl?member=<!-- TMPL_VAR NAME="bornum" -->";
-	}
+    var is_confirmed = window.confirm('Do you confirm deletion ?');
+    var borrowernumbervalue=document.form.borrowernumber.value; 
+   
+    if (is_confirmed) {
+            window.location='/cgi-bin/koha/members/deletemem.pl?member='+borrowernumbervalue+'';
+    }
 }
+
 function confirm_reregistration() {
-	var is_confirmed = confirm('Do you confirm re_registration ?');
-	if (is_confirmed) {
-	window.location="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&reregistration=y";
-	}
+    var is_confirmed = window.confirm('Do you confirm re_registration ?');
+    var borrowernumbervalue1=document.form.borrowernumber.value;
+    if (is_confirmed) {
+    window.location='/cgi-bin/koha/members/moremember.pl?reregistration=y&borrowernumber='+borrowernumbervalue1+'';
+    }
 }
 </script>
+<!-- /TMPL_IF --> <!-- unknowuser -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl
index 8ca0bbe155..dc1523aa45 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl
@@ -1,54 +1,57 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->KOHA -- Pay Fines for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Pay Fines for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
-	<form class="inline" id="payment" action="/cgi-bin/koha/members/pay.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" />
-<div class="table"><table>
-<input type="hidden" name="loggedinuser" value="<!-- TMPL_VAR NAME="loggedinusername" -->">
-<caption>Pay Fines for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></caption>
+
+<h1>Pay Fines for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h1>
+<form action="/cgi-bin/koha/members/pay.pl" method="post">
+	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR name="borrowernumber" -->" />
+
+<table>
 <tr>
 	<th>Fines &amp; Charges</th>
 	<th>Description</th>
 	<th>Account Type</th>
+	<th>Notify id</th>
+	<th>Level</th>
 	<th>Amount</th>
 	<th>Amount Outstanding</th>
-	<th>Amount to pay</th></tr>
+</tr>
 	
-<!-- TMPL_LOOP name="loop_pay" -->
+<!-- TMPL_LOOP name="allfile" -->
+	<!-- TMPL_LOOP name="loop_pay" -->
 <tr>
-	<td><fieldset><label for="payfine<!-- TMPL_VAR name="i" -->">Unpaid</label><input id="payfine<!-- TMPL_VAR name="i" -->" type="radio" name="payfine<!-- TMPL_VAR name="i" -->" value="no" checked="checked" /><br>
-	<label for="payfine<!-- TMPL_VAR name="i" -->">Pay</label><input type="radio" id="payfine<!-- TMPL_VAR name="i" -->" name="payfine<!-- TMPL_VAR name="i" -->" value="yes" /><br>
-	<!--TMPL_IF NAme="CAN_user_management"--> <label for="payfine<!-- TMPL_VAR name="i" -->">Writeoff</label><input type="radio" id="payfine<!-- TMPL_VAR name="i" -->" name="payfine<!-- TMPL_VAR name="i" -->" value="wo" /><!--/TMPL_IF--> </fieldset>
+	<td><select name="payfine<!-- TMPL_VAR name="i" -->">
+	<option value="no">Unpaid</option>
+	<option value="yes">Paid</option>
+	<option value="wo">Writeoff</option>
+	</select>
 	<input type="hidden" name="itemnumber<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="itemnumber" -->" />
 	<input type="hidden" name="accounttype<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accounttype" -->" />
 	<input type="hidden" name="amount<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amount" -->" />
 	<input type="hidden" name="out<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amountoutstanding" -->" />
-	<input type="hidden" name="bornum<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="bornum" -->" />
+	<input type="hidden" name="borrowernumber<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="borrowernumber" -->" />
 	<input type="hidden" name="accountno<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accountno" -->" />
-	<input type="hidden" name="desc<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="description" --><!-- TMPL_VAR name="title" -->" />
-	<input type="hidden" id="counter" value="">
+	<input type="hidden" name="notify_id<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="notify_id" -->" />
+	<input type="hidden" name="notify_level<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="notify_level" -->" />
+	<input type="hidden" name="totals<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="totals" -->" />
 	</td>
 	<td><!-- TMPL_VAR name="description" --><!-- TMPL_VAR name="title" --></td>
 	<td><!-- TMPL_VAR name="accounttype" --></td>
+	<td><!-- TMPL_VAR name="notify_id" --></a></td>
+	<td><!-- TMPL_VAR name="notify_level" --></td>
 	<td class="debit"><!-- TMPL_VAR name="amount" --></td>
 	<td class="debit"><!-- TMPL_VAR name="amountoutstanding" --></td>
-	<td><input type="text" name="amounttopay<!-- TMPL_VAR name="i" -->" size="5" value="<!-- TMPL_VAR name="amountoutstanding" -->" />
-	</td>
 </tr>
-<!-- /TMPL_LOOP -->
+<!-- /TMPL_LOOP  -->
+<!-- TMPL_IF  NAME="total"-->
 <tr>
-	<td colspan="4">Total Due</td>
-	<td class="debit"><!-- TMPL_VAR name="total" --></td>
-	</tr>
-</table><div>
-<input type="submit" name="submit"  value="Make Payment" class="submit" /></form> <form class="inline" action="/cgi-bin/koha/members/moremember.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="bornum" -->" name="bornum" /> <input type="submit" class="submit" value="Return to Member Record" /></form>
 
-<script language="JavaScript" type="text/javascript">
-function changetotal() {
-mytotal=0;
-for (i=0 ; i<document.forms['payment'].counter.length ; i++) {
- mytotal +=document.getElementById("amounttopay"+i).value;
-}
-document.forms['payment'].totalamountopay.value=mytotal;
-}
-</script>
+	<td colspan="6">Total Due</td>
+	<td><!-- TMPL_VAR name="total" --></td>
+</tr>
+<!--/TMPL_IF-->
+<!-- /TMPL_LOOP  -->
+</table>
+<input type="submit" name="submit"  value="Make Payment" class="submit" /></form>
+<form action="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> <input type="submit" value="Return to Patron Record" /></form>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl
index 6d92c42688..3f7cc97c7a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl
@@ -6,26 +6,26 @@
 <!-- TMPL_IF NAME="showfulllink" -->
 <ul>
 	<li>Showing All Items</li>
-	<li><a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;limit=full">Show Last 50 Items Only</a></li>
+	<li><a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;limit=full">Show Last 50 Items Only</a></li>
 </ul>
 <!-- TMPL_ELSE -->
 <ul>
 	<li>Showing Last 50 Items</li>
-	<li><a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;limit=full">Show All Items</a></li>
+	<li><a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;limit=full">Show All Items</a></li>
 </ul>
 <!-- /TMPL_IF -->
 <h1>Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
 <table>
 <tr>
 	<th>
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;order=title&amp;amp;limit=<!-- TMPL_VAR name="limit" -->">Title</a>
+		<a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;order=title&amp;amp;limit=<!-- TMPL_VAR name="limit" -->">Title</a>
 	</th>
 	<th>
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;order=author&amp;limit=<!-- TMPL_VAR name="limit" -->">Author</a>
+		<a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;order=author&amp;limit=<!-- TMPL_VAR name="limit" -->">Author</a>
 	</th>
 	<th>Call No.</th>
 	<th>
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;order=returndate DESC&amp;limit=<!-- TMPL_VAR name="limit" -->">Return Date</a>
+		<a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;order=returndate DESC&amp;limit=<!-- TMPL_VAR name="limit" -->">Return Date</a>
 	</th>
 </tr>
 <!-- TMPL_LOOP name="loop_reading" -->
@@ -35,7 +35,7 @@
 <tr>
 <!-- /TMPL_IF -->
 	<td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->>
- 		<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR name="title" --></a>
+ 		<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR name="title" --></a>
 	</td>
 	<td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->>
  		<!-- TMPL_VAR name="author" -->
@@ -46,6 +46,6 @@
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
-<form action="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" value="Return to Patron Record" /></form>
+<form action="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> <input type="submit" value="Return to Patron Record" /></form>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/acquisitions_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/acquisitions_stats.tmpl
index 78136955a8..87ca6cec36 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/acquisitions_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/acquisitions_stats.tmpl
@@ -1,4 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc" -->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,13 +11,13 @@
 
 <!-- TMPL_IF NAME="do_it" -->
 	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Acquisitions statistics </h1>
-		<!-- TMPL_IF NAME="loopfilter"-->
+		<h1>Acquisitions statistics </h1>
+     		<!-- TMPL_IF NAME="loopfilter" -->
 			<p>Filtered on</p>
 			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><!-- TMPL_IF NAME="err" -->  <!--/TMPL_IF --> <!-- TMPL_VAR NAME="crit"--> =<!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" -->  <!--/TMPL_IF --></p>
+					<p><!-- TMPL_IF NAME="err" -->  <!--/TMPL_IF --> <!-- TMPL_VAR NAME="crit"--> =<!--  TMPL_VAR NAME="filter" --><!-- TMPL_IF NAME="err" -->  <!--/TMPL_IF --></p>
 			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_IF NAME="loopfilter"-->
+		<!-- /TMPL_IF NAME="loopfilter" -->
 		
 		<table>
 			<tr >
@@ -54,7 +55,7 @@
 		</table>
 	<!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-	<h1>Koha : Acquisitions statistics </h1>
+	<h1>Acquisitions statistics</h1>
 	<form method="post">
 	<table>
 		<thead>
@@ -219,7 +220,7 @@
 				<td>&nbsp;</td>
 			</tr>
 			<tr class="hilighted">
-				<td>Book Seller</td>
+				<td>Supplier</td>
 				<td><input type="radio" name="Line" value="aqbooksellers.name" /></td>
 				<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
 				<td ><!-- TMPL_VAR NAME="CGIBookSeller" --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl
index 44ee5d2d94..d3ca96fd3c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl
@@ -1,4 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -15,7 +16,7 @@ function Dopop(link) {
 }
 </script>
 	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Top <!-- TMPL_VAR NAME="limit"--> List borrowers for Issues </h1>
+		<h1>Top <!-- TMPL_VAR NAME="limit"--> List borrowers for Issues</h1>
 		<!-- TMPL_IF NAME="loopfilter"-->
 			<p>Filtered on</p>
 			<!-- TMPL_LOOP NAME="loopfilter" -->
@@ -43,7 +44,7 @@ function Dopop(link) {
 						<!-- TMPL_VAR NAME="rowtitle" --></td>
 						<!-- TMPL_LOOP NAME="loopcell" -->
 							<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
-								<!-- TMPL_IF NAME="reference" --><a href="javascript:Dopop('../members/moremember.pl?bornum=<!-- TMPL_VAR NAME="reference" -->')" ><!-- /TMPL_IF -->
+								<!-- TMPL_IF NAME="reference" --><a href="javascript:Dopop('../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>
@@ -56,7 +57,7 @@ function Dopop(link) {
 		</table>
 	<!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-	<h1>Koha : Top List borrowers for Issues  </h1>
+	<h1>Top List borrowers for Issues</h1>
 	<form method="post">
 	
 	<table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl
index 4b100d5c19..e1ead3c07a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl
@@ -1,4 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -9,109 +10,109 @@
 
 
 <!-- TMPL_IF NAME="do_it" -->
-	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Borrowers with No Issues </h1>
-		<!-- TMPL_IF NAME="loopfilter"-->
-			<p>Filtered on</p>
-			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><!-- TMPL_IF NAME="err" -->  <!--/TMPL_IF --> <!-- TMPL_VAR NAME="crit"--> =<!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" -->  <!--/TMPL_IF --></p>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_IF NAME="loopfilter"-->
-		
-		<table>
-			<tr >
-				<th>Num/Borrowers</th>
-				<!-- TMPL_LOOP NAME="loopcol" -->
-					<th><!-- TMPL_VAR NAME="coltitle" --></th>
-				<!-- /TMPL_LOOP -->
-			</tr>
-				<!-- TMPL_LOOP NAME="looprow" -->
-					<tr>
-						<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-						<!-- 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>
-						<!-- /TMPL_LOOP -->
-					</tr>
-				<!-- /TMPL_LOOP NAME="looprow" -->
-		</table>
-	<!-- /TMPL_LOOP -->
+    <!-- TMPL_LOOP NAME="mainloop" -->
+        <h1>Borrowers with No Issues</h1>
+        <!-- TMPL_IF NAME="loopfilter"-->
+            <p>Filtered on</p>
+            <!-- TMPL_LOOP NAME="loopfilter" -->
+                    <p><!-- TMPL_IF NAME="err" -->  <!--/TMPL_IF --> <!-- TMPL_VAR NAME="crit"--> =<!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" -->  <!--/TMPL_IF --></p>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_IF-->
+        
+        <table>
+            <tr >
+                <th>Num/Borrowers</th>
+                <!-- TMPL_LOOP NAME="loopcol" -->
+                    <th><!-- TMPL_VAR NAME="coltitle" --></th>
+                <!-- /TMPL_LOOP -->
+            </tr>
+                <!-- TMPL_LOOP NAME="looprow" -->
+                    <tr>
+                        <!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+                        <!-- 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>
+                        <!-- /TMPL_LOOP -->
+                    </tr>
+                <!-- /TMPL_LOOP -->
+        </table>
+    <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-	<h1>Koha : Borrowers with no Issues  </h1>
-	<form method="post">
-	
-	<table>
-		<thead>
-			<tr>
-			<th>Limit to </th>
-			<th>By </th>
-			<th colspan="2">Filters</th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr>
-				<td>
-					<select name="Limit">
-						<option value ="" checked>None</option>
-						<option value ="5"> 5</option>
-						<option value ="10">10</option>
-						<option value ="15">15</option>
-						<option value ="20">20</option>
-						<option value ="25">25</option>
-						<option value ="40">40</option>
-						<option value ="50">50</option>
-						<option value ="100">100</option>
-					</select>
-				</td>
-				<td>
-					<select name="Criteria">
-						<option value ="" checked>None</option>
-						<option value ="categorycode">Categorycode</option>
-						<option value ="itemtype">Itemtype</option>
-					</select>
-				</td>
-			</tr>
-			<tr class="hilighted">
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>Borrower Category</td>
-				<td><input type="text" name="Filter" value="" /></td>
-			</tr>
-			<tr class="hilighted">
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>Without issues since</td>
-				<td><input size="10" id="to" name="Filter" value="" type="text" />
-						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
-							<script type="text/javascript">
-								Calendar.setup(
-									{
-										inputField : "to",
-										ifFormat : "%Y-%m-%d",
-										button : "openCalendarTo",
-									}
-								);
-							</script></td>
-			</tr>
-		</tbody>
-	</table>
-	
-	
-		<h3> Output </h3>
-		<input type="radio" checked name="output" value="screen" /> To screen into the browser
-		
-		<input type="radio" name="output" value="file" /> To file <input type="text" name="basename" value="Export" /> into an application  
-		<!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" -->
-	</p>
-	
-	<p>
-	<input type="submit" value="OK" />
-	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
-	<input type="hidden" name="do_it" value="1" />
-	</form>
+    <h1>Borrowers with no Issues</h1>
+    <form method="post">
+    
+    <table>
+        <thead>
+            <tr>
+            <th>Limit to </th>
+            <th>By </th>
+            <th colspan="2">Filters</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>
+                    <select name="Limit">
+                        <option value ="" checked>None</option>
+                        <option value ="5"> 5</option>
+                        <option value ="10">10</option>
+                        <option value ="15">15</option>
+                        <option value ="20">20</option>
+                        <option value ="25">25</option>
+                        <option value ="40">40</option>
+                        <option value ="50">50</option>
+                        <option value ="100">100</option>
+                    </select>
+                </td>
+                <td>
+                    <select name="Criteria">
+                        <option value ="" checked>None</option>
+                        <option value ="categorycode">Categorycode</option>
+                        <option value ="itemtype">Itemtype</option>
+                    </select>
+                </td>
+            </tr>
+            <tr class="hilighted">
+                <td>&nbsp;</td>
+                <td>&nbsp;</td>
+                <td>Borrower Category</td>
+                <td><input type="text" name="Filter" value="" /></td>
+            </tr>
+            <tr class="hilighted">
+                <td>&nbsp;</td>
+                <td>&nbsp;</td>
+                <td>Without issues since</td>
+                <td><input size="10" id="to" name="Filter" value="" type="text" />
+                        <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+                            <script type="text/javascript">
+                                Calendar.setup(
+                                    {
+                                        inputField : "to",
+                                        ifFormat : "%Y-%m-%d",
+                                        button : "openCalendarTo",
+                                    }
+                                );
+                            </script></td>
+            </tr>
+        </tbody>
+    </table>
+    
+    
+        <h3> Output </h3>
+        <input type="radio" checked name="output" value="screen" /> To screen into the browser
+        
+        <input type="radio" name="output" value="file" /> To file <input type="text" name="basename" value="Export" /> into an application  
+        <!-- TMPL_VAR NAME="CGIextChoice" -->
+        <!-- TMPL_VAR NAME="CGIsepChoice" -->
+    </p>
+    
+    <p>
+    <input type="submit" value="OK" />
+    <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
+    <input type="hidden" name="do_it" value="1" />
+    </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl
index a2d66be8a2..066dfd2fc0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl
@@ -1,4 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,13 +11,13 @@
 
 <!-- TMPL_IF NAME="do_it" -->
 	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Borrowers statistics </h1>
+		<h1>Borrowers statistics</h1>
 		<!-- TMPL_IF NAME="loopfilter"-->
 			<p>Filtered on</p>
 			<!-- TMPL_LOOP NAME="loopfilter" -->
 					<p> <!-- TMPL_VAR NAME="crit"--> =<!-- TMPL_VAR NAME="filter"--></p>
 			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_IF NAME="loopfilter"-->
+		<!-- /TMPL_IF -->
 		<table>
 			<tr >
 				<th><!-- TMPL_VAR name="line" --> / <!-- TMPL_VAR name="column" --></th>
@@ -41,7 +42,7 @@
 							<!-- TMPL_VAR NAME="totalrow" -->
 						</td>
 					</tr>
-				<!-- /TMPL_LOOP NAME="looprow" -->
+				<!-- /TMPL_LOOP  -->
 				<tr >
 					<th>TOTAL</th>
 					<!-- TMPL_LOOP NAME="loopfooter" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl
index b864b362f0..1eb22241c9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl
@@ -1,4 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
+
+
+<!-- TMPL_IF NAME="do_it" -->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -6,22 +11,19 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js"></script>
 <!-- End of additions -->
-
-
-<!-- TMPL_IF NAME="do_it" -->
 <script language="JavaScript" type="text/javascript">
 function Dopop(link) {
 	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
 }
 </script>
 	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Top <!-- TMPL_VAR NAME="limit"--> List On Catalogue Issues </h1>
+		<h1>Top <!-- TMPL_VAR NAME="limit"--> List On Catalogue Issues </h1>
 		<!-- TMPL_IF NAME="loopfilter"-->
 			<p>Filtered on</p>
 			<!-- TMPL_LOOP NAME="loopfilter" -->
 					<p><!-- TMPL_IF NAME="err" -->  <!--/TMPL_IF --> <!-- TMPL_VAR NAME="crit"--> =<!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" -->  <!--/TMPL_IF --></p>
 			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_IF NAME="loopfilter"-->
+		<!-- /TMPL_IF-->
 		
 		<table>
 			<tr >
@@ -43,7 +45,7 @@ function Dopop(link) {
 						<!-- TMPL_VAR NAME="rowtitle" --></td>
 						<!-- TMPL_LOOP NAME="loopcell" -->
 							<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
-								<!-- TMPL_IF NAME="reference" --><a href="javascript:Dopop('../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="reference" -->')" ><!-- /TMPL_IF -->
+								<!-- TMPL_IF NAME="reference" --><a href="javascript:Dopop('../catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="reference" -->')" ><!-- /TMPL_IF -->
 								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- TMPL_ELSE -->Item<!-- /TMPL_IF -->
 								<!-- TMPL_IF NAME="reference" --></a><!-- /TMPL_IF -->
 							</td>
@@ -52,11 +54,11 @@ function Dopop(link) {
 							</td>
 						<!-- /TMPL_LOOP -->
 					</tr>
-				<!-- /TMPL_LOOP NAME="looprow" -->
+				<!-- /TMPL_LOOP -->
 		</table>
 	<!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-	<h1>Koha : Top List On Catalogue Issues  </h1>
+	<h1>Top List On Catalogue Issues</h1>
 	<form method="post">
 	
 	<table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl
index c573c4f488..7985aa439c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl
@@ -1,4 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,7 +11,7 @@
 
 <!-- TMPL_IF NAME="do_it" -->
 	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Items with no Issues </h1>
+		<h1>Items with no Issues</h1>
 		<!-- TMPL_IF NAME="loopfilter"-->
 			<p>Filtered on</p>
 			<!-- TMPL_LOOP NAME="loopfilter" -->
@@ -39,7 +40,7 @@
 		</table>
 	<!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-	<h1>Koha : Items with no Issues </h1>
+	<h1>Items with no Issues</h1>
 	<form method="post">
 	
 	<table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_stats.tmpl
index 95517d9c56..08a0958ed8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_stats.tmpl
@@ -1,4 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,7 +11,7 @@
 
 <!-- TMPL_IF NAME="do_it" -->
 	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Catalogue statistics </h1>
+		<h1>Catalogue statistics</h1>
 		<!-- TMPL_IF NAME="loopfilter"-->
 			<p>Filtered on</p>
 			<!-- TMPL_LOOP NAME="loopfilter" -->
@@ -54,7 +55,7 @@
 		</table>
 	<!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-	<h1>Koha : Catalogue statistics</h1>
+	<h1>Catalogue statistics</h1>
 	<form method="post">
 	<table>
 		<thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/inventory.tmpl
index f2d4d29cb0..2f168fcb66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/inventory.tmpl
@@ -1,4 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions --><!-- Additions to enable Calendar system -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl
index bab340e3ba..ace67c778d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl
@@ -1,4 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,13 +11,13 @@
 
 <!-- TMPL_IF NAME="do_it" -->
 	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Issues Average Period statistics </h1>
+		<h1>Issues Average Period statistics </h1>
 		<!-- TMPL_IF NAME="loopfilter"-->
 			<p>Filtered on</p>
 			<!-- TMPL_LOOP NAME="loopfilter" -->
 					<p><!-- TMPL_IF NAME="err" -->  <!--/TMPL_IF --> <!-- TMPL_VAR NAME="crit"--> =<!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" -->  <!--/TMPL_IF --></p>
 			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_IF NAME="loopfilter"-->
+		<!-- /TMPL_IF-->
 		
 		<table>
 			<tr >
@@ -31,7 +32,7 @@
 						<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
 						<!-- TMPL_VAR NAME="rowtitle" --></td>
 						<!-- TMPL_LOOP NAME="loopcell" -->
-							<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+							<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
 								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
 							</td>
 						<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl
index 2eb2b2721f..1ab563c8b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl
@@ -1,4 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -9,7 +10,7 @@
 
 <!-- TMPL_IF NAME="do_it" -->
 <!-- TMPL_LOOP NAME="mainloop" -->
-	<h1>Koha : Issues by borrower category <!--TMPL_IF NAME="borrower_category" --> for category = <!-- TMPL_VAR NAME="borrower_category" --><!-- /TMPL_IF --></h1>
+	<h1>Issues by borrower category <!--TMPL_IF NAME="borrower_category" --> for category = <!-- TMPL_VAR NAME="borrower_category" --><!-- /TMPL_IF --></h1>
 	<table>
 		<tr>
 			<th>&nbsp;</th>
@@ -54,4 +55,4 @@
 	</form>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl
index a79f6d0360..af77177cd2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl
@@ -1,4 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -10,7 +11,7 @@
 
 <!-- TMPL_IF NAME="do_it" -->
 	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Issues statistics </h1>
+		<h1>Issues statistics </h1>
 		<!-- TMPL_IF NAME="loopfilter"-->
 			<p>Filtered on</p>
 			<!-- TMPL_LOOP NAME="loopfilter" -->
@@ -54,7 +55,7 @@
 		</table>
 	<!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-	<h1>Koha : Issues statistics </h1>
+	<h1>Issues statistics </h1>
 	<form method="post">
 	<table>
 		<thead>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/itemtypes.tmpl
index e09b4a8a1d..9e907b49ec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/itemtypes.tmpl
@@ -1,4 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_INCLUDE NAME="menus.inc" --><!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -20,7 +21,7 @@
 					<td><!-- TMPL_VAR NAME="itemtype" --></td>
 					<td><!-- TMPL_VAR NAME="count" --></td>
 				</tr>
-			<!-- /TMPL_LOOP NAME="loopitemtype" -->
+			<!-- /TMPL_LOOP -->
 			<tr>
 				<th>TOTAL</th>
 				<th><!-- TMPL_VAR NAME="total" --></th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl
index 258c5b584e..e8748032f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl
@@ -1,5 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reports --<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc"-->
+<!-- TMPL_INCLUDE NAME="menu-reports.inc"-->
 <!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
 <!-- End of additions --><!-- Additions to enable Calendar system -->
@@ -35,14 +36,10 @@
 	<h2>Other stats</h2>
 	<p>on catalogue</p>
 	<ul>
-		<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></li>
 		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>
 	</ul>
 	<p>on issues</p>
 	<ul>
-		<li><a href="/cgi-bin/koha/reports/stats.pl?time=yesterday">Till Reconciliation:</a> Daily Report (yesterday)</li>
-		<li><a href="/cgi-bin/koha/reports/stats.pl?time=today">Till Reconciliation:</a> Daily Report (today)</li>
-		<li><a href="/cgi-bin/koha/reports/overdue.pl">Overdue items</a></li>
 		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Issues by borrower category</a></li>
 		<li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li>
 	</ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl
index 5433b2d462..2dee7f1112 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl
@@ -2,6 +2,7 @@
 Koha -- Circulation
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-circ.inc" -->
 
 <script language="JavaScript">
 function check() {
@@ -33,14 +34,14 @@ if (document.form.alreadyreserved.value == "1"){
 }
 
 if (count_reserv == "0"){
-		msg += _("- Please select a document to reserve\n");
+		msg += ("- Please select a document to reserve\n");
 }
 if (count_reserv >= "2"){
-		msg += _("- You can select only one type of document\n by item, or by the first item returned\n");
+		msg += ("- You can select only one type of document\n by item, or by the first item returned\n");
 }
 
 if (alreadyreserved > "0"){
-		msg += _("- This borrower had already reserved this document\n Please cancel the previous reserve first \n");
+		msg += ("- This borrower had already reserved this document\n Please cancel the previous reserve first \n");
 }
 
 	if (msg == "") return(true);
@@ -50,81 +51,83 @@ if (alreadyreserved > "0"){
 	}
 }
 </script>
-
-
+<!-- TMPL_IF NAME="messagetransfert" -->
+		<div>
+				<h2>Reserve find for the document(<!-- TMPL_VAR NAME="nextreservtitle" -->)must transfered</h2>
+			<p>This documen is reserved by : <b> <!-- TMPL_VAR NAME="nextreservsurname" --> <!-- TMPL_VAR NAME="nextreservfirstname" --></b> at the library : <b> <!-- TMPL_VAR NAME="branchname" --> </b>, Please put this document in transfer .
+			</p>
+			<form name="cancelReservewithtransfert" action="branchreserves.pl" method="post">
+				<input type="submit" class="button circulation">
+			</form>
+		</div>
+	<!-- /TMPL_IF -->
 <h1>Request for reserve</h1>
 
 <fieldset>
   <legend>Biblio informations</legend>
   <ul>
-    <li>Title: <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="bib" -->"><!-- TMPL_VAR NAME="title" --></a></li>
-    <li>Author: <!-- TMPL_VAR NAME="author" --></li>
+    <p><label>Title: </label><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></p>
+    <p><label>Author: </label><!-- TMPL_VAR NAME="author" --></p>
   </ul>
 </fieldset>
 
 <!-- TMPL_UNLESS NAME="cardnumber"-->
-<form action="request.pl?bib=<!-- TMPL_VAR NAME="bib" -->" method="post" onSubmit="request.pl" name="getborrower">
-  <fieldset>
-    <legend>Member search</legend>
-  <!-- TMPL_UNLESS name="CGIselectborrower" -->
-    <table>
-      <tr>
-        <th>Member (number or name)</th>
-        <td>
-          <input type="text" size="20" name="findborrower">
-        </td>
-      </tr>
-    </table>
-
-    <div id="action">
-    <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="bib"-->">
-     <input type="submit" value="Search">
-    </div>
-  <!-- TMPL_ELSE -->
-    <!-- TMPL_VAR NAME="CGIselectborrower" -->
-
-    <div id="action">
-    <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="bib"-->">
-     <input type="submit" value="Select">
-    </div>
-  <!-- /TMPL_UNLESS -->
-
-  </fieldset>
+<form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" method="post" onSubmit="request.pl" name="getborrower">
+    <fieldset>
+        <legend>Member search</legend>
+    <!-- TMPL_UNLESS name="CGIselectborrower" -->
+            <p>
+            <label>Member (number or name)</label>
+            <input type="text" size="20" name="findborrower">
+            </p>
+        <div id="action">
+            <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber"-->">
+            <input type="submit" value="Search">
+        </div>
+    <!-- TMPL_ELSE -->
+        <!-- TMPL_VAR NAME="CGIselectborrower" -->
+        <div id="action">
+            <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber"-->">
+            <input type="submit" value="Select">
+        </div>
+    <!-- /TMPL_UNLESS -->
+    
+    </fieldset>
 </form>
 <!-- TMPL_ELSE -->
     
   <!-- TMPL_IF NAME="maxreserves" -->
-      <br>
+    <br>
     <p class="problem">
-      <label class="label100"><u>Too many reserves</u></label>
+      <label><u>Too many reserves</u></label>
       Currently, this member has <!-- TMPL_VAR NAME="borrowerreservs" --> active reserves.
     </p>
     <!-- /TMPL_IF -->
 
     <!-- TMPL_IF NAME="expiry" -->
-    <br>			
+    <br>
     <p class="problem">
-      <label class="label100"><u>Expired card</u></label>
+      <label>Expired card</label>
       The card of this member is expired
     </p>
     <!-- /TMPL_IF -->
 
     <!-- TMPL_IF NAME="diffbranch" -->			
     <p class="problem">
-      <label class="label100"><u>Localisation</u></label>
+      <label>Localisation</label>
       The borrower isn't in is own library
     </p>
     <!-- /TMPL_IF -->
 
     <!-- TMPL_IF NAME="alreadyreserved" -->			
     <p class="problem">
-      <label class="label100"><u>Operation can be make</u></label>
-      This borrower had already make a reserv for this document
+      <label>Operation can be make</label>
+      This borrower had already make a reserve for this document
     </p>
     <!-- /TMPL_IF -->
 
   <!-- TMPL_IF NAME="messageborrower" -->
-    <div class="problem">Carrefull,there is no borrower with this name, Please, try an other </div> 
+    <div class="problem">Carrefull,there is no borrower with this name, Please, try an other </div>
   <!-- /TMPL_IF -->
 <!-- /TMPL_UNLESS -->
 
@@ -133,57 +136,30 @@ if (alreadyreserved > "0"){
     <legend>Reservation properties</legend>
 
     <input type="hidden" size="10" name="member" value="<!--  TMPL_VAR NAME="cardnumber" -->">
-    <input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="bib" -->">
+    <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
     <input type="hidden" name="type" value="str8">
     <input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->">
-
-    <table>
-      <tr>
-        <th>Member</th>
-        <td>
-<!-- TMPL_IF NAME="cardnumber"-->
-          <!-- TMPL_VAR NAME="borrowersurname" --> <!-- TMPL_VAR NAME="borrowerfirstname" -->
-          (card number: <!--  TMPL_VAR NAME="cardnumber" -->)
-<!-- TMPL_ELSE -->
-          Not defined yet
-<!-- /TMPL_IF -->
-        </td>
-      </tr>
-      
-      <tr>
-        <th><label for="priority">Priority</label></th>
-        <td>
-          <select name="rank-request">
-<!-- TMPL_LOOP Name="optionloop" -->
-  <!-- TMPL_IF Name="selected" -->
-            <option value="<!-- TMPL_VAR NAME="num" -->" selected="selected"><!-- TMPL_VAR NAME="num" --></option>
-  <!-- TMPL_ELSE -->
-            <option value="<!-- TMPL_VAR NAME="num" -->"><!-- TMPL_VAR NAME="num" --></option>
-  <!-- /TMPL_IF -->
-<!-- /TMPL_LOOP -->
-          </select>
-        </td>
-      </tr>
-
-      <tr>
-        <th>
-          <label>Notes</label>
-        </th>
-        <td>
-          <textarea name="notes" cols="40" rows="5"></textarea>
-        </td>
-      </tr>
-
-      <tr>
-        <th>
-          <label>Place of retreat</label>
-        </th>
-        <td>
-          <!-- TMPL_VAR NAME="CGIbranch" -->
-        </td>
-      </tr>
-
-    </table>
+    <input type="hidden" name="rank-request" value="<!-- TMPL_VAR NAME="fixedRank" -->">
+    <p><label>Member</label>
+        <!-- TMPL_IF NAME="cardnumber"-->
+            <!-- TMPL_VAR NAME="borrowersurname" --> <!-- TMPL_VAR NAME="borrowerfirstname" -->
+            (card number: <!--  TMPL_VAR NAME="cardnumber" -->)
+        <!-- TMPL_ELSE -->
+            Not defined yet
+        <!-- /TMPL_IF -->
+    </p>
+    <p>
+    <label for="priority">Priority</label>
+     	<b> <!-- TMPL_VAR Name="fixedRank" --> </b>
+    </p>
+    <p>
+        <label>Notes</label>
+        <textarea name="notes" cols="20" rows="2"></textarea>
+    </p>
+    <p>
+        <label>Pickup at</label>
+        <!-- TMPL_VAR NAME="CGIbranch" -->
+    </p>
   </fieldset>
 
   <fieldset>
@@ -193,26 +169,29 @@ if (alreadyreserved > "0"){
       <li>Item type: <!-- TMPL_VAR NAME="description" --></li>
       <li>Publication year: <!-- TMPL_VAR NAME="publicationyear" --></li>
     </ul>
-    
+
     <table>
       <tr>
-        <th>Item number</th>
+        <th>Barcode</th>
         <th>Home branch</th>
         <th>Holding branch</th>
+        <th>Call number</th>
         <th>Information</th>
+        <th>Cancel a Reserve</th>
       </tr>
   <!-- TMPL_LOOP Name="itemloop" -->
       <tr class="<!-- TMPL_VAR NAME="backgroundcolor" -->">
         <td>
-          <!-- TMPL_VAR NAME="barcode" -->
+        	<!-- TMPL_VAR NAME="barcode" --> 
         </td>
         <td>
-          <!-- TMPL_VAR NAME="homebranchname" -->
+          <!-- TMPL_VAR NAME="homebranch" -->
         </td>
         <td>
-    <!-- TMPL_IF NAME="holdingbranchname" -->
-          <!-- TMPL_VAR NAME="holdingbranchname" -->
-    <!-- /TMPL_IF -->
+          <!-- TMPL_VAR NAME="holdingbranch" -->
+        </td>
+        <td>
+          <!-- TMPL_VAR NAME="itemcallnumber" -->
         </td>
         <td>
     <!-- TMPL_IF Name="date_due" -->
@@ -243,6 +222,25 @@ if (alreadyreserved > "0"){
           to : <!-- TMPL_VAR NAME="transfertto" -->, the : <!-- TMPL_VAR NAME="transfertwhen" -->
     <!-- /TMPL_IF -->
         </td>
+        <td>
+        <!-- TMPL_IF NAME="reservedate"-->
+		<!-- TMPL_IF NAME="nocancel" -->
+			Can't be cancelled, when item on transfert
+			<!-- TMPL_ELSE -->
+			<a class="info" href="modrequest.pl?CancelBiblioNumber=<!-- TMPL_VAR NAME="biblionumber" -->&CancelBorrowerNumber=<!-- TMPL_VAR NAME="ReservedForBorrowernumber" -->&CancelItemnumber=<!--  TMPL_VAR NAME="itemnumber"-->"  onclick="if (window.confirm('You will delete a reserve, are you sure ?'))    
+                                   {return true;}
+                else {return false;}">Cancel A reserve
+        	 <span> Item reserved for :
+        	 	<!-- TMPL_VAR NAME="ReservedForSurname" -->  <!-- TMPL_VAR NAME="ReservedForFirstname" -->
+        	 <br>
+        	 expected at :	<!-- TMPL_VAR NAME="ExpectedAtLibrary" -->
+        	 </span>
+        	 </a>
+		<!-- /TMPL_IF -->
+        <!-- TMPL_ELSE -->
+        	No reserves
+        <!-- /TMPL_IF -->
+        </td>
       </tr>
   <!-- /TMPL_LOOP --> <!-- itemloop -->
     </table>
@@ -257,13 +255,14 @@ if (alreadyreserved > "0"){
     
     <input type="hidden" name="biblioitem" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
     <input type="hidden" name="alreadyreserved" value="<!-- TMPL_VAR NAME="alreadyreserved" -->">
+  
   </fieldset>
 
   <div id="actions">
 <!-- TMPL_IF NAME="cardnumber"-->
     <input type="submit" value="Reserve">
 <!-- TMPL_ELSE -->
-    <input type="submit" value="Reserve" disabled="disabled" style="background-color: gray;">
+    <input type="submit" value="Reserve" value="Reserve" disabled="disabled" style="background-color: gray;" disabled="disabled"  title="Search member first">
 <!-- /TMPL_IF -->
   </div>
 
@@ -272,7 +271,7 @@ if (alreadyreserved > "0"){
 <!-- TMPL_IF name="reserveloop" -->
 <form name="T<!-- TMPL_VAR NAME="time" -->" action="modrequest.pl" method="post">
   <fieldset>
-    <legend>Modify existing reserves</legend>
+    <legend>Queue list</legend>
     
     <table>
       <tr>
@@ -291,24 +290,26 @@ if (alreadyreserved > "0"){
           <select name="rank-request">
     <!-- TMPL_IF Name="wait" -->
             <option value="W" selected>Waiting</option>
-    <!-- /TMPL_IF -->
-              
-    <!-- TMPL_LOOP Name="optionloop" -->
-            <option value="<!-- TMPL_VAR NAME="num" -->" <!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
-              <!-- TMPL_VAR NAME="num" -->
+    	<!-- TMPL_ELSE -->
+            <option value="<!-- TMPL_VAR NAME="priority" -->" <!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+              <!-- TMPL_VAR NAME="priority" -->
             </option>
-    <!-- /TMPL_LOOP -->
+        <!-- /TMPL_IF -->
             <option value="del">del</option>
           </select>
         </td>
         <td>
-          <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="borrowernumber" --></a>
+          <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" ><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a>
         </td>
         <td><!-- TMPL_VAR NAME="notes" --></td>
         <td><!-- TMPL_VAR NAME="date" --></td>
         <td>
     <!-- TMPL_IF Name="wait" -->
+    	<!-- TMPL_IF NAME="atdestination" -->
           Document waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value=<!-- TMPL_VAR NAME="wbrcd" -->>
+          <!-- TMPL_ELSE -->
+          Document will be transfered to <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value=<!-- TMPL_VAR NAME="wbrcd" -->>
+         <!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->
           <select name="pickup">
       <!-- TMPL_LOOP Name="branchloop" -->
@@ -325,8 +326,13 @@ if (alreadyreserved > "0"){
         </td>
         <td>
     <!-- TMPL_IF Name="wait" -->
-          <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME=''biblionumber" -->&amp;type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
-            <!-- TMPL_VAR NAME="barcode" -->
+          <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME='biblionumber' -->&type='intra'" onclick="openWindow(this, 'Item', 480, 640); return false;">
+                <!-- TMPL_IF NAME="barcodenumber" -->
+                    <!-- TMPL_VAR NAME="barcodenumber" -->
+                    <input type="hidden" name="itemnumber" value=<!-- TMPL_VAR NAME="itemnumber" -->>
+                <!-- TMPL_ELSE -->
+                    No Barcode
+                <!-- /TMPL_IF -->
           </a>
     <!-- TMPL_ELSE -->
       <!-- TMPL_IF Name="constrainttypea" -->
@@ -341,9 +347,8 @@ if (alreadyreserved > "0"){
       </tr>
   <!-- /TMPL_LOOP --> <!-- existing reserveloop -->
       <tr>
-        <td colspan="6" align="right">
-          Cancel a reserve with select
-          <input type="image" name="submit" value="Reserv" border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/2rightarrow.png">
+        <td colspan="6">
+          <input type="submit" name="submit" value="Cancel reserve(s)" border="0">
         </td>
       </tr>
     </table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/reviews/reviewswaiting.tmpl b/koha-tmpl/intranet-tmpl/prog/en/reviews/reviewswaiting.tmpl
index 3ec53c7ca1..82663af29a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/reviews/reviewswaiting.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/reviews/reviewswaiting.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-    Reviews waiting for Approval --
+Reviews waiting for Approval --
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
@@ -23,10 +23,10 @@
             &nbsp;
         </th>
     </tr>
-<!-- TMPL_LOOP NAME="reviews" -->
+    <!-- TMPL_LOOP NAME="reviews" -->
     <tr>
         <td>
-            <!-- TMPL_VAR NAME="surname" --> 
+            <!-- TMPL_VAR NAME="surname" -->
             <!-- TMPL_VAR NAME="firstname" -->
         </td>
         <td>
@@ -36,14 +36,14 @@
             <!-- TMPL_VAR NAME="review" -->
         </td>
         <td>
-            <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&reviewid=<!-- TMPL_VAR NAME="reviewid" -->">Approve</a> | 
+            <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=approve&reviewid=<!-- TMPL_VAR NAME="reviewid" -->">Approve</a> |
             <a href="/cgi-bin/koha/reviews/reviewswaiting.pl?op=delete&reviewid=<!-- TMPL_VAR NAME="reviewid" -->">Delete</a>
         </td>
     </tr>
-<!-- /TMPL_LOOP -->
+    <!-- /TMPL_LOOP -->
 </table>
 <!-- TMPL_ELSE -->
-    <b>No reviews has been writed.</b>
+<b>No review has to be approved or deleted.</b>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl
index 51a44b0cd2..38171e9623 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl
@@ -1,7 +1,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit -- Select supplier<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
 <h1>Supplier Search Results</h1>
 <h2>You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
+
+<div class="searchresults">
+<!-- TMPL_IF NAME="loop_suppliers" -->
 <table>
 	<tr>
 		<th>Book seller</th>
@@ -10,18 +12,22 @@
 	<!-- TMPL_LOOP name="loop_suppliers" -->
 		<tr>
 			<td><!-- TMPL_VAR name="name" --></td>
-			<td><a href="#" onclick="javascript:GetIt(<!-- TMPL_VAR name="aqbooksellerid" -->,'<!-- TMPL_VAR name="name" -->')">Get It !</td>
+			<td><a href="#" onclick="javascript:GetIt(<!-- TMPL_VAR NAME="aqbooksellerid" -->,'<!--  TMPL_VAR escape="URL" NAME="name" -->')">Get It !</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 </table>
+<!-- /TMPL_IF -->
+    <br />
+    <a href="javascript:back();">Perform a new search</a>
+</div>
 
-<script language="Javascript">
+<script type="text/javascript" language="Javascript">
 
 function GetIt(aqbooksellerid,name)
 {
   opener.document.f.aqbooksellerid.value = aqbooksellerid;
   opener.document.f.aqbooksellername.value = name;
-  self.close();
+  window.close();
 }
 </script>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl
index 34e50c2d45..920c9817bd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl
@@ -1,21 +1,18 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit -- Search supplier<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-
-
 <script language="Javascript">
 
 function GetIt(aqbooksellerid,name)
 {
   opener.document.f.aqbooksellerid.value = aqbooksellerid;
   opener.document.f.aqbooksellername.value = name;
-  self.close();
+  window.close();
 }
 </script>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
 
 <h1>Search supplier for serial subscription</h1>
-	<form action="/cgi-bin/koha/serials/acqui-search-result.pl" method=post>
-		Supplier name : <input type="text"  size="25"   name="supplier">
+    <form action="/cgi-bin/koha/serials/acqui-search-result.pl" method="POST">
+        <label for="text">Supplier name : </label>
+        <input id="text" type="text"  size="25"   name="supplier">
         <input type="submit" class="button serial" value="OK">
-	</form>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
\ No newline at end of file
+    </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl
index 836aa6c879..250c23d1a9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl
@@ -1,10 +1,22 @@
 <!-- TMPL_UNLESS NAME="preview" -->
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!--
 TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
 
-<div id="main">
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+
+<script type="text/javascript">
+function Setorder(myorder){
+    if (document.claims.elements['order'].value == myorder){
+      document.claims.elements['order'].value=myorder+' desc';
+    } else {
+      document.claims.elements['order'].value=myorder;
+    }
+    document.claims.elements['op'].value="";
+    document.claims.submit();
+}
+</script>
+<div id="mainbloc">
 <!-- TMPL_ELSE -->
 <!-- TMPL_INCLUDE NAME="popup-top.inc" -->
 <div class="popup-block">
@@ -14,60 +26,72 @@ TMPL_INCLUDE NAME="doc-head-close.inc" -->
 	<h1>Claims</h1>
 
 	<p>
-	<form action="claims.pl" method="post">
-	<input type="hidden" name="claimletter" value="<!-- TMPL_VAR NAME="claimletter"-->">
+	<form name="claims" action="claims.pl" method="post">
 	<!-- TMPL_VAR name="CGIsupplier" -->
-	<input type="submit" value="Filter by Supplier" class="button">
-	</form>
+			<!-- TMPL_IF name="phone" -->Phone: <!-- TMPL_VAR name="phone" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="booksellerfax" -->Fax: <!-- TMPL_VAR name="booksellerfax" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF name="bookselleremail" --></p><p><a href="mailto:<!-- TMPL_VAR name="bookselleremail" -->"><!-- TMPL_VAR name="bookselleremail" --></a><!-- /TMPL_IF -->
+
 	</p>
-<!--
 	<p>
-	<form action="claims.pl" method="post">
-	<input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid"-->">
-	<!-- TMPL_VAR name="CGIletter" -->
-	<input type="submit" value="Choose Claim Form" class="button">
-	</form>
-	</p> -->
+    <!--TMPL_IF Name="letter"-->
+    Select Letter :
+    <select name="letter_code">
+	<!-- TMPL_LOOP name="letters" -->
+      <option value="<!--TMPL_VAR Name="code"-->"><!--TMPL_VAR Name="name"--></option>
+    <!--/TMPL_LOOP-->
+    </select>
+    <!--TMPL_ELSE-->
+    No Letter defined. Please Define One. The list of expected issues is displayed.
+    <!--/TMPL_IF-->
+	</p> 
 
-<form method="post" action="lateissues-excel.pl">
-<input type="hidden" name="op" value="claims" />
+
+<input type="hidden" name="order" value="<!--TMPL_VAR Name="order"-->" />
+<input type="hidden" name="op" value="" />
 
 		<!-- TMPL_IF NAME="missingissues" -->
 		<h3>Missing Issues</h3>
 		<table cellpadding="0" cellspacing="0" border="0" class="collapse">
 			<tr>
-				<th class="cell-header">&nbsp;</th>
+                <!--TMPL_IF Name=letter-->
+                <th class="cell-header">&nbsp;</th>
+                <!--/TMPL_IF-->
 				<th class="cell-header">Supplier</th>
 				<th class="cell-header">Title</th>
 				<th class="cell-header">Issue number</th>
-				<th class="cell-header">Missing since</th>
+				<th class="cell-header">Status <a href="javascript:Setorder('status');">sort</a></th>
+				<th class="cell-header">Since <a href="javascript:Setorder('planneddate');">sort</a></th>
 				<th class="cell-header">Began Claim</th>
-				<th class="cell-header">&nbsp;</th>
 			</tr>
 			<!-- TMPL_LOOP name="missingissues" -->
 				<tr>
+					<!--TMPL_IF Name=letter-->
 					<td class="cell">
-					<input type="checkbox" name="serialid" value="<!-- TMPL_VAR NAME="serialid"-->">
+                    <input type="checkbox" name="serialid" value="<!-- TMPL_VAR NAME="serialid"-->" onclick="document.claims.op='send_alert';">
 					</td>
+                    <!--/TMPL_IF-->
 					<td class="cell">
 					<!-- TMPL_VAR name="name" -->
 					</td>
 					<td class="cell">
-					<!-- TMPL_VAR name="Title" -->
+					<!-- TMPL_VAR name="title" -->
 					</td>
 					<td class="cell">
 					<!-- TMPL_VAR name="serialseq" -->
 					</td>
 					<td class="cell">
-					<!-- TMPL_VAR name="planneddate" -->
+                    <!-- TMPL_IF Name="status1" -->Waited<!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="status2" -->Arrived<!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="status7" -->Claimed<!-- /TMPL_IF -->
 					</td>
 					<td class="cell">
-					<!-- TMPL_VAR name="claimdate" -->
+					<!-- TMPL_VAR name="planneddate" -->
 					</td>
 					<td class="cell">
-					<a href="lateissues-excel.pl?supplierid=<!--TMPL_VAR NAME="supplierid"-->&amp;serialid=<!-- TMPL_VAR name="serialid" -->&amp;op=claims" class="button">Export Item Data</a>
-					<!--
-					<a href="claims.pl?serialid=<!-- TMPL_VAR name="serialid" -->&amp;supplierid=<!-- TMPL_VAR name="supplierid" -->&amp;op=preview" onclick="popup(<!-- TMPL_VAR name="supplierid" -->,<!-- TMPL_VAR name="serialid" -->); return false">Claim Letter</a> -->
+					<!-- TMPL_VAR name="claimdate" -->
 					</td>
 				</tr>
 			<!-- /TMPL_LOOP -->
@@ -85,7 +109,9 @@ name="supplierid" -->&amp;op=preview" onclick="popup(<!-- TMPL_VAR
 name="supplierid" -->,''); return false" class="button">Supplier Group Claim Letter</a></p> -->
 	<!-- /TMPL_IF -->
 <p><br/>
-		<input type="submit" name="submit" class="button" value="Export Selected Data" />
+<!--TMPL_IF Name=letter-->
+  <input type="submit" name="submit" class="button" value="Send letter" />
+<!--/TMPL_IF-->
 
 </form>
 <!-- TMPL_ELSE -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/distributedto.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/distributedto.tmpl
index 5f3983a5fb..924c1a2a2c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/distributedto.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/distributedto.tmpl
@@ -1,7 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit -- Select supplier<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
-
+<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
+<div id="mainbloc">
 	<h1>Select borrowers or enter manually the names</h1>
 	<p>
 		<form action="/cgi-bin/koha/serials/distributedto.pl" method="post" name="Aform">
@@ -83,5 +82,5 @@
 			document.Aform.submit();
 		}
 	</script>
-
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl
index 60a69b0ca8..be09083109 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl
@@ -1,9 +1,10 @@
-<!-- TMPL_INCLUDE NAME="popup-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Member Search: <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <script type="text/javascript">
 <!--
 
-function add_member(subscriptionid,bornum){
-     var myurl = "routing.pl?subscriptionid="+subscriptionid+"&bornum="+bornum+"&op=add";
+function add_member(subscriptionid,borrowernumber){
+     var myurl = "routing.pl?subscriptionid="+subscriptionid+"&borrowernumber="+borrowernumber+"&op=add";
      window.opener.location.href = myurl;
 }
 
@@ -21,25 +22,27 @@ function add_member(subscriptionid,bornum){
 </form>
 </p>
 <!-- TMPL_IF NAME="memberloop" -->
+<div class="searchresults">
 <table cellspacing="0" cellpadding="0" border="0" width="480" class="collapse">
-<tr><td class="cell-header">Name</td>
-    <td class="cell-header">Location</td>
-    <td class="cell-header">Add</td></tr>
+<tr><th class="cell-header">Name</th>
+    <th class="cell-header">Location</th>
+    <th class="cell-header">Add</th></tr>
 <!-- TMPL_LOOP NAME="memberloop" -->
 <tr><td class="cell"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></td>
     <td class="cell"><!-- TMPL_VAR NAME="streetaddress" --></td>
     <td class="cell"><a onclick="add_member(<!-- TMPL_VAR
-NAME="subscriptionid" -->,<!-- TMPL_VAR NAME="borrowernumber" -->); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;op=add">Add</a></td></tr>
+NAME="subscriptionid" -->,<!-- TMPL_VAR NAME="borrowernumber" -->); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;op=add">Add</a></td></tr>
 <!-- /TMPL_LOOP -->
         </table></td></tr>
 </table>
+</div>
 <!-- TMPL_ELSE -->
     <!-- TMPL_IF NAME="member" -->
         <p>No results found</p>
     <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 <br />
-<p><a href="javascript:self.close()" class="button">Close</a></p>
+<p><a href="javascript:window.close()" class="button">Close</a></p>
 </div>
 
 <!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/receipt-search-result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/receipt-search-result.tmpl
index 2a372953fc..8e2581ddc4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/receipt-search-result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/receipt-search-result.tmpl
@@ -1,7 +1,5 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
-
+<!-- TMPL_INCLUDE NAME="serials-top.inc" -->
+<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 <div id="mainbloc">
 	<h1 class="authority">Serial search results</h1>
 	<div id="resultnumber">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/result.tmpl
index d6b8ae139f..d51e5bb409 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/result.tmpl
@@ -1,85 +1,53 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="serials-menu.inc" -->
-
-	<h1 class="catalogue">Search results</h1>
-	<div id="resultnumber">
-		<p>
-			<!-- TMPL_IF NAME=displayprev -->
-				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border=0>
-				</a>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME=numbers -->
-				<!-- TMPL_IF NAME=highlight -->
-					<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
-				<!-- TMPL_ELSE -->
-					<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
-				<!-- /TMPL_IF -->
-			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF NAME=displaynext -->
-				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border=0></a>
-				<!-- /TMPL_IF -->
-		</p>
-		<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>
-			<!-- TMPL_ELSE -->
-			&nbsp No results found.<br>
-			<!-- /TMPL_IF -->
-		</p>
-	</div>
-	<div id="resultlist">
-		<table>
-			<tr>
-			<th class="catalogue">Summary</th>
-			<th class="catalogue">&nbsp;</th>
-			</tr>
-			<!-- TMPL_LOOP name="result" -->
-			<tr>
-				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
-					<p>
-						<p><b><!-- TMPL_VAR NAME="title" --></b></p>
-						<p><!-- TMPL_VAR NAME="author" -->
-						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /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 -->
-					</p>
-				</td>
-				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
-						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" escape="URL" -->') ">Get it!</a>
-				</td>
-			</tr>
-			<!-- /TMPL_LOOP -->
-		</table>
-	</div>
-	<div id="resultnumber">
-		<p>
-			<!-- TMPL_IF NAME=displayprev -->
-			<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border=0></a>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME=numbers -->
-				<!-- TMPL_IF NAME=highlight -->
-				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
-				<!-- TMPL_ELSE -->
-				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
-				<!-- /TMPL_IF -->
-			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF NAME=displaynext -->
-			<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border=0></a>
-				<!-- /TMPL_IF -->
-		</p>
-	</div>	
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Search results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
+<div id="mainbloc">
+    <h1 class="catalogue">Search results</h1>
+<!-- TMPL_IF NAME="total"-->
+<div class="searchresults">
+    <table>
+    <tr>
+       <th>Title</th>
+       <th>Author</th>
+       <th>publisher</th>
+       <th>Publication year</th>
+    </tr>
+    <!-- TMPL_LOOP NAME="resultsloop" -->
+        <tr>
+            <td>
+                <a href="#" onclick="Javascript:GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR escape="URL" NAME="title" -->');" title="Get this one !">
+                    <!-- TMPL_VAR NAME="title" -->
+                </a>
+                <br />
+                <small><!-- TMPL_VAR NAME="subtitle" --></small>
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="author" -->
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="publishercode" -->
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="publicationyear" -->
+            </td>
+        </tr>
+    <!-- /TMPL_LOOP -->
+    </table>
+</div>
+<!-- TMPL_ELSE -->
+No result found for <b><!-- TMPL_VAR NAME="query" --></b>
+<!-- /TMPL_IF-->
+</div>
 
 
 <script language="Javascript">
 
 function GetIt(bibno,title)
 {
-  opener.document.f.biblionumber.value = bibno;
-  opener.document.f.title.value = title;
-  self.close();
+    title = title.replace(/\?/,"\?");
+    title = title.replace(/"/,"\"");
+    title = title.replace(/'/,"\'");
+    opener.document.f.biblionumber.value = bibno;
+    opener.document.f.title.value = title;
+    window.close();
 }
 </script>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview-slip.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview-slip.tmpl
index 9d82cf734a..f4335ace7f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview-slip.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview-slip.tmpl
@@ -2,7 +2,7 @@
 
 <div id="slip-block">
 <table cellspacing="0" cellpadding="0" border="0" class="collapse routingslip">
-<tr><td class="cell" colspan="3"><h3>Opus International Consultants - Information Centre</h3></td></tr>
+<tr><td class="cell" colspan="3"><h3><!-- TMPL_VAR NAME="libraryname" --></h3></td></tr>
 <tr><td class="cell" colspan="3"><b>Title:</b> <!-- TMPL_VAR NAME="title" --><br />
 <!-- TMPL_VAR NAME="issue" --></td></tr>
 <tr><td class="cell"><b>Name/Location</b></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview.tmpl
index 1672fce524..b8a9b4fe66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview.tmpl
@@ -1,7 +1,10 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!--
+TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
+<div id="mainbloc">
 <h1 class="bull">Preview Routing List</h1>
 
 <form method="post" action="routing-preview.pl">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/routing.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/routing.tmpl
index d59606d61b..57fda83a88 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/routing.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/routing.tmpl
@@ -1,8 +1,8 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!--
+TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
 <script language="javascript" type="text/javascript">
 <!--
@@ -14,7 +14,7 @@ function reorder_item(sid,rid,rank){
 //-->
 </script>
 
-<div id="main">
+<div id="mainbloc">
 <!-- TMPL_IF NAME="op" -->
 <h1>Create Routing List</h1>
 <!-- TMPL_ELSE -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues-full.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues-full.tmpl
index 57425835f6..40bd392a32 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues-full.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues-full.tmpl
@@ -1,11 +1,10 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!-- TMPL_INCLUDE NAME="serials-top.inc" -->
+<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
 <!-- TMPL_UNLESS name="popup" -->
 	<h1 class="serial">Subscription information for biblio #<!-- TMPL_VAR NAME="biblionumber" --> with title : <!-- TMPL_VAR name="bibliotitle" --></h1>
 	<p>
-	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button serial">Back to biblio</a>
+	<a href="opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button serial">Back to biblio</a>
 <!-- /TMPL_UNLESS -->
 	<!-- TMPL_LOOP NAME="years" -->
 		<!-- TMPL_IF NAME="year" -->
@@ -48,7 +47,6 @@
 			<!-- /TMPL_LOOP -->
 		</table>
 	</div>
-</div>
 	<!--/TMPL_LOOP -->
 <script language="JavaScript" type="text/javascript">
 active(<!-- TMPL_VAR name="yearmin" -->);
@@ -65,6 +63,6 @@ function active(numlayer)
 	}
 }
 
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
+</script>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues.tmpl
index 6a38f41700..03f35842ce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues.tmpl
@@ -1,106 +1,105 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
-<h1>Issues for a subscription</h1>
+<h1>Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h1>
+<div id="action">
+    <a href="/cgi-bin/koha/serials/serials-home.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Subscriptions</a>
+    <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->">Back to biblio</a>
+    <a href="/cgi-bin/koha/serials/serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&selectview=full">Complete view</a>
+    </form>
+</div>
 <!-- TMPL_LOOP name="subscription_LOOP" -->
-	<div id="serials_serial_issue_<!-- TMPL_VAR name="subscriptionid" -->">
-		<h2>Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
-		<p>It began on <b><!-- TMPL_VAR name="histstartdate" --></b> and is issued every
-		<b>
-		<!--TMPL_IF name="periodicity1" -->
-				day
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity2" -->
-				week
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity3" -->
-				2 weeks
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity4" -->
-				3 weeks
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity5" -->
-				month
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity6" -->
-				2 months
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity7" -->
-				3 months
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity8" -->
-				quarter
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity9" -->
-				2 quarters
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity10" -->
-				year
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity11" -->
-				2 years
-		<!-- /TMPL_IF -->
-		</b>
-		<!--TMPL_IF name="arrival1" -->
-			on <b>monday</b>
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="arrival2" -->
-			on <b>tuesday</b>
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="arrival3" -->
-			on <b>wednesday</b>
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="arrival4" -->
-			on <b>thursday</b>
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="arrival5" -->
-			on <b>friday</b>
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="arrival6" -->
-			on <b>saturday</b>
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="arrival7" -->
-			on <b>sunday</b>
-		<!-- /TMPL_IF -->
-		for <b>
-			<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> weeks<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->
-			</b>
-		</p>
-		<p>Last renewal of subscription was <b><!-- TMPl_VAR name="startdate" --></b></p>
-		<!-- TMPL_IF name="enddate" --><p><b>This subscription is now ended. The last issue was received on <!-- TMPL_VAR name="enddate" --></b></p><!-- /TMPL_IF name="enddate" -->
-	<!--TMPL_UNLESS Name=fullinfo -->
-		<p><!-- TMPL_VAR name="notes" --></p>
-		<!-- TMPL_IF name="opacnote" -->
-			<h3 class="serial">Issues summary</h2>
-			<p>
-				<!-- TMPL_VAR name="opacnote" -->
-			</p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="receivedlist" -->
-			<h3 class="serial">received issues</h2>
-			<p>
-				<!-- TMPL_VAR name="receivedlist" -->
-			</p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="missinglist" -->
-			<h3 class="serial">Missing issues</h2>
-			<p>
-				<!-- TMPL_VAR name="missinglist" -->
-			</p>
-		<!-- /TMPL_IF -->
-	</div>
-	<!-- /TMPL_UNLESS -->
+    <div id="serials_serial_issue_<!-- TMPL_VAR name="subscriptionid" -->">
+    <h2>Subscription summary</h2>
+        <p>It began on <b><!-- TMPL_VAR name="histstartdate" --></b> and is issued every
+        <b>
+        <!--TMPL_IF name="periodicity1" -->
+                day
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="periodicity2" -->
+                week
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="periodicity3" -->
+                2 weeks
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="periodicity4" -->
+                3 weeks
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="periodicity5" -->
+                month
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="periodicity6" -->
+                2 months
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="periodicity7" -->
+                3 months
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="periodicity8" -->
+                quarter
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="periodicity9" -->
+                2 quarters
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="periodicity10" -->
+                year
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="periodicity11" -->
+                2 years
+        <!-- /TMPL_IF -->
+        </b>
+        <!--TMPL_IF name="arrival1" -->
+            on <b>monday</b>
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="arrival2" -->
+            on <b>tuesday</b>
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="arrival3" -->
+            on <b>wednesday</b>
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="arrival4" -->
+            on <b>thursday</b>
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="arrival5" -->
+            on <b>friday</b>
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="arrival6" -->
+            on <b>saturday</b>
+        <!-- /TMPL_IF -->
+        <!--TMPL_IF name="arrival7" -->
+            on <b>sunday</b>
+        <!-- /TMPL_IF -->
+        for <b>
+            <!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF -->
+            <!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> weeks<!-- /TMPL_IF -->
+            <!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->
+            </b>
+        </p>
+        <p>Last renewal of subscription was <b><!-- TMPl_VAR name="startdate" --></b></p>
+        <!-- TMPL_IF name="enddate" --><p><b>This subscription is now ended. The last issue was recieved on <!-- TMPL_VAR name="enddate" --></b></p><!-- /TMPL_IF -->
+    <!--TMPL_UNLESS Name=fullinfo -->
+        <p><!-- TMPL_VAR name="notes" --></p>
+        <!-- TMPL_IF name="opacnote" -->
+            <h2>Issues summary</h2>
+            <p>
+                <!-- TMPL_VAR name="opacnote" -->
+            </p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="recievedlist" -->
+            <h2>Recieved issues</h2>
+            <p>
+                <!-- TMPL_VAR name="recievedlist" -->
+            </p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="missinglist" -->
+            <h2>Missing issues</h2>
+            <p>
+                <!-- TMPL_VAR name="missinglist" -->
+            </p>
+        <!-- /TMPL_IF -->
+    </div>
+    <!-- /TMPL_UNLESS -->
 <!-- /TMPL_LOOP -->
-
-<div id="action">
-	
-	<form action="/cgi-bin/koha/serials/serial-issues.pl">
-		<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->">
-		<input type="hidden" name="selectview" value="full">
-		<input type="submit" value="Complete view">
-	</form>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl
index 578d2564bb..08c655230e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl
@@ -1,99 +1,124 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
 
-
-<h1>Serials</h1>
+<h1>Serials subscription</h1>
 <div id="serials_home">
-	<h2>Serials subscriptions</h2>
+	<h2>Search existing subscription</h2>
 <!-- TMPL_IF NAME="routing" -->
         <h3>Search for Serial Routing List</h3>
 <!-- /TMPL_IF -->
 
     <table>
-        <tr><th>Biblionumber</th>
+        <tr>
             <th>ISSN</th>
             <th>Title</th>
             <th>
                 Note
-            </td>
-            <th colspan=2>&nbsp;</th>
+            </th>
+            <th>
+                Branch
+            </th>
+            <!-- TMPL_IF NAME="routing" -->
+              <th colspan=3>&nbsp;</th>
+            <!-- TMPL_ELSE -->
+              <th colspan=2>&nbsp;</th>
+            <!-- /TMPL_IF -->        
         </tr>
         <tr>
-            <form action="serials-home.pl" method="post">
+            <form action="/cgi-bin/koha/serials/serials-home.pl" method="get">
             <!-- TMPL_IF NAME="routing" -->
                 <input type="hidden" name="routing" value="<!-- TMPL_VAR NAME="routing" -->" />
             <!-- /TMPL_IF -->
             <input type="hidden" name="searched" value="1" />
-	<td>
-                <input type="text" size=10 maxlength=15 name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" title="type biblionumber here to filter subscription">
-            </td>
             <td>
-                <input type="text" size=10 maxlength=11 name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->" title="type ISSN here to filter subscription">
+                <input type="text" size=10 maxlength=11 name="ISSN_filter" value="<!-- TMPL_VAR name="ISSN_filter" -->" title="type ISSN here to filter subscription">
             </td>
             <td>
-                <input type="text" size=40 maxlength=40 name="title" value="<!-- TMPL_VAR name="title" -->" title="type a title -complete or partial- to filter subscription">
+                <input type="text" size=40 maxlength=40 name="title_filter" value="<!-- TMPL_VAR name="title_filter" -->" title="type a title -complete or partial- to filter subscription" />
             </td>
-            <td>
+            <td colspan="2">
                 &nbsp;
             </td>
-            <td colspan=2>
+            <td colspan="2">
                 <input type="submit" value="filter" class="button serial" title="set a filter on ISSN / title">
             </td>
         </tr>
+        <!-- TMPL_IF NAME="done_searched"-->
         <!-- TMPL_LOOP name="subscriptions" -->
-	 <!-- TMPL_IF name="toggle" -->
-            <tr class="hilighted">
+            <tr>
+                <!-- TMPL_IF name="toggle" -->
+                    <td class="hilighted">
                 <!-- TMPL_ELSE -->
-	<tr>
-	          <!-- /TMPL_IF -->
-                    
-               <td><a href="/cgi-bin/koha/cataloguing/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button serial" title="Biblio"><!-- TMPL_VAR name="biblionumber" --></a></td>
-       <td>
-                <!-- TMPL_IF name="ISSN" -->
-                   <a href="serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button serial" title="Issues history"><!-- TMPL_VAR name="ISSN" --></a>   
+                    <td>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="issn" -->
+                    <a href="/cgi-bin/koha/serials/serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" title="Issues history"><!-- TMPL_VAR name="issn" --></a>
                 <!-- /TMPL_IF -->
-             </td>
-               
+                </td>
+                <!-- TMPL_IF name="toggle" -->
+                    <td class="hilighted">
+                <!-- TMPL_ELSE -->
                     <td>
-            
+                <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="title" -->
                     <!-- TMPL_VAR name="title" -->
                 <!-- TMPL_ELSE -->
                     |
                 <!-- /TMPL_IF -->
                 </td>
-                
+                <!-- TMPL_IF name="toggle" -->
+                    <td class="hilighted">
+                <!-- TMPL_ELSE -->
                     <td>
-             
+                <!-- /TMPL_IF -->
                 <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
                 </td>
+                <!-- TMPL_IF name="toggle" -->
+                    <td class="hilighted">
+                <!-- TMPL_ELSE -->
+                    <td>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="branchcode" --><!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF -->
+                </td>
                 <!-- TMPL_IF NAME="routing" -->
+                    <!-- TMPL_IF name="toggle" -->
+                        <td class="hilighted">
+                    <!-- TMPL_ELSE -->
                         <td>
-                        <a href="routing.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" --><!-- TMPL_UNLESS NAME="routingedit" -->&op=new<!-- /TMPL_UNLESS -->">Routing List</a>
+                    <!-- /TMPL_IF -->
+                        <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" --><!-- TMPL_UNLESS NAME="routingedit" -->&op=new<!-- /TMPL_UNLESS -->">Routing List</a>
                     </td>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="toggle" -->
+                    <td class="hilighted">
                 <!-- TMPL_ELSE -->
-                            <td>
-                            <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial" title="subscription detail">Detail</a>
-                        </td>
-                            <td>
-                            <a href="serials-receive.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial" title="receive issues for this subscription">Receive</a>
-                        </td>
+                    <td>
                 <!-- /TMPL_IF -->
-
+                    <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial" title="subscription detail">Detail</a>
+                </td>
+                <!-- TMPL_IF name="toggle" -->
+                    <td class="hilighted">
+                <!-- TMPL_ELSE -->
+                    <td>
+                <!-- /TMPL_IF -->
+                  <a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1">Serial receive</a>
+                </td>
             </tr>
         <!-- /TMPL_LOOP -->
+        <!-- /TMPL_IF -->
     </table>
     
     <!-- TMPL_IF NAME="routing" -->
     <!-- TMPL_ELSE -->
-        <!-- TMPL_IF NAME="alt_links" -->
-            <a href="/cgi-bin/koha/serials/alt_subscription-add.pl" class="button serial">Add subscription</a>	      
-        <!-- TMPL_ELSE -->      
-            <a href="/cgi-bin/koha/serials/subscription-add.pl" class="button serial">Add subscription</a>
-        <!-- /TMPL_IF -->
+    	<h2>Add a new subscription</h2>
+    	<div id="action">
+            <a href="/cgi-bin/koha/serials/subscription-add.pl" class="button serial">
+                Add subscription
+            </a>
+        </div>
     <!-- /TMPL_IF -->
 </div>
-
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
index d887277f5d..6a3373b4f9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
@@ -1,233 +1,238 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!--TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!--
+TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
+<!-- Additions to enable Calendar system -->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+<!-- End of additions -->
 
-
-<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/calendar.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/calendar-en.js"></script>
-<script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/calendar/calendar-setup.js"></script>
-<!-- **************************************************** -->
-
+<!-- Additions to enable Calendar system -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js"></script>
+<!-- End of additions -->
 
 <script type="text/javascript" language="javascript">
+<!--
+    function _(s) { return s } // dummy function for gettext
+
 // the english words used in display purposes
-var text = new Array('Number','Volume','Issue','Month','Week','Starting with:','Rollover at:','Choose Hemisphere:','Northern','Southern',
-'Autumn','Winter','Spring','Summer','Fall','Season','Year');
+var text = new Array(_('Number'),_('Volume'),_('Issue'),_('Month'),_('Week'),_('Starting with:'),_('Rollover at:'),_('Choose Hemisphere:'),_('Northern'),_('Southern'),
+_('Autumn'),_('Winter'),_('Spring'),_('Summer'),_('Fall'),_('Season'),_('Year'));
 var is_season = 0;
 var is_hemisphere = 1;
 
 // common pre defined number patterns
 function num_pattern() {
 var patternchoice = document.getElementById("numberpattern").value;
-	switch(patternchoice){
-	case "2":
-	 	document.f.add1.value=1;
-	 	document.f.add2.value=1;
-	 	document.f.add3.value=1;
-		document.f.every1.value=12;
-		document.f.every2.value=1;
-		document.f.every3.value=1;
-		document.f.whenmorethan1.value=9999999;
-		document.f.whenmorethan2.value=12;
-		document.f.whenmorethan3.value=4;
-		document.f.setto1.value=0;
-		document.f.setto2.value=1;
-		document.f.setto3.value=1;
-		document.f.lastvalue1.value=1;
-		document.f.lastvalue2.value=1;
-		document.f.lastvalue3.value=1;
-		document.f.numberingmethod.value='Vol {X}, No {Y}, Issue {Z}';
-		moreoptions(text[1],text[0],text[2]);
-		display_table(0); // toggle info box on (1) or off (0)
-		break;
-	case "3":
-	 	document.f.add1.value=1;
-	 	document.f.add2.value=1;
-	 	document.f.add3.value='';
-		document.f.every1.value=12;
-		document.f.every2.value=1;
-		document.f.every3.value='';
-		document.f.whenmorethan1.value=9999999;
-		document.f.whenmorethan2.value=12;
-		document.f.whenmorethan3.value='';
-		document.f.setto1.value=0;
-		document.f.setto2.value=1;
-		document.f.setto3.value='';
-		document.f.lastvalue1.value=1;
-		document.f.lastvalue2.value=1;
-		document.f.lastvalue3.value='';
-		document.f.numberingmethod.value='Vol {X}, No {Y}';
-		moreoptions(text[1],text[0]);
-		display_table(0);
-		break;
-	case "4":
-	 	document.f.add1.value=1;
-	 	document.f.add2.value=1;
-	 	document.f.add3.value='';
-		document.f.every1.value=12;
-		document.f.every2.value=1;
-		document.f.every3.value='';
-		document.f.whenmorethan1.value=9999999;
-		document.f.whenmorethan2.value=12;
-		document.f.whenmorethan3.value='';
-		document.f.setto1.value=0;
-		document.f.setto2.value=1;
-		document.f.setto3.value='';
-		document.f.lastvalue1.value=1;
-		document.f.lastvalue2.value=1;
-		document.f.lastvalue3.value='';
-		document.f.numberingmethod.value='Vol {X}, Issue {Y}';
-		moreoptions(text[1],text[2]);
-		display_table(0);
-		break;
-	case "5":
-	 	document.f.add1.value=1;
-	 	document.f.add2.value=1;
-	 	document.f.add3.value='';
-		document.f.every1.value=12;
-		document.f.every2.value=1;
-		document.f.every3.value='';
-		document.f.whenmorethan1.value=9999999;
-		document.f.whenmorethan2.value=12;
-		document.f.whenmorethan3.value='';
-		document.f.setto1.value=0;
-		document.f.setto2.value=1;
-		document.f.setto3.value='';
-		document.f.lastvalue1.value=1;
-		document.f.lastvalue2.value=1;
-		document.f.lastvalue3.value='';
-		document.f.numberingmethod.value='No {X}, Issue {Y}';
-		moreoptions(text[0],text[2]);
-		display_table(0);
-		break;
-	case "6":
-		var d = new Date();
-		var sYear = d.getFullYear();
-	 	document.f.add1.value=1;
-	 	document.f.add2.value='1';
-	 	document.f.add3.value='';
-		document.f.every1.value=4;
-		document.f.every2.value='1';
-		document.f.every3.value='';
-		document.f.whenmorethan1.value=9999999;
-		document.f.whenmorethan2.value='4';
-		document.f.whenmorethan3.value='';
-		document.f.setto1.value=0;
-		document.f.setto2.value='1';
-		document.f.setto3.value='';
-		document.f.lastvalue1.value=sYear;
-		document.f.lastvalue2.value='1';
-		document.f.lastvalue3.value='';
-		document.f.periodicity.value='8';
-		document.f.numberingmethod.value='{Y} {X}';
-		moreoptions_seasons(text[15],sYear);
-		display_table(0);
-		is_season = 1;
-		break;
-	case "7":
-		display_table(1);
-		document.f.irreg_check.value=1; 
-		break;
-	default:
-	 	document.f.add1.value=1;
-	 	document.f.add2.value='';
-	 	document.f.add3.value='';
-		document.f.every1.value=1;
-		document.f.every2.value='';
-		document.f.every3.value='';
-		document.f.whenmorethan1.value=9999999;
-		document.f.whenmorethan2.value='';
-		document.f.whenmorethan3.value='';
-		document.f.setto1.value=0;
-		document.f.setto2.value='';
-		document.f.setto3.value='';
-		document.f.lastvalue1.value=1;
-		document.f.lastvalue2.value='';
-		document.f.lastvalue3.value='';
-		document.f.numberingmethod.value='{X}';
-		moreoptions_daily_check(text[0]);
-		document.f.irreg_check.value=1;
-		display_table(0);
-		break;
-	}
+    switch(patternchoice){
+    case "2":
+        document.f.add1.value=1;
+        document.f.add2.value=1;
+        document.f.add3.value=1;
+        document.f.every1.value=12;
+        document.f.every2.value=1;
+        document.f.every3.value=1;
+        document.f.whenmorethan1.value=9999999;
+        document.f.whenmorethan2.value=12;
+        document.f.whenmorethan3.value=4;
+        document.f.setto1.value=0;
+        document.f.setto2.value=1;
+        document.f.setto3.value=1;
+        document.f.lastvalue1.value=1;
+        document.f.lastvalue2.value=1;
+        document.f.lastvalue3.value=1;
+        document.f.numberingmethod.value=_('Vol {X}, No {Y}, Issue {Z}');
+        moreoptions(text[1],text[0],text[2]);
+        display_table(0); // toggle info box on (1) or off (0)
+        break;
+    case "3":
+        document.f.add1.value=1;
+        document.f.add2.value=1;
+        document.f.add3.value='';
+        document.f.every1.value=12;
+        document.f.every2.value=1;
+        document.f.every3.value='';
+        document.f.whenmorethan1.value=9999999;
+        document.f.whenmorethan2.value=12;
+        document.f.whenmorethan3.value='';
+        document.f.setto1.value=0;
+        document.f.setto2.value=1;
+        document.f.setto3.value='';
+        document.f.lastvalue1.value=1;
+        document.f.lastvalue2.value=1;
+        document.f.lastvalue3.value='';
+        document.f.numberingmethod.value=_('Vol {X}, No {Y}');
+        moreoptions(text[1],text[0]);
+        display_table(0);
+        break;
+    case "4":
+        document.f.add1.value=1;
+        document.f.add2.value=1;
+        document.f.add3.value='';
+        document.f.every1.value=12;
+        document.f.every2.value=1;
+        document.f.every3.value='';
+        document.f.whenmorethan1.value=9999999;
+        document.f.whenmorethan2.value=12;
+        document.f.whenmorethan3.value='';
+        document.f.setto1.value=0;
+        document.f.setto2.value=1;
+        document.f.setto3.value='';
+        document.f.lastvalue1.value=1;
+        document.f.lastvalue2.value=1;
+        document.f.lastvalue3.value='';
+        document.f.numberingmethod.value=_('Vol {X}, Issue {Y}');
+        moreoptions(text[1],text[2]);
+        display_table(0);
+        break;
+    case "5":
+        document.f.add1.value=1;
+        document.f.add2.value=1;
+        document.f.add3.value='';
+        document.f.every1.value=12;
+        document.f.every2.value=1;
+        document.f.every3.value='';
+        document.f.whenmorethan1.value=9999999;
+        document.f.whenmorethan2.value=12;
+        document.f.whenmorethan3.value='';
+        document.f.setto1.value=0;
+        document.f.setto2.value=1;
+        document.f.setto3.value='';
+        document.f.lastvalue1.value=1;
+        document.f.lastvalue2.value=1;
+        document.f.lastvalue3.value='';
+        document.f.numberingmethod.value=_('No {X}, Issue {Y}');
+        moreoptions(text[0],text[2]);
+        display_table(0);
+        break;
+    case "6":
+        var d = new Date();
+        var sYear = d.getFullYear();
+        document.f.add1.value=1;
+        document.f.add2.value='1';
+        document.f.add3.value='';
+        document.f.every1.value=4;
+        document.f.every2.value='1';
+        document.f.every3.value='';
+        document.f.whenmorethan1.value=9999999;
+        document.f.whenmorethan2.value='4';
+        document.f.whenmorethan3.value='';
+        document.f.setto1.value=0;
+        document.f.setto2.value='1';
+        document.f.setto3.value='';
+        document.f.lastvalue1.value=sYear;
+        document.f.lastvalue2.value='1';
+        document.f.lastvalue3.value='';
+        document.f.periodicity.value='8';
+        document.f.numberingmethod.value=_('{Y} {X}');
+        moreoptions_seasons(text[15],sYear);
+        display_table(0);
+        is_season = 1;
+        break;
+    case "7":
+        display_table(1);
+        document.getElementById("more_options").innerHTML = '';
+        document.f.irreg_check.value=1; 
+        break;
+    default:
+        document.f.add1.value=1;
+        document.f.add2.value='';
+        document.f.add3.value='';
+        document.f.every1.value=1;
+        document.f.every2.value='';
+        document.f.every3.value='';
+        document.f.whenmorethan1.value=9999999;
+        document.f.whenmorethan2.value='';
+        document.f.whenmorethan3.value='';
+        document.f.setto1.value=0;
+        document.f.setto2.value='';
+        document.f.setto3.value='';
+        document.f.lastvalue1.value=1;
+        document.f.lastvalue2.value='';
+        document.f.lastvalue3.value='';
+        document.f.numberingmethod.value='{X}';
+        moreoptions_daily_check(text[0]);
+        document.f.irreg_check.value=1;
+        display_table(0);
+        break;
+    }
 }
 
 function display_table(n) {
-	if(n==1){
-		document.getElementById("basetable").style.display = 'block';
-	} else {
-		document.getElementById("basetable").style.display = 'none';
-	}
+    if(n==1){
+        document.getElementById("basetable").style.display = 'block';
+    } else {
+        document.getElementById("basetable").style.display = 'none';
+    }
 }
 
 function modify_num_pattern() {
-	document.getElementById("numberpattern").value = '<!-- TMPL_VAR NAME="numberpattern" -->';
-	num_pattern();
-	
-	document.f.add1.value='<!-- TMPL_VAR NAME="add1" -->';
-	document.f.add2.value='<!-- TMPL_VAR NAME="add2" -->';
-	document.f.add3.value='<!-- TMPL_VAR NAME="add3" -->';
-	document.f.every1.value='<!-- TMPL_VAR NAME="every1" -->';
-	document.f.every2.value='<!-- TMPL_VAR NAME="every2" -->';
-	document.f.every3.value='<!-- TMPL_VAR NAME="every3" -->';
-	document.f.whenmorethan1.value='<!-- TMPL_VAR NAME="whenmorethan1" -->';
-	document.f.whenmorethan2.value='<!-- TMPL_VAR NAME="whenmorethan2" -->';
-	document.f.whenmorethan3.value='<!-- TMPL_VAR NAME="whenmorethan3" -->';
-	document.f.setto1.value='<!-- TMPL_VAR NAME="setto1" -->';
-	document.f.setto2.value='<!-- TMPL_VAR NAME="setto2" -->';
-	document.f.setto3.value='<!-- TMPL_VAR NAME="setto3" -->';
-	document.f.lastvalue1.value='<!-- TMPL_VAR NAME="lastvalue1" -->';
-	document.f.lastvalue2.value='<!-- TMPL_VAR NAME="lastvalue2" -->';
-	document.f.lastvalue3.value='<!-- TMPL_VAR NAME="lastvalue3" -->';
-	document.f.numberingmethod.value='<!-- TMPL_VAR NAME="numberingmethod" -->';
+    document.getElementById("numberpattern").value = '<!-- TMPL_VAR NAME="numberpattern" -->';
+    num_pattern();
+    
+    document.f.add1.value='<!-- TMPL_VAR NAME="add1" -->';
+    document.f.add2.value='<!-- TMPL_VAR NAME="add2" -->';
+    document.f.add3.value='<!-- TMPL_VAR NAME="add3" -->';
+    document.f.every1.value='<!-- TMPL_VAR NAME="every1" -->';
+    document.f.every2.value='<!-- TMPL_VAR NAME="every2" -->';
+    document.f.every3.value='<!-- TMPL_VAR NAME="every3" -->';
+    document.f.whenmorethan1.value='<!-- TMPL_VAR NAME="whenmorethan1" -->';
+    document.f.whenmorethan2.value='<!-- TMPL_VAR NAME="whenmorethan2" -->';
+    document.f.whenmorethan3.value='<!-- TMPL_VAR NAME="whenmorethan3" -->';
+    document.f.setto1.value='<!-- TMPL_VAR NAME="setto1" -->';
+    document.f.setto2.value='<!-- TMPL_VAR NAME="setto2" -->';
+    document.f.setto3.value='<!-- TMPL_VAR NAME="setto3" -->';
+    document.f.lastvalue1.value='<!-- TMPL_VAR NAME="lastvalue1" -->';
+    document.f.lastvalue2.value='<!-- TMPL_VAR NAME="lastvalue2" -->';
+    document.f.lastvalue3.value='<!-- TMPL_VAR NAME="lastvalue3" -->';
+    document.f.numberingmethod.value='<!-- TMPL_VAR NAME="numberingmethod" -->';
 
-	var more_strY;
-	var more_strZ;
-	<!-- TMPL_IF NAME="add2" -->
-	if(<!-- TMPL_VAR NAME="add2" --> > 0){
-		more_strY="Y";
-	}
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="add3" -->
-	if(<!-- TMPL_VAR NAME="add3" --> > 0){
-		more_strZ="Z";
-	}
-	<!-- /TMPL_IF -->
+    var more_strY;
+    var more_strZ;
+    <!-- TMPL_IF NAME="add2" -->
+    if(<!-- TMPL_VAR NAME="add2" --> > 0){
+        more_strY="Y";
+    }
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="add3" -->
+    if(<!-- TMPL_VAR NAME="add3" --> > 0){
+        more_strZ="Z";
+    }
+    <!-- /TMPL_IF -->
 
-	document.f.lastvaluetemp1.value='<!-- TMPL_VAR NAME="lastvalue1" -->';
-	if(more_strY){
-		document.f.lastvaluetemp2.value='<!-- TMPL_VAR NAME="lastvalue2" -->';
-	document.f.whenmorethantemp2.value='<!-- TMPL_VAR NAME="whenmorethan2" -->';
-	}
-	if(more_strZ){
-		document.f.lastvaluetemp3.value='<!-- TMPL_VAR NAME="lastvalue3" -->';
-	document.f.whenmorethantemp3.value='<!-- TMPL_VAR NAME="whenmorethan3" -->';
-	}
+    document.f.lastvaluetemp1.value='<!-- TMPL_VAR NAME="lastvalue1" -->';
+    if(more_strY){
+        document.f.lastvaluetemp2.value='<!-- TMPL_VAR NAME="lastvalue2" -->';
+    document.f.whenmorethantemp2.value='<!-- TMPL_VAR NAME="whenmorethan2" -->';
+    }
+    if(more_strZ){
+        document.f.lastvaluetemp3.value='<!-- TMPL_VAR NAME="lastvalue3" -->';
+    document.f.whenmorethantemp3.value='<!-- TMPL_VAR NAME="whenmorethan3" -->';
+    }
 }
 
 // a pre check with more options to see if 'number' and '1/day' are chosen
 function moreoptions_daily_check(x) {
-	var periodicity = document.f.periodicity.value;
-	var errortext='';
-	if(periodicity == 1){
-		document.getElementById("irregularity").innerHTML = '';
-		document.getElementById("more_options").innerHTML = '';
-		var daynames = new Array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday');
-		errortext ="Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>";
-		for(var j=0;j<daynames.length;j++){
-			errortext +="<input type='checkbox' name='irregular' id='irregular"+(j+1)+"' value='"+(j+1)+"' />"+daynames[j]+" &nbsp; ";
-		}
-	var error = errortext;
-	document.getElementById("irregularity").innerHTML = error;
-	} else {
-		document.getElementById("irregularity").innerHTML = '';
-		document.getElementById("more_options").innerHTML = '';
-		moreoptions(x);
-	}
+    var periodicity = document.f.periodicity.value;
+    var errortext='';
+    if(periodicity == 1){
+        document.getElementById("irregularity").innerHTML = '';
+        var daynames = new Array(_('Monday'),_('Tuesday'),_('Wednesday'),_('Thursday'),_('Friday'),_('Saturday'),_('Sunday'));
+        errortext =_("Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>");
+        for(var j=0;j<daynames.length;j++){
+            errortext +="<input type='checkbox' name='irregular' id='irregular"+(j+1)+"' value='"+(j+1)+"' />"+daynames[j]+" &nbsp; ";
+        }
+        var error = errortext;
+        moreoptions(x);
+        document.getElementById("irregularity").innerHTML = error;
+    } else {
+        document.getElementById("irregularity").innerHTML = '';
+        document.getElementById("more_options").innerHTML = '';
+        moreoptions(x);
+    }
 }
 
 // to dispaly the more options section
@@ -235,61 +240,63 @@ function moreoptions(x,y,z){
 document.getElementById("irregularity").innerHTML = '';
 document.getElementById("more_options").innerHTML = '';
 var textbox = '';
-	// alert("X: "+x+"Y: "+y+"Z: "+z);
-	if(x){
-		textbox +="<table>\n<tr><td>&nbsp;<\/td><td>"+x+"<\/td>";
-		if(y){
-			textbox +="<td>"+y+"<\/td>";
-			if(z){
-				textbox +="<td>"+z+"<\/td>";
-			}
-		}
-		textbox +="<\/tr>\n";
-		textbox +="<tr><td>"+text[5]+"<\/td><td><input type='text' name='lastvaluetemp1' size='4' onkeyup='moreoptionsupdate(\"lastvalue1\")'><\/td>\n";
-		if(y){
-			textbox +="<td><input type='text' name='lastvaluetemp2' size='4' onkeyup='moreoptionsupdate(\"lastvalue2\")'><\/td>\n";
-			if(z){
-				textbox +="<td><input type='text' name='lastvaluetemp3' size='4' onkeyup='moreoptionsupdate(\"lastvalue3\")'><\/td>\n";
-			}
-		}
-		textbox +="<\/tr>\n";
-		if(y){
-			textbox +="<tr><td>"+text[6]+"<\/td>";
-			textbox +="<td><a href='javascript:irregularity_check()'>Irregularity?<\/a><\/td>\n";
-			textbox +="<td><input type='text' name='whenmorethantemp2' size='4' onkeyup='moreoptionsupdate(\"whenmorethan2\",1)'><\/td>\n";
-			if(z){
-				textbox +="<td><input type='text' name='whenmorethantemp3' size='4' onkeyup='moreoptionsupdate(\"whenmorethan3\",1)'><\/td>\n";
-			}
-			textbox +="<\/tr>";
-		}
-		textbox +="<\/table>\n";
-	}
-	document.getElementById("more_options").innerHTML = textbox;
+    // alert("X: "+x+"Y: "+y+"Z: "+z);
+    if(x){
+        textbox +="<table>\n<tr><td>&nbsp;<\/td><td>"+x+"<\/td>";
+        if(y){
+            textbox +="<td>"+y+"<\/td>";
+            if(z){
+                textbox +="<td>"+z+"<\/td>";
+            }
+        }
+        textbox +="<\/tr>\n";
+        textbox +="<tr><td>"+text[5]+"<\/td><td><input type='text' name='lastvaluetemp1' size='4' onkeyup='moreoptionsupdate(\"lastvalue1\")'><\/td>\n";
+        if(y){
+            textbox +="<td><input type='text' name='lastvaluetemp2' size='4' onkeyup='moreoptionsupdate(\"lastvalue2\")'><\/td>\n";
+            if(z){
+                textbox +="<td><input type='text' name='lastvaluetemp3' size='4' onkeyup='moreoptionsupdate(\"lastvalue3\")'><\/td>\n";
+            }
+        }
+        textbox +="<\/tr>\n";
+        if(y){
+            textbox +="<tr><td>"+text[6]+"<\/td>";
+            textbox +="<td><a href='javascript:irregularity_check()'>"+_('Irregularity?')+"<\/a><\/td>\n";
+            textbox +="<td><input type='text' name='whenmorethantemp2' size='4' onkeyup='moreoptionsupdate(\"whenmorethan2\",1)'><\/td>\n";
+            if(z){
+                textbox +="<td><input type='text' name='whenmorethantemp3' size='4' onkeyup='moreoptionsupdate(\"whenmorethan3\",1)'><\/td>\n";
+            }
+            textbox +="<\/tr>";
+        } else {
+          textbox +="<tr> <td>"+_('issues expected')+"</td><td><input type='text' name='issuesexpectedtemp1' size='4' onkeyup='moreoptionsupdate(\"issuesexpected1\",0)'><br/><a href='javascript:irregularity_check()'>"+_('Irregularity?')+"</a></td></tr>";
+        }
+        textbox +="<\/table>\n";
+    }
+    document.getElementById("more_options").innerHTML = textbox;
 }
 
 function hemispheres(chosen){
 var selbox = document.getElementById("season1");
     if(selbox){
-	var selboxselected = selbox.options[selbox.selectedIndex].value;
-	selbox.options.length = 0;
+    var selboxselected = selbox.options[selbox.selectedIndex].value;
+    selbox.options.length = 0;
 
-	if (chosen == "1") {
-		selbox.options[selbox.options.length] = new Option(text[11],'1');
-		selbox.options[selbox.options.length] = new Option(text[12],'2');
-		selbox.options[selbox.options.length] = new Option(text[13],'3');
-		selbox.options[selbox.options.length] = new Option(text[14],'4');
-		is_hemisphere = 1;
-		selbox.options[selboxselected-1].selected = true;
-	}
+    if (chosen == "1") {
+        selbox.options[selbox.options.length] = new Option(text[11],'1');
+        selbox.options[selbox.options.length] = new Option(text[12],'2');
+        selbox.options[selbox.options.length] = new Option(text[13],'3');
+        selbox.options[selbox.options.length] = new Option(text[14],'4');
+        is_hemisphere = 1;
+        selbox.options[selboxselected-1].selected = true;
+    }
 
-	if (chosen == "2") {
-		selbox.options[selbox.options.length] = new Option(text[13],'1');
-		selbox.options[selbox.options.length] = new Option(text[10],'2');
-		selbox.options[selbox.options.length] = new Option(text[11],'3');
-		selbox.options[selbox.options.length] = new Option(text[12],'4');
-		is_hemisphere = 2;
-		selbox.options[selboxselected-1].selected = true;
-	}
+    if (chosen == "2") {
+        selbox.options[selbox.options.length] = new Option(text[13],'1');
+        selbox.options[selbox.options.length] = new Option(text[10],'2');
+        selbox.options[selbox.options.length] = new Option(text[11],'3');
+        selbox.options[selbox.options.length] = new Option(text[12],'4');
+        is_hemisphere = 2;
+        selbox.options[selboxselected-1].selected = true;
+    }
     }
 }
 
@@ -298,670 +305,714 @@ function moreoptions_seasons(x,y){
 document.getElementById("irregularity").innerHTML = '';
 document.getElementById("more_options").innerHTML = '';
 var textbox = '';
-	// alert("X: "+x+"Year: "+y);
-	if(x){
-		var hemi_select = parseInt('<!-- TMPL_VAR NAME="hemisphere" -->');
-		textbox +="<table>\n<tr><td>"+ text[7]  +"<\/td><td colspan='2'><select name='hemisphere' onchange='hemispheres(this.options[this.selectedIndex].value)'>";
-		for(var i = 1; i <= 2; i++){
-			textbox +="<option value='"+i+"'";
-			if(i == hemi_select){
-				textbox += " selected "
-			}
-			textbox +=">"+text[i+7]+"<\/option>";
-		}
-		textbox +="<\/select><\/td><\/tr>\n";
-		textbox +="<tr><td>&nbsp;<\/td><td>"+x+"<\/td>";
-		textbox +="<td>"+text[16]+"<\/td>";
-		textbox +="<\/tr>\n";
-		textbox +="<tr><td>"+text[5]+"<\/td><td><select name='lastvaluetemp2' id='season1' onchange='moreoptionsupdate(\"lastvalue2\")'>";
-		for(var j = 1; j <= 4; j++){
-			textbox +="<option value='"+j+"'>"+text[j+10]+"<\/option>";
-		}
-		textbox +="<\/select><\/td><td><select name='lastvaluetemp1' onchange='moreoptionsupdate(\"lastvalue1\")'>";
-		for(var k = parseInt(y); k <= parseInt(y)+15; k++){
-			textbox +="<option value='"+k+"'>"+k+"<\/option>";
-		}
-		textbox +="<\/select><\/td><\/tr>\n";
-		textbox +="<tr><td>"+text[6]+"<\/td>";
-		textbox +="<td><a href='javascript:irregularity_check()'>Irregularity?<\/a><\/td>\n";
-		textbox +="<td><input type='text' name='whenmorethantemp2' size='4' onkeyup='moreoptionsupdate(\"whenmorethan2\",1)'><\/td>\n";
-    	        textbox +="<\/tr><\/table>\n";
-	}
-	document.getElementById("more_options").innerHTML = textbox;
+    // alert("X: "+x+"Year: "+y);
+    if(x){
+        var hemi_select = parseInt('<!-- TMPL_VAR NAME="hemisphere" -->');
+        textbox +="<table>\n<tr><td>"+ text[7]  +"<\/td><td colspan='2'><select name='hemisphere' onchange='hemispheres(this.options[this.selectedIndex].value)'>";
+        for(var i = 1; i <= 2; i++){
+            textbox +="<option value='"+i+"'";
+            if(i == hemi_select){
+                textbox += " selected "
+            }
+            textbox +=">"+text[i+7]+"<\/option>";
+        }
+        textbox +="<\/select><\/td><\/tr>\n";
+        textbox +="<tr><td>&nbsp;<\/td><td>"+x+"<\/td>";
+        textbox +="<td>"+text[16]+"<\/td>";
+        textbox +="<\/tr>\n";
+        textbox +="<tr><td>"+text[5]+"<\/td><td><select name='lastvaluetemp2' id='season1' onchange='moreoptionsupdate(\"lastvalue2\")'>";
+        for(var j = 1; j <= 4; j++){
+            textbox +="<option value='"+j+"'>"+text[j+10]+"<\/option>";
+        }
+        textbox +="<\/select><\/td><td><select name='lastvaluetemp1' onchange='moreoptionsupdate(\"lastvalue1\")'>";
+        for(var k = parseInt(y); k <= parseInt(y)+15; k++){
+            textbox +="<option value='"+k+"'>"+k+"<\/option>";
+        }
+        textbox +="<\/select><\/td><\/tr>\n";
+        textbox +="<tr><td>"+text[6]+"<\/td>";
+        textbox +="<td><a href='javascript:irregularity_check()'>"+_('Irregularity?')+"<\/a><\/td>\n";
+        textbox +="<td><input type='text' name='whenmorethantemp2' size='4' onkeyup='moreoptionsupdate(\"whenmorethan2\",1)'><\/td>\n";
+                textbox +="<\/tr><\/table>\n";
+    }
+    document.getElementById("more_options").innerHTML = textbox;
 }
 
 function irregularity_check(){
-	document.f.irreg_check.value = 1; // Irregularity button now pushed
-	var periodicity = document.f.periodicity.value;
-	var rollover = document.f.whenmorethantemp2.value;
-	if(document.f.whenmorethantemp3){
-		rollover = document.f.whenmorethantemp3.value;
-	}
-	var error='';
-	var toobig;
-	var expected; 
-	var errortext = "<b>Warning irregularity detected<\/b><br \/>";
-	switch(periodicity){
-	case "1":
-		if(rollover < 365) expected =365;
-		if(rollover > 365) {
-			expectedover=365;
-			toobig=1;
-		}
-		break;
-	case "2":
-		if(rollover < 52) expected =52;
-		if(rollover > 52){
-			expectedover=52;
-			toobig=1;
-		}
-		break;
-	case "3":
-		if(rollover < 26) expected =26;
-		if(rollover > 26){
-			expectedover=26;
-			toobig=1;
-		}
-		break;
-	case "4":
-		if(rollover < 17) expected =17;
-		if(rollover > 17){
-			expectedover=17;
-			toobig=1;
-		}
-		break;
-	case "5":
-		if(rollover < 12) expected =12;
-		if(rollover > 12){
-			expectedover=12;
-			toobig=1;
-		}
-		break;
-	case "6":
-		if(rollover < 6) expected =6;
-		if(rollover > 6){
-			expectedover=6;
-			toobig=1;
-		}
-		break;
-	case "7":
-		if(rollover < 4) expected =4;
-		if(rollover > 4){
-			expectedover=4;
-			toobig=1;
-		}
-		break;
-	case "8":
-		if(rollover < 4) expected =4;
-		if(rollover > 4){
-			expectedover=4;
-			toobig=1;
-		}
-		break;
-	case "9":
-		if(rollover < 2) expected =2;
-		if(rollover > 2){
-			expectedover=2;
-			toobig=1;
-		}
-		break;
-	case "10":
-		if(rollover < 1) expected =1;
-		if(rollover > 1){
-			expectedover=1;
-			toobig=1;
-		}
-		break;
-	default:
-		break;
-	}
-	if(expected){
-		if(expected == 365){
-			var daynames = new Array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday');
-			errortext +="Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>";
-			for(var j=0;j<daynames.length;j++){
-				errortext +="<input type='checkbox' name='irregular' id='irregular"+(j+1)+"' value='"+(j+1)+"' />"+daynames[j]+" &nbsp; ";
-			}
-			error=errortext;
-		} else {
-			errortext +=expected+" issues expected "+rollover+" were entered. <br \/>Please indicate which date(s) an issue is not expected<br \/>";
-			var count=0;
-			for(var i=rollover;i<expected;i++){
-				errortext +="<select name='irregular' id='irregular"+count+"' onchange='display_example(expected)'>\n";
-				errortext +=irregular_options(periodicity);
-				errortext +="<\/select>\n";
-				count++;
-			}
-			error=errortext;
-		}
-	}
-	if(toobig){
-		errortext +=expectedover+" issues expected "+rollover+" were entered.<br \/> You seem to have indicated more issues per year than expected.";
-		error=errortext;
-	}
-	if(error.length ==0){
-		error='No irregularities noticed';
-	}
-	display_example(expected);
-	document.getElementById("irregularity").innerHTML = error;
+    document.f.irreg_check.value = 1; // Irregularity button now pushed
+    var periodicity = document.f.periodicity.value;
+    var rollover = document.f.issuesexpected1.value;
+    if(document.f.whenmorethantemp2){
+      rollover = document.f.whenmorethantemp2.value;
+    }
+    if(document.f.whenmorethantemp3){
+        rollover = document.f.whenmorethantemp3.value;
+    }
+    var error='';
+    var toobig;
+    var expected; 
+    var errortext = _("<b>Warning irregularity detected<\/b><br \/>");
+    switch(periodicity){
+    case "1":
+        if(rollover < 365) expected =365;
+        if(rollover > 365) {
+            expectedover=365;
+            toobig=1;
+        }
+        break;
+    case "2":
+        if(rollover < 52) expected =52;
+        if(rollover > 52){
+            expectedover=52;
+            toobig=1;
+        }
+        break;
+    case "3":
+        if(rollover < 26) expected =26;
+        if(rollover > 26){
+            expectedover=26;
+            toobig=1;
+        }
+        break;
+    case "4":
+        if(rollover < 17) expected =17;
+        if(rollover > 17){
+            expectedover=17;
+            toobig=1;
+        }
+        break;
+    case "5":
+        if(rollover < 12) expected =12;
+        if(rollover > 12){
+            expectedover=12;
+            toobig=1;
+        }
+        break;
+    case "6":
+        if(rollover < 6) expected =6;
+        if(rollover > 6){
+            expectedover=6;
+            toobig=1;
+        }
+        break;
+    case "7":
+        if(rollover < 4) expected =4;
+        if(rollover > 4){
+            expectedover=4;
+            toobig=1;
+        }
+        break;
+    case "8":
+        if(rollover < 4) expected =4;
+        if(rollover > 4){
+            expectedover=4;
+            toobig=1;
+        }
+        break;
+    case "9":
+        if(rollover < 2) expected =2;
+        if(rollover > 2){
+            expectedover=2;
+            toobig=1;
+        }
+        break;
+    case "10":
+        if(rollover < 1) expected =1;
+        if(rollover > 1){
+            expectedover=1;
+            toobig=1;
+        }
+        break;
+    default:
+        break;
+    }
+    if(expected){
+        if(expected == 365){
+            var daynames = new Array(_('Monday'),_('Tuesday'),_('Wednesday'),_('Thursday'),_('Friday'),_('Saturday'),_('Sunday'));
+            errortext += _("Please indicate which days of the week you <b>DO NOT<\/b> expect to receive issues.<br \/>");
+            for(var j=0;j<daynames.length;j++){
+                errortext +="<input type='checkbox' name='irregular' id='irregular"+(j+1)+"' value='"+(j+1)+"' />"+daynames[j]+" &nbsp; ";
+            }
+            error=errortext;
+        } else {
+            errortext +=expected+_(" issues expected ")+rollover+_(" were entered. <br \/>Please indicate which date(s) an issue is not expected<br \/>");
+            var count=0;
+            for(var i=rollover;i<expected;i++){
+                errortext +="<select name='irregular' id='irregular"+count+"' onchange='display_example(expected)'>\n";
+                errortext +=irregular_options(periodicity);
+                errortext +="<\/select>\n";
+                count++;
+            }
+            error=errortext;
+        }
+    }
+    if(toobig){
+        errortext +=expectedover+_(" issues expected ")+rollover+_(" were entered.<br \/> You seem to have indicated more issues per year than expected.");
+        error=errortext;
+    }
+    if(error.length ==0){
+        error=_('No irregularities noticed');
+    }
+    display_example(expected);
+    document.getElementById("irregularity").innerHTML = error;
 }
 
 function irregular_options(periodicity){
-	var titles;
-	var count;
+    var titles;
+    var count;
 <!-- TMPL_IF NAME="weekarrayjs" -->
-	var weeks = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
+    var weeks = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
 <!-- /TMPL_IF -->
-	var months = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
-	var seasons = new Array('Autumn','Winter','Spring','Summer','Fall');
-	var errortext='';
-	if(periodicity == 1) {
-		expected = 366;
-		titles = "Day";
-		count = 1;
-	}
-	if(periodicity == 2 || periodicity == 3 || periodicity == 4) { 
-		expected = 52;
-	<!-- TMPL_IF NAME="weekarrayjs" -->
-		titles = weeks;
-		count = <!-- TMPL_VAR NAME="weekno" -->;
-	<!-- TMPL_ELSE -->
-		titles = "Week";
-		count = 1;
-	<!-- /TMPL_IF -->
-	}
-	if(periodicity == 5 || periodicity == 6 || periodicity == 7 || periodicity == 8 || periodicity == 9) {
-		if(periodicity == 8) {
-			is_season = 1; // setting up from edit page
-		} 
-		if(is_season){
-			titles = seasons;
-			expected = 4;
-			if(is_hemisphere == 2){
-				count = 2;
-			} else {
-				count = 1;
-			}
-		} else {
-			titles = months;
-			expected = 12;
-			count = 1;
-		}
-	}
-	for(var j=1;j<=expected;j++){
-		if(isArray(titles)){
-			if(count>expected){
-				count = count-expected;
-			}
-			if(is_season && is_hemisphere == 1){
-				errortext +="<option value='"+((count*3)-2)+"'>"+titles[j]+"<\/option>\n";
+    var months = new Array(_('January'),_('February'),_('March'),_('April'),_('May'),_('June'),_('July'),_('August'),_('September'),_('October'),_('November'),_('December'));
+    var seasons = new Array(_('Autumn'),_('Winter'),_('Spring'),_('Summer'),_('Fall'));
+    var errortext='';
+    if(periodicity == 1) {
+        expected = 366;
+        titles = "Day";
+        count = 1;
+    }
+    if(periodicity == 2 || periodicity == 3 || periodicity == 4) { 
+        expected = 52;
+    <!-- TMPL_IF NAME="weekarrayjs" -->
+        titles = weeks;
+        count = <!-- TMPL_VAR NAME="weekno" -->;
+    <!-- TMPL_ELSE -->
+        titles = "Week";
+        count = 1;
+    <!-- /TMPL_IF -->
+    }
+    if(periodicity == 5 || periodicity == 6 || periodicity == 7 || periodicity == 8 || periodicity == 9) {
+        if(periodicity == 8) {
+            is_season = 1; // setting up from edit page
+        } 
+        if(is_season){
+            titles = seasons;
+            expected = 4;
+            if(is_hemisphere == 2){
+                count = 2;
+            } else {
+                count = 1;
+            }
+        } else {
+            titles = months;
+            expected = 12;
+            count = 1;
+        }
+    }
+    for(var j=1;j<=expected;j++){
+        if(isArray(titles)){
+            if(count>expected){
+                count = count-expected;
+            }
+            if(is_season && is_hemisphere == 1){
+                errortext +="<option value='"+((count*3)-2)+"'>"+titles[j]+"<\/option>\n";
 // alert("value: "+((count*3)-2)+" title: "+titles[j]);
-			} else if(is_season && is_hemisphere == 2){
-				errortext +="<option value='"+((count*3)-2)+"'>"+titles[j-1]+"<\/option>\n";
+            } else if(is_season && is_hemisphere == 2){
+                errortext +="<option value='"+((count*3)-2)+"'>"+titles[j-1]+"<\/option>\n";
 // alert("value: "+((count*3)-2)+" title: "+titles[j-1]);
-			} else {
-				errortext +="<option value='"+count+"'>"+titles[j-1]+"<\/option>\n";
-			}
-			count++;
-		} else {
-			errortext +="<option value='"+j+"'>"+titles+" "+j+"<\/option>\n";
-		}
-	}
-	return errortext;
+            } else {
+                errortext +="<option value='"+count+"'>"+titles[j-1]+"<\/option>\n";
+            }
+            count++;
+        } else {
+            errortext +="<option value='"+j+"'>"+titles+" "+j+"<\/option>\n";
+        }
+    }
+    return errortext;
 }
 
 function irregular_order(){
-	var irregular = '<!-- TMPL_VAR NAME="irregularity" -->';
-	var periodicity = document.f.periodicity.value;
-	var irregarray = irregular.split('|');
-	if(periodicity ==1){
-		for(j=0;j<irregarray.length;j++){
-		document.getElementById("irregular"+irregarray[j]).checked = true; 
-		}
-	} else {
-		for(i=0;i<irregarray.length;i++){    
-			document.getElementById("irregular"+i).value = irregarray[i];
-		}
-	}
+    var irregular = '<!-- TMPL_VAR NAME="irregularity" -->';
+    var periodicity = document.f.periodicity.value;
+    var irregarray = irregular.split(',');
+    if(periodicity ==1){
+        for(j=0;j<irregarray.length;j++){
+        document.getElementById("irregular"+irregarray[j]).checked = true; 
+        }
+    } else {
+        for(i=0;i<irregarray.length;i++){    
+            document.getElementById("irregular"+i).value = irregarray[i];
+        }
+    }
 }
 
 function display_example(expected){
-	var startfrom1 = parseInt(document.f.lastvalue1.value);
-	var startfrom2 = parseInt(document.f.lastvalue2.value);
-	var startfrom3 = parseInt(document.f.lastvalue3.value);
-	var every1 = parseInt(document.f.every1.value);
-	var every2 = parseInt(document.f.every2.value);
-	var every3 = parseInt(document.f.every3.value);
-	var numberpattern = document.f.numberingmethod.value;
-	var whenmorethan2 = parseInt(document.f.whenmorethan2.value);
-	var whenmorethan3 = parseInt(document.f.whenmorethan3.value);
-	var setto2 = parseInt(document.f.setto2.value);
-	var setto3 = parseInt(document.f.setto3.value);
-	var displaytext = 'Based on the information<br \/>entered the Numbering Pattern<br \/>will look like this<br \/>\n';
-	if(startfrom3>0){
-		var count=startfrom3-1;
-		var count2=startfrom2;
-		for(var i=0;i<12;i++){
-			if(count>=whenmorethan3){
-				count=setto3;
-				if(count2>=whenmorethan2){
-					startfrom1++;
-					count2=setto2;
-				} else {
-					count2++;
-				}
-			} else {
-				count++;
-			}
-			displaytext += numberpattern.replace(/{Z}/,count)+'\n';
-			displaytext = displaytext.replace(/{Y}/,count2)+'<br \/>\n';
-			displaytext = displaytext.replace(/{X}/,startfrom1)+'<br \/>\n';
+    var startfrom1 = parseInt(document.f.lastvalue1.value);
+    var startfrom2 = parseInt(document.f.lastvalue2.value);
+    var startfrom3 = parseInt(document.f.lastvalue3.value);
+    var every1 = parseInt(document.f.every1.value);
+    var every2 = parseInt(document.f.every2.value);
+    var every3 = parseInt(document.f.every3.value);
+    var numberpattern = document.f.numberingmethod.value;
+    var whenmorethan2 = parseInt(document.f.whenmorethan2.value);
+    var whenmorethan3 = parseInt(document.f.whenmorethan3.value);
+    var setto2 = parseInt(document.f.setto2.value);
+    var setto3 = parseInt(document.f.setto3.value);
+    var displaytext = _('Based on the information<br \/>entered the Numbering Pattern<br \/>will look like this<br \/>\n');
+    if(startfrom3>0){
+        var count=startfrom3-1;
+        var count2=startfrom2;
+        for(var i=0;i<12;i++){
+            if(count>=whenmorethan3){
+                count=setto3;
+                if(count2>=whenmorethan2){
+                    startfrom1++;
+                    count2=setto2;
+                } else {
+                    count2++;
+                }
+            } else {
+                count++;
+            }
+            displaytext += numberpattern.replace(/{Z}/,count)+'\n';
+            displaytext = displaytext.replace(/{Y}/,count2)+'<br \/>\n';
+            displaytext = displaytext.replace(/{X}/,startfrom1)+'<br \/>\n';
 
-		}
-	}
-	if(startfrom2>0 && !startfrom3){
-		var count=startfrom2-1;
-		for(var i=0;i<12;i++){
-			if(count>=whenmorethan2){
-				startfrom1++;
-				count=setto2;
-			} else {
-				count++;
-			}
+        }
+    }
+    if(startfrom2>0 && !startfrom3){
+        var count=startfrom2-1;
+        for(var i=0;i<12;i++){
+            if(count>=whenmorethan2){
+                startfrom1++;
+                count=setto2;
+            } else {
+                count++;
+            }
 
-			if(is_season){
-				if(is_hemisphere == 2){
-					if(count == 1) {
-						displaytext += numberpattern.replace(/{Y}/,text[count+12])+'\n';
-					} else {
-						displaytext += numberpattern.replace(/{Y}/,text[count+8])+'\n';
-					}
-				} else {
-				displaytext += numberpattern.replace(/{Y}/,text[count+10])+'\n';
-				}
-			} else {
-				displaytext += numberpattern.replace(/{Y}/,count)+'\n';
-			}
-			displaytext = displaytext.replace(/{X}/,startfrom1)+'<br \/>\n';
-		}
-	}
-	if(startfrom1>0 && !startfrom2 && !startfrom3){
-		for(var i=startfrom1;i<(startfrom1+12);i=i+(1*every1)){
-			startfrom1 = i;
-			displaytext += numberpattern.replace(/{X}/,startfrom1)+'<br \/>\n';
-		}
-	}
-	displaytext = "<div style='padding: 5px; background-color: #CCCCCC'>"+displaytext+"<\/div>";
-	document.getElementById("displayexample").innerHTML = displaytext;
+            if(is_season){
+                if(is_hemisphere == 2){
+                    if(count == 1) {
+                        displaytext += numberpattern.replace(/{Y}/,text[count+12])+'\n';
+                    } else {
+                        displaytext += numberpattern.replace(/{Y}/,text[count+8])+'\n';
+                    }
+                } else {
+                displaytext += numberpattern.replace(/{Y}/,text[count+10])+'\n';
+                }
+            } else {
+                displaytext += numberpattern.replace(/{Y}/,count)+'\n';
+            }
+            displaytext = displaytext.replace(/{X}/,startfrom1)+'<br \/>\n';
+        }
+    }
+    if(startfrom1>0 && !startfrom2 && !startfrom3){
+        var offset=eval(document.f.issuesexpected1.value);
+        if (!offset){
+            offset = 12 
+        }
+        for(var i=startfrom1;i<(startfrom1+offset);i+=every1){
+            displaytext += numberpattern.replace(/{X}/,i)+'<br \/>\n';
+        }
+    }
+    displaytext = "<div style='padding: 5px; background-color: #CCCCCC'>"+displaytext+"<\/div>";
+    document.getElementById("displayexample").innerHTML = displaytext;
 }
 
 function isArray(obj) {
-   if (obj.constructor.toString().indexOf("Array") == -1)
-      return false;
-   else
-      return true;
+if (obj.constructor.toString().indexOf("Array") == -1)
+    return false;
+else
+    return true;
 }
 
 function moreoptionsupdate(fieldnames,rollover){
-	fieldname = fieldnames;
-	fld = fieldname.length;
-	fld = fld-1;
-	fieldnametempnumber = fieldname.substr(fld);
-	//alert(fieldnametempnumber);
-	fieldnametemp = fieldname.slice(0,-1)+"temp"+fieldnametempnumber;
-	// alert(fieldnametemp);
-	eval("document.f."+fieldname+".value = document.f."+fieldnametemp+".value");
-	if(rollover){
-		eval("document.f.every"+(fieldnametempnumber-1)+".value = document.f."+fieldnametemp+".value");
-	}
+    fieldname = fieldnames;
+    fld = fieldname.length;
+    fld = fld-1;
+    fieldnametempnumber = fieldname.substr(fld);
+    //alert(fieldnametempnumber);
+    fieldnametemp = fieldname.slice(0,-1)+"temp"+fieldnametempnumber;
+    // alert(fieldnametemp);
+    eval("document.f."+fieldname+".value = document.f."+fieldnametemp+".value");
+//     alert (fieldname+" : "+eval("document.f."+fieldname+".value") +' '+fieldnametemp+' : ' +eval("document.f."+fieldnametemp+".value"));
+    if(rollover){
+        eval("document.f.every"+(fieldnametempnumber-1)+".value = document.f."+fieldnametemp+".value");
+    }
 }
 
 
 function check_input(e){
-	var unicode=e.charCode? e.charCode : e.keyCode
-	if (unicode!=8 && unicode !=46){ // if key isn't backspace or delete
-		if (unicode<48||unicode>57) { // if not a number
-			alert("Needs to be entered in digit form -eg 10");
-			return false // disable key press
-		}
-	}
+    var unicode=e.charCode? e.charCode : e.keyCode
+    if (unicode!=8 && unicode !=46 && unicode!=9 && unicode !=13){ // if key isn't backspace or delete
+        if (unicode<48||unicode>57) { // if not a number
+            alert(_("Needs to be entered in digit form -eg 10"));
+            return false // disable key press
+        }
+    }
 }
 
+-->
 </script>
 
-<div id="main">
 <!-- TMPL_IF name="mod" -->
-	<h1>Modify subscription</h1>
-	<form method="post" name="f" action="subscription-detail.pl">
-		<input type="hidden" name="op" value="modsubscription">
-		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
+    <h1>Modify a subscription</h1>
+    <form method="post" name="f">
+        <input type="hidden" name="op" value="modsubscription">
+        <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
 <!-- TMPL_ELSE -->
-	<h1>Add a subscription (Serial Holdings Record)</h1>
-	<form method="post" name="f">
-		<input type="hidden" name="op" value="addsubscription">
+    <h1>Add a subscription (Serial Holdings Record)</h1>
+    <form method="post" name="f">
+        <input type="hidden" name="op" value="addsubscription">
 <!-- /TMPL_IF -->
-		<input type="hidden" name="user" value="<!-- TMPL_VAR name="loggedinusername" -->">
-		<input type="hidden" name="irreg_check" value="0">
-
-
-<div id="bloc25">
-	<h2>Subscription information</h2>
-	<table border="0" cellspacing="5" cellpadding="0">
-	<tr><td>Librarian:</td>
-	    <td><!-- TMPL_VAR name="loggedinusername" --></td></tr>
-	<tr><td><label>Supplier:</label></td>
-	    <td><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <a href="#" onClick="FindAcqui(f)">Search for a Supplier</a></td>
-	<tr><td><label>Biblio</label></td>
-	    <td><input type="text" id="biblionumber"  name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4"> (<input type="text" id="title" name="title" value="<!-- TMPL_VAR name="title" -->" disabled readonly>) <a href="#" onClick="Plugin(f)">Search for Biblio</a> | <a href="#" onClick="AddBiblio()">Create Biblio</a></td>
-	<tr><td><label>Call Number</label></td>
-	    <td><input type="text" name="callnumber" value="<!-- TMPL_VAR name="callnumber" -->" size="20"></td></tr>
-	<tr><td><label>Notes</label></td>
-	    <td><textarea name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
-		<!-- TMPL_IF name="letters" -->
-			<tr><td><label>Enable issue alert</label>
-				<select name="letter">
-					<option value=""></option>
-					<!-- TMPL_LOOP name="letters" -->
-						<!-- TMPL_IF name="selected" -->
-							<option value="<!-- TMPL_VAR name="code" -->" selected><!-- TMPL_VAR name="name" --></option>
-						<!-- TMPL_ELSE -->
-							<option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="name" --></option>
-						<!-- /TMPL_IF -->
-					<!-- /TMPL_LOOP -->
-				</select>
-			</td>
-		<!-- /TMPL_IF -->
-		<td><label>Distributed to </label><a href="#" onClick="DistributedTo()">...</a></td><tr>
-
-
-
-
-
-
-
-
-
-	<tr><td><b>Warning:</b></td>
-	    <td>
-		<ul>
-			<li>Remember you <b>must</b> have created a biblio <b>before</b> creating a subscription</li>
-			<li>You also must have selected a supplier if you want to ask for late issues</li>
-		</ul></td></tr>
-	</table>
-</div>
-<div id="bloc25">
-	<h2>Planning</h2>
-	<table border="0" cellspacing="5" cellpadding="0">
-	<tr><td><label class="label100">This issue publishes on:</label></td>
-	    <td> <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="button2" style="cursor: pointer;"  />
+<input type="hidden" name="user" value="<!-- TMPL_VAR name="loggedinusername" -->">
+<input type="hidden" name="irreg_check" value="0">
+<input type="hidden" name="issuesexpected1" value="0">
 
-<input type="text" name="publisheddate" value="<!-- TMPL_VAR name="publisheddate" -->" size=13 maxlength=10 id="acqui_date" style="border-width: 0px;">
-<!-- both scripts for calendar must follow the input field --> 
-                                        <script type="text/javascript">
-                                            Calendar.setup({
-                                                inputField:"acqui_date",
-                                                ifFormat       :   "%d/%m/%Y",
-                                                button         :   "button2",
-                                                align          :   "Tl"
-                                            });
-                                        </script>
-                                        <script type="text/javascript">
-                                            Calendar.setup({
-                                                inputField     :   "acqui_date",
-                                                ifFormat       :   "%d/%m/%Y",
-                                                button         :   "acqui_date",
-                                                align          :   "Tl"
-                                            });
-                                        </script></td>
-	    <td rowspan="5"><div id="displayexample"></div></td></tr>
-	<tr><td><label class="label100">Frequency: (*)</label></td>
-	    <td>	<select name="periodicity" size="1">
-				<option value="" selected>-- please choose --</option>
-				<option value="">Unknown</option>
 
-				<!-- TMPL_IF name="periodicity1" -->
-					<option value="1" selected>1/day</option>
-				<!-- TMPL_ELSE -->
-					<option value="1">1/day</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="periodicity2" -->
-					<option value="2" selected>1/week</option>
-				<!-- TMPL_ELSE -->
-					<option value="2">1/week</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="periodicity3" -->
-					<option value="3" selected>1/2 weeks (2/month)</option>
-				<!-- TMPL_ELSE -->
-					<option value="3">1/2 weeks (2/months)</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="periodicity4" -->
-					<option value="4" selected>1/3 weeks</option>
-				<!-- TMPL_ELSE -->
-					<option value="4">1/3 weeks</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="periodicity5" -->
-					<option value="5" selected>1/month</option>
-				<!-- TMPL_ELSE -->
-					<option value="5">1/month</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="periodicity6" -->
-					<option value="6" selected>1/2 months (6/year)</option>
-				<!-- TMPL_ELSE -->
-					<option value="6">1/2 months (6/year)</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="periodicity7" -->
-					<option value="7" selected>1/3 months (1/quarter)</option>
-				<!-- TMPL_ELSE -->
-					<option value="7">1/3 months (1/quarter)</option>
-				<!-- /TMPL_IF -->
-				<!-- periodicity8 is 1/quarter, exactly like periodicity7 but will use it for seasonal option -->
-				<!-- TMPL_IF name="periodicity8" -->
-					<option value="8" selected>1/quarter (seasonal)</option>
-				<!-- TMPL_ELSE -->
-					<option value="8">1/quarter (seasonal)</option>
-				<!-- /TMPL_IF -->
+<div>
+    <h2>Subscription information <br />for subscription #<!--TMPL_VAR name="subscriptionid"--></h2>
+    <table border="0" cellspacing="5" cellpadding="0">
+        <tr>
+            <td>Librarian:</td>
+            <td><!-- TMPL_VAR name="loggedinusername" --></td>
+        </tr>
+        <tr>
+            <td><label>Supplier:</label></td>
+            <td><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="8"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <a href="#" onClick="FindAcqui(f)">Search for a Supplier</a></td>
+        </tr>
+        <tr>
+            <td><label>Biblio</label></td>
+            <td>
+                <input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="8"> 
+                (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>)
+                <a href="#" onClick="Plugin(f)">Search for Biblio</a> |
+                <!--TMPL_UNLESS Name="mod"--><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Create Biblio</a><!--/TMPL_UNLESS-->
+            </td>
+        </tr>
+        <tr>
+            <td><label>Call Number</label></td>
+            <td><input type="text" name="callnumber" value="<!-- TMPL_VAR name="callnumber" -->" size="20"></td>
+        </tr>
+        <tr>
+            <td>Branch</td>
+            <td>
+                <select name="branchcode">
+                    <option value="">Any branch</option>
+                    <!-- TMPL_LOOP name="branchloop" -->
+                        <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
+                    <!-- /TMPL_LOOP -->
+                </select> (select a branch)
+            </td>
+        </tr>
+        <tr>
+            <td><label>Notes</label></td>
+            <td><textarea name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td>
+        </tr>
+        <tr>
+            <td><label>Management Notes</label></td>
+            <td><textarea name="internalnotes" cols="30" rows="2"><!-- TMPL_VAR name="internalnotes" --></textarea></td>
+        </tr>
+        <tr>
+            <td>Patron alert with </td>
+            <td>
+                <select name="letter">
+                    <option value="">un-activated</option>
+                <!-- TMPL_LOOP name="letterloop" -->
+                    <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="lettername" --></option>
+                <!-- /TMPL_LOOP -->
+                </select> (select a letter &amp; patrons will be able to "follow" this subscription and recieve a mail on every new issue)
+            </td>
+        </tr>
+        <tr>
+            <td><b>Warning:</b></td>
+            <td>
+                <ul>
+                    <li>Remember you <b>must</b> have created a biblio <b>before</b> creating a subscription</li>
+                    <li>You also must have selected a supplier if you want to ask for late issues</li>
+                </ul>
+            </td>
+        </tr>
+    </table>
+<div>
+    <h2>Planning</h2>
+    <table border="0" cellspacing="5" cellpadding="0">
+        <tr>
+            <td><label>First Issue ETA:</label></td>
+            <td>
+                <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="button2" style="cursor: pointer;"  />
+                <input type="text" name="firstacquidate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10 id="acqui_date" style="border-width: 0px;" />
+                <!-- both scripts for calendar must follow the input field --> 
+                <script type="text/javascript">
+                    Calendar.setup({
+                        inputField:"acqui_date",
+                        ifFormat       :   "%d/%m/%Y",
+                        button         :   "button2",
+                        align          :   "Tl"
+                    });
+                </script>
+                <script type="text/javascript">
+                    Calendar.setup({
+                        inputField     :   "acqui_date",
+                        ifFormat       :   "%d/%m/%Y",
+                        button         :   "acqui_date",
+                        align          :   "Tl"
+                    });
+                </script>
+            </td>
+            <td rowspan="5">
+                <div id="displayexample"></div>
+            </td>
+        </tr>
+        <tr>
+            <td><label">Frequency: (*)</label></td>
+            <td>
+                <select name="periodicity" size="1" onchange="javascript:document.getElementsByName('manualhist')[0].checked=(this.value==1);num_pattern;">
+                <option value="" selected>-- please choose --</option>
+                <option value="">Unknown</option>
 
-				<!-- TMPL_IF name="periodicity9" -->
-					<option value="9" selected>2/years</option>
-				<!-- TMPL_ELSE -->
-					<option value="9">2/year</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="periodicity10" -->
-					<option value="10" selected>1/year</option>
-				<!-- TMPL_ELSE -->
-					<option value="10">1/year</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="periodicity11" -->
-					<option value="11" selected>1/2 years</option>
-				<!-- TMPL_ELSE -->
-					<option value="11">1/2 years</option>
-				<!-- /TMPL_IF -->
-			</select>
-	</td></tr>
-	<tr><td><label class="label100">Numbering Pattern:</label></td>
-	    <td><select name="numbering_pattern" size="1" id="numberpattern" onchange="num_pattern()">
-		<option value="" selected>-- please choose --</option>
-		<!-- TMPL_IF name="numberpattern1" -->
-			<option value="1" selected>Number</option>
-		<!-- TMPL_ELSE -->
-			<option value="1">Number</option>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern2" -->
-			<option value="2" selected>Volume, Number, Issue</option>
-		<!-- TMPL_ELSE -->
-			<option value="2">Volume, Number, Issue</option>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern3" -->
-			<option value="3" selected>Volume, Number</option>
-		<!-- TMPL_ELSE -->
-			<option value="3">Volume, Number</option>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern4" -->
-			<option value="4" selected>Volume, Issue</option>
-		<!-- TMPL_ELSE -->
-			<option value="4">Volume, Issue</option>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern5" -->
-			<option value="5" selected>Number, Issue</option>
-		<!-- TMPL_ELSE -->
-			<option value="5">Number, Issue</option>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern6" -->
-			<option value="6" selected>Seasonal only</option>
-		<!-- TMPL_ELSE -->
-	 		<option value="6">Seasonal only</option>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern7" -->
-			<option value="7" selected>None of the above</option>
-		<!-- TMPL_ELSE -->
-	 		<option value="7">None of the above</option>
-		<!-- /TMPL_IF -->
+                <!-- TMPL_IF name="periodicity1" -->
+                    <option value="1" selected>1/day</option>
+                <!-- TMPL_ELSE -->
+                    <option value="1">1/day</option>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="periodicity2" -->
+                    <option value="2" selected>1/week</option>
+                <!-- TMPL_ELSE -->
+                    <option value="2">1/week</option>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="periodicity3" -->
+                    <option value="3" selected>1/2 weeks (2/month)</option>
+                <!-- TMPL_ELSE -->
+                    <option value="3">1/2 weeks (2/months)</option>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="periodicity4" -->
+                    <option value="4" selected>1/3 weeks</option>
+                <!-- TMPL_ELSE -->
+                    <option value="4">1/3 weeks</option>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="periodicity5" -->
+                    <option value="5" selected>1/month</option>
+                <!-- TMPL_ELSE -->
+                    <option value="5">1/month</option>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="periodicity6" -->
+                    <option value="6" selected>1/2 months (6/year)</option>
+                <!-- TMPL_ELSE -->
+                    <option value="6">1/2 months (6/year)</option>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="periodicity7" -->
+                    <option value="7" selected>1/3 months (1/quarter)</option>
+                <!-- TMPL_ELSE -->
+                    <option value="7">1/3 months (1/quarter)</option>
+                <!-- /TMPL_IF -->
+                <!-- periodicity8 is 1/quarter, exactly like periodicity7 but will use it for seasonal option -->
+                <!-- TMPL_IF name="periodicity8" -->
+                    <option value="8" selected>1/quarter (seasonal)</option>
+                <!-- TMPL_ELSE -->
+                    <option value="8">1/quarter (seasonal)</option>
+                <!-- /TMPL_IF -->
 
-		</select>
-<div id="more_options"></div>
-<div id="irregularity"></div></td></tr>
-	<tr><td><label class="label100">Planned to arrive on: (*)</label></td>
-	    <td><img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="button1" style="cursor: pointer;"  />
-<input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10 id="beginning_date" style="border-width: 0px;">
-<!-- both scripts for calendar must follow the input field --> 
-                                        <script type="text/javascript">
-                                            Calendar.setup({
-                                                inputField   : "beginning_date",
-                                                ifFormat     : "%d/%m/%Y",
-                                                button       : "button1",
-                                                align        : "Tl"
-                                            });
-                                        </script>
-                                        <script type="text/javascript">
-                                            Calendar.setup({
-                                                inputField   : "beginning_date",
-                                                ifFormat     : "%d/%m/%Y",
-                                                button       : "beginning_date",
-                                                align        : "Tl"
-                                            });
-                                        </script></td></tr>
-</table> 
-</div>
-
-<!--	<tr><td><label class="label100">Arrives on</label></td>
-	    <td>	<select name="dow" size="1">
-				<option value="">None</option>
-				<!-- TMPL_IF name="dow1" -->
-					<option value="1" selected>Monday</option>
-				<!-- TMPL_ELSE -->
-					<option value="1">Monday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow2" -->
-					<option value="2" selected>Tuesday</option>
-				<!-- TMPL_ELSE -->
-					<option value="2">Tuesday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow3" -->
-					<option value="3" selected>Wednesday</option>
-				<!-- TMPL_ELSE -->
-					<option value="3">Wednesday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow4" -->
-					<option value="4" selected>Thursday</option>
-				<!-- TMPL_ELSE -->
-					<option value="4">Thursday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow5" -->
-					<option value="5" selected>Friday</option>
-				<!-- TMPL_ELSE -->
-					<option value="5">Friday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow6" -->
-					<option value="6" selected>Saturday</option>
-				<!-- TMPL_ELSE -->
-					<option value="6">Saturday</option>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF name="dow7" -->
-					<option value="7" selected>Sunday</option>
-				<!-- TMPL_ELSE -->
-					<option value="7">Sunday</option>
-				<!-- /TMPL_IF -->
-			</select></td></tr> -->
-
-<div id="bloc25">
-	<h2>Subscription length</h2>
-		<p><select name="subtype">
-<!-- TMPL_LOOP NAME="subtype" -->
-<option value="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="selected" --> selected="SELECTED" <!-- /TMPL_IF -->><!-- TMPL_VAR NAME="name" --></option>
-<!-- /TMPL_LOOP -->
-</select> <input type="text" name="sublength" value="<!-- TMPL_VAR name="sublength" -->" size="3" onkeypress="return check_input(event)"> (*) (enter amount in numerals)</p>
-
-</div>
-<div id="bloc25">
-	<h2>Numbering calculation</h2>
-	<p>Numbering formula: <input type="text" name="numberingmethod" value="<!-- TMPL_VAR name="numberingmethod" -->"></p>
-	<div id="basetable" style="display: none;">
-		<table class="small">
-			<tr>
-				<th>&nbsp;</th>
-				<th>X</th>
-				<th>Y</th>
-				<th>Z</th>
-			</tr>
-			<tr>
-				<td>Add</td>
-				<td>
-					<input type="text" name="add1" value="<!-- TMPL_VAR name="add1" -->">
-				</td>
-				<td>
-					<input type="text" name="add2" value="<!-- TMPL_VAR name="add2" -->">
-				</td>
-				<td>
-					<input type="text" name="add3" value="<!-- TMPL_VAR name="add3" -->">
-				</td>
-			</tr>
-			<tr>
-				<td>once every</td>
-				<td><input type="text" name="every1" value="<!-- TMPL_VAR name="every1" -->"></td>
-				<td><input type="text" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
-				<td><input type="text" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
-			</tr>
-			<tr>
-				<td>When more than</td>
-				<td><input type="text" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
-				<td><input type="text" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
-				<td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
-			</tr>
-			<!-- TMPL_IF name="mod" -->
-			<tr>
-				<td>The loop is for instance</td>
-				<td><input type="text" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
-				<td><input type="text" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
-				<td><input type="text" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
-			</tr>
-			<!-- /TMPL_IF -->
-			<tr>
-				<td>Set back to</td>
-				<td><input type="text" name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
-				<td><input type="text" name="setto2" value="<!-- TMPL_VAR name="setto2" -->"></td>
-				<td><input type="text" name="setto3" value="<!-- TMPL_VAR name="setto3" -->"></td>
-			</tr>
-			<tr>
-				<td>
-					<!-- TMPL_IF name="mod" -->
-						Last value
-					<!-- TMPL_ELSE -->
-						Begins with
-					<!-- /TMPL_IF -->
-				</td>
-				<td><input type="text" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->"></td>
-				<td><input type="text" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->"></td>
-				<td><input type="text" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->"></td>
-			</tr>
-		</table> </div>
-</div>
+                <!-- TMPL_IF name="periodicity9" -->
+                    <option value="9" selected>2/years</option>
+                <!-- TMPL_ELSE -->
+                    <option value="9">2/year</option>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="periodicity10" -->
+                    <option value="10" selected>1/year</option>
+                <!-- TMPL_ELSE -->
+                    <option value="10">1/year</option>
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="periodicity11" -->
+                    <option value="11" selected>1/2 years</option>
+                <!-- TMPL_ELSE -->
+                    <option value="11">1/2 years</option>
+                <!-- /TMPL_IF -->
+                </select>
+                Manual History :<input type="checkbox" name="manualhist" value="1" />
+            </td>
+        </tr>
+        <tr>
+            <td>
+                <label>Numbering Pattern:</label>
+            </td>
+            <td>
+                <select name="numbering_pattern" size="1" id="numberpattern" onchange="num_pattern()">
+                    <option value="" selected>-- please choose --</option>
+                    <!-- TMPL_IF name="numberpattern1" -->
+                        <option value="1" selected>Number</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="1">Number</option>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="numberpattern2" -->
+                        <option value="2" selected>Volume, Number, Issue</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="2">Volume, Number, Issue</option>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="numberpattern3" -->
+                        <option value="3" selected>Volume, Number</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="3">Volume, Number</option>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="numberpattern4" -->
+                        <option value="4" selected>Volume, Issue</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="4">Volume, Issue</option>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="numberpattern5" -->
+                        <option value="5" selected>Number, Issue</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="5">Number, Issue</option>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="numberpattern6" -->
+                        <option value="6" selected>Seasonal only</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="6">Seasonal only</option>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="numberpattern7" -->
+                        <option value="7" selected>None of the above</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="7">None of the above</option>
+                    <!-- /TMPL_IF -->
+                </select>
+                <div id="more_options"></div>
+                <div id="irregularity"></div>
+            </td>
+        </tr>
+        <tr>
+            <td><label>Begins On: (*)</label></td>
+            <td>
+                <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="button1" style="cursor: pointer;"  />
+                <input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size=13 maxlength=10 id="beginning_date" style="border-width: 0px;">
+                <!-- both scripts for calendar must follow the input field --> 
+                <script type="text/javascript">
+                    Calendar.setup({
+                        inputField   : "beginning_date",
+                        ifFormat     : "%d/%m/%Y",
+                        button       : "button1",
+                        align        : "Tl"
+                    });
+                </script>
+                <script type="text/javascript">
+                    Calendar.setup({
+                        inputField   : "beginning_date",
+                        ifFormat     : "%d/%m/%Y",
+                        button       : "beginning_date",
+                        align        : "Tl"
+                    });
+                </script>
+            </td>
+        </tr>
+        <tr>
+            <td>Subscription length</td>
+            <td>
+                <select name="subtype">
+                    <!-- TMPL_LOOP NAME="subtype" -->
+                        <!-- TMPL_IF NAME="selected" -->
+                        <option value="<!-- TMPL_VAR NAME="name" -->"  selected="SELECTED">
+                        <!-- TMPL_ELSE -->
+                        <option value="<!-- TMPL_VAR NAME="name" -->">
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_VAR NAME="name" -->
+                        </option>
+                    <!-- /TMPL_LOOP -->
+                </select>
+                <input type="text" name="sublength" value="<!-- TMPL_VAR name="sublength" -->" size="3" onkeypress="return check_input(event)"> (*) (enter amount in numerals)
+            </td>
+        </tr>
+    <tr>
+        <td>Numbering calculation</td>
+        <td>Numbering formula: <input type="text" name="numberingmethod" value="<!-- TMPL_VAR name="numberingmethod" -->"></td>
+    </tr>
+    <tr>
+    <td colspan=3>
+        <div id="basetable" style="display: none;">
+            <table class="small">
+                <tr>
+                    <th>&nbsp;</th>
+                    <th>X</th>
+                    <th>Y</th>
+                    <th>Z</th>
+                </tr>
+                <tr>
+                    <td>Add</td>
+                    <td>
+                        <input type="text" name="add1" value="<!-- TMPL_VAR name="add1" -->">
+                    </td>
+                    <td>
+                        <input type="text" name="add2" value="<!-- TMPL_VAR name="add2" -->">
+                    </td>
+                    <td>
+                        <input type="text" name="add3" value="<!-- TMPL_VAR name="add3" -->">
+                    </td>
+                </tr>
+                <tr>
+                    <td>once every</td>
+                    <td><input type="text" name="every1" value="<!-- TMPL_VAR name="every1" -->"></td>
+                    <td><input type="text" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
+                    <td><input type="text" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
+                </tr>
+                <tr>
+                    <td>When more than</td>
+                    <td><input type="text" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
+                    <td><input type="text" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
+                    <td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
+                </tr>
+                <!-- TMPL_IF name="mod" -->
+                <tr>
+                    <td>The loop is for instance</td>
+                    <td><input type="text" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
+                    <td><input type="text" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
+                    <td><input type="text" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
+                </tr>
+                <!-- /TMPL_IF -->
+                <tr>
+                    <td>Set back to</td>
+                    <td><input type="text" name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
+                    <td><input type="text" name="setto2" value="<!-- TMPL_VAR name="setto2" -->"></td>
+                    <td><input type="text" name="setto3" value="<!-- TMPL_VAR name="setto3" -->"></td>
+                </tr>
+                <tr>
+                    <td>
+                        <!-- TMPL_IF name="mod" -->
+                            Last value
+                        <!-- TMPL_ELSE -->
+                            Begins with
+                        <!-- /TMPL_IF -->
+                    </td>
+                    <td><input type="text" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->"></td>
+                    <td><input type="text" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->"></td>
+                    <td><input type="text" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->"></td>
+                </tr>
+            </table>
+        </div>
+        </td></tr>
+    </table>
+<!--TMPL_IF Name="history"-->
+    <h2>History</h2>
+    <table border="0" cellspacing="5" cellpadding="0">
+		<tr>
+          <td><label>Starting date:</label></td>
+          <td><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->"> (the date of the 1st subscription)</td>
+        </tr>
+		<tr>
+          <td><label>Ending date:</label></td>
+          <td><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->">(if empty : subscription still active)</td>
+        </tr>
+        <tr>
+            <td><label>Recieved issues</label></td>
+            <td><textarea name="recievedlist" cols="60" rows="5"><!-- TMPL_VAR name="recievedlist" --></textarea></td>
+        </tr>
+        <tr>
+            <td><label>Missing issues</label></td>
+            <td><textarea name="missinglist" cols="60" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td>
+        </tr>
+        <tr>
+            <td><label>Opac's notes</label></td>
+            <td><textarea name="opacnote" cols="60" rows="5"><!-- TMPL_VAR name="opacnote" --></textarea></td>
+        </tr>
+        <tr>
+            <td><label>Librarian notes</label></td>
+            <td><textarea name="librariannote" cols="60" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td>
+        </tr>
+    </table>
+<!--/TMPL_IF-->
 <!-- TMPL_IF name="mod" -->
-	<input type="button" value="Save subscription" onclick="Check(this.form)" accesskey="w" class="button">
+    <input type="button" value="Save subscription" onclick="Check(this.form)" accesskey="w" class="button">
 <!-- TMPL_ELSE -->
-	<input type="button" value="Add subscription" onclick="Check(this.form)" accesskey="w" class="button">
+    <input type="button" value="Add subscription" onclick="Check(this.form)" accesskey="w" class="button">
 <!-- /TMPL_IF -->
 </form>
-
+</div>
 
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
@@ -970,56 +1021,48 @@ function check_input(e){
 
 function Plugin(f)
 {
-	 window.open('subscription-bib-search.pl','FindABibIndex','width=500,height=400,toolbar=no,scrollbars=yes');
+	 window.open('subscription-bib-search.pl','FindABibIndex','width=800,height=400,toolbar=no,scrollbars=yes');
 }
 
 function FindAcqui(f)
 {
-	 window.open('acqui-search.pl','FindASupplier','width=500,height=400,toolbar=no,scrollbars=yes');
+	 window.open('acqui-search.pl','FindASupplier','width=800,height=400,toolbar=no,scrollbars=yes');
 }
 
 function Find_ISSN(f)
 {
-	 window.open('issn-search.pl','FindABibIndex','width=500,height=400,toolbar=no,scrollbars=yes');
+	 window.open('issn-search.pl','FindABibIndex','width=800,height=400,toolbar=no,scrollbars=yes');
 }
 
 
 function Check(f) {
-	if (f.startdate.value.length != 0 && f.sublength.value > 0) {
-		if (f.irreg_check.value == 1) {
-			document.f.submit();
-		} else {
-			if(f.numbering_pattern.value == ''){
-				alert("need to choose a numbering pattern");
-			} else {
-				alert("need to check for irregularity by clicking 'Irregularity?'");
-			}
-		}
-	} else {
-	 	alert('field marked with * are mandatory');
-	}
-	return false;
-}
-function DistributedTo()
-{
-	newwin= window.open('distributedto.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->',"Distributed_to",'width=800,height=600,toolbar=false,scrollbars=yes');
-}
-function AddBiblio() {
-     window.open("/cgi-bin/koha/cataloguing/addbiblio.pl?fromserials=1&popup=1","AddBiblio",'width=700,height=400,toolbar=no,scrollbars=yes,status=yes');
-
+    if (f.startdate.value.length != 0 && f.sublength.value > 0) {
+        if (f.irreg_check.value == 1) {
+            document.f.submit();
+        } else {
+            if(f.numbering_pattern.value == ''){
+                alert(_("need to choose a numbering pattern"));
+            } else {
+                alert(_("need to check for irregularity by clicking 'Irregularity?'"));
+            }
+        }
+    } else {
+        alert(_('field marked with * are mandatory'));
+    }
+    return false;
 }
 </script>
 <!-- TMPL_IF name="mod" -->
-<script language="JavaScript" type="text/javascript">
+<script type="text/javascript">
 window.onload = modify_num_pattern();
-	<!-- TMPL_IF name="hemisphere" -->
-	window.onload = hemispheres(<!-- TMPL_VAR NAME="hemisphere" -->);
-	<!-- /TMPL_IF -->
+    <!-- TMPL_IF name="hemisphere" -->
+    window.onload = hemispheres(<!-- TMPL_VAR NAME="hemisphere" -->);
+    <!-- /TMPL_IF -->
 </script>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF name="irregularity" -->
-<script language="JavaScript"  type="text/javascript">
+<script type="text/javascript">
 window.onload = irregularity_check();
 window.onload = irregular_order();
 </script>
-<!-- /TMPL_IF -->
\ No newline at end of file
+<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl
index f875e61f63..99f2ed53fb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl
@@ -1,74 +1,10 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="main-compact">
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <h1>Catalogue search</h1>
 
 <form name="f" action="/cgi-bin/koha/serials/subscription-bib-search.pl" method="post">
-	<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 class="data">
-		<table>
-		<caption>Search on</caption>
-		<tr><th scope="row"><label for="keyword">Search</label></th><td>
-			
-			<input type="hidden" name="and_or" value="@and" />
-			<input type="hidden" name="relation" value="@attr 5=1" /> 
-			<input type="text" id="keyword" name="value"> 
-		</td><td><select align="right" id="kohafield" name="kohafield" size="1">
-				<option value="any">Any field</option>
-				<option value="title">Title</option>
-				<option value="Author">Author</option>
-				<option value="ISSN">ISSN</option>
-			</select></td></tr>
-		<tr><th scope="row"><label for="itemtype">Itemtype</label></th><td>
-			<!-- TMPL_VAR name="CGIitemtype" -->
-			<input type="hidden" name="kohafield" value="itemtype" />
-			<input type="hidden" name="value" value="<!-- TMPL_VAR name="category" -->">
-		
-			<input type="hidden" name="and_or" value="@and" />
-			<input type="hidden" name="relation" value="@attr 5=1" />
-
-			<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->" />
-		</td></tr>
-	</div>
-	<div class="data">
-		<tr><th scope="row"><label for="resultsperpage">Results per page :</label></th><td>
-			<select align="right" id="resultsperpage" name="resultsperpage" size="1">
-				<option value="10">10</option>
-				<option value="20">20</option>
-				<option value="50">50</option>
-			</select></td><td>
-		<label for="orderby">Ordered by</label>
-			<select id="orderby" name="order" size="1">
-				<option value="title i<">Title</option>
-				<option value="author i<">Author</option>
-					</select>
-		</td></tr>
-		</table>
-		<p>
-			<input type="submit" value="Start search" class="submit" />
-			
-		</p>
-	</div>
+    <input type="hidden" name="op" value="do_search" />
+    <input type="hidden" name="type" value="intranet" />
+    <label for="q">Keyword</label>
+    <input type="text" id="q"  name="q" />
+    <input type="submit" value="Search" />
 </form>
-
-<script language="Javascript" type="text/javascript">
-function AddStatement() {
-
-	document.forms['f'].op.value="AddStatement";
-	document.f.submit();
-}
-
-function PopupSuggestion() {
-    var strQuery="";
-	for (i=0 ; i<document.f.marclist.length ; i++) {
-		if (document.f.value[i].value.length>0) {
-		    strQuery += " "+document.f.value[i].value;
-		}
-	}
-	newin=window.open("suggest.pl?Q="+strQuery,"Suggestions",'width=500,height=400,toolbar=false,scrollbars=yes');
-}
-
-</script>
-</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl
index 6609baa225..488aa89205 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl
@@ -1,417 +1,399 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription edit<!--
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha_--_Subscription detail_#<!-- TMPL_VAR name="subscriptionid" --><!--
 TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-serials.inc" -->
+<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 
-<script language="Javascript" type="text/javascript">
+<script type="text/javascript" language="javascript">
 <!--
 // the english words used in display purposes
 var text = new Array('Number','Volume','Issue','Month','Week','Starting with:','Rollover at:','Choose Hemisphere:','Northern','Southern',
 'Autumn','Winter','Spring','Summer','Fall','Season','Year');
 
 // common pre defined number patterns
-function num_pattern() {
-var patternchoice = '<!--TMPL_VAR NAME='numberpattern'-->';
-	switch(patternchoice){
-	case "2":
-		options(text[1],text[0],text[2]);
-		irregularity();
-		display_table(0);
-		break;
-	case "3":
-		options(text[1],text[0]);
-		irregularity();
-		display_table(0);
-		break;
-	case "4":
-		options(text[1],text[2]);
-		irregularity();
-		display_table(0);
-		break;
-	case "5":
-		options(text[0],text[2]);
-		irregularity();
-		display_table(0);
-		break;
-	case "6":
-		var d = new Date();
-		var sYear = d.getFullYear();
-		// options_seasons(text[15],sYear);
-		irregularity();
-		is_season = 1;
-		display_table(0);
-		break;
-	case "7":
-		display_table(1);
-		irregularity();
-		break;
-	default:
-		options(text[0]);
-		irregularity();
-		display_table(0);
-		break;
-	}
-}
-
-function display_table(n) {
-	if(n==1){
-		document.getElementById("basetable").style.display = 'block';
-	} else {
-		document.getElementById("basetable").style.display = 'none';
-	}
-}
+// function num_pattern() {
+// var patternchoice = '<!--TMPL_VAR NAME='numberpattern'-->';
+//     switch(patternchoice){
+//     case "2":
+//         options(text[1],text[0],text[2]);
+//         irregularity();
+//         display_table(0);
+//         break;
+//     case "3":
+//         options(text[1],text[0]);
+//         irregularity();
+//         display_table(0);
+//         break;
+//     case "4":
+//         options(text[1],text[2]);
+//         irregularity();
+//         display_table(0);
+//         break;
+//     case "5":
+//         options(text[0],text[2]);
+//         irregularity();
+//         display_table(0);
+//         break;
+//     case "6":
+//         var d = new Date();
+//         var sYear = d.getFullYear();
+//         // options_seasons(text[15],sYear);
+//         irregularity();
+//         is_season = 1;
+//         display_table(0);
+//         break;
+//     case "7":
+//         display_table(1);
+//         irregularity();
+//         break;
+//     default:
+//         options(text[0]);
+//         irregularity();
+//         display_table(0);
+//         break;
+//     }
+// }
+// 
+// function display_table(n) {
+//     if(n==1){
+//         document.getElementById("basetable").style.display = 'block';
+//     } else {
+//         document.getElementById("basetable").style.display = 'none';
+//     }
+// }
 
 // to dispaly the options section
 function options(x,y,z){
 var textbox = '';
-	// alert("X: "+x+"Y: "+y+"Z: "+z);
-	if(x){
-		document.f.xfield.value = x;
-		if(y){
-			document.f.yfield.value = y;
-			if(z){
-				document.f.zfield.value = z;
-			}
-		}
-	}
+    // alert("X: "+x+"Y: "+y+"Z: "+z);
+    if(x){
+        document.f.xfield.value = x;
+        if(y){
+            document.f.yfield.value = y;
+            if(z){
+                document.f.zfield.value = z;
+            }
+        }
+    }
 }
 
 function irregularity(){
-	var periodicity = '<!-- TMPL_VAR NAME="periodicity"-->';
-	switch(periodicity){
-	case "1":
-		var names = new Array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday');
-		break;
-	case "2":
-		<!-- TMPL_IF NAME="weekarrayjs" -->
-		var names = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
-		<!-- /TMPL_IF -->
-		break;
-	case "3":
-		<!-- TMPL_IF NAME="weekarrayjs" -->
-		var names = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
-		<!-- /TMPL_IF -->
-		break;
-	case "4":
-		<!-- TMPL_IF NAME="weekarrayjs" -->
-		var names = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
-		<!-- /TMPL_IF -->
-		break;
-	case "5":
-		var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
-		break;
-	case "6":
-		var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
-		break;
-	case "7":
-		var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
-		break;
-	case "8":
-		var names = new Array('Autumn','Winter','Spring','Summer','Fall');
-		break;
-	case "9":
-		var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
-		break;
-	case "10":
-		expected =1;
-		break;
-	default:
-		break;
-	}
+    var periodicity = '<!-- TMPL_VAR NAME="periodicity"-->';
+    switch(periodicity){
+    case "1":
+        var names = new Array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday');
+        break;
+    case "2":
+        <!-- TMPL_IF NAME="weekarrayjs" -->
+        var names = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
+        <!-- /TMPL_IF -->
+        break;
+    case "3":
+        <!-- TMPL_IF NAME="weekarrayjs" -->
+        var names = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
+        <!-- /TMPL_IF -->
+        break;
+    case "4":
+        <!-- TMPL_IF NAME="weekarrayjs" -->
+        var names = new Array(<!-- TMPL_VAR NAME="weekarrayjs" -->); 
+        <!-- /TMPL_IF -->
+        break;
+    case "5":
+        var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
+        break;
+    case "6":
+        var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
+        break;
+    case "7":
+        var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
+        break;
+    case "8":
+        var names = new Array('Autumn','Winter','Spring','Summer','Fall');
+        break;
+    case "9":
+        var names = new Array('January','February','March','April','May','June','July','August','September','October','November','December');
+        break;
+    case "10":
+        expected =1;
+        break;
+    default:
+        break;
+    }
 
-	<!-- TMPL_IF NAME="irregularity" -->
-	var irregular = '<!-- TMPL_VAR NAME="irregularity" -->';
-	var irregarray = irregular.split('|');
-	var irregtext = '<p>';
-	for(var i=0;i<irregarray.length;i++){
-		irregtext += names[i]+' &nbsp;';
-	}
-	irregtext += '</p>';
-	document.getElementById("irreg").innerHTML = irregtext;
-	<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="irregularity" -->
+    var irregular = '<!-- TMPL_VAR NAME="irregularity" -->';
+    var irregarray = irregular.split('|');
+    var irregtext = '<p>';
+    for(var i=0;i<irregarray.length;i++){
+        irregtext += names[i]+' &nbsp;';
+    }
+    irregtext += '</p>';
+    document.getElementById("irreg").innerHTML = irregtext;
+    <!-- /TMPL_IF -->
 }
 
 -->
 </script>
-
-
-<h1>Subscription Details for biblio :  <!-- TMPL_VAR name="biblionumber" --></h1>
-<form class="inline" method="get" action="subscription-add.pl">
-<input type="hidden" name="op" value="mod" />
-<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
-<input type="submit" class="submit" title="Modify subscription" value="Edit" /></form>
-
-<form class="inline" method="get" action="serials-receive.pl">
-<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
-<input type="submit" class="submit" value="Receive Issues" /></form>
-
-<form class="inline" method="get" action="serial-issues.pl">
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
-<input type="submit" class="submit"  title="All issues on this title" value="Issue History" /></form>
-
-<form class="inline" method="get" action="/cgi-bin/koha/serials/serials-home.pl">
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
-<input type="submit" class="submit"  title="all subscriptions on <!-- TMPL_VAR name="bibliotitle" -->" value="Subscriptions" /></form>
-
-<form class="inline" method="get" action="/cgi-bin/koha/catalogue/MARCdetail.pl">
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" />
-<input type="submit" class="submit"  title="go to <!-- TMPL_VAR name="bibliotitle" -->" value="View Biblio Record" /></form>
-
-<form class="inline"><input type="submit" class="cancel" value="Delete Subscription" onclick="confirm_deletion(); return false;" /></form>
-<!-- TMPL_IF NAME="routing" -->
-<form class="inline" method="get" action="/cgi-bin/koha/serials/routing.pl">
-<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
-<input type="submit"  class="submit" value="Edit Routing List"/></form>
-<!-- TMPL_ELSE -->
-<form class="inline" method="get" action="/cgi-bin/koha/serials/routing.pl">
-<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
-<input type="hidden" name="op" value="new" />
-<input type="submit"  class="submit" value="Create Routing List"/></form>
-<!-- /TMPL_IF -->
-
-<table>
-<tr valign="top"><td>
-
-<div class="bloc25">
-	<h2>Subscription information</h2>
-	<p><label class="label100">Librarian identity:</label> <!-- TMPL_VAR name="librarian" --></p><br />
-
-	<p><label class="label100">Supplier:</label> <!-- TMPL_VAR name="aqbooksellername" -->&nbsp;</p>
-
-	<p><label class="label100">Cost:</label> <!-- TMPL_VAR name="cost" -->&nbsp;</p>
-
-	<p><label class="label100">Budget:</label> <!-- TMPL_VAR name="bookfundid" -->&nbsp;</p>
-
-	<p><label class="label100">Biblio:</label> <i>(<!-- TMPL_VAR name="biblionumber" -->)</i> <!-- TMPL_VAR name="bibliotitle" --></p><br />
-	<p><label class="label100">Call Number:</label> <!-- TMPL_VAR name="callnumber" -->&nbsp;</p>
-
-	<p><label class="label100">Notes:</label> <!-- TMPL_VAR name="notes" --></p>
-</div>
-
-<div class="bloc25">
-	<form name="f">
-	<h2>Planning</h2>
-	<p><label class="label100">Beginning date:</label> <!-- TMPL_VAR name="publisheddate" -->
-	</p>
-	<p><label class="label100">Frequency (*):</label>
-		<!--TMPL_IF name="periodicity1" -->
-				1/day
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity2" -->
-				1/week
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity3" -->
-				1/2 weeks
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity4" -->
-				1/3 weeks
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity5" -->
-				1/Month
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity6" -->
-				1/2 Months (6/year)
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity7" -->
-				1/quarter
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity8" -->
-				1/quarter
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity9" -->
-				2/year
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity10" -->
-				1/year
-		<!-- /TMPL_IF -->
-		<!--TMPL_IF name="periodicity11" -->
-				1/2 years
-		<!-- /TMPL_IF -->
-	</p>
-	<p><label class="label100">Number Pattern:</label>
-		<!-- TMPL_IF name="numberpattern1" -->
-			Number
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern2" -->
-			Volume, Number, Issue
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern3" -->
-			Volume, Number
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern4" -->
-			Volume, Issue
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern5" -->
-			Number, Issue
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern6" -->
-			Seasonal only
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="numberpattern7" -->
-			None of the above
-		<!-- /TMPL_IF -->
-	</p>
-	<table cellpadding="0" cellspacing="0">
-	<tr><td>&nbsp;</td>
-	    <td align="right"><input type="text" name="xfield" style="border:0px solid #FFFFFF; text-align:center;"></td>
-	<!--TMPL_IF NAME="lastvalue2"-->
-	    <td align="right"><input type="text" name="yfield" style="border:0px solid #FFFFFF; text-align:center;"></td>
-	<!--/TMPL_IF-->
-	<!--TMPL_IF NAME="lastvalue3"-->
-	    <td align="right"><input type="text" name="zfield" style="border:0px solid #FFFFFF; text-align:center;"></td>
-	<!--/TMPL_IF-->
-	</tr>
-	<tr><td><p><label class="label100">Starting with:</label></p></td>
-	    <td align="center"><!--TMPL_VAR NAME="lastvalue1"--></td>
-	<!--TMPL_IF NAME="lastvalue2"-->
-	    <td align="center">&nbsp; 
-			<!--TMPL_VAR NAME="lastvalue2"-->
-	    </td>
-	<!--/TMPL_IF-->
-	<!--TMPL_IF NAME="lastvalue3"-->
-	    <td align="center">&nbsp; 
-			<!--TMPL_VAR NAME="lastvalue3"-->
-	    </td>
-	<!--/TMPL_IF-->
-	</tr>
-	<tr><td><p><label class="label100">Rollover:</label></p></td>
-	    <td align="center">&nbsp;</td>
-	<!--TMPL_IF NAME="whenmorethan2"-->
-	    <td align="center">&nbsp; 
-			<!--TMPL_VAR NAME="whenmorethan2"-->
-	    </td>
-	<!--/TMPL_IF-->
-	<!--TMPL_IF NAME="whenmorethan3"-->
-	    <td align="center">&nbsp; 
-			<!--TMPL_VAR NAME="whenmorethan3"-->
-	    </td>
-	<!--/TMPL_IF-->
-	</tr>
-	</table>
-	<!-- TMPL_IF NAME="irregularity" -->
-	<p><label class="label100">Irregularity:</label>
-		<div id="irreg"></div>
-	</p>
-	<!-- /TMPL_IF -->
-	<p><label class="label100">Begins on:</label>
-		<!--TMPL_VAR name="startdate" -->
-	</p>
-	</form>
-</div>
-<div class="bloc25">
-	<h2>Subscription length</h2>
-	<!-- TMPL_IF name="numberlength" --><p><label>Number of issues:</label> <!-- TMPL_VAR name="numberlength" --></p><!-- /TMPL_IF -->
-	<!-- TMPL_IF name="weeklength" --><p><label>Number of weeks:</label> <!-- TMPL_VAR name="weeklength" --></p><!-- /TMPL_IF -->
-	<!-- TMPL_IF name="monthlength" --><p><label class="label100">Number of months:</label> <!-- TMPL_VAR name="monthlength" --></p><!-- /TMPL_IF -->
-
-</div>
-<div class="bloc25">
-	<h2>Numbering calculation</h2>
-	<p><label class="label100">Numbering formula:</label> <!-- TMPL_VAR name="numberingmethod" --></p>
+    <h1>Subscription #<!--TMPL_VAR name="subscriptionid"--></h1>
+    <!--TMPL_IF Name="abouttoexpire"--><div class="problem">Subscription is by its end.<br />It should be renewed now.</div><!--/TMPL_IF-->
+    <div id="action">
+        <a href="subscription-add.pl?op=mod&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Edit</a>
+        <a href="subscription-add.pl?op=dup&amp;subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Duplicate </a>
+        <a href="subscription-renew.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Renew</a>
+        <a href="serials-edit.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&amp;serstatus=1">Receive</a>
+        <a href="serials-collection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Serial Collection</a>
+        <!-- TMPL_IF NAME="routing" -->
+        <a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->">Edit Routing List</a>
+        <!-- TMPL_ELSE -->
+        <a href="routing.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->&op=new">Create Routing List</a>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_UNLESS name="totalissues" -->
+            <a href="javascript:confirm_deletion()">
+                delete
+            </a>
+        <!-- /TMPL_UNLESS -->
+    </div>
+    <br />
+    <fieldset>
+        <legend>Subscription information</legend>
+        <p><label>Librarian identity:</label> <!-- TMPL_VAR name="librarian" --></p>
+        <p><label>Supplier:</label> <a href="/cgi-bin/koha/acqui/supplier.pl?id=<!-- TMPL_VAR name="aqbooksellerid"-->"><!-- TMPL_VAR name="aqbooksellername" -->&nbsp;</a></p>
+        <p><label>Biblio:</label> <i>(<!-- TMPL_VAR name="biblionumber" -->)</i> <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR name="bibliotitle" --></a></p><br />
+<!-- TMPL_IF name="branchcode" --><p><label>Branch :</label> <!-- TMPL_VAR name="branchcode" -->&nbsp;</p><!-- /TMPL_IF -->
+        <!-- TMPL_IF name="callnumber" --><p><label>Call Number:</label> <!-- TMPL_VAR name="callnumber" -->&nbsp;</p><!-- /TMPL_IF -->
+        <!-- TMPL_IF name="letter" --><p><label>Patron alert with:</label> <!-- TMPL_VAR name="letter" -->&nbsp;</p><!-- /TMPL_IF -->
+        <!-- TMPL_IF name="notes" --><p><label>Notes:</label> <!-- TMPL_VAR name="notes" --></p><!-- /TMPL_IF -->
+        <!-- TMPL_IF name="internalnotes" --><p><label>Management Notes:</label> <!-- TMPL_VAR name="internalnotes" --></p><!-- /TMPL_IF -->
+        
+    </fieldset>
+    <form name="f">
+    <fieldset>
+        <legend>Planning</legend>
+            <p><label>Beginnning date:</label> <!-- TMPL_VAR name="startdate" -->
+            </p>
+            <p><label>Frequency (*):</label>
+                <!--TMPL_IF name="periodicity1" -->
+                        1/day
+                <!-- /TMPL_IF -->
+                <!--TMPL_IF name="periodicity2" -->
+                        1/week
+                <!-- /TMPL_IF -->
+                <!--TMPL_IF name="periodicity3" -->
+                        1/2 weeks
+                <!-- /TMPL_IF -->
+                <!--TMPL_IF name="periodicity4" -->
+                        1/3 weeks
+                <!-- /TMPL_IF -->
+                <!--TMPL_IF name="periodicity5" -->
+                        1/Month
+                <!-- /TMPL_IF -->
+                <!--TMPL_IF name="periodicity6" -->
+                        1/2 Months (6/year)
+                <!-- /TMPL_IF -->
+                <!--TMPL_IF name="periodicity7" -->
+                        1/quarter
+                <!-- /TMPL_IF -->
+                <!--TMPL_IF name="periodicity8" -->
+                        1/quarter
+                <!-- /TMPL_IF -->
+                <!--TMPL_IF name="periodicity9" -->
+                        2/year
+                <!-- /TMPL_IF -->
+                <!--TMPL_IF name="periodicity10" -->
+                        1/year
+                <!-- /TMPL_IF -->
+                <!--TMPL_IF name="periodicity11" -->
+                        1/2 years
+                <!-- /TMPL_IF -->
+              Manual history : <input type="checkbox" <!--TMPL_IF Name="manualhistory"-->checked<!--/TMPL_IF--> disabled>
+            </p>
+            <p><label>Number Pattern:</label>
+                <!-- TMPL_IF name="numberpattern1" -->
+                    Number
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="numberpattern2" -->
+                    Volume, Number, Issue
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="numberpattern3" -->
+                    Volume, Number
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="numberpattern4" -->
+                    Volume, Issue
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="numberpattern5" -->
+                    Number, Issue
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="numberpattern6" -->
+                    Seasonal only
+                <!-- /TMPL_IF -->
+                <!-- TMPL_IF name="numberpattern7" -->
+                    None of the above
+                <!-- /TMPL_IF -->
+            </p>
+            <table cellpadding="0" cellspacing="0">
+            <tr><td>&nbsp;</td>
+                <td align="right"><input type="text" name="xfield" style="border:0px solid #FFFFFF; text-align:center;" /></td>
+            <!--TMPL_IF NAME="lastvalue2"-->
+                <td align="right"><input type="text" name="yfield" style="border:0px solid #FFFFFF; text-align:center;"></td>
+            <!--/TMPL_IF-->
+            <!--TMPL_IF NAME="lastvalue3"-->
+                <td align="right"><input type="text" name="zfield" style="border:0px solid #FFFFFF; text-align:center;"></td>
+            <!--/TMPL_IF-->
+            </tr>
+            <tr><td><p><label>Starting with:</label></p></td>
+                <td align="center"><!--TMPL_VAR NAME="lastvalue1"--></td>
+            <!--TMPL_IF NAME="lastvalue2"-->
+                <td align="center">&nbsp; 
+                    <!--TMPL_VAR NAME="lastvalue2"-->
+                </td>
+            <!--/TMPL_IF-->
+            <!--TMPL_IF NAME="lastvalue3"-->
+                <td align="center">&nbsp; 
+                    <!--TMPL_VAR NAME="lastvalue3"-->
+                </td>
+            <!--/TMPL_IF-->
+            </tr>
+            <tr><td><p><label>Rollover:</label></p></td>
+                <td align="center">&nbsp;</td>
+            <!--TMPL_IF NAME="whenmorethan2"-->
+                <td align="center">&nbsp; 
+                    <!--TMPL_VAR NAME="whenmorethan2"-->
+                </td>
+            <!--/TMPL_IF-->
+            <!--TMPL_IF NAME="whenmorethan3"-->
+                <td align="center">&nbsp; 
+                    <!--TMPL_VAR NAME="whenmorethan3"-->
+                </td>
+            <!--/TMPL_IF-->
+            </tr>
+            </table>
+            <!-- TMPL_IF NAME="irregularity" -->
+            <p><label>Irregularity:</label>
+                <div id="irreg"></div>
+            </p>
+            <!-- /TMPL_IF -->
+            <p><label>Begins on:</label>
+                <!--TMPL_VAR name="startdate" -->
+            </p>
+            </form>
+        <!-- TMPL_IF name="numberlength" --><p><label>Number of issues:</label> <!-- TMPL_VAR name="numberlength" --></p><!-- /TMPL_IF -->
+        <!-- TMPL_IF name="weeklength" --><p><label>Number of weeks:</label> <!-- TMPL_VAR name="weeklength" --></p><!-- /TMPL_IF -->
+        <!-- TMPL_IF name="monthlength" --><p><label>Number of months:</label> <!-- TMPL_VAR name="monthlength" --></p><!-- /TMPL_IF -->
+    </fieldset>
+    <h2>Numbering calculation</h2>
+    <p><label>Numbering formula:</label> <!-- TMPL_VAR name="numberingmethod" --></p>
+    <table>
+        <tr>
+            <th>&nbsp;</th>
+            <th>X</th>
+            <th>Y</th>
+            <th>Z</th>
+            </tr>
+            <tr>
+                <td>Add</td>
+                <td>
+                    <!-- TMPL_VAR name="add1" -->
+                </td>
+                <td>
+                    <!-- TMPL_VAR name="add2" -->
+                </td>
+                <td>
+                    <!-- TMPL_VAR name="add3" -->
+                </td>
+            </tr>
+            <tr>
+                <td>once every</td>
+                <td><!-- TMPL_VAR name="every1" --></td>
+                <td><!-- TMPL_VAR name="every2" --></td>
+                <td><!-- TMPL_VAR name="every3" --></td>
+            </tr>
+            <tr>
+                <td>When more than</td>
+                <td><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br/>
+                    <i>(is <!-- TMPL_VAR name="innerloop1" -->)</i><!-- /TMPL_IF --></td>
+                <td><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br/>
+                    <i>(is <!-- TMPL_VAR name="innerloop2" -->)</i><!-- /TMPL_IF --></td>
+                <td><!-- TMPL_VAR name="whenmorethan3" --> <!-- TMPL_IF name="innerloop3" --><br/>
+                    <i>(is <!-- TMPL_VAR name="innerloop3" -->)</i><!-- /TMPL_IF --></td>
+            </tr>
+            <tr>
+                <td>Set back to</td>
+                <td><!-- TMPL_VAR name="setto1" --></td>
+                <td><!-- TMPL_VAR name="setto2" --></td>
+                <td><!-- TMPL_VAR name="setto3" --></td>
+            </tr>
+            <tr>
+                <td>
+                        Last value
+                </td>
+                <td><!-- TMPL_VAR name="lastvalue1" --></td>
+                <td><!-- TMPL_VAR name="lastvalue2" --></td>
+                <td><!-- TMPL_VAR name="lastvalue3" --></td>
+            </tr>
+        </table>
+</fieldset>
+<fieldset>
+    <legend>Serial issues</legend>
+    <table cellpadding="0" cellspacing="0">
+    <tr>
+        <th>Issue number</th>
+        <th>Planned date</th>
+        <th>Status</th>
+    </tr>
+    <!-- TMPL_LOOP name="serialslist" -->
+        <tr>
+            <td>
+                <!-- TMPL_VAR name="serialseq" -->
+            </td>
+            <td>
+                <!-- TMPL_VAR name="planneddate" -->
+            </td>
+            <td>
+                    <!--TMPL_IF name="status1" -->
+                        Waited
+                    <!-- /TMPL_IF -->
+                    <!--TMPL_IF name="status2" -->
+                        Arrived
+                    <!-- /TMPL_IF -->
+                    <!--TMPL_IF name="status3" -->
+                        Late
+                    <!-- /TMPL_IF -->
+                    <!--TMPL_IF name="status4" -->
+                        Missing
+                    <!-- /TMPL_IF -->
+            </td>
+        </tr>
+    <!-- /TMPL_LOOP -->
+    </table>
+	<h3>Subscription summary</h3>
+      <table cellpadding="0" cellspacing="0">
+        <tr>
+          <td><label>Start Date :</label></td>
+          <td> <!-- TMPL_VAR name="histstartdate" --> </td>
+        </tr>
+        <tr>
+          <td><label>End Date :</label></td>
+          <td> <!-- TMPL_VAR name="enddate" --></td>
+        </tr>
+		<tr><td><label>Recieved issues</label></td><td><!-- TMPL_VAR name="recievedlist" --></td></tr>
+		<tr><td><label>Missing issues</label></td><td><!-- TMPL_VAR name="missinglist" --></td></tr>
+		<tr><td><label>Librarian's note</label></td><td><!-- TMPL_VAR name="librariannote" --></td></tr>
+		<tr><td><label>Opac's note</label></td><td><!-- TMPL_VAR name="opacnote" --></td></tr>
+      </table>
+</fieldset>
 </div>
-<div class="bloc25" id="basetable">
-	<table cellpadding="0" cellspacing="0" border="0" class="collapse">
-		<tr>
-			<th class="cell-header">&nbsp;</th>
-			<th class="cell-header">X</th>
-			<th class="cell-header">Y</th>
-			<th class="cell-header">Z</th>
-			</tr>
-			<tr>
-				<td class="cell">Add</td>
-				<td class="cell">
-					<!-- TMPL_VAR name="add1" -->
-				</td>
-				<td class="cell">
-					<!-- TMPL_VAR name="add2" -->
-				</td>
-				<td class="cell">
-					<!-- TMPL_VAR name="add3" -->
-				</td>
-			</tr>
-			<tr>
-				<td class="cell">once every</td>
-				<td class="cell"><!-- TMPL_VAR name="every1" --></td>
-				<td class="cell"><!-- TMPL_VAR name="every2" --></td>
-				<td class="cell"><!-- TMPL_VAR name="every3" --></td>
-			</tr>
-			<tr>
-				<td class="cell">When more than</td>
-				<td class="cell"><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br/>
-					<i>(is <!-- TMPL_VAR name="innerloop1" -->)</i><!-- /TMPL_IF --></td>
-				<td class="cell"><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br/>
-					<i>(is <!-- TMPL_VAR name="innerloop2" -->)</i><!-- /TMPL_IF --></td>
-				<td class="cell"><!-- TMPL_VAR name="whenmorethan3" --> <!-- TMPL_IF name="innerloop3" --><br/>
-					<i>(is <!-- TMPL_VAR name="innerloop3" -->)</i><!-- /TMPL_IF --></td>
-			</tr>
-			<tr>
-				<td class="cell">Set back to</td>
-				<td class="cell"><!-- TMPL_VAR name="setto1" --></td>
-				<td class="cell"><!-- TMPL_VAR name="setto2" --></td>
-				<td class="cell"><!-- TMPL_VAR name="setto3" --></td>
-			</tr>
-			<tr>
-				<td class="cell">
-						Last value
-				</td>
-				<td class="cell"><!-- TMPL_VAR name="lastvalue1" --></td>
-				<td class="cell"><!-- TMPL_VAR name="lastvalue2" --></td>
-				<td class="cell"><!-- TMPL_VAR name="lastvalue3" --></td>
-			</tr>
-		</table>
-</div>
-</td><td>
-<div class="bloc25">
-	<h2>Issues</h2>
-	<table cellpadding="0" cellspacing="0" border="0" class="collapse">
-	<tr>
-		<th class="cell-header">Issue number</th>
-		<th class="cell-header">Planned date</th>
-		<th class="cell-header">Status</th>
-	</tr>
-	<!-- TMPL_LOOP name="serialslist" -->
-		<tr>
-			<td class="cell">
-				<!-- TMPL_VAR name="serialseq" -->
-			</td>
-			<td class="cell">
-				<!-- TMPL_VAR name="planneddate" -->
-			</td>
-			<td class="cell">
-					<!--TMPL_IF name="status1" -->
-						Waited
-					<!-- /TMPL_IF -->
-					<!--TMPL_IF name="status2" -->
-						Arrived
-					<!-- /TMPL_IF -->
-					<!--TMPL_IF name="status3" -->
-						Late
-					<!-- /TMPL_IF -->
-					<!--TMPL_IF name="status4" -->
-						Missing
-					<!-- /TMPL_IF -->
-			</td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-	</table>
-</div>
-</td></tr>
-</table>
-
-
 <script type="text/javascript">
 function _(s) { return s } // dummy function for gettext
 function confirm_deletion() {
-	<!-- TMPL_IF name="totalissues" -->
-		var is_confirmed = confirm(_('You already made <!-- TMPL_VAR name="totalissues"--> receipts. Do you confirm deletion?'));
-	<!-- TMPL_ELSE -->
-		var is_confirmed = confirm(_('Are you sure you want to delete this subscription?'));
-	<!-- /TMPL_IF -->	
-	if (is_confirmed) {
-		window.location="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del";
-	}
+    var is_confirmed = confirm(_('Are you sure you want to delete this subscription?'));
+    if (is_confirmed) {
+        window.location="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del";
+    }
+}
+function popup(link) {
+    newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
 }
-window.onload = num_pattern();
-</script>
 
+// window.onload = num_pattern();
+</script>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-renew.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-renew.tmpl
index 0616369e05..a35b4f3aa4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-renew.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-renew.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="popup-top.inc" -->
-
+<div id="mainbloc">
 
 <h1 class="serial">subscription renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl
index 24c4ebb074..edda66dd21 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl
@@ -1,5 +1,6 @@
-<!-- TMPL_INCLUDE NAME="serials-top.inc" -->
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- View alerts<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 <div id="mainbloc">
 		<h1 class="serial">Alert subscribers for <!-- TMPL_VAR name="bibliotitle" --></h1>
 		<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial">subscription</a>
@@ -14,7 +15,7 @@
 			<!-- TMPL_LOOP NAME="alertloop" -->
 				<tr>
 					<td><!-- TMPL_VAR name="name" --></td>
-					<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber">" class="button serial">View</a></td>
+					<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber">" class="button serial">View</a></td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 			</table>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/suggestion/acceptorreject.tmpl b/koha-tmpl/intranet-tmpl/prog/en/suggestion/acceptorreject.tmpl
index 5cf77e17b8..a47e4b8d53 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/suggestion/acceptorreject.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/suggestion/acceptorreject.tmpl
@@ -1,40 +1,187 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Suggestion Management
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-acqui.inc" -->
+
+    <h1>Suggestions Management</h1>
+    
+    <div id="action">
+        <a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=accepted">Accepted</a>
+        <a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=aorr_confirm">Waiting</a>
+        <a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=rejected">Rejected</a>
+    </div>
 
 <!-- TMPL_IF name="op_else" -->
-	<h1>Suggestions Management</h1>
-	<form method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
-	<input type="hidden" name="op" value="aorr_confirm">
-	<table>
-		<tr>
-			<th>Status</th>
-			<th>Suggestion</th>
-			<th>Suggested by</th>
-		</tr>
-		<!-- TMPL_LOOP NAME="suggestions_loop" -->
-			<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
-				<td>
-					<select name="aorr">
-						<option value=""> -- Choose Action --</option>
-						<option value="R<!--TMPL_VAR name="suggestionid" -->">Reject</option>
-						<option value="A<!--TMPL_VAR name="suggestionid" -->">Accept</option>
-					</select>
-				</td>
-				<td><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br>
-					<!-- TMPL_IF name="copyrightdate" -->&copy <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
-						<!-- TMPL_IF name="volumedesc" -->; Volume:<i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
-						<!-- TMPL_IF name="isbn" -->; ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->; Published by <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="place" --> in <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF --><br><!-- TMPL_IF name="note" --><!-- TMPL VAR NAME="note" --><!-- /TMPL_IF -->
+    <br />
+    <!-- TMPL_IF NAME="suggestions_loop" -->
+    <b>Waiting suggestion,</b> accept or reject these suggestions with a reason.
+    <form name="f" method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
+    <input type="hidden" name="op" value="aorr_confirm">
+    <table>
+        <tr>
+            <th>Status</th>
+            <th>Reason</th>
+            <th>Suggestion</th>
+            <th>Suggested by</th>
+        </tr>
+        <!-- TMPL_LOOP NAME="suggestions_loop" -->
+            <tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
+                <td>
+                    <select name="aorr">
+                        <option value=""> -- Choose Action -- </option>
+                        <option value="R<!--TMPL_VAR name="suggestionid" -->">Reject</option>
+                        <option value="A<!--TMPL_VAR name="suggestionid" -->">Accept</option>
+                    </select>
+                </td>
+                <td>
 
-				</td>
-				<td>
-					<!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
-				</td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-		</table>
-		<input type="submit" value="Change Status">
+		            <span id="span-select-reason<!-- TMPL_VAR NAME="suggestionid" -->" class="content_visible">
+                        <select name="reason<!-- TMPL_VAR name="suggestionid" -->" onchange="displayOther('<!-- TMPL_VAR NAME="suggestionid" -->');">
+			                <option value=""> -- Choose a reason -- </option>
+                            <!-- TMPL_LOOP NAME="reasonsloop" -->
+                                <option value="<!-- TMPL_VAR NAME="lib" -->"><!-- TMPL_VAR NAME="lib" --></option>
+                            <!-- /TMPL_LOOP -->
+			                <option value="other">Others...</option>
+                        </select>
+                    <!-- TMPL_UNLESS NAME="reasonsloop"-->
+                        <span class="problem">No reasons defined on</span> <a href="/cgi-bin/koha/admin/authorised_values.pl">authorised value</a>.
+                    <!-- /TMPL_UNLESS -->
+		    </span>
+		    <span id="span-other-reason<!-- TMPL_VAR NAME="suggestionid" -->" class="content_hidden">
+			<input type="text" name="other-reason<!-- TMPL_VAR name="suggestionid" -->" value="write your reason here..." onclick="if(this.value === 'write your reason here...'){this.value=''}" />
+			<small><a href="JavaScript:displayOther('<!-- TMPL_VAR NAME="suggestionid" -->');">back to list</a></small>
+		    </span>
+                </td>
+                <td>
+		<!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br>
+                    <!-- TMPL_IF name="copyrightdate" -->&copy <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="volumedesc" -->; Volume:<i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="isbn" -->; ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->; Published by <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="place" --> in <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF --><br><!-- TMPL_IF name="note" --><!-- TMPL VAR NAME="note" --><!-- /TMPL_IF -->
+                </td>
+                <td>
+                    <!-- TMPL_VAR name="surnamesuggestedby" -->
+                    <!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF -->
+                    <!-- TMPL_VAR name="firstnamesuggestedby" -->
+                </td>
+            </tr>
+        <!-- /TMPL_LOOP -->
+        </table>
+        <input type="submit" value="Change Status">
 </form>
-	
+<!-- TMPL_ELSE -->
+    <b>No waiting suggestion to accept or reject.</b>
+<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
+<!-- TMPL_IF NAME="done" -->
+    <br />
+    <!-- TMPL_IF NAME="op_accepted"-->
+        <b>Accepted suggestion</b>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="op_rejected"-->
+        <b>Rejected suggestion</b>
+    <!-- /TMPL_IF -->
+    
+    <!-- TMPL_IF NAME="suggestions_loop" -->
+        <table>
+        <tr>
+            <th>Reason</th>
+            <th>Suggestion</th>
+            <th>Suggested by</th>
+            <th>Date</th>
+        </tr>
+        <!-- TMPL_LOOP NAME="suggestions_loop" -->
+            <td>
+                <!-- TMPL_VAR NAME="reason" -->
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="title" -->
+                    <!-- TMPL_IF NAME="author" -->
+                        , by <!-- TMPL_VAR NAME="author" -->
+                    <!-- /TMPL_IF -->
+                    <br>
+                    <!-- TMPL_IF name="copyrightdate" -->
+                        &copy <!-- TMPL_VAR name="copyrightdate" -->
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="volumedesc" -->
+                        ; Volume:<i><!-- TMPL_VAR name="volumedesc" --></i>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="isbn" -->
+                        ; ISBN :<i><!-- TMPL_VAR name="isbn" --></i>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="publishercode" -->
+                        ; Published by <!-- TMPL_VAR name="publishercode" -->
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="publicationyear" -->
+                        in <i><!-- TMPL_VAR name="publicationyear" --></i>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="place" -->
+                        in <i><!-- TMPL_VAR name="place" --></i>
+                    <!-- /TMPL_IF -->
+                    <br>
+                    <!-- TMPL_IF name="note" -->
+                        <!-- TMPL VAR NAME="note" -->
+                    <!-- /TMPL_IF -->
+            </td>
+            <td>
+                <!-- TMPL_VAR name="surnamesuggestedby" -->
+                <!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF -->
+                <!-- TMPL_VAR name="firstnamesuggestedby" -->
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="date" -->
+            </td>
+         </tr>
+        <!-- /TMPL_LOOP -->
+        </table>
+    <!-- TMPL_ELSE -->
+        <br /><br />
+        No suggestion has already been 
+        <!-- TMPL_IF NAME="op_accepted"-->
+            accepted.
+        <!-- TMPL_ELSE -->
+            rejected.
+        <!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+<script type="text/JavaScript" language="JavaScript">
+ // <![CDATA[
+    /**
+     *  check(form);
+     *  This function check the form before submit it.
+     */
+     /*
+     function check(form){
+        return true;
+     }
+     */
+	/**
+	 *  displayOther.
+	 *  This function display the select or an textaera to write a reason.
+	 */
+	function displayOther(id) {
+		var spanselect = document.getElementById("span-select-reason"+id);
+		var spanother = document.getElementById("span-other-reason"+id);
+        var select = spanselect.firstChild.nextSibling;	
+        
+		if(select.value != "other"){
+			return;
+		}
+		if(spanother.getAttribute('class')=='content_visible'){
+			spanother.removeAttribute('class');
+			spanselect.removeAttribute('class');
+			spanother.setAttribute('class','content_hidden');
+			spanselect.setAttribute('class','content_visible');
+		}
+		else{
+			spanother.removeAttribute('class');
+			spanselect.removeAttribute('class');
+			spanselect.setAttribute('class','content_hidden');
+			spanother.setAttribute('class','content_visible');			
+		}
+	}
+// ]]>
+</script>
+
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/suggestion/mail_suggestion_REJECTED.tmpl b/koha-tmpl/intranet-tmpl/prog/en/suggestion/mail_suggestion_REJECTED.tmpl
index 7df84691ae..cb88c6eb5b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/suggestion/mail_suggestion_REJECTED.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/suggestion/mail_suggestion_REJECTED.tmpl
@@ -2,10 +2,12 @@ Dear <!-- TMPL_VAR NAME="LibraryName" --> user,
 
 You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.
 
-<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your request today, and has decided not to accept the suggestion at this time.
+<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR name="lib.firstname" --> reviewed your request today, and has decided not to accept the suggestion at this time.
+
+The reason given for this reject is: <!-- TMPL_VAR NAME="reason" -->
 
 If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.
 
 Thank you,
 
-<!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
+<!-- TMPL_VAR NAME="LibraryName" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/barcodes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/barcodes.tmpl
index 97efe01438..9786123284 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/tools/barcodes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/tools/barcodes.tmpl
@@ -1,4 +1,7 @@
-<!-- TMPL_INCLUDE NAME="doc-head-barcodes.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
 <!--   START OF ADD COUNTRY CODE PANEL  -->
 <div class="countryPanel" id="addCountryCode">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl
index 97adfb4c46..e18eb4c8b6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl
@@ -1,16 +1,86 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Cataloging: MARC Export<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+MARC biblio export
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
-<h1>MARC Export</h1>
-<div class="details"><h4>Export in MARC format the following biblios (bibliographic records only):</h4>
-<form method="post">
-<p>From biblio number: <input type="text" name="start_bib" />
-to biblio number: <input type="text" name="end_bib" /></p>
-<p>(leave blank to export every biblio)</p>
-<input type="hidden" name="op" value="export" />
-<input type="submit" value="Export" class="submit" />
-</form></div>
-<p>Note : Exporting all by this tool may take some time</p>
+<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
+
+<h2>Select biblios to export</h2>
+<p>
+    <b>Note : The items are exported by this tool.</b>
+</p>
 
+<form method="post" action="/cgi-bin/koha/tools/export.pl">
+    <fieldset>
+    <legend>
+        Records
+    </legend>
+    	<p>
+    	    <label for="start">from biblio number</label>
+    	    <input id="start" type="text" name="StartingBiblionumber" size="5" />
+    	    <label for="end">to biblio number :</label>
+    	    <input id="end" type="text" name="EndingBiblionumber" size="5" />
+    	</p>
+    	
+    	<p>
+    	    <label for="itemtypes" >Document type</label>
+            <select name="itemtype">
+                <option value="">-- All --</option>
+                <!-- TMPL_LOOP NAME="itemtypeloop" -->
+                <option value="<!-- TMPL_VAR name="value" -->"
+                    <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+                    <!-- TMPL_VAR name="description" -->
+                    </option>
+                <!-- /TMPL_LOOP -->
+            </select>
+    	</p>
+    	
+    	<p>
+    	    <label for="branch">Branch</label>
+    	    <select id="branch" name="branch">
+    	    <option value="">-- All --</option>
+                <!-- TMPL_LOOP name="branchloop" -->
+                    <option value="<!-- TMPL_VAR name="value" -->"
+                     <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+                        <!-- TMPL_VAR name="branchname" -->
+                    </option>
+                    <!-- /TMPL_LOOP -->
+                </select>
+        </p>
+    	<p>
+    	    <label for="startcn">from itemcallnumber</label>
+    	    <input id="startcn" type="text" name="start_callnumber" size="5" />
+        	<label for="endcn">to itemcallnumber : </label>
+        	<input id="endcn" type="text" name="end_callnumber" size="5" />
+        </p>
+    </fieldset>
+    <fieldset>
+    <legend>
+        Options
+    </legend>
+        <label for="dont_export_item">Don't export items</label>
+        <input id="dont_export_item" type="checkbox" name="dont_export_item" />
+        <br />
+        <label for="dont_export_fields">Don't export fields</label>
+        <input id="dont_export_fields" type="text" name="dont_export_fields" />
+        <i>splitted by a blank. (for example: 100a 200 606)</i>
+        <br />
+    </fieldset>
+    <fieldset>
+    <legend>
+        Output format
+    </legend>
+    	<p>
+    	    <label for="output_format">into </label>
+    	    <select id="output_format" name="output_format">
+    	        <option value="marc">marc</option>
+    	        <option value="xml">xml</option>
+    	    </select>
+    	    format.
+    	</p>
+	</fieldset>
+	<input type="hidden" name="op" value="export" />
+	<input type="submit" value="Export" class="button" />
+</form>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/holidays.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/holidays.tmpl
index bcc7877bb4..1072738232 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/tools/holidays.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/tools/holidays.tmpl
@@ -2,7 +2,7 @@
 <!-- TMPL_INCLUDE NAME="holidays-top.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
 <!-- ******************************** FLAT PANELS ******************************************* -->
 <!-- *****           Makes all the flat panel to deal with holidays                     ***** -->
@@ -131,7 +131,7 @@
 	<p>
 		<span class="normalday">Working day</span>
 		<span class="holiday">Unique holiday</span>
-		<span class="repeatableday">Repetible holiday</span>
+		<span class="repeatableday">Repeatable holiday</span>
 		<span class="exception">Holiday exception</span>
 	</p>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/import.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/import.tmpl
index 30ce8f9053..c9e217aa32 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/tools/import.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/tools/import.tmpl
@@ -1,4 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
 <h1>MARC acquisition system</h1>
 <h4>Import into the reservoir</h4>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl
index 7fba6f035a..697c63c3a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl
@@ -1,103 +1,140 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="menu.inc" -->
-<!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
-	<h1> OPAC & KOHA News</h1>
-	<!-- TMPL_IF name="add_form" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+    KOHA -- News Management
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-		<form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
-			<input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->">
-			<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->">
-			<table style="border:0" cellspacing="0" cellpadding="2">
-			    <tr>
-			        <td>Language</td>
-			        </td>
-			        <td>
-						<select name="lang">
-				<option value="">All news</option>
-				<option value="koha">Librarian interface</option>
-				<!-- TMPL_LOOP name="lang_list" -->
-					
-						<option value="<!-- TMPL_VAR name="language" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="language" -->	</option>
-				<!-- /TMPL_LOOP" -->
-			</select>
-					</td>
-			    </tr>
-				<tr>
-					<td>Title</td>
-					<td><input size="30" type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->"></td>
-				</tr>
-				<tr>
-					<td>News</td>
-					<td><textarea name="new" cols="35" rows="4"><!-- TMPL_VAR NAME="new" --></textarea></td>
-				</tr>
-				<tr>
-					<td  colspan="2">
-						<input class="button" type="submit" value="Save">
-						<input class="button" type="button" value="Cancel" onclick="window.location.href='/cgi-bin/koha/tools/koha-news.pl'">
-					</td>
-				</tr>
-			</table>
-		</form>
+<!-- Additions to enable Calendar system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+<!-- End of additions --><!-- Additions to enable Calendar system -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js"></script>
+<!-- End of additions -->
 
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-tools.inc" -->
 
-	<!-- TMPL_ELSE -->
-
-		<!-- TMPL_IF NAME="opac_news_count" -->
-
-            <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
-			Language:
-			
-			<select name="lang">
-				<option value="">All news</option>
-				<option value="koha">Librarian interface</option>
-				<!-- TMPL_LOOP name="lang_list" -->
-					
-						<option value="<!-- TMPL_VAR name="language" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="language" -->	</option>
-				<!-- /TMPL_LOOP" -->
-			</select>
-		
-			<input type="submit" class="button" value="Filter">
-			</form>
-
-			<form name="del_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" onsubmit="return confirm('¿Are you sure you want to delete the selected news?')">
-				<table border="0" cellspacing="0" cellpadding="3">
-					<tr bgcolor="#99cc33">
-						<th></td>
-						<th style="padding-left:3px;padding-right:3px">Language</th>
-						<th>Date</th>
-						<th  width="20%">Title</th>
-						<th>News</th>
-						<th></th>
-					</tr>
-
-					<!-- TMPL_LOOP NAME="opac_news" -->
-						<tr>
-							<td width="5%"><input type="checkbox" name="ids" value="<!-- TMPL_VAR NAME="idnew" -->"</td>
-							<td align="center"><!-- TMPL_VAR NAME="lang" --></td>
-							<td><!-- TMPL_VAR NAME="newdate" --></td>
-							<td align="center"><!-- TMPL_VAR NAME="title" --></td>
-							<td><!-- TMPL_VAR NAME="new" --></td>
-							<td width="5%">
-								<a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=<!-- TMPL_VAR NAME="idnew" -->">Edit</a>
-							</td>
-						</tr>
-					<!-- /TMPL_LOOP -->
-
-				</table>
-					<input type="hidden" name="op" value="del">
-					<input type="submit" class="button" value="Delete selected">
-			</form>
-		<!-- TMPL_ELSE -->
-			<h5>No news loaded</h5>
-		<!-- /TMPL_IF -->
-
-		<form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl">
-			<input type="hidden" name="op" value="add_form">
-			<input type="submit" class="button" value="Add  news">
-		</form>
-	
-	
-	<!-- /TMPL_IF -->
-
+<div id="koha-news_main" class="searchresults">
+    <h1> OPAC & KOHA News</h1>
+    <!-- TMPL_IF name="add_form" -->
+        <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
+            <input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->" />
+            <input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->" />
+            <p>
+            <label for="lang">Language</label>
+            <select id="lang" name="lang">
+                <option value="koha">Librarian interface</option>
+                <!-- TMPL_LOOP name="lang_list" -->
+                    <!-- TMPL_IF name="selected" -->
+                        <option value="<!-- TMPL_VAR name="language" -->" selected>
+                    <!-- TMPL_ELSE -->
+                        <option value="<!-- TMPL_VAR name="language" -->">
+                    <!-- /TMPL_IF -->
+                        <!-- TMPL_VAR name="language" -->
+                    </option>
+                <!-- /TMPL_LOOP" -->
+            </select>
+            </p>
+            <p>
+                <label for="title">Title</label>
+                <input id="title" size="30" type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
+            </p>
+            <p>
+                <label for="expirationdate">Expiration date</label>
+                <input id="expirationdate" type="text" name="expirationdate" value="<!-- TMPL_VAR NAME="expirationdate" -->"/>
+                <script type="text/javascript">
+                    Calendar.setup(
+                    {
+                        inputField : "expirationdate",
+                        ifFormat : "%Y-%m-%d",
+                    }
+                    );
+                </script>
+            </p>
+            <p>
+                <label for="number">Appear in position </label>
+                <!-- TMPL_IF NAME="number"-->
+                    <input id="number" size="3" name="number" type="text" checked="1" />
+                <!-- TMPL_ELSE -->
+                    <input id="number" size="3" name="number" type="text" />
+                <!-- /TMPL_IF -->
+            </p>
+            <p>News</p>
+            <textarea name="new" cols="75" rows="10"><!-- TMPL_VAR NAME="new" --></textarea>
+            <p>
+                <input class="button" type="submit" value="Save" />
+                <input class="button" type="button" value="Cancel" onclick="window.location.href='/cgi-bin/koha/tools/opac-news.pl'" />
+            </p>
+        </form>
+    <!-- TMPL_ELSE -->
+        <div id="koha-news_filter">
+            <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" />
+            <label>Language</label>
+            <select name="lang">
+            <option value="">All</option>
+            <option value="koha">Librarian interface</option>
+                <!-- TMPL_LOOP name="lang_list" -->
+                    <!-- TMPL_IF name="selected" -->
+                        <option value="<!-- TMPL_VAR name="language" -->" selected />
+                    <!-- TMPL_ELSE -->
+                        <option value="<!-- TMPL_VAR name="language" -->" />
+                    <!-- /TMPL_IF -->
+                        <!-- TMPL_VAR name="language" -->
+                    </option>
+                <!-- /TMPL_LOOP" -->
+            </select>
+            <input type="submit" class="button" value="Filter">
+            </form>
+        </div>
+        <!-- TMPL_IF NAME="opac_news_count" -->
+        <div id="koha-news_list">
+            <form name="del_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" onsubmit="return confirm('Are you sure you want to delete the selected news?')">
+                <table>
+                    <tr>
+                        <th></th>
+                        <th>Language</th>
+                        <th>Number</th>
+                        <th>Creation Date</th>
+                        <th>Expiration Date</th>
+                        <th>Title</th>
+                        <th>News</th>
+                        <th></th>
+                    </tr>
+                    <!-- TMPL_LOOP NAME="opac_news" -->
+                        <tr>
+                            <td>
+                                <input type="checkbox" name="ids" value="<!-- TMPL_VAR NAME="idnew" -->" />
+                            </td>
+                            <td><!-- TMPL_VAR NAME="lang" --></td>
+                            <td><!-- TMPL_VAR NAME="number" --></td>
+                            <td><!-- TMPL_VAR NAME="newdate" --></td>
+                            <td><!-- TMPL_VAR NAME="expirationdate" --></td>
+                            <td><!-- TMPL_VAR NAME="title" --></td>
+                            <!-- TMPL_IF NAME="hasexpirated" -->
+                            <td class="hasexpirated">
+                            <!-- TMPL_ELSE -->
+                            <td>
+                            <!-- /TMPL_IF -->
+                                <!-- TMPL_VAR NAME="new" -->
+                            </td>
+                            <td>
+                                <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&id=<!-- TMPL_VAR NAME="idnew" -->">
+                                    Edit
+                                </a>
+                            </td>
+                        </tr>
+                    <!-- /TMPL_LOOP -->
+                </table>
+                <input type="hidden" name="op" value="del" />
+                <input type="submit" class="button" value="Delete selected" />
+            </form>
+        <!-- TMPL_ELSE -->
+            <p>No news loaded</p>
+        <!-- /TMPL_IF -->
+        <div id="action">
+          <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">Add news</a>
+        </div>
+    </div>
+    <!-- /TMPL_IF -->
+</div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl
index 10ba7b1dcc..6b6df9f267 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl
@@ -25,14 +25,10 @@
 				<td><!-- TMPL_VAR NAME="code" --></td>
 				<td><!-- TMPL_VAR NAME="name" --></td>
 				<td>
-					<a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=<!-- TMPL_VAR name="module" -->&amp;code=<!-- TMPL_VAR NAME="code" -->">
-						<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0">
-					</a>
+					<a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;module=<!-- TMPL_VAR name="module" -->&amp;code=<!-- TMPL_VAR NAME="code" -->">Edit</a>
 				</td>
 				<td>
-					<a href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&amp;module=<!-- TMPL_VAR name="module"-->&amp;code=<!-- TMPL_VAR NAME="code" -->">
-						<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0">
-					</a>
+					<a href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&amp;module=<!-- TMPL_VAR name="module"-->&amp;code=<!-- TMPL_VAR NAME="code" -->">Delete</a>
 				</td>
 			</tr>
 		<!-- /TMPL_LOOP -->
@@ -150,46 +146,36 @@
 			<p>
 				<label class="label100">Koha module:</label>
 				<select name="module">
-					<!-- TMPL_IF name="acquisition" -->
-						<option value="acquisition" selected>Acquisition</option>
-					<!-- TMPL_ELSE -->
-						<option value="acquisition">Acquisition</option>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="catalogue" -->
-						<option value="catalogue" selected>Catalogue</option>
-					<!-- TMPL_ELSE -->
-						<option value="catalogue">Catalogue</option>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="serial" -->
+						<!--TMPL_IF Name="catalogue"-->
+                        <option value="catalogue" selected>Catalogue</option>
+						<!--TMPL_ELSE-->
+                        <option value="catalogue" >Catalogue</option>
+                        <!--/TMPL_IF-->
+						<!--TMPL_IF Name="Serial"-->
 						<option value="serial" selected>Serial</option>
-					<!-- TMPL_ELSE -->
+						<!--TMPL_ELSE-->
 						<option value="serial">Serial</option>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="circulation" -->
+						<!--/TMPL_IF-->
+						<!--TMPL_IF Name="claimacquisition"-->
+						<option value="claimacquisition" selected>Claim Acquisition</option>
+						<!--TMPL_ELSE-->
+						<option value="claimacquisition">Claim Acquisition</option>
+						<!--/TMPL_IF -->
+						<!--TMPL_IF Name="claimissues"-->
+						<option value="claimissues" selected>Claim Issues</option>
+						<!--TMPL_ELSE-->
+						<option value="claimissues">Claim Issues</option>
+						<!--/TMPL_IF-->
+						<!--TMPL_IF Name="circulation"-->
 						<option value="circulation" selected>Circulation</option>
-					<!-- TMPL_ELSE -->
+						<!--TMPL_ELSE-->
 						<option value="circulation">Circulation</option>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="members" -->
+						<!--/TMPL_IF-->
+						<!--TMPL_IF Name="members"-->
 						<option value="members" selected>Members</option>
-					<!-- TMPL_ELSE -->
+						<!--TMPL_ELSE-->
 						<option value="members">Members</option>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="authorities" -->
-						<option value="authorities" selected>Authorities</option>
-					<!-- TMPL_ELSE -->
-						<option value="authorities">Authorities</option>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="reports" -->
-						<option value="reports" selected>Reports</option>
-					<!-- TMPL_ELSE -->
-						<option value="reports">Reports</option>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="parameters" -->
-						<option value="parameters" selected>Parameters</option>
-					<!-- TMPL_ELSE -->
-						<option value="parameters">Parameters</option>
-					<!-- /TMPL_IF -->
+						<!--/TMPL_IF-->
 				</select>
 			</p>
 			<p>
@@ -200,15 +186,37 @@
 		<!-- TMPL_IF NAME="adding" -->
 			<p>
 				<label class="label100">Koha module:</label>
-				<select name="module">
-						<option value="acquisition">Acquisition</option>
-						<option value="catalogue">Catalogue</option>
+				<select name="module" onchange="javascript:window.location.href = unescape(window.location.pathname)+'?op=add_form&amp;module='+this.value+'&amp;content='+window.document.forms['Aform'].elements['content'].value;">
+						<!--TMPL_IF Name="catalogue"-->
+                        <option value="catalogue" selected>Catalogue</option>
+						<!--TMPL_ELSE-->
+                        <option value="catalogue" >Catalogue</option>
+                        <!--/TMPL_IF-->
+						<!--TMPL_IF Name="serial"-->
+						<option value="serial" selected>Serial</option>
+						<!--TMPL_ELSE-->
 						<option value="serial">Serial</option>
+						<!--/TMPL_IF-->
+						<!--TMPL_IF Name="claimacquisition"-->
+						<option value="claimacquisition" selected>Claim Acquisition</option>
+						<!--TMPL_ELSE-->
+						<option value="claimacquisition">Claim Acquisition</option>
+						<!--/TMPL_IF -->
+						<!--TMPL_IF Name="claimissues"-->
+						<option value="claimissues" selected>Claim Issues</option>
+						<!--TMPL_ELSE-->
+						<option value="claimissues">Claim Issues</option>
+						<!--/TMPL_IF-->
+						<!--TMPL_IF Name="circulation"-->
+						<option value="circulation" selected>Circulation</option>
+						<!--TMPL_ELSE-->
 						<option value="circulation">Circulation</option>
+						<!--/TMPL_IF-->
+						<!--TMPL_IF Name="members"-->
+						<option value="members" selected>Members</option>
+						<!--TMPL_ELSE-->
 						<option value="members">Members</option>
-						<option value="authorities">Authorities</option>
-						<option value="reports">Reports</option>
-						<option value="parameters">Parameters</option>
+						<!--/TMPL_IF-->
 				</select>
 			</p>
 			<p>
@@ -217,21 +225,22 @@
 		<!-- /TMPL_IF -->
 		
 		<p>
-			<label class="label100">Name:</label><input type="text" name="name" size="100" value="<!-- TMPL_VAR NAME="name" -->">
+			<label class="label100">Name:</label><input type="text" name="name" size="60" value="<!-- TMPL_VAR NAME="name" -->">
 		</p>
 		<p>
-			<label class="label100">Title (mail subject):</label><input type="text" name="title" size="100" value="<!-- TMPL_VAR NAME="title" -->">
+			<label class="label100">Title (mail subject):</label><input type="text" name="title" size="60" value="<!-- TMPL_VAR NAME="title" -->">
 		</p>
 		<p>
 			<label class="label100">Content (mail content):</label>
 		</p>
-		<p><textarea name="content" cols="80" rows="10"><!-- TMPL_VAR NAME="content" --></textarea>
-		<input type="button" name="insert" value="&lt;&lt;" onclick="insertValueQuery()" title="Insert" />
-		<select name="SQLfieldname" size=10>
+		<p>		
+		<select name="SQLfieldname" size=9>
 			<!-- TMPL_LOOP name="SQLfieldname" -->
 				<option value="<!-- TMPL_VAR name="value"-->"><!-- TMPL_VAR name="text"--></option>
 			<!-- /TMPL_LOOP -->
 		</select>
+        <input type="button" name="insert" value="&gt;&gt;" onclick="insertValueQuery()" title="Insert" />
+        <textarea name="content" cols="100" rows="15"><!-- TMPL_VAR NAME="content" --></textarea>
 		</p>
 		<p><input type="button" value="OK" onclick="Check(this.form)" class="button"></p>
 		</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/tools-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/tools-home.tmpl
index c7827f0285..9fe5abbee3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/tools/tools-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/tools/tools-home.tmpl
@@ -7,41 +7,50 @@
 
 <table>
 <caption>Various tools</caption>
-	<tr>
-		<th><a href="/cgi-bin/koha/z3950/zebraqueue_windows_start.pl">ZEBRA queue starter--for Windows</a></th>
-		<td> Starts Zebra queue if stopped or system restarted. ZEBRA queue is required for the system to update ZEBRA</td>
-	</tr>
 <tr>
-	<th><a href="/cgi-bin/koha/tools/barcodes.pl">Barcode generator</a></th>
-	<td>Generate your barcodes</td>
+    <td><a href="/cgi-bin/koha/tools/barcodes.pl">Barcode generator</a></td>
+    <td>Generate your barcodes</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/tools/holidays.pl">Holidays</a></th>
-	<td>Define holidays (days where the library is closed)</td>
+    <td><a href="/cgi-bin/koha/tools/holidays.pl">Holidays</a></td>
+    <td>Define holidays (days where the library is closed)</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/tools/export.pl">Export</a></th>
-	<td>Export datas</td>
+    <td><a href="/cgi-bin/koha/tools/export.pl">Export</a></td>
+    <td>Export datas</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/tools/import.pl">Import</a></th>
-	<td>Import datas in the reservoir</td>
+    <td><a href="/cgi-bin/koha/tools/import.pl">Import</a></td>
+    <td>Import datas in the reservoir</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/tools/koha-news.pl">News</a></th>
-	<td>A basic news system for OPAC & librarian interfaces</td>
+    <td><a href="/cgi-bin/koha/tools/koha-news.pl">News</a></td>
+    <td>A basic news system for OPAC & librarian interfaces</td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/tools/letter.pl">Letters</a></th>
-	<td>Define letters </td>
+    <td><a href="/cgi-bin/koha/tools/letter.pl">Letters</a></td>
+    <td>Define letters </td>
 </tr>
 <tr>
-	<th><a href="/cgi-bin/koha/tools/overduerules.pl">overdue rules</a></th>
-	<td>Rules for overdue books</td>
+    <td><a href="/cgi-bin/koha/tools/overduerules.pl">overdue rules</a></td>
+    <td>Rules for overdue books</td>
+</tr>
+<tr>
+    <td><a href="/cgi-bin/koha/tools/inventory.pl">Inventory/stocktaking</a></td>
+    <td>Tool to inventory (stocktaking) of your catalogue</td>
+</tr>
+<tr>
+    <td><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Clean borrowers</a></td>
+    <td>Delete some old private data/reading history relative to borrowers.</td>
+</tr>
+<tr>
+    <td><a href="/cgi-bin/koha/tools/itemslost.pl">Items lost</a></td>
+    <td>Show lost items</td>
+</tr>
+<tr>
+    <td><a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a></td>
+    <td>Browse the system logs</td>
 </tr>
-<th><a href="/cgi-bin/koha/barcodes/cbarcodes.pl">Membership cards</a></th>
-		<td>create membership cards from member cardnumbers
-		</td>
 </table>
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/z3950/searchresult.tmpl b/koha-tmpl/intranet-tmpl/prog/en/z3950/searchresult.tmpl
index 4204e8250f..49a451d7e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/z3950/searchresult.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/z3950/searchresult.tmpl
@@ -1,76 +1,46 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Advanced MARC Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-
-
-<!-- TMPL_IF NAME="refresh" -->
-		<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR NAME="refresh" -->" />
-	<!-- /TMPL_IF -->
-
-<div id="main-compact">
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Z39.50 Search Results</title>
+<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR NAME="refresh" -->" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
+<style type="text/css"> 
+    @import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+</style>
+</head>
+<body>
+
+    <h2>Z3950 Search Results</h2>
+    
+    <!-- TMPL_IF NAME="breeding_loop" -->
 <table>
-<!-- TMPL_IF name="opsearch" -->
-<h3>Select Search Libraries</h3>
-
-
-<form method="post" action="search.pl" name="f">
-
-<input type="hidden" name="op" id="op" value="do_search" />
-<input type="hidden" name="title" value=<!-- TMPL_VAR NAME="title" --> />
-<input type="hidden" name="author" value=<!-- TMPL_VAR NAME="author" --> />
-<input type="hidden" name="isbn" value=<!-- TMPL_VAR NAME="isbn" --> />
-<input type="hidden" name="issn" value=<!-- TMPL_VAR NAME="issn" --> />
-<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->" />
-
-<tr>
-		<th>Library</th>
-		<th>Select</th>
-</tr>
-<!-- TMPL_LOOP name="serverloop" -->
-		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
-			<td><!-- TMPL_VAR NAME="server" --></td>
-			
-			<td> <input type="checkbox" name="id" value=<!-- TMPL_VAR NAME="id" --> <!-- TMPL_IF name="checked" -->checked="1"<!-- /TMPL_IF --> ></td>
-	</tr>
-	<!-- /TMPL_LOOP -->
-	<tr><td><input type="submit"  class="submit" value="Search internet" onclick="cursor :'wait'";
-	 /></td></tr></form>
-<!-- TMPL_ELSE -->
-
-<caption>Bibliographic Records Found</caption>
-	<tr>
-		<th>Title</th>
-		<th>Author</th>
-		<th>ISBN</th>
-		<th>coming from</th>
-		<th>&nbsp;</th>
-		<th>&nbsp;</th>
-	</tr>
-	<!-- TMPL_IF name="breeding_loop" -->
-	<!-- TMPL_LOOP name="breeding_loop" -->
-		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
-			<td><!-- TMPL_VAR NAME="title" --></a>
-			<td><!-- TMPL_VAR NAME="author" --></td>
-			<td><!-- TMPL_VAR NAME="isbn" --></td>
-			<td><!-- TMPL_VAR NAME="server" --></td>
-			<td><a href="javascript:Import(<!-- TMPL_VAR NAME="id" -->,<!-- TMPL_VAR NAME="oldbiblionumber" -->)">Import</a></td> 
-		
-		</tr>
-	<!-- /TMPL_LOOP -->
-	<!-- TMPL_ELSE -->
-		<tr><td colspan="6">Nothing found</td></tr>
-	<!-- /TMPL_IF -->
-</table>
-<!-- /TMPL_IF -->
-
-</div>
-<!-- TMPL_IF name="numberpending" --><h3 align="center">Still <!-- TMPL_VAR NAME="numberpending" --> requests to go</h3><!-- /TMPL_IF -->
-<script language="JavaScript" type="text/javascript">
-	function Import(GetThisOne,biblionumber) {
-		opener.document.location= "../cataloguing/addbiblio.pl?oldbiblionumber="+biblionumber+"&z3950=1&breedingid="+GetThisOne;
-		self.close();
-		return false;
-	}
+    <tr>
+        <th>Title</th>
+        <th>Author</th>
+        <th>ISBN</th>
+        <th>coming from</th>
+        <th>&nbsp;</th>
+        <th>&nbsp;</th>
+    </tr>
+                <!-- TMPL_LOOP NAME="breeding_loop" -->
+        <tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+                        <td><!-- TMPL_VAR NAME="title" --></td>
+            <td><!-- TMPL_VAR NAME="author" --></td>
+            <td><!-- TMPL_VAR NAME="isbn" --></td>
+            <td><!-- TMPL_VAR NAME="file" --></td>
+            <td><a href="javascript:Import(<!-- TMPL_VAR NAME="id" -->)">Import this biblio</a></td>
+        </tr>
+    <!-- /TMPL_LOOP -->
+        </table>
+    <!-- TMPL_ELSE -->
+                <p>Nothing found</p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="numberpending" --><h1>Still <!-- TMPL_VAR NAME="numberpending" --> requests to go</h1><!-- /TMPL_IF -->
+    <script language="javascript" type="text/javascript">
+    function Import(GetThisOne) {
+        opener.document.location= "../cataloguing/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
+        self.close();
+        return false;
+    }
 </script>
-</div>
-<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
 
+</body>
+</html>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/kohaerror.tmpl b/koha-tmpl/opac-tmpl/prog/en/kohaerror.tmpl
index b6671dac8f..7274e5650b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/kohaerror.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/kohaerror.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- An Error Has Occurred
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- An Error Has Occurred
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl
index 9d31f0c85f..72602ef797 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl
@@ -1,69 +1,149 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- ISBD
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- ISBD
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="main">
-	<h3>ISBD</h3>
-	<p><!-- TMPL_VAR name="ISBD" --></p>
-	
-		<!-- TMPL_IF name="subscriptionsnumber" -->
-		<h2>We have <!-- TMPL_VAR name="subscriptionsnumber" --> subscription(s) associated with this title.</h2> 
-		<p>Below is a list of the three latest issues :</p>
-		<!-- TMPL_LOOP Name="subscriptions" -->
-				<!-- TMPL_IF name="subscriptionnotes"-->
-					<h2><!--TMPL_VAR Name="subscriptionnotes"--> </h2>
-				<!-- /TMPL_IF -->
-				<!--TMPL_IF Name="latestserials"-->
-				<table>
-				<tr><th>Issue number</th><th>Date</th><th>Status</th></tr>
-				<!--TMPL_LOOP Name="latestserials"-->
-					<tr>
-						<td>
-							<!--TMPL_VAR Name="serialseq"-->
-						</td>
-						<td>
-							<!--TMPL_VAR Name="planneddate"-->
-						</td>
-						<td>
-							<!--TMPL_IF Name="status1"-->Pending
-							<!--TMPL_ELSE -->
-								<!-- TMPL_IF Name="status2"-->Arrived
-								<!--TMPL_ELSE -->
-									<!-- TMPL_IF Name="status3"-->Late
-									<!--TMPL_ELSE -->
-										<!-- TMPL_IF Name="status4"-->Missing
-										<!--TMPL_ELSE -->
-											<!-- TMPL_IF Name="status5"-->Not Issued
-											<!--/TMPL_IF-->
-										<!--/TMPL_IF-->
-									<!--/TMPL_IF-->
-								<!--/TMPL_IF-->
-							<!--/TMPL_IF-->
-						</td>
-					</tr>
-				<!--/TMPL_LOOP -->
-				</table>
-				<!-- /TMPL_IF -->
-		<!-- /TMPL_LOOP -->
-		<p><a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Click here</a> for more information on subscription(s) history</p>
- 	<!-- /TMPL_IF -->
-	
-	<!-- TMPL_UNLESS NAME="norequests" -->
-    <form action="/cgi-bin/koha/opac-reserve.pl" method="post">
-    <input type="submit" name="submit"  value="Place Reserve" />
-    <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-    </form>
-<!-- /TMPL_UNLESS -->
+    <div id="action">
+        <!-- TMPL_UNLESS NAME="norequests" -->
+        	<!-- TMPL_IF NAME="RequestOnOpac" -->
+        <a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+            Place Reserve
+        </a>
+        	<!-- /TMPL_IF -->
+        <!-- /TMPL_UNLESS -->
+        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+            Normal View
+        </a>
+        <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+            ISBD
+        </a>
+        <a href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+            Print
+        </a>
+        <!-- TMPL_IF name="virtualshelves" -->
+            <!-- TMPL_IF NAME="loggedinusername" -->
+            <a href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+                Add to My Book List
+            </a>
+            <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+        <a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+            Add to My Book Bag
+        </a>
+    </div>
+    
+    <h1>ISBD</h1>
+    <!-- TMPL_VAR name="ISBD" -->
+        <!-- TMPL_IF name="subscriptionsnumber" -->
+        <h2>
+            We have <!-- TMPL_VAR name="subscriptionsnumber" --> subscription(s) associated with this title.
+        </h2>
+        <p>Below is a list of the three latest issues :</p>
+        <!-- TMPL_LOOP Name="subscriptions" -->
+                <!-- TMPL_IF name="subscriptionnotes"-->
+                    <h2><!--TMPL_VAR Name="subscriptionnotes"--> </h2>
+                <!-- /TMPL_IF -->
+                <!--TMPL_IF Name="latestserials"-->
+                <table>
+                <tr><th>Issue number</th><th>Date</th><th>Status</th></tr>
+                <!--TMPL_LOOP Name="latestserials"-->
+                    <tr>
+                        <td>
+                            <!--TMPL_VAR Name="serialseq"-->
+                        </td>
+                        <td>
+                            <!--TMPL_VAR Name="planneddate"-->
+                        </td>
+                        <td>
+                            <!--TMPL_IF Name="status1"-->Pending
+                            <!--TMPL_ELSE -->
+                                <!-- TMPL_IF Name="status2"-->Arrived
+                                <!--TMPL_ELSE -->
+                                    <!-- TMPL_IF Name="status3"-->Late
+                                    <!--TMPL_ELSE -->
+                                        <!-- TMPL_IF Name="status4"-->Missing
+                                        <!--TMPL_ELSE -->
+                                            <!-- TMPL_IF Name="status5"-->Not Issued
+                                            <!--/TMPL_IF-->
+                                        <!--/TMPL_IF-->
+                                    <!--/TMPL_IF-->
+                                <!--/TMPL_IF-->
+                            <!--/TMPL_IF-->
+                        </td>
+                    </tr>
+                <!--/TMPL_LOOP -->
+                </table>
+                <!-- /TMPL_IF -->
+        <!-- /TMPL_LOOP -->
+        <p><a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Click here</a> for more information on subscription(s) history</p>
+    <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="reviewson" -->
+    <!-- TMPL_IF NAME="reviews" -->
+    <h2>Reviews by members:</h2>
+        <!--TMPL_LOOP NAME="reviews"-->
+        <p>
+            <b>
+                Review by
+                <!--TMPL_VAR NAME="title"-->
+                <!--TMPL_VAR NAME="surname"-->
+                <!--TMPL_VAR NAME="firstname"-->
+            </b>
+            <br />
+            <small>
+                <!--TMPL_VAR NAME="datereviewed"-->
+            </small>
+        </p>
+        <p>
+          <!--TMPL_VAR NAME="review"-->
+        </p>
+        <br />
+        <!--/TMPL_LOOP-->
+    <!-- TMPL_ELSE  -->
+        <b>No reviews has been writed on this biblio.</b>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="loggedinusername" -->
+        <a href="javascript:Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->');">
+            Write or modify your reviews on this biblio.
+        </a>
+    <!-- TMPL_ELSE -->
+        <br /><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a> to write a review here.
+    <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="AmazonContent" -->
+<!-- Amazon Reviews -->
+<div id="itemReviews">
+        <h2>Amazon Reader Reviews:</h2>
+        <h4>
+    <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+    <!-- TMPL_IF NAME="isbn" -->
+        <a href="http://www.amazon.com/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&asin=<!-- TMPL_VAR NAME="isbn" -->&store=books">Add your own review</a></h4>
+    <!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP --><br/>
 
-<form action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="MARC View" /></form>
+        <!-- TMPL_IF NAME="rating" -->
+            <h4>Rating (from Amazon.com):</h4>
+        <div id="starMT"><div id="starFull" style="width:<!-- TMPL_VAR NAME="rating" -->px"></div></div>
 
-<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Simple View" /></form>
+        <!-- TMPL_LOOP NAME="AMAZONREVIEWS" -->
+            <div class="content_set">
+            <!-- TMPL_IF NAME="summary" -->
+            <h4 class="underline">  <!-- TMPL_VAR NAME="summary" --></h4>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="comment" -->
+                <p><!-- TMPL_VAR NAME="comment" -->
+            </p><!-- /TMPL_IF -->
+            </div>
+    <!-- /TMPL_LOOP -->
+    <!-- TMPL_ELSE -->
 
-<form action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
+    <div class="content_set">
+    <p class="error"> Sorry, there are no reviews available for this title. </p>
+    </div>
 
-<form action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
+    <!-- /TMPL_IF -->
+</div> <!-- itemReviews -->
+<!-- /TMPL_IF-->
 
-<form><input type="submit"  onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
-</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl
index 8177bef033..b2487f0dc5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl
@@ -1,143 +1,154 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- MARC Details for Record No. <!-- TMPL_VAR name="biblionumber" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- MARC Details for Record No. <!-- TMPL_VAR name="biblionumber" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="main">
-<h2>MARC View</h2>
-<!-- TMPL_UNLESS NAME="norequests" -->
-    <form action="/cgi-bin/koha/opac-reserve.pl" method="post">
-    <input type="submit" name="submit"  VALUE="Place Reserve" />
-    <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-    </form>
-<!-- /TMPL_UNLESS -->
-<!-- Hide from NPL --><form action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="ISBD" /></form><!-- /Hide from NPL -->
-
-<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Normal View" /></form>
-
-<form action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
-
-<!-- TMPL_IF name="virtualshelves" --><form action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" value="Add to My Book List" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form><!-- /TMPL_IF -->
-
-<form><input type="submit" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
+<div id="action">
+    <!-- TMPL_UNLESS NAME="norequests" -->
+    	<!-- TMPL_IF NAME="RequestOnOpac" -->
+    <a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+        Place Reserve
+    </a>
+    	<!-- /TMPL_IF -->
+    <!-- /TMPL_UNLESS -->
+    <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+        Normal View
+    </a>
+    <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+        ISBD
+    </a>
+    <a href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+        Print
+    </a>
+    <!-- TMPL_IF name="virtualshelves" -->
+    <a href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+        Add to My Book List
+    </a>
+    <!-- /TMPL_IF -->
+    <a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+        Add to My Book Bag
+    </a>
+</div>
 
-		<table><!-- TMPL_LOOP name="0XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
+<h1>MARC View</h1>
 
-		<!-- TMPL_LOOP name="1XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
+    <table style="border:0px;">
+        <!-- TMPL_LOOP name="0XX" -->
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
+        <!-- TMPL_LOOP name="subfield" -->
+                <tr><td style="border:0px;">&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
+                </tr>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
+        <!-- TMPL_LOOP name="1XX" -->
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
+        <!-- TMPL_LOOP name="subfield" -->
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td  style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td  style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
+                </tr>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
 
-		<!-- TMPL_LOOP name="2XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
+        <!-- TMPL_LOOP name="2XX" -->
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
+        <!-- TMPL_LOOP name="subfield" -->
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
+                </tr>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
 
-		<!-- TMPL_LOOP name="3XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
+        <!-- TMPL_LOOP name="3XX" -->
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
+        <!-- TMPL_LOOP name="subfield" -->
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
+                </tr>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
 
-		<!-- TMPL_LOOP name="4XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
+        <!-- TMPL_LOOP name="4XX" -->
+        <tr><td colspan="3" style="border:0px;" ><!-- TMPL_VAR name="tag" --></td></tr>
+        <!-- TMPL_LOOP name="subfield" -->
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
+                </tr>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
 
-		<!-- TMPL_LOOP name="5XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
+        <!-- TMPL_LOOP name="5XX" -->
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
+        <!-- TMPL_LOOP name="subfield" -->
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
+                </tr>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
 
-		<!-- TMPL_LOOP name="6XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
+        <!-- TMPL_LOOP name="6XX" -->
+        <tr><td colspan="3" style="border:0px;"><b><!-- TMPL_VAR name="tag" --></b></td></tr>
+        <!-- TMPL_LOOP name="subfield" -->
+                <tr><td style="border:0px;">&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
+                </tr>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
 
-		<!-- TMPL_LOOP name="7XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
+        <!-- TMPL_LOOP name="7XX" -->
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
+        <!-- TMPL_LOOP name="subfield" -->
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
+                </tr>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
 
-		<!-- TMPL_LOOP name="8XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
+        <!-- TMPL_LOOP name="8XX" -->
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
+        <!-- TMPL_LOOP name="subfield" -->
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
+                </tr>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
 
-		<!-- TMPL_LOOP name="9XX" -->
-		<tr><td colspan="3" class="marctag"><!-- TMPL_VAR name="tag" --></td></tr>
-		<!-- TMPL_LOOP name="subfield" -->
-				<tr><td class="marcsubfieldletter"><!-- TMPL_VAR name="marc_subfield" --></td>
-					<td class="marcsubfieldname"><!-- TMPL_VAR name="marc_lib" --></td>
-					<td class="subfieldvalue"><!-- TMPL_VAR name="marc_value" --></td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		<!-- /TMPL_LOOP -->
-	</table>
+        <!-- TMPL_LOOP name="9XX" -->
+        <tr><td colspan="3" style="border:0px;" ><b><!-- TMPL_VAR name="tag" --></b></td></tr>
+        <!-- TMPL_LOOP name="subfield" -->
+                <tr><td style="border:0px;" >&nbsp;</td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_lib" --></td>
+                    <td style="border:0px;" ><!-- TMPL_VAR name="marc_value" --></td>
+                </tr>
+            <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP -->
+    </table>
 <!-- TMPL_IF NAME="item_header_loop" -->
 <h3>Copies</h3>
-		<table>
-				<tr>
-					<!-- TMPL_LOOP name="item_header_loop" -->
-						<th>
-							<!-- TMPL_VAR name="header_value" -->
-						</th>
-					<!-- /TMPL_LOOP -->
-				</tr>
-				<!-- TMPL_LOOP name="item_loop" -->
-					<tr>
-						<!-- TMPL_VAR name="item_value" -->
-					</tr>
-				<!-- /TMPL_LOOP -->
-		</table><!-- TMPL_ELSE -->
-		<p>No copies available.</p>
-	<!-- /TMPL_IF -->
-</div>
+        <table>
+                <tr>
+                    <!-- TMPL_LOOP name="item_header_loop" -->
+                        <tr>
+                            <!-- TMPL_VAR name="header_value" -->
+                        </tr>
+                    <!-- /TMPL_LOOP -->
+                </tr>
+                <!-- TMPL_LOOP name="item_loop" -->
+                    <tr>
+                        <!-- TMPL_VAR name="item_value" -->
+                    </tr>
+                <!-- /TMPL_LOOP -->
+        </table><!-- TMPL_ELSE -->
+        <p>No copies available.</p>
+    <!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl
index efcb9763af..19fa9a0ed2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-account.tmpl
@@ -1,46 +1,48 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Account for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Account for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
 <!--CONTENT-->
-
-<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
-<div id="main">
-<h1>Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
-<!-- /TMPL_LOOP -->
-
-<ul><li>	 <a href="/cgi-bin/koha/opac-account.pl">my fines</a> </li> <li> 
-	<a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a>		<!-- TMPL_IF name="OpacPasswordChange" --> </li> <li> <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- /TMPL_IF --><!-- TMPL_IF NAME="opacreadinghistory" --></li> <li> <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF -->	<!-- TMPL_IF name="virtualshelves" --> </li> <li> <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" --></li> <li> <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></li></ul>
-
-<!-- TMPL_IF NAME="ACCOUNT_LINES" -->
-<h3>Fines and Charges</h3>
-<table>
-<thead>
-<tr><th>Date</th>
-<th>Description</th>
-<th>Fine Amount</th>
-<th>Amount Outstanding</th>
-</tr>
-</thead>
-
-<tfoot><tr>
-<th colspan="3">Total Due</th>
-<td class="sum">$<!-- TMPL_VAR NAME="total" --></td>
-</tr></tfoot>
-
-<tbody>
-<!-- TMPL_LOOP NAME="ACCOUNT_LINES" -->
-<!-- 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="print_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>
-<!-- /TMPL_LOOP -->
-</tbody>
-
-</table>
-<!-- TMPL_ELSE --><h4>You have no Fines or Charges</h4><!-- /TMPL_IF -->
-</div>
+    <!-- TMPL_LOOP NAME="BORROWER_INFO" -->
+        <!-- TMPL_INCLUDE name="usermenu.inc" -->
+        <h1>Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
+    <!-- /TMPL_LOOP -->
+    
+    <!-- TMPL_IF NAME="ACCOUNT_LINES" -->
+        <h3>Fines and Charges</h3>
+        <table>
+            <thead>
+                <tr>
+                    <th>Date</th>
+                    <th>Description</th>
+                    <th>Fine Amount</th>
+                    <th>Amount Outstanding</th>
+                </tr>
+            </thead>
+            
+            <tfoot>
+            <tr>
+                <th colspan="3">Total Due</th>
+                <td class="sum">$<!-- TMPL_VAR NAME="total" --></td>
+            </tr>
+            </tfoot>
+            
+            <tbody>
+                <!-- TMPL_LOOP NAME="ACCOUNT_LINES" -->
+                    <!-- 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="print_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>
+                <!-- /TMPL_LOOP -->
+            </tbody>
+        
+        </table>
+    <!-- TMPL_ELSE -->
+        <h4>You have no Fines or Charges</h4>
+    <!-- /TMPL_IF -->
+    
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl
index 2b447a7749..1a082d95b0 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl
@@ -1,24 +1,62 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Add to My Book List<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<div id="window">
-<h3>Add <i><!-- TMPL_VAR NAME="title" --></i> <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> to a Book List</h3><form action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="post">
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Add to My Book List
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
-<h3>Select a Book List:</h3>
-<p><label for="shelfnumber">Add to Existing List</label> <!-- TMPL_VAR NAME="CGIbookshelves" --></p>
+
+<!-- TMPL_IF NAME="multiple"-->
+    <h1>Add these <!-- TMPL_VAR NAME="total"--> biblios to a shelf</h1>
+        <!-- TMPL_LOOP NAME="biblios"-->
+            <b><!-- TMPL_VAR NAME="title"--></b> 
+            <!-- TMPL_IF NAME="author"-->by <!-- TMPL_VAR NAME="author"--><!-- /TMPL_IF -->
+            <br /><br />
+        <!-- /TMPL_LOOP -->
+<!-- TMPL_ELSE -->
+<h1>Add 
+    <i><!-- TMPL_VAR NAME="title" --></i>
+    <!-- TMPL_IF NAME="author" -->
+        by <!-- TMPL_VAR NAME="author" -->
+    <!-- /TMPL_IF --> to a Virtual Shelf
+</h1>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="CGIbookshelves"-->
+<form name="f1" action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="POST">
+    <p><b>Select an Existing Bookshelf</b></p>
+    <label>Add to virtual shelf</label> <!-- TMPL_VAR NAME="CGIbookshelves" -->
+    <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+    <input type="hidden" name="modifyshelfcontents" value="1" />
+    <input type="submit" value="Add to virtual shelf" class="submit" />
+</form>
+<p>...or...</p>
+<!-- /TMPL_IF -->
+
+<form name="f2" method="POST" action="/cgi-bin/koha/opac-addbookbybiblionumber.pl">
+    <b>Add to a New Bookshelf:</b>
+        <p>
+            <label for="newbookshelf">
+                Shelf Name:
+            </label>
+            <input type="text" name="newbookshelf" id="newbookshelf" size="40" />
+        </p>
+            <label for="category">Category:</label>
+            <select name="category" id="category">
+                <option value="1">Private</option>
+                <option value="2">Public</option>
+            </select>
+    <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+    <input type="submit" value="Add to virtual shelf" class="submit" /> 
 </form>
-<h4>...or...</h4>
-<form action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="post">
 
-<h3>Add to a new Book List:</h3>
-<p><label for="newbookshelf">New List Name:</label><input type="text" id="newbookshelf" name="newbookshelf" maxlength="40" size="40">
-	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"></p>
-<p><label for="category">List Type: </label></th><td><select id="category" name="category">
-			<option value="1">Private</option>
-			<option value="2">Public</option>
-			<option value="3">Free</option>
-		</select></p>
+<p align="center">
+    <br /><br />
+    <a href="javascript:closePopup();">close this window.</a>
+</p>
 
+<script type="text/javascript" language="javascript">
+    function closePopup () {
+        window.close();
+    }
+</script>
 
-	<p><input type="hidden" name="category" value="1" /><input type="submit" value="Add to My Book List"></p></form>
-</div>
 </body>
 </html>
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-auth.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-auth.tmpl
index db2c39374c..0659ab02bb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-auth.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-auth.tmpl
@@ -1,10 +1,9 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Log in to Your Account
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Log in to Your Account
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
 <!--CONTENT-->
-<div id="main">
 <!-- TMPL_IF NAME="loginprompt" -->
 <!-- login prompt time-->
 <h3>Log In to Your Account</h3>
@@ -44,5 +43,4 @@
 
 
 <!-- /TMPL_IF -->
-</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl
index 05254693c9..3cc46ff895 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-basket.tmpl
@@ -1,85 +1,227 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Your Book Bag<!-- TMPL_IF NAME="print_basket" --><!-- TMPL_INCLUDE NAME="doc-head-close-basket-print.inc" --><!-- TMPL_ELSE --><!-- TMPL_INCLUDE NAME="doc-head-close-basket.inc" --><!-- /TMPL_IF -->
-
-<div id="window">
-	<!-- TMPL_UNLESS NAME="print_basket" --><h3>Your Book Bag</h3>
-	<!-- MENUS -->
-	
-<!-- TMPL_IF NAME="verbose" -->
-<form action="opac-basket.pl" method="get"><input type="submit" onclick="showLess(); return false;" value="Brief Display" /></form>
-<!-- TMPL_ELSE -->
-<form action="opac-basket.pl" method="get"><input type="submit" onclick="showMore(); return false;" value="More Details" /></form>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<!-- TMPL_VAR NAME="LibraryNameTitle" -->
+    Catalog -- Your Book Bag
+    <!-- TMPL_IF NAME="print_basket" -->
+        <!-- TMPL_INCLUDE NAME="doc-head-close-basket-print.inc" -->
+    <!-- TMPL_ELSE -->
+    <!-- TMPL_INCLUDE NAME="doc-head-close-basket.inc" -->
 <!-- /TMPL_IF -->
-<form action="opac-basket.pl" method="get"><input type="submit" onclick="delSelRecords(); return false;" value="Remove Selected Items" /></form>
 
-<form action="opac-basket.pl" method="get"><input type="submit" onclick="sendBasket(); return false;" value="Send" /></form>
+<div> <!-- main -->
 
-<form action="opac-basket.pl" method="get"><input type="submit" onclick="printBasket(); return false;" value="Print" /></form>
+<!-- TMPL_UNLESS NAME="print_basket" -->
+<h1>Your Book Bag</h1>
 
-		<form action="opac-basket.pl" method="get"><input type="submit" onclick="delBasket(); return false;" value="Empty and Close" /></form> 
-<form action="opac-basket.pl" method="get"><input type="submit" onclick="quit(); return false;" value="Hide Window" /></form>
-<!-- /TMPL_UNLESS -->
-			
+<div id="action">
+        <!-- TMPL_IF NAME="verbose" -->
+        <a href="opac-basket.pl" onclick="showLess(); return false;">Brief Display</a>
+        <!-- TMPL_ELSE -->
+        <a href="opac-basket.pl" onclick="showMore(); return false;">More Details</a>
+        <!-- /TMPL_IF -->
+        <a href="opac-basket.pl" onclick="sendBasket(); return false;">Send</a>
+        <a href="opac-basket.pl" onclick="printBasket(); return false;">Print</a>
+        <a href="opac-basket.pl" onclick="delBasket(); return false;">Empty and Close</a>
+        <a href="opac-basket.pl" onclick="quit(); return false;">Hide Window</a>
+        <!-- /TMPL_UNLESS -->
+</div>
+<br />
+<p>
+<b>Selected items :</b>
+<a href="javascript:delSelRecords();">
+    Remove
+</a> | 
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <a href="javascript:addSelToShelf();">
+        Add to a shelf
+    </a>
+<!-- /TMPL_IF -->
+</p>
 
 <!-- TMPL_IF NAME="verbose" -->
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-<h3><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --></h3>
-<table>
-				<!-- TMPL_UNLESS NAME="print_basket" --><tr><td colspan="2"><form><label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"><input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" onclick="selRecord(value,checked)"> Select this Item</label></form></td></tr><!-- /TMPL_UNLESS -->
+    <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+    <h3>
+        <!-- TMPL_IF NAME="print_basket" -->
+            <!-- TMPL_VAR NAME="title" -->
+                <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
+        <!-- TMPL_ELSE -->
+            <form>
+                <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" -->
+                <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
+            </form>
+        <!-- /TMPL_IF -->
+    </h3>
+    <table>
+    
+        <!-- TMPL_IF name="isbn" -->
+        <tr>
+            <th scope="row">ISBN</th>
+            <td><!-- TMPL_VAR NAME="isbn" --></td>
+        </tr>
+        <!-- /TMPL_IF -->
+        
+        <!-- TMPL_IF name="MARCAUTHORS" -->
+        <tr>
+            <th scope="row">Authors</th>
+            <td>
+                <!-- TMPL_LOOP NAME="MARCAUTHORS" -->
+                    <!-- TMPL_VAR NAME="value" -->
+            <!-- /TMPL_LOOP -->
+            </td>
+        </tr>
+        <!-- /TMPL_IF -->
+        
+        <!-- TMPL_IF NAME="publishercode" -->
+            <tr>
+                <th scope="row">Publisher</th>
+                <td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" -->
+                </td>
+            </tr>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="pages" -->
+            <tr>
+                <th scope="row">Details</th>
+                <td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td>
+            </tr>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="seriestitle" -->
+        <tr>
+            <th scope="row">Collection</th>
+            <td> <!-- TMPL_VAR NAME="seriestitle" --></td>
+        </tr>
+        <!-- /TMPL_IF -->
+        
+        <!-- TMPL_IF name="MARCSUBJCTS" -->
+        <tr>
+            <th scope="row">Subjects</th>
+            <td>
+                <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
+                    <p><!-- TMPL_VAR NAME="label" --></p>
+            <!-- /TMPL_LOOP -->
+            </td>
+        </tr>
+        <!-- /TMPL_IF -->
+    
+        <!-- TMPL_IF name="copyrightdate" -->
+            <tr><th scope="row">Copyright</th>
+                <td> <!-- TMPL_VAR NAME="copyrightdate" --></td>
+            </tr>
+        <!-- /TMPL_IF -->
+    
+        <!-- TMPL_IF name="MARCNOTES" -->
+        <tr>
+            <th scope="row">Notes</th>
+            <td>
+            <!-- TMPL_LOOP NAME="MARCNOTES" -->
+                <p>- <!-- TMPL_VAR NAME="marcnote" --></p>
+            <!-- /TMPL_LOOP -->
+            </td>
+        </tr>
+        <!-- /TMPL_IF -->
+    
+        <!-- TMPL_IF name="unititle" -->
+        <tr>
+            <th scope="row">Unified title</th>
+            <td> <!-- TMPL_VAR NAME="unititle" --></td>
+        </tr>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="serial" -->
+        <tr>
+            <th scope="row">Serial</th>
+            <td><!-- TMPL_VAR NAME="serial" --></td>
+        </tr>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="dewey" -->
+        <tr>
+            <th scope="row">Dewey</th>
+            <td><!-- TMPL_VAR name="dewey" --></td>
+        </tr>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="classification" -->
+        <tr>
+            <th scope="row">Classification</th>
+            <td> <!-- TMPL_VAR name="classification" --></td>
+        </tr>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="lccn" -->
+        <tr>
+            <th scope="row">LCCN</th>
+            <td> <!-- TMPL_VAR name="lccn" --></td>
+        </tr>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF name="url" -->
+        <tr>
+            <th scope="row">URL</th>
+            <td> <!-- TMPL_VAR NAME="url" --></td>
+        </tr><!-- /TMPL_IF -->
+        <tr>
+            <th scope="row">Location</th>
+            <td>
+                <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+                <p>
+                    <!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" -->
+                    <!-- TMPL_IF name="itemcallnumber" -->
+                        (<!-- TMPL_VAR NAME="itemcallnumber" -->)
+                    <!-- /TMPL_IF -->
+                </p>
+                <!-- /TMPL_LOOP -->
+            </td>
+        </tr>
+    </table>
+    <!-- /TMPL_LOOP -->
 
-				<!-- TMPL_IF name="isbn" --><tr><th scope="row">ISBN:</th><td><!-- TMPL_VAR NAME="ISBN" --></td></tr><!-- /TMPL_IF -->
-						
-						<!-- TMPL_IF name="author" --><tr><th scope="row">Author:</th><td> <!-- TMPL_VAR NAME="author" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="additional" --><tr><th scope="row">Additional authors:</th><td><!-- TMPL_VAR NAME="additional" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="publishercode" -->
-	    <tr><th scope="row">Publisher:</th><td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" --></td></tr>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="pages" -->
-	<tr><th scope="row">Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
-<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="collection" --><tr><th scope="row">Collection:</th><td> <!-- TMPL_VAR NAME="seriestitle" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="subject" --><tr><th scope="row">Subject:</th><td> <!-- TMPL_VAR NAME="subject" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="copyrightdate" --><tr><th scope="row">Copyright:</th><td> <!-- TMPL_VAR NAME="copyrightdate" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="notes" --><tr><th scope="row">Notes:</th><td> <!-- TMPL_VAR NAME="notes" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="unititle" --><tr><th scope="row">Unified title:</th><td> <!-- TMPL_VAR NAME="unititle" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="serial" --><tr><th scope="row">Serial:</th><td><!-- TMPL_VAR NAME="serial" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="dewey" --><tr><th scope="row">Dewey:</th><td><!-- TMPL_VAR name="dewey" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="classification" --><tr><th scope="row">Call Number:</th><td> <!-- TMPL_VAR name="classification" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="lccn" --><tr><th scope="row">LCCN:</th><td> <!-- TMPL_VAR name="lccn" --></td></tr><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="url" --><tr><th scope="row">URL:</th><td> <!-- TMPL_VAR NAME="url" --></td></tr><!-- /TMPL_IF -->
-			</table>
-							<table><tr>
-					<th>Location: </th>
-					<th>Barcode: </th>
-				</tr>
-				<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
-					<tr>
-						<td>
-							<!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> 
-							<!-- TMPL_IF name="itemcallnumber" -->
-								(<!-- TMPL_VAR NAME="itemcallnumber" -->)
-							<!-- /TMPL_IF -->
-						</td>
-						<td><!-- TMPL_VAR NAME="barcode" --></td>
-					</tr>
-				<!-- /TMPL_LOOP --></table>
-			<br>
-<!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-<table><!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-				<!-- BIBLIO RECORD TABLE -->
-<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-<td><form><!-- TMPL_UNLESS NAME="print_basket" --><label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></label><br><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_UNLESS --></form></td><td><p><a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)"><!-- TMPL_VAR NAME="title" --></a> <!-- TMPL_VAR NAME="author" -->
-						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" -->
-						<!-- TMPL_IF name="place" --> <!-- TMPL_VAR name="place" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" --> <!-- TMPL_VAR name="size" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
-						<!-- TMPL_IF name="notes" --><p><!-- TMPL_VAR name="notes" --></p><!-- /TMPL_IF -->
-					</p></td><td><!-- TMPL_VAR NAME="classification" --></td></tr>
-	<!-- /TMPL_LOOP -->
-</table>
+    <table>
+        <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+            <!-- TMPL_IF NAME="even" -->
+                <tr class="highlight">
+            <!-- TMPL_ELSE -->
+                <tr>
+            <!-- /TMPL_IF -->
+            <td>
+                <form>
+                    <!-- TMPL_UNLESS NAME="print_basket" -->
+                        <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->">
+                        </label>
+                        <br />
+                        <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_UNLESS -->
+                </form>
+            </td>
+            <td><!-- TMPL_VAR name="itemtype" --></td>
+            <td>
+                <p>
+                    <a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)">
+                        <!-- TMPL_VAR NAME="title" -->
+                    </a>
+                        <!-- TMPL_VAR NAME="author" -->
+                        <!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" -->
+                        <!-- TMPL_IF name="place" --> <!-- TMPL_VAR name="place" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" --> <!-- TMPL_VAR name="size" -->
+                        <!-- /TMPL_IF -->
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="notes" -->
+                        <p><!-- TMPL_VAR name="notes" --></p>
+                        <!-- /TMPL_IF -->
+            </td>
+            <td><!-- TMPL_VAR NAME="classification" --></td>
+            </tr>
+        <!-- /TMPL_LOOP -->
+    </table>
 <!-- /TMPL_IF -->
+
 <!-- TMPL_UNLESS NAME="print_basket" -->
-<form name="myform"><input type="hidden" name="records"></form>
+<form name="myform">
+    <input type="hidden" name="records" id="records" />
+</form>
 <!-- /TMPL_UNLESS -->
-</div>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl
index feb700c524..4ac1b00bd6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-detail.tmpl
@@ -1,217 +1,328 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="main">
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-
-<!-- TMPL_IF NAME="AmazonContent" --><!-- TMPL_IF NAME="isbn" --><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image" /></a><!-- TMPL_ELSE --><img border="0" src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="Book Cover Image" /><!-- /TMPL_IF --><!-- /TMPL_IF -->
-
-
-<ul>
-<!-- TMPL_UNLESS NAME="norequests" --><li><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_UNLESS -->
-<li><a class="detail" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></li>
-<!-- Hide from NPL --> <li><a class="isbd" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li> <!-- Hide from NPL -->
-<li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
-<!-- TMPL_IF name="virtualshelves" --><li><a class="shelf" href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book List</a></li><!-- /TMPL_IF -->
-<li><a class="cart" href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book Bag</a></li>
-</ul>
-
-
-<h4>Search for this title in:</h4>
-<ul>
-<li><a href="http://www.google.com/search?q=<!-- TMPL_VAR NAME="title" ESCAPE="url" -->+site:worldcatlibraries.org">Other Libraries(WorldCat)</a></li>
-<li><a href="http://www.scholar.google.com/scholar?q=<!-- TMPL_VAR NAME="title" ESCAPE="url" -->">Other Databases (Google Scholar)</a></li></ul>
-
-<h2><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --></h2>
-<!-- TMPL_IF NAME="author" --><h3>By <a href="/cgi-bin/koha/opac-search.pl?marclist=biblio.author&amp;and_or=and&amp;excluding=&amp;operator=contains&amp;value=<!-- TMPL_VAR NAME="author" -->&amp;resultsperpage=20&amp;orderby=biblio.title&amp;op=do_search"><!-- TMPL_VAR NAME="author" --></a></h3><!-- /TMPL_IF --> 
-
-<table>
-
-<!-- TMPL_UNLESS NAME="MARCNOTES" -->
-
-<!-- TMPL_IF NAME="notes" -->
-<tr><th scope="row">Notes:</th><td><!-- TMPL_VAR NAME="notes" --></td></tr><!-- /TMPL_IF -->
-
-<!-- /TMPL_UNLESS -->
-	
-<!-- TMPL_UNLESS NAME="MARCSUBJCTS" -->
-
-<!-- TMPL_IF name="subjects" --><tr><th>Subject(s):</th><td><!-- TMPL_LOOP name="subjects" --><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&amp;and_or=and&amp;operator=contains&amp;value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP --></td></tr><!-- /TMPL_IF -->
-
-<!-- /TMPL_UNLESS -->
-
-<!-- TMPL_IF NAME="MARCNOTES" -->
-		<tr>
-			<th scope="row">Detailed notes:</th>
-			<td scope="row"><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnote" --></li><!-- /TMPL_LOOP --></ul></td></tr>
-	<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="MARCSUBJCTS" -->
-		<tr>
-			<th scope="row">Related links:</th>
-			<td><ul><!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
-							<!-- TMPL_IF name="linkvalue" -->
-								<li><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR name="link" -->&amp;and_or=and&amp;operator==&amp;value=<!-- TMPL_VAR NAME="linkvalue" escape="HTML"-->"><!-- TMPL_VAR NAME="marcsubjct" --></a></li>
-							<!-- TMPL_ELSE -->
-								<li><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&amp;and_or=and&amp;operator=contains&amp;value=<!-- TMPL_VAR NAME="marcsubjct" escape="HTML"-->"><!-- TMPL_VAR NAME="marcsubjct" --></a></li>
-							<!-- /TMPL_IF -->
+<div id="action">
 
-<!-- /TMPL_LOOP --></ul></td></tr>
+<!-- TMPL_UNLESS NAME="norequests" -->
+	<!-- TMPL_IF NAME="RequestOnOpac" -->
+		<a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+		Place Reserve
+		</a>
 	<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="item_description" -->
-<tr>
-<th scope="row">Item Description (from Amazon.com):</th>
-<td><ul><li><!-- TMPL_VAR NAME="item_description" --></li></ul></td></tr>
+<!-- /TMPL_UNLESS -->
+        <a href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+            MARC View
+        </a>
+        <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+            ISBD
+        </a>
+        <a href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+            Print
+        </a>
+<!-- TMPL_IF name="virtualshelves" -->
+    <!-- TMPL_IF NAME="loggedinusername" -->
+        <a href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+            Add to My Book List
+        </a>
+    <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
+        <a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+            Add to My Book Bag
+        </a>
+</div>
 
-
-
-<!-- TMPL_IF NAME="abstract" --><tr><th scope="row">Format:</th><td><!-- TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="copyrightdate" -->
-    <tr><th scope="row">Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate" --></td></tr>
-<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="seriestitle" --><tr><th scope="row">Series Title:</th><td><a href="/cgi-bin/koha/opac-search.pl?marclist=biblio.seriestitle&amp;and_or=and&amp;excluding=&amp;operator=contains&amp;value=<!-- TMPL_VAR NAME="seriestitle" ESCAPE=URL -->&amp;resultsperpage=20&amp;orderby=biblio.title&amp;op=do_search"><!-- TMPL_VAR NAME="seriestitle" --></a><!-- TMPL_IF NAME="volume" --><!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF --></td></tr><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="isbn" -->
-	    <tr><th scope="row">ISBN:</th><td><!-- TMPL_VAR NAME="isbn" --></td></tr>
+<div id="catalogue_detail_biblio">
+    <!-- TMPL_IF NAME="AmazonContent" -->
+        <!-- TMPL_IF NAME="isbn" -->
+        <a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link">
+            <img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image" />
+        </a><!-- TMPL_ELSE -->
+        <img border="0" src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="Book Cover Image" />
+        <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="lccn" -->
-	    <tr><th scope="row">LCCN:</th><td><!-- TMPL_VAR NAME="lccn" --></td></tr>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="publishercode" -->
-	    <tr><th scope="row">Publisher:</th><td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" --></td></tr>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="pages" -->
-	<tr><th scope="row">Physical Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
-<!-- /TMPL_IF -->
-<!-- /TMPL_LOOP -->
-
- <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
- <tr><th scope="row">Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> <!-- /TMPL_LOOP -->
-</table>
-<table>
-<!-- TMPL_IF NAME="MARCURLS" -->
-		<tr><th scope="row">Related URLs: </th><td><ul><!-- TMPL_LOOP NAME="MARCURLS" --><li><a href="<!-- TMPL_VAR NAME="MARCURL" -->"><!-- TMPL_VAR NAME="MARCURL" --></a></li><!-- /TMPL_LOOP --></ul></td></tr>
-	<!-- /TMPL_IF -->
-</table>
-<br clear="right" />
+    <h1>
+        <!-- TMPL_VAR NAME="title" -->
+        <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR NAME="author" -->)<!-- /TMPL_IF -->
+        <!-- TMPL_VAR NAME="class" -->
+    </h1>
+    
+    <!-- TMPL_IF name="subtitles" -->
+    <p><label><b>Subtitle(s):</b></label>
+        <!-- TMPL_LOOP name="subtitles" -->
+        <!-- TMPL_VAR NAME="subtitle" --> ;
+        <!-- /TMPL_LOOP -->
+        &nbsp;
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="author" -->
+    <p><label><b>Author: </b></label>
+        <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" -->">
+            <!-- TMPL_VAR NAME="author" -->&nbsp;
+        </a>
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MARCAUTHORS" -->
+    <p><label><b>Additional Author:</b></label>
+        <!-- TMPL_LOOP NAME="MARCAUTHORS" -->
+        <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="value" -->">
+            <!-- TMPL_VAR NAME="value" -->
+        </a>&nbsp;
+        <!-- /TMPL_LOOP -->
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="illus" -->
+    <p><label><b>Illus:</b></label><!-- TMPL_VAR name="illus" -->&nbsp;</p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="publishercode" -->
+    <p><label><b>Published by :</b></label>
+        <a href="/cgi-bin/koha/opac-search.pl?q=pb:<!-- TMPL_VAR NAME="publishercode"-->">
+            <!-- TMPL_VAR NAME="publishercode" -->
+        </a>&nbsp;
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="publicationyear" -->
+    <p><label><b>in</b></label><!-- TMPL_VAR NAME="publicationyear" -->&nbsp;</p>
+    <!-- /TMPL_IF -->
+    <p>
+        <!-- TMPL_IF name="pages" --> <label><b>Size: </b></label><!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+        <!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" -->&nbsp;
+    </p>
+    <!-- TMPL_IF name="isbn" -->
+    <p><label><b>ISBN: </b></label><!-- TMPL_VAR NAME="isbn" -->&nbsp;</p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="issn" -->
+    <p><label><b>ISSN:</b></label><!-- TMPL_VAR NAME="issn" -->&nbsp;</p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="seriestitle" -->
+    <p><label><b>Collection: </b></label>
+        <!-- TMPL_VAR NAME="seriestitle" -->
+        <!-- TMPL_IF name="volume" -->vol. <!-- TMPL_VAR name="volume" --> <!-- TMPL_VAR name="volumedate" --><!-- /TMPL_IF -->
+        <!-- TMPL_VAR name="volumedesc" -->&nbsp;
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MARCSUBJCTS" -->
+    <p><label><b>Subjects: </b></label></p>
+    <p>
+        <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
+        <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="link" ESCAPE="URL"-->"><!-- TMPL_VAR NAME="label" --></a>
+        &nbsp;
+        <!-- /TMPL_LOOP -->
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="copyrightdate" -->
+    <p><label><b>Year : </b></label><!-- TMPL_VAR NAME="copyrightdate" --></p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="MARCNOTES" -->
+    <p><label><b>Notes: </b></label></p>
+    <p>
+        <!-- TMPL_LOOP NAME="MARCNOTES" -->
+        <p>- <!-- TMPL_VAR NAME="marcnote" --></p>
+        <!-- /TMPL_LOOP -->
+    </p>
+    <!-- TMPL_ELSE -->
+    <!-- TMPL_IF name="notes" -->
+    <p><label><b>Notes: </b></label><!-- TMPL_VAR NAME="notes" --></p>
+    <!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="unititle" -->
+    <p><label><b>Alt title: </b></label><!-- TMPL_VAR NAME="unititle" --></p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="classification" -->
+    <p><label><b>classification:</b></label><!-- TMPL_VAR name="subclass" --><!-- TMPL_VAR name="classification" --></p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="dewey" -->
+    <p><label><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --></p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="URLS" -->
+    <p><label><b>URL: </b></label>
+        <!-- TMPL_LOOP name="URLS" -->
+        <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a>&nbsp;
+        <!-- /TMPL_LOOP -->
+    </p>
+    <!-- /TMPL_IF -->
+    <p><label><b>Item type : </b></label>
+        <!-- TMPL_IF name="description" -->
+        <!-- TMPL_VAR name="description" -->
+        <!-- TMPL_ELSE -->
+        <!-- TMPL_VAR NAME="itemtype" -->
+        <!-- /TMPL_IF -->
+    </p>
 </div>
 
-<!-- TMPL_IF NAME="ITEM_RESULTS" -->
-<table>
-<!--HOLDINGS INFORMATION HEADER TABLE ROWS-->
-<tr><!-- <th>&nbsp;</th> -->
-<th>Type/Format</th>
-<th>Call Number</th>
-<th>Location</th>
-<th>Status</th>
-<th>Due Date</th>
-<th>Last Seen</th>
-<!-- <th>Barcode</th> --></tr>
-<tbody>
-<!--INFORMATION ROWS-->
-<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
-<tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
-<td><!-- TMPL_VAR NAME="classification" --></td>
-				<td>
-					<!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> 
-					<!-- TMPL_IF name="itemcallnumber" -->
-						(<!-- TMPL_VAR NAME="itemcallnumber" -->)
-					<!-- /TMPL_IF -->
-				</td>
-				<td>
-					<!-- TMPL_IF name="datedue" -->
-						On loan
-					<!-- TMPL_ELSE -->
-						<!-- TMPL_IF name="notforloantext" -->
-							<!-- TMPL_VAR name="notforloantext" -->
-						<!-- TMPL_ELSE -->
-							Available
-						<!-- /TMPL_IF -->
-					<!-- /TMPL_IF -->
-				</td>
-<td><!-- TMPL_VAR NAME="datedue" --></td>
-<td><!-- TMPL_VAR NAME="datelastseen" --></td>
-<!-- <td><!-- TMPL_VAR NAME="barcode" --></td> --></tr>
-<!-- /TMPL_LOOP -->
-</tbody>
-</table>
+<!-- TMPL_IF name="count" -->
+<div id="catalogue_detail_items">
+    <h2><!-- TMPL_VAR NAME="count" --> items</h2>
+    <table>
+        <tr>
+            <th>Item type</th>
+            <th>Location</th>
+            <th>Status</th>
+            <th>Date Due</th>
+            <th>Volume</th>
+        </tr>
+        <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+        <tr>
+            <td><!-- TMPL_VAR NAME="description" --></td>
+            <td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --></td>
+            <td>
+                <!-- TMPL_IF name="datedue" -->
+                On issue to <!-- TMPL_VAR NAME="cardnumber" -->
+                <!-- TMPL_ELSE -->
+                <!-- TMPL_IF name="notforloan" -->
+                <!-- TMPL_VAR name="notforloan" -->
+                <!-- TMPL_ELSE -->
+                <!-- TMPL_IF name="itemlost"-->
+                Item lost
+                <!-- TMPL_ELSE -->
+                <!-- TMPL_IF NAME="wthdrawn" -->Item Cancelled<!-- TMPL_ELSE -->Available<!-- /TMPL_IF -->
+                <!-- /TMPL_IF -->
+                <!-- /TMPL_IF -->
+                <!-- /TMPL_IF -->
+            </td>
+            <td><!-- TMPL_VAR NAME="datedue" --></td>
+            <td><!-- TMPL_VAR NAME="volumeddesc" --></td>
+            <!-- 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 -->
+        </tr>
+        <!-- /TMPL_LOOP -->
+    </table>
+</div>
 <!-- TMPL_ELSE -->
-<table><tr><td>No copies available.</td></tr></table>
+<p>we don't have any physical item for this document</p>
 <!-- /TMPL_IF -->
-	<!-- TMPL_IF name="subscriptionsnumber" -->
-		<p>This is a serial subscription (There are <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions associated with this title).</p> 
-		<!-- TMPL_LOOP Name="subscriptions" -->
-				<!-- TMPL_IF NAME="subscriptionnotes" --><p><!--TMPL_VAR Name="subscriptionnotes"--> </p><!-- /TMPL_IF -->
-				<!--TMPL_IF Name="latestserials"-->
-				<p> The three latest issues related to this subscription:</p>
-				<table>
-				<!--TMPL_LOOP Name="latestserials"-->
-					<tr>
-						<td>
-							<!--TMPL_VAR Name="serialseq"-->
-						</td>
-						<td>
-							<!--TMPL_VAR Name="planneddate"-->
-						</td>
-						<td>
-							<!--TMPL_IF Name="status1"-->Waited
-							<!--TMPL_ELSE -->
-								<!-- TMPL_IF Name="status2"-->Arrived
-								<!--TMPL_ELSE -->
-									<!-- TMPL_IF Name="status3"-->Late
-									<!--TMPL_ELSE -->
-										<!-- TMPL_IF Name="status4"-->Missing
-										<!--TMPL_ELSE -->
-											<!-- TMPL_IF Name="status5"-->Not Issued
-											<!--/TMPL_IF-->
-										<!--/TMPL_IF-->
-									<!--/TMPL_IF-->
-								<!--/TMPL_IF-->
-							<!--/TMPL_IF-->
-						</td>
-					</tr>
-				<!--/TMPL_LOOP -->
-				</table>
-				<!-- /TMPL_IF -->
-		<!-- /TMPL_LOOP -->
-		<p> For more information: View a record of <a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">this subscription's issues</a></p>
- 	<!-- /TMPL_IF -->
+<!-- TMPL_IF name="subscriptionsnumber" -->
+<div id="catalogue_detail_subscriptions">
+    <h2>This is a serial subscription</h2>
+    <p> (We have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions associated with this title).</p>
+    <!-- TMPL_LOOP Name="subscriptions" -->
+    <!-- TMPL_IF NAME="subscriptionnotes" --><p><!--TMPL_VAR NAME="subscriptionnotes"--> </p><!-- /TMPL_IF -->
+    <!--TMPL_IF NAME="latestserials"-->
+    <p> The three latest issues related to this subscription:</p>
+    <table>
+        <tr>
+            <th>Issue #</th>
+            <th>Date</th>
+            <th>Status</th>
+            <th>Note</th>
+            <!--TMPL_LOOP Name="latestserials"-->
+            <tr>
+                <td>
+                    <!--TMPL_VAR Name="serialseq"-->
+                </td>
+                <td>
+                    <!--TMPL_VAR Name="planneddate"-->
+                </td>
+                <td>
+                    <!--TMPL_IF Name="status1"-->Waited
+                    <!--TMPL_ELSE -->
+                    <!-- TMPL_IF Name="status2"-->Arrived
+                    <!--TMPL_ELSE -->
+                    <!-- TMPL_IF Name="status3"-->Late
+                    <!--TMPL_ELSE -->
+                    <!-- TMPL_IF Name="status4"-->Missing
+                    <!--TMPL_ELSE -->
+                    <!-- TMPL_IF Name="status5"-->Not Issued
+                    <!--/TMPL_IF-->
+                    <!--/TMPL_IF-->
+                    <!--/TMPL_IF-->
+                    <!--/TMPL_IF-->
+                    <!--/TMPL_IF-->
+                </td>
+                <td>
+                    <!--TMPL_VAR Name="notes"-->
+                </td>
+            </tr>
+            <!--/TMPL_LOOP -->
+        </table>
+        <!-- /TMPL_IF -->
+        <!-- /TMPL_LOOP -->
+    </div>
+    <!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="reviewson" -->
+    <!-- TMPL_IF NAME="reviews" -->
+    <h2>Reviews by members:</h2>
+        <!--TMPL_LOOP NAME="reviews"-->
+        <p>
+            <b>
+                Review by
+                <!--TMPL_VAR NAME="title"-->
+                <!--TMPL_VAR NAME="surname"-->
+                <!--TMPL_VAR NAME="firstname"-->
+            </b>
+            <br />
+            <small>
+                <!--TMPL_VAR NAME="datereviewed"-->
+            </small>
+        </p>
+        <p>
+          <!--TMPL_VAR NAME="review"-->
+        </p>
+        <br />
+        <!--/TMPL_LOOP-->
+    <!-- TMPL_ELSE  -->
+        <b>No reviews has been writed on this biblio.</b>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="loggedinusername" -->
+        <a href="javascript:Dopop('/cgi-bin/koha/opac-review.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->');">
+            Write or modify your reviews on this biblio.
+        </a>
+    <!-- TMPL_ELSE -->
+        <br /><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a> to write a review here.
+    <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
 <!-- TMPL_IF NAME="AmazonContent" -->
 <!-- Amazon Reviews -->
 <div id="itemReviews">
         <h2>Amazon Reader Reviews:</h2>
         <h4>
-	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-	<!-- TMPL_IF NAME="isbn" -->
-		<a href="http://www.amazon.com/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&asin=<!-- TMPL_VAR NAME="isbn" -->&store=books">Add your own review</a></h4>
-	<!-- /TMPL_IF -->
-	<!-- /TMPL_LOOP --><br/>
+    <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+    <!-- TMPL_IF NAME="isbn" -->
+        <a href="http://www.amazon.com/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&asin=<!-- TMPL_VAR NAME="isbn" -->&store=books">Add your own review</a></h4>
+    <!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP --><br/>
 
         <!-- TMPL_IF NAME="rating" -->
-        	<h4>Rating (from Amazon.com):</h4>
-		<div id="starMT"><div id="starFull" style="width:<!-- TMPL_VAR NAME="rating" -->px"></div></div>
+            <h4>Rating (from Amazon.com):</h4>
+        <div id="starMT"><div id="starFull" style="width:<!-- TMPL_VAR NAME="rating" -->px"></div></div>
 
-		<!-- TMPL_LOOP NAME="REVIEWS" -->
-        	<div class="content_set">
-        	<!-- TMPL_IF NAME="summary" -->
-			<h4 class="underline">  <!-- TMPL_VAR NAME="summary" --></h4>
-        	<!-- /TMPL_IF -->
-        	<!-- TMPL_IF NAME="comment" -->
-        		<p><!-- TMPL_VAR NAME="comment" -->
-        	</p><!-- /TMPL_IF -->
-        	</div>
-	<!-- /TMPL_LOOP -->
-	<!-- TMPL_ELSE -->
+        <!-- TMPL_LOOP NAME="AMAZONREVIEWS" -->
+            <div class="content_set">
+            <!-- TMPL_IF NAME="summary" -->
+            <h4 class="underline">  <!-- TMPL_VAR NAME="summary" --></h4>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="comment" -->
+                <p><!-- TMPL_VAR NAME="comment" -->
+            </p><!-- /TMPL_IF -->
+            </div>
+    <!-- /TMPL_LOOP -->
+    <!-- TMPL_ELSE -->
 
-	<div class="content_set">
-	<p class="error"> Sorry, there are no reviews available for this title. </p>
-	</div>
+    <div class="content_set">
+    <p class="error"> Sorry, there are no reviews available for this title. </p>
+    </div>
 
-	<!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
 </div> <!-- itemReviews -->
 <!-- /TMPL_IF-->
 
-</div>
+<script language="javascript" type="text/javascript">
+    function Dopop(link) {
+        newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
+    }
+    function confirm_deletion() {
+        var is_confirmed = confirm('Are you sure you want to delete this biblio?');
+        if ( is_confirmed ) {
+            window.location="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
+        }
+    }
+</script>
+
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-detailprint.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-detailprint.tmpl
index ee4cb2ed0d..0c6285c7d2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-detailprint.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-detailprint.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE NAME="doc-head-close-basket-print.inc" -->
 
 <div id="window">
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl
index c253416ab7..a47cd10ccb 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-full-serial-issues.tmpl
@@ -1,80 +1,75 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Serials
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Serials
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
 
-
 <!-- TMPL_UNLESS name="popup" -->
-<div id="main">
-	<h2>Subscription information for <em><!-- TMPL_VAR name="bibliotitle" --></em></h2>
-	<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Normal View" /></form>
+    <h1 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h1>
+    <a href="opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
 <!-- /TMPL_UNLESS -->
+    <div class="tabsubs">
+    <!-- TMPL_LOOP NAME="years" -->
+        <!-- TMPL_IF NAME="year" -->
+            <a  class="tabsubs" href="javascript:showlayer(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a>
+        <!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP -->
+    <a class="tabsubs" href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&selectview=small">Compact view</a>
+    </div>
 
-	<div class="tabs">
-	<!-- TMPL_LOOP NAME="years" -->
-		<!-- TMPL_IF NAME="year" -->
-			<a href="#" onclick="active(<!-- TMPL_VAR NAME="year" -->); return false;" id="link<!-- TMPL_VAR NAME="year" -->"><!-- TMPL_VAR NAME="year" --></a>
-		<!-- /TMPL_IF -->
-	<!-- /TMPL_LOOP -->
-	</div>
-
-	<!-- TMPL_LOOP NAME="years" -->
-	<div name="<!-- TMPL_VAR NAME="year" -->" id="<!-- TMPL_VAR NAME="year" -->" class="tab" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
-		<table>
-			<caption><!-- TMPL_VAR NAME="year" --> Issues</caption>
-			<tr>
-				<th> Date
-				</th>
-				<th> Number
-				</th>
-				<th> Status
-				</th>
-			</tr>
-			<!-- TMPL_LOOP Name="serials" -->
-			<tr>
-				<td>
-					<!-- TMPL_VAR Name="planneddate" -->
-				</td>
-				<td>
-					<!-- TMPL_VAR Name="serialseq" -->
-				</td>
-				<td>
-					<!-- TMPL_IF Name="status1" -->Arrived<!-- /TMPL_IF -->
-					<!-- TMPL_IF Name="status2" -->Waited<!-- /TMPL_IF -->
-					<!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
-					<!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
-				</td>
-			</tr>
-			<!-- /TMPL_LOOP -->
-		</table>
-	</div>
-	<!--/TMPL_LOOP -->
-</div>
+    <!-- TMPL_LOOP NAME="years" -->
+    <div name="yeardata" id="<!-- TMPL_VAR NAME="year" -->" class="tabsub" <!--TMPL_IF Name="first" -->style="visibility:visible"<!--/TMPL_IF -->>
+        <table width="400px">
+            <tr>
+                <th>Date
+                </th>
+                <th>Date received
+                </th>
+                <th>Number
+                </th>
+                <th>Status
+                </th>
+            </tr>
+            <!-- TMPL_LOOP Name="serials" -->
+            <tr>
+                <td>
+                    <!-- TMPL_VAR Name="publisheddate" -->
+                </td>
+                <td>
+                    <!-- TMPL_VAR Name="planneddate" -->
+                </td>
+                <td>
+                    <!-- TMPL_VAR Name="serialseq" -->
+                </td>
+                <td>
+                    <!-- TMPL_IF Name="status1" -->Waited<!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="status2" -->Arrived<!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="status3" -->Late<!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="status4" -->Missing<!-- /TMPL_IF -->
+                    <!-- TMPL_IF Name="status5" -->Not Published<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
+                </td>
+            </tr>
+            <!-- /TMPL_LOOP -->
+        </table>
+    </div>
+    <!--/TMPL_LOOP -->
 <script language="JavaScript" type="text/javascript">
-function active(numlayer)
+showlayer(<!-- TMPL_VAR name="yearmin" -->);
+function showlayer(numlayer)
 {
-	for (i=<!--TMPL_VAR Name="yearmin"-->; i<=<!--TMPL_VAR Name="yearmax"-->; i++ ) {
-		ong = i;
-		link = "link"+i;
-		if (numlayer==i) {
-			document.getElementById(ong).style.visibility="visible";
-			document.getElementById(link).style.color="#000066";
-			document.getElementById(link).style.backgroundColor="#FFFFCC";
-		} else {
-			document.getElementById(ong).style.visibility="hidden";
-			if (document.getElementById(link)) {
-			document.getElementById(link).style.color="#669999";
-			document.getElementById(link).style.backgroundColor="#D8DEB8";
-			}
-		}
-	}
+    var yeardata=document.getElementsByName("yeardata");
+    for (i=0; i<yeardata.length; i++ ) {
+        ong=yeardata[i].getAttribute('id');
+        if (numlayer==ong) {
+            yeardata[i].style.visibility="visible";
+        } else {
+            yeardata[i].style.visibility="hidden";
+        }
+    }
 }
-<!-- TMPL_LOOP name="years" -->
-<!-- TMPL_IF NAME="first" -->
-	active(<!-- TMPL_VAR NAME="year" -->);
-<!-- /TMPL_IF -->
-	<!--/TMPL_LOOP -->
+
 </script>
 </body>
 </html>
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl
index f5660d3c5f..a0db3d05a3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-main.tmpl
@@ -1,85 +1,145 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> -- Library Catalog
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<!-- TMPL_VAR NAME="LibraryNameTitle" --> -- Library Catalog
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="main">
-
-<div>
-
-<!-- TMPL_IF NAME="loggedinusername" -->
-<!-- TMPL_ELSE -->
-<form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
-<h3>Log in to Check Your Account</h3>
-<p><label for="userid">Card Number:</label><input type="text" id="userid" size="10" name="userid" /></p>
-<p><label for="password">Password:</label> <input type="password" id="password" size="10" name="password" /></p>
-<p><input type="submit" value="Log In" class="submit" /></p>
-</form>
+<!-- TMPL_IF name="koha_news_count" -->
+<div id="news">
+    <table>
+    <!-- TMPL_LOOP name="koha_news" -->
+    <tr>
+        <th>
+            <!-- TMPL_VAR name="title" -->
+        </th>
+        <tr><td>
+                <p><!-- TMPL_VAR name="new" --></p>
+                <p><i>(published on <!-- TMPL_VAR name="newdate" -->)</i></p>
+            </td></tr>
+    <!-- /TMPL_LOOP -->
+    </table>
+</div>
 <!-- /TMPL_IF -->
 
-<form action="/cgi-bin/koha/opac-search.pl">
-<h3>Search the Library Catalog</h3>
-<p>
-<label for="value">Enter Keyword(s):</label>
-			<input type="hidden" name="op" value="do_search" />
-			<input type="hidden" name="type" value="opac" />
-			<input type="hidden" name="marclist" value="" />
-			<input type="hidden" name="and_or" value="and" />
-			<input type="hidden" name="excluding" value="" />
-			<input type="hidden" name="operator" value="contains" />
-			<input type="text" size="27" name="value" id="value" /></p>
-		<p><input type="submit" value="Search" class="submit" /></p>
-		<p>
-			<a href="/cgi-bin/koha/opac-search.pl">Advanced Search (More Options)</a>
-		</p>
-
-	</form>
+<div id="opac-main-search">
+<h1>Search our catalogue</h1>
+    <ul><li>
+    <label for="masthead_search">Query the catalogue</label>
+    <form name="searchform" method="POST" action="/cgi-bin/koha/opac-search.pl" id="searchform">
+        <input type="text" name="q" style="width: 30%;"/>
+        <input type="submit" value="Search" class="submit" />
+    </form>
+    <i>(<a href="/cgi-bin/koha/opac-search.pl">more search options</a>)</i>
+    </li>
+    <!-- TMPL_IF name="OpacBrowser" -->
+        <li><a href="/cgi-bin/koha/opac-browser.pl">Browse the Catalogue</a>, through a hierarchy of subjects</li>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="OpacAuthorities" -->
+        <li>Query the <a href="/cgi-bin/koha/opac-authorities-home.pl">authorities</a></li>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="OpacCloud" -->
+        <li>Dig into <a href="/cgi-bin/koha/opac-tags_subject.pl">tag cloud</a></li>
+    <!-- /TMPL_IF -->
+        <li>
+            <form name="recent-acqui" action="/cgi-bin/koha/opac-main.pl" method="POST">
+                <label for="recentacqui">Get the last</label>
+                <input id="recentacqui" type="text" name="recentacqui" value="30" size="3"/>
+                acquisitions
+                <input type="submit" value=" OK " />
+        </li>
+    </ul>
 </div>
 
-<div>
-	<h3>Recent acquisitions</h3>
-	<form action="/cgi-bin/koha/opac-search.pl">
-		<p>
-			<!-- TMPL_VAR name="CGIitemtype" --><input type="hidden" name="marclist" value="biblioitems.itemtype" />
-			<input type="hidden" name="and_or" value="and" />
-			<input type="hidden" name="excluding" value="" />
-			<input type="hidden" name="operator" value="=" />
-			<input type="hidden" name="op" value="do_search" />
-			<input type="hidden" name="type" value="opac" />
-			<input type="hidden" name="orderby" value="biblio.timestamp" />
-			<input type="hidden" name="desc_or_asc" value="desc" />
-			acquired in the last
-			<input type="text" name="desc_or_asc" size="3" value="30" />
-			days
-			<input type="submit" value="Search" class="submit" />
-		</p>
-	</form>
+<!-- TMPL_IF NAME="languages" -->
+<div id="opac-main-changelanguage">
+    <h1>Change language</h1>
+    <ul>
+    <form action="/cgi-bin/koha/changelanguage.pl" method="POST">
+        <label for="selectlang">Set language to</label>
+        <select id="selectlang" name="language" onchange="javascript:submit();">
+            <!-- TMPL_LOOP NAME="languages" -->
+                <option value="<TMPL_VAR NAME="language">">
+                    <!-- TMPL_VAR NAME="language" -->
+                </option>
+            <!-- /TMPL_LOOP -->
+        </select>
+    </form>
+    </ul>
 </div>
-	
-<!-- TMPL_IF NAME="loggedinusername" -->
-<div>
-<h3>You're logged in as <em><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></em> (<a href="/cgi-bin/koha/opac-logout.pl">Click here</a> if you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->)<!-- /TMPL_LOOP --></h3>
+<!-- /TMPL_IF -->
 
-<ul><li><a href="/cgi-bin/koha/opac-user.pl">my library home</a> </li> <li> <a href="/cgi-bin/koha/opac-account.pl">my fines</a> </li> <li> 
-	<a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a> </li> <li> <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a>	<!-- TMPL_IF NAME="opacreadinghistory" --></li> <li> <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF -->	<!-- TMPL_IF name="virtualshelves" --> </li> <li> <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" --></li> <li> <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></li></ul>
-		<!-- TMPL_IF name="textmessaging"-->
-			<h3>Message from the library</h3>
-			<p class="error"><!-- TMPL_VAR name="textmessaging" --></p>
-		<!-- /TMPL_IF -->
-<form method="post" action="/cgi-bin/koha/opac-logout.pl">
-<p><input type="submit" class="submit" name="logout" value="Log Out" /></p>
-</form>
-</div><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="recentacquiloop"-->
+    <div class="searchresults">
+        <table>
+        <tr>
+            <th>
+                Title
+            </th>
+            <th>
+                Author
+            </th>
+            <th>
+                copyright
+            </th>
+            <th>
+                publication year
+            </th>
+            <th>
+                Date
+            </th>
+        </tr>
+        <!-- TMPL_LOOP NAME="recentacquiloop" -->
+        <tr>
+            <td>
+                <p>
+                    <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
+                    <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                    <!-- TMPL_IF NAME="title"-->
+                        <!-- TMPL_VAR NAME="title" -->
+                    <!-- TMPL_ELSE -->
+                        <span class="problem">(no title)</span>
+                    <!-- /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_IF NAME="title"-->
+                        <!-- TMPL_VAR NAME="title" -->
+                    <!-- TMPL_ELSE -->
+                        <span class="problem">(no title)</span>
+                    <!-- /TMPL_IF -->
+                    </a>
+                    <!-- TMPL_ELSE -->
+                    <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
+                    <!-- TMPL_IF NAME="title"-->
+                        <!-- TMPL_VAR NAME="title" -->
+                    <!-- TMPL_ELSE -->
+                        <span class="problem">(no title)</span>
+                    <!-- /TMPL_IF -->
+                    </a>
+                    <!-- /TMPL_IF -->
+                    <!-- /TMPL_IF -->
+                </p>
+            </td>
+            <td>
+                <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" -->">
+                    <!-- TMPL_VAR NAME="author" -->
+                </a>
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="copyrightdate" -->
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="publicationyear" -->
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="timestamp" -->
+            </td>
+        </tr>
+        <!-- /TMPL_LOOP -->
+        </table>
+     </div>
+<!-- /TMPL_IF -->
 
-	<!-- TMPL_IF NAME="opaclanguagesdisplay" --><div class="content-block">
-	<h4 class="inline">Change Language:</h3>
-	<form action="/cgi-bin/koha/changelanguage.pl" method="post" class="inline">
-		<select name="language">
-			<!-- TMPL_LOOP NAME="languages" -->
-				<option value="<TMPL_VAR NAME="language">"><!-- TMPL_VAR NAME="language" --></option>
-			<!-- /TMPL_LOOP -->
-		</select>
-		<input type="submit" value="Switch" class="submit">
-	</form></div><!-- /TMPL_IF -->
-</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl
index 809db363ac..2adaefda93 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-passwd.tmpl
@@ -1,46 +1,43 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Change Your Password
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Account for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead-user.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
-<!-- CONTENT -->
-<div id="main">
+<!--CONTENT-->
+    <!-- TMPL_INCLUDE name="usermenu.inc" -->
 
+    <!-- TMPL_IF NAME= "Error_messages" -->
+        <h3>There was a problem with your submission</h3>
+        <p class="error">
+            <!-- TMPL_IF NAME= "PassMismatch" -->
+            Passwords do not match.  Please re-type your new password.
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME= "ShortPass" -->
+            Your new password must be at least 6 characters long
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME= "WrongPass" -->
+            Your current password was entered incorrectly.  If this problem persists, please ask a librarian to re-set your password for you.	
+            <!-- /TMPL_IF -->
+        </p>
+    <!-- /TMPL_IF -->
+    
+    <!-- TMPL_IF NAME= "Ask_data" -->
+        <h1>Change your Password</h1>
+        <form action="/cgi-bin/koha/opac-passwd.pl" name="mainform" id="mainform" method="get">
+            <p><label for="password">Current Password:</label><input type="password" id="Oldkey" size="25"  name="Oldkey" /></p>
+            <p><label for="Newkey">New Password:</label><input type="password" id="Newkey"  size="25"  name="Newkey" /></p>
+            <p><label for="Confirm">Re-Type New Password:</label><input type="password"  id="Confirm" size="25" name="Confirm" /></p>
+            <p><input type="submit" value="Submit Changes" class="submit" /></p>
+    <!-- /TMPL_IF -->
+    
+    <!-- TMPL_IF NAME= "password_updated" -->
+        <h1>Password Updated</h1>
+        Your password has been changed
+        <form action="/cgi-bin/koha/opac-user.pl" method="post">
+            <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+            <p><input type="submit" class="icon back" value="Return to Your Record" /></p>
+        </form>
+    <!-- /TMPL_IF -->
+    </form>
 
-
-<!-- TMPL_IF NAME= "Error_messages" -->
-<h3>There was a problem with your submission</h3>
-<p class="error">
-	<!-- TMPL_IF NAME= "PassMismatch" -->
-	Passwords do not match.  Please re-type your new password.
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME= "ShortPass" -->
-	Your new password must be at least 6 characters long
-	<!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME= "WrongPass" -->
-	Your current password was entered incorrectly.  If this problem persists, please ask a librarian to re-set your password for you.	
-	<!-- /TMPL_IF --></p>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME= "Ask_data" -->
-<h1>Change your Password</h1>
-<form action="/cgi-bin/koha/opac-passwd.pl" name="mainform" id="mainform" method="get">
-<div class="form">
-<table><tr><th><label for="password">Current Password:</label></th><td><input type="password" id="Oldkey" size="25"  name="Oldkey" /></td></tr>
-<tr><th><label for="Newkey">New Password:</label></th><td><input type="password" id="Newkey"  size="25"  name="Newkey" /></td></tr>
-<tr>	<th><label for="Confirm">Re-Type New Password:</label></th><td><input type="password"  id="Confirm" size="25" name="Confirm" /></td></tr></table>
-	<p><input type="submit" value="Submit Changes" class="submit" /></p>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME= "password_updated" -->
-<h1>Password Updated</h1>
-	Your password has been changed
-	<form action="/cgi-bin/koha/opac-user.pl" method="post">
-		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
-		<p><input type="submit" class="icon back" value="Return to Your Record" /></p>
-	</form>
-<!-- /TMPL_IF -->
-</form>
-
-</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl
index 7c3fa3a41d..544ba3bc13 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-readingrecord.tmpl
@@ -1,9 +1,10 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Library Home for  <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Account for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead-user.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
-<div id="main">
+<!--CONTENT-->
+    <!-- TMPL_INCLUDE name="usermenu.inc" -->
 <h3>Reading History of <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h3>
 
 <!-- TMPL_UNLESS NAME="count" -->
@@ -14,14 +15,15 @@ You have never borrowed anything from the library.
 <tr><td colspan="4">Showing All Items | <a href="opac-readingrecord.pl?limit=">Show Last 50 Items Only</a></td></tr><!-- TMPL_ELSE -->
 <tr><td colspan="4">Showing Last 50 Items | <a href="opac-readingrecord.pl?limit=full">Show All Items</a></td></tr>
 <!-- /TMPL_IF --><tr>
-<tr><th><!-- TMPL_UNLESS NAME="orderbytitle" --><a href="/cgi-bin/koha/opac-readingrecord.pl?order=title">Title</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_UNLESS NAME="orderbyauthor"--></th>
+<tr><th><!-- TMPL_UNLESS NAME="orderbytitle" --><a href="/cgi-bin/koha/opac-readingrecord.pl?order=title">Title</a><!-- TMPL_ELSE -->&nbsp;
+        <!-- /TMPL_UNLESS --></th>
 <th><!-- TMPL_UNLESS --><a href="/cgi-bin/koha/opac-readingrecord.pl?order=author">Author</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_UNLESS --></th>
 <th><!-- TMPL_UNLESS NAME="orderbydate" --><a href="/cgi-bin/koha/opac-readingrecord.pl">Date</a><!-- TMPL_ELSE -->Date<!-- /TMPL_UNLESS --></th></tr>
 
 <!-- TMPL_LOOP NAME="READING_RECORD" -->
 
 <!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
-<td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+<td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
 <td><!-- TMPL_VAR NAME="author" --></td>
 <td><!-- TMPL_IF NAME="returndate" --><!-- TMPL_VAR NAME="returndate" --><!-- TMPL_ELSE --><em>(Checked out)</em><!-- /TMPL_IF --></td>
 </tr>
@@ -31,5 +33,4 @@ You have never borrowed anything from the library.
 
 <!-- /TMPL_UNLESS -->
 
-</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-recacquisitions.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-recacquisitions.tmpl
index 5f3632f749..aa6fcca2cc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-recacquisitions.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-recacquisitions.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Recent Acquisitions
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Recent Acquisitions
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl
index 133236e57d..00a73410b5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-reserve.tmpl
@@ -1,30 +1,68 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Reserving <!-- 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-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Reserving <!-- 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="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<!--CONTENT-->
 <!-- TMPL_IF NAME="message" -->
-<div id="main">
-<!-- TMPL_IF NAME="GNA" --><p class="error"><strong>Sorry</strong>, you cannot place reserves because the library doesn't have up-to-date <a href="/cgi-bin/koha/opac-userdetails.pl">contact information</a> on file. </p><p class="error">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><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="lost" --><p class="error"><strong>Sorry</strong>, you cannot place reserves because your library card has been marked as lost or stolen. </p><p class="error"> If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</p><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="debarred" --><p class="error"><strong>Sorry</strong>, you cannot place reserves because your account has been frozen.</p><p class="error">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><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="too_much_oweing" --><p class="error">Sorry, you cannot make reserves because you owe <!-- TMPL_VAR NAME="too_much_oweing" -->. </p> <!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="too_many_reserves" --><p class="error">Sorry, you cannot make more than <!-- TMPL_VAR NAME="too_many_reserves" --> reserves. </p><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="already_reserved" --><p class="error">You already have a reserve placed on this item.
-<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon back" value="Return to Item Detail Screen" /></form></p>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="no_items_selected" --><p class="error">You must select at least one item.</p><!-- /TMPL_IF -->
-	<!-- TMPL_IF NAME="no_branch_selected" --><p class="error">You must select a branch for pickup!</p><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="GNA" -->
+    <p class="problem">
+        <strong>Sorry</strong>, you cannot place reserves because the library doesn't have up-to-date <a href="/cgi-bin/koha/opac-userdetails.pl">contact information</a> on file.
+    </p>
+    <p class="problem">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>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="lost" -->
+    <p class="problem">
+        <strong>Sorry</strong>, you cannot place reserves because your library card has been marked as lost or stolen.
+    </p>
+    <p class="problem">
+        If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="debarred" -->
+    <p class="error">
+        <strong>Sorry</strong>, you cannot place reserves because your account has been frozen.
+    </p>
+    <p class="problem">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>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="too_much_oweing" -->
+    <p class="problem">
+        Sorry, you cannot make reserves because you owe <!-- TMPL_VAR NAME="too_much_oweing" -->.
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="too_many_reserves" -->
+        <p class="error">Sorry, you cannot make more than <!-- TMPL_VAR NAME="too_many_reserves" --> reserves.
+        </p>
+        <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="already_reserved" -->
+    <p class="problem">
+        You already have a reserve placed on this item.
+        <form action="/cgi-bin/koha/opac-detail.pl" method="POST">
+            <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+            <input type="submit" class="icon back" value="Return to Item Detail Screen" />
+        </form>
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="no_items_selected" -->
+    <p class="problem">
+        You must select at least one item.
+    </p>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="no_branch_selected" -->
+    <p class="error">
+        You must select a branch for pickup!
+    </p>
+    <!-- /TMPL_IF -->
 </div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="select_item_types" -->
 <!-- The first time round you select which bibitems you want -->
-<div id="main">
 <form action="/cgi-bin/koha/opac-reserve.pl" method="post">
 <input type="hidden" name="item_types_selected" value="1">
-<input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
 <h2>Reservation Details</h2>
 <div class="form">
 <table>
@@ -32,15 +70,15 @@
     <tr><th>For:</th><td><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- /TMPL_LOOP --></td></tr>
 
     <tr><th>Pick up from:</th><td><select name="branch" id="branch">
-		<option>-- Please choose your branch --</option>
-		<!-- TMPL_LOOP NAME="CGIbranch" --><option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branch" --></option><!-- /TMPL_LOOP -->
+        <option>-- Please choose your branch --</option>
+        <!-- TMPL_LOOP NAME="CGIbranch" --><option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branch" --></option><!-- /TMPL_LOOP -->
 </select></td></tr>
 </table>
 
 <!-- TMPL_IF NAME="onlyone" -->
 <!-- If there is only one type -->
 
-</div><p><input type="submit" class="submit" value="Next &gt;&gt;">
+<p><input type="submit" class="submit" value="Next &gt;&gt;">
 <input type="hidden" name="all" value="1"></p>
 </form>
 
@@ -48,8 +86,10 @@
 <!-- If there is more than one type -->
 
     <h4>Choose Either...</h4>
-      <p><input class="checkbox" type="checkbox" name="all" value="next-available">
-        Next Available Copy (any format)</p>
+        <p>
+            <input id="checknextavailable" type="checkbox" name="all" value="next-available">
+            <label for="checknextavailable">Next Available Copy (any format)</label>
+        </p>
     <h4>
      ...Or Choose Acceptable Formats
     </h4>
@@ -60,7 +100,7 @@
 <!-- /TMPL_LOOP -->
 </ul><!-- /TMPL_LOOP -->
 <!-- <table>
-	<tr>
+    <tr>
     <th>Number of Copies</th><th>Requests already received for this title</th> <th>Items curently on issue, due back</th></tr>
     <td><!-- TMPL_VAR NAME="itemcount" --></td>
     <td><!-- TMPL_VAR NAME="reservecount" --></td>
@@ -69,32 +109,29 @@
 </div>
 <p><input type="submit" class="submit" value="Confirm Reservation &gt;&gt;"></p>
 </form>
-</div>
 <!-- /TMPL_IF -->
 
-
 <!-- end of the first form -->
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="item_types_selected" -->
 <!-- if the bibitems have already been selected -->
-<div id="main">
 <form action="/cgi-bin/koha/opac-reserve.pl" method="post">
 <input type="hidden" name="place_reserve" value="1">
-<input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->"><h3>Confirm Reservation</h3>
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"><h3>Confirm Reservation</h3>
 <div class="details">
-	<table>
-		<tr><th>Title: </th><td><span class="title"><!-- TMPL_VAR NAME="title" --></span></td></tr>
+    <table>
+        <tr><th>Title: </th><td><span class="title"><!-- TMPL_VAR NAME="title" --></span></td></tr>
 
 <!-- TMPL_IF NAME="all" -->
-		<tr><th>Item Type: </th><td>Any<input type="hidden" name="all" value="1"></td></tr>
+        <tr><th>Item Type: </th><td>Any<input type="hidden" name="all" value="1"></td></tr>
 <!-- TMPL_ELSE -->
-		<tr><th>Item Types: </th><td><!-- TMPL_LOOP NAME="TYPES" -->
+        <tr><th>Item Types: </th><td><!-- TMPL_LOOP NAME="TYPES" -->
 <input type="hidden" name="itemtype" value="<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" -->;
 <!-- /TMPL_LOOP --></td></tr>
 
 <!-- /TMPL_IF -->
-		<tr><th>Pick up From: </th><td><!-- TMPL_VAR NAME="branchname" --><input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->"></td></tr>
+        <tr><th>Pick up From: </th><td><!-- TMPL_VAR NAME="branchname" --><input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->"></td></tr>
 </table>
 </div>
 <p><input type="submit" value="Finish and Place Reservation" class="submit" onclick="this.value='Please wait...'; this.disabled=true; this.form.submit();"></p>
@@ -102,6 +139,4 @@
 </FORM>
 
 <!-- /TMPL_IF -->
-</div>
-</body>
-</html>
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc"-->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-sendbasket.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-sendbasket.tmpl
index 5f312ab145..2ed2aa251f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-sendbasket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-sendbasket.tmpl
@@ -9,9 +9,25 @@ Here is your Book Bag, sent from the Koha Online Catalog by <!-- TMPL_VAR name="
 
 <MESSAGE>
 ---------------------------------------------
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><!-- TMPL_IF name="isbn" -->
-Author: <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><!-- TMPL_IF name="additional" -->
-Additional authors: <!-- TMPL_VAR NAME="additional" --><!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->
+
+<!-- TMPL_IF NAME="comment" -->
+    <!-- TMPL_VAR NAME="comment" -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+    <!-- TMPL_VAR NAME="title" -->
+    <!-- TMPL_IF name="subtitle" -->
+       <!-- TMPL_VAR NAME="subtitle" -->
+    <!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="MARCAUTHORS" -->
+<!-- TMPL_LOOP NAME="MARCAUTHORS"-->
+    Authors: <!-- TMPL_VAR NAME="value" -->
+<!-- /TMPL_LOOP -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="publishercode" -->
+
 ISBN: <!-- TMPL_VAR NAME="ISBN" --><!-- /TMPL_IF --><!-- TMPL_IF name="author" -->
 Published by: <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" --><!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><!-- TMPL_IF name="collection" -->
 Collection: <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><!-- TMPL_IF name="subject" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-sendbasketform.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-sendbasketform.tmpl
index 4649210b4b..3e14527223 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-sendbasketform.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-sendbasketform.tmpl
@@ -1,24 +1,44 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Sending Your Book Bag
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Sending Your Book Bag
 <!-- TMPL_INCLUDE NAME="doc-head-close-basket.inc" -->
 
 <div id="window">
 <h3>Sending your book bag</h3>
 
 <!-- TMPL_IF NAME="email_add" -->
+
 	<!-- TMPL_IF NAME="SENT" -->
-	<p>The book bag was sent to: <!-- TMPL_VAR NAME="email_add" --></p>
-	<!-- TMPL_ELSE -->
+	    <p>The book bag was sent to: <!-- TMPL_VAR NAME="email_add" --></p>
+	<!-- /TMPL_IF  -->
+	<!-- TMPL_IF NAME="error" -->
 	<p>Problem sending the book bag...</p>
 	<!-- /TMPL_IF -->
+	
 <!-- TMPL_ELSE -->
+
 <form action="<!-- TMPL_VAR NAME="url" -->" method="post">
-<p>		<label for="email_add">E-mail Address:</label> <input type="text" id="email_add" name="email_add" size="35" /></p>
-	
-<p><input type="submit" value="Send" />
-	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" /></p>
+
+    <p>
+        <label for="email_add">E-mail Address:</label>
+        <input type="text" id="email_add" name="email_add" size="35" />
+    </p>
+    <p>
+            <label for="comment">Comment</label><br />
+            <textarea id="comment" name="comment" rows="7" cols="50"></textarea>
+    </p>
+    <p>
+        <input type="submit" value="Send" />
+        <input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" />
+    </p>
 </form>
+
 <!-- /TMPL_IF -->
-<p><form action="opac-sendbasket.pl" method="get" /><input type="submit" value="Close Window" onclick="window.close(); return false;" /></form></p>
+<p>
+
+    <form action="opac-sendbasket.pl" method="get" />
+        <input type="submit" value="Close Window" onclick="window.close(); return false;" />
+    </form>
+</p>
+
 </div>
-</body>
-</html>
\ No newline at end of file
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl
index 591c900980..179dbbda87 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-serial-issues.tmpl
@@ -1,11 +1,11 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Serials
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Serials
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!--TMPL_INCLUDE NAME="masthead_adv.inc" -->
+<!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="main">
 <h1>Issues for a subscription</h1>
-	<form action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Normal View" /></form>
+	<a href="opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button">Normal View</a>
+	<a href="opac-serial-issues.pl?selectview=full&amp;biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button">Full History</a>
 
 <form method="post" name="f">
 <!-- TMPL_LOOP name="subscription_LOOP" -->
@@ -85,6 +85,5 @@
 		</p>
 	<!-- /TMPL_IF -->
 <!-- /TMPL_LOOP -->
-</div>
-</body>
-</html>
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl
index 7a89af4d0b..dea8659b7b 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-shelves.tmpl
@@ -1,124 +1,200 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- <!-- TMPL_IF Name="viewshelf" -->Contents of <!-- TMPL_VAR Name="shelfname" --><!-- TMPL_ELSE -->List of Virtual Shelves<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- <!-- TMPL_IF Name="viewshelf" -->Contents of <!-- TMPL_VAR Name="shelfname" --><!-- TMPL_ELSE -->List of Virtual Shelves<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="main">
-
-<ul><li>	 <a href="/cgi-bin/koha/opac-account.pl">my fines</a> </li> <li> 
-	<a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a>		<!-- TMPL_IF name="OpacPasswordChange" --> </li> <li> <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- /TMPL_IF --><!-- TMPL_IF NAME="opacreadinghistory" --></li> <li> <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF -->	<!-- TMPL_IF name="virtualshelves" --> </li> <li> <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" --></li> <li> <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></li></ul>
+<!-- TMPL_INCLUDE NAME="usermenu.inc" -->
 
 <!-- TMPL_IF Name="viewshelf" -->
 
 <h3>Contents of <!-- TMPL_VAR Name="shelfname" --></h3>
 
-<form class="inline" action="/cgi-bin/koha/opac-shelves.pl" method="post" name="mainform">
+<a class="button" href="/cgi-bin/koha/opac-shelves.pl">Back to Virtual Shelves</a>
+
+<!-- TMPL_IF name="manageshelf" -->
+ | <a class="button" href="/cgi-bin/koha/opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR Name="shelfnumber" -->">
+ Modify this Shelf</a>
+<!-- /TMPL_IF -->
+
+<form action="/cgi-bin/koha/opac-shelves.pl"
+      method="POST"
+      name="mainform"
+      onsubmit="return checkForm(this);">
+    
+    <!-- TMPL_IF NAME="itemsloop" -->
     <table>
-    		<tr>
-			<th><a href="/cgi-bin/koha/opac-shelves.pl" onclick="CheckAll(); return false;"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/checkall.gif" height="18" width="18" alt="Check All" title="Check All" border="0" /></a></th><th>&nbsp;</th><th>Title</th><th>Author</th><th>Call No.</th><!-- TMPL_UNLESS NAME="itemsloop" --><th>&nbsp;</th><!-- /TMPL_UNLESS -->
-		</tr>
-		<!-- TMPL_IF NAME="itemsloop" -->
-		<!-- TMPL_LOOP Name="itemsloop" -->
-			<tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->>
-					<td><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->" /><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
-	<input type="hidden" name="modifyshelfcontents" value="1" />
-	<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" /></td>
-					<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></td>
-					<td><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></td>
-					<td><!-- TMPL_VAR Name="author" --></td>
-					<td><!-- TMPL_VAR NAME="classification" --></td>
-		</tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
-		<tr><td colspan="6">This shelf is empty.</td><!-- TMPL_UNLESS NAME="itemsloop" --><td><input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="hidden" name="shelves" value="1" /><input type="submit" class="icon delete" value="Delete this Shelf" onclick="return confirmDelete('Are you sure you want to delete this shelf?')" /></td><!-- /TMPL_UNLESS --></tr>
-		<!-- /TMPL_IF -->
-	</table>
-	<!-- TMPL_IF name="manageshelf" --><!-- TMPL_IF NAME="itemsloop" --><input type="submit" value="Remove Selected Items" class="icon delete" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" /><!-- /TMPL_IF --><!-- /TMPL_IF --></form><!-- TMPL_IF name="manageshelf" --> <form class="inline" method="get" action="/cgi-bin/koha/opac-shelves.pl"><input type="hidden" name="op" value="modif" /><input type="hidden" value="<!-- TMPL_VAR Name="shelfnumber" -->" name="shelf" /><input type="submit" value="Modify this Shelf" class="icon edit" /></form>
-<br /><br />
+        <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
+        <input type="hidden" name="modifyshelfcontents" value="1" />
+            <tr>
+                <th>
+                    <a style="color:white;" href="/cgi-bin/koha/opac-shelves.pl" onclick="CheckAll(); return false;">Check All</a>
+                </th>
+                <th>&nbsp;</th>
+                <th>Title</th>
+                <th>Author</th>
+                <th>Call No.</th>
+            </tr>
+        <!-- TMPL_LOOP Name="itemsloop" -->
+            <tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->>
+                    <td>
+                        <input type="checkbox" name="MOD-<!-- TMPL_VAR Name="itemnumber" -->" />
+                        <input type="hidden" name="ModBiblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+                    </td>
+                    <td>
+                        <img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" />
+                    </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" --> <!-- TMPL_VAR NAME="subtitle" -->
+                                        </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_VAR NAME="subtitle" -->
+                                            </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_VAR NAME="subtitle" -->
+                                            </a>
+                                        <!-- /TMPL_IF -->
+                                    <!-- /TMPL_IF -->
+                        </a>
+                    </td>
+                    <td><!-- TMPL_VAR Name="author" --></td>
+                    <td><!-- TMPL_VAR NAME="classification" --></td>
+        </tr>
+        <!-- /TMPL_LOOP -->
+    </table>
+    <!-- TMPL_ELSE -->
+    <b>This shelf is empty.</b>
+    <!-- TMPL_UNLESS NAME="itemsloop" -->
+        <input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" />
+        <input type="hidden" name="shelves" value="1" />
+        <input type="submit" class="icon delete"
+               value="Delete this Shelf"
+               onclick="return confirmDelete('Are you sure you want to delete this shelf?')" />
+        <!-- /TMPL_UNLESS -->
+        <!-- /TMPL_IF -->
+    <!-- TMPL_IF name="manageshelf" -->
+        <!-- TMPL_IF NAME="itemsloop" -->
+            <h2>With selected items :</h2>
+            <p>
+            <label for="check-remove">remove</label>
+            <input id="check-remove"
+                   type="checkbox"
+                   name="remove"
+                   />
+            </p>
+            <p>
+            <label for="check-addbb">Add to bookbag</label>
+            <input id="check-addbb"
+                   type="checkbox"
+                   name="addToBookBag"
+                   />
+            </p>
+            <p><input type="submit"
+                   value=" GO "
+                   />
+            </p>
+        <!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
+</form>
+    <!-- TMPL_IF name="manageshelf" -->
+
+<br />
 <form action="/cgi-bin/koha/opac-shelves.pl" method="post">
-	<table>
-		<tr><th colspan="2">Add an Item to this Shelf by Barcode</th></tr>
-		<tr>
-			<td><label for="addbarcode">Barcode:</label></td>
-			<td><input name="addbarcode" type="text" id="addbarcode" size="14" maxlength="14" /><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->" /><input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" /><input type="hidden" name="modifyshelfcontents" value="1" /><input type="submit" value="Save" /></td>
-		</tr>
-	</table>
+    <table>
+        <tr><th colspan="2">Add an Item to this Shelf by Barcode</th></tr>
+        <tr>
+            <td>
+                <label for="addbarcode">Barcode:</label>
+            </td>
+            <td>
+                <input name="addbarcode" type="text" id="addbarcode" size="14" maxlength="14" />
+                <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
+                <input type="hidden" name="modifyshelfcontents" value="1" />
+                <input type="submit" value=" Add " />
+            </td>
+        </tr>
+    </table>
 </form>
 <!-- /TMPL_IF -->
-<form class="inline" method="get" action="opac-shelves.pl"><input type="submit" value="Back to Virtual Shelves" /></form>
 <!-- TMPL_ELSE -->
-	<!-- TMPL_IF Name="shelves" -->
-		<!-- TMPL_IF Name="status1" -->
-			<p class="error"><!-- TMPL_VAR Name="string1" --></p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_LOOP Name="paramsloop" -->
-			<!-- TMPL_IF Name="status" -->
-				<p class="error"><!-- TMPL_VAR Name="string" --></p>
-			<!-- /TMPL_IF -->
-		<!-- /TMPL_LOOP -->
-<form method="post" action="/cgi-bin/koha/opac-shelves.pl">
-		<input type="hidden" name="shelves" value="1">
-		<h3>Create a New a Virtual Shelf</h3>
-		<table>
-		<tr><th scope="row"><label for="addshelf">Shelf Name:</label> </th><td> <input id="addshelf" type="text" name="addshelf" size="25"></td></tr>
-		<tr><th scope="row"><label for="owner">Owner:</label> </th><td><input type="hidden" name="owner" id="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></td></tr>
-		<tr><th scope="row"><label for="category">Category:</label> </th><td><select name="category" id="category">
-									<option value="1">Private</option>
-									<option value="2">Public</option>
-									<option value="3">Free</option>
-									</select></td></tr></table>
-		<ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen only by you.</li><li> A <strong>public</strong> virtual shelf can be seen by everybody, but managed only by you.</li>
-			<li> A <strong>free</strong> virtual shelf can be added to and changed by any user.</li></ul>
-								<p><input type="submit" value="Add New Shelf"></p>
-					</form>	
-		
-		<!-- TMPL_IF NAME="shelvesloop" -->
-		<form method="post" action="/cgi-bin/koha/opac-shelves.pl" name="mainform">
-					<input type="hidden" name="shelves" value="1" />
-					<h3>Delete Virtual Shelves</h3>
-					<table>
-						<tr><th>&nbsp;</th><th>Shelf Name</th><th>Contents</th></tr>
-						<!-- TMPL_LOOP Name="shelvesloop" -->
-						<!-- TMPL_IF name="canmanage" -->
-						<tr>
-							<td><input type="checkbox" name="DEL-<!-- TMPL_VAR Name="shelf" -->" /></td><td><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td></tr>
-						<!-- /TMPL_IF -->
-						<!-- /TMPL_LOOP -->
-					</table>
-		<input type="submit" value="Delete Shelves" /></form>
-		<!-- /TMPL_IF -->
-		<p><form class="inline" action="opac-shelves.pl" method="get"><input type="submit" value="Back to Virtual Shelves" /></form></p>
+    <!-- TMPL_IF Name="shelves" -->
+        <!-- TMPL_IF Name="status1" -->
+            <p class="error"><!-- TMPL_VAR Name="string1" --></p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_LOOP Name="paramsloop" -->
+            <!-- TMPL_IF Name="status" -->
+                <p class="error"><!-- TMPL_VAR Name="string" --></p>
+            <!-- /TMPL_IF -->
+        <!-- /TMPL_LOOP -->
+    <form method="post" action="/cgi-bin/koha/opac-shelves.pl">
+        <input type="hidden" name="shelves" value="1">
+        <h3>Create a New a Virtual Shelf</h3>
+        <table>
+        <tr><th scope="row"><label for="addshelf">Shelf Name:</label> </th><td> <input id="addshelf" type="text" name="addshelf" size="25"></td></tr>
+        <tr><th scope="row"><label for="owner">Owner:</label> </th><td><input type="hidden" name="owner" id="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></td></tr>
+        <tr><th scope="row"><label for="category">Category:</label> </th><td><select name="category" id="category">
+                                    <option value="1">Private</option>
+                                    <option value="2">Public</option>
+                                    <option value="3">Free</option>
+                                    </select></td></tr></table>
+        <ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen only by you.</li><li> A <strong>public</strong> virtual shelf can be seen by everybody, but managed only by you.</li>
+            <li> A <strong>free</strong> virtual shelf can be added to and changed by any user.</li></ul>
+                                <p><input type="submit" value="Add New Shelf"></p>
+                    </form>
+    
+        <!-- TMPL_IF NAME="shelvesloop" -->
+        <form method="post" action="/cgi-bin/koha/opac-shelves.pl" name="mainform">
+                    <input type="hidden" name="shelves" value="1" />
+                    <h3>Delete Virtual Shelves</h3>
+                    <table>
+                        <tr><th>&nbsp;</th><th>Shelf Name</th><th>Contents</th></tr>
+                        <!-- TMPL_LOOP Name="shelvesloop" -->
+                        <!-- TMPL_IF name="canmanage" -->
+                        <tr>
+                            <td><input type="checkbox" name="DEL-<!-- TMPL_VAR Name="shelf" -->" /></td><td><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td></tr>
+                        <!-- /TMPL_IF -->
+                        <!-- /TMPL_LOOP -->
+                    </table>
+        <input type="submit" value="Delete Shelves" /></form>
+        <!-- /TMPL_IF -->
+        <p><form class="inline" action="opac-shelves.pl" method="get"><input type="submit" value="Back to Virtual Shelves" /></form></p>
 
-	<!-- TMPL_ELSE -->
-	<!-- TMPL_IF name="edit" -->
-		<form method="post">
-			<input type="hidden" name="op" value="modifsave">
-			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
+    <!-- TMPL_ELSE -->
+    <!-- TMPL_IF name="edit" -->
+        <form method="post">
+            <input type="hidden" name="op" value="modifsave">
+            <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
 <h3>Modify Virtual Shelf <!-- TMPL_VAR name="shelfname"--></h3>
-			<table>
-			<tr><td><label for="shelfname">Shelf Name: </label></td><td><input type="text" id="shelfname" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
-			<tr><td><label for="owner">Owner: </label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
-			<tr><td><label for="category">Category: </label></td><td><select id="category" name="category">
-					<!-- TMPL_IF name="category1" -->
-						<option value="1" selected>Private</option>
-					<!-- TMPL_ELSE -->
-						<option value="1">Private</option>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="category2" -->
-						<option value="2" selected>Public</option>
-					<!-- TMPL_ELSE -->
-						<option value="2">Public</option>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="category3" -->
-						<option value="3" selected>Free</option>
-					<!-- TMPL_ELSE -->
-						<option value="3">Free</option>
-					<!-- /TMPL_IF -->
-				</select></td></tr>
-			</table>
-			<ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen <strong>only</strong> by you.</li>
-				<li> A <strong>public</strong> virtual shelf can be seen by <strong>everybody</strong>, but managed only by you.</li>
-				<li>A <strong>free</strong> virtual shelf can be added to or changed by <strong>any</strong> user.</li></ul>
-			<p><input type="submit" value="Save Changes"></p>
+            <table>
+            <tr><td><label for="shelfname">Shelf Name: </label></td><td><input type="text" id="shelfname" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
+            <tr><td><label for="owner">Owner: </label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
+            <tr><td><label for="category">Category: </label></td><td><select id="category" name="category">
+                    <!-- TMPL_IF name="category1" -->
+                        <option value="1" selected>Private</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="1">Private</option>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="category2" -->
+                        <option value="2" selected>Public</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="2">Public</option>
+                    <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="category3" -->
+                        <option value="3" selected>Free</option>
+                    <!-- TMPL_ELSE -->
+                        <option value="3">Free</option>
+                    <!-- /TMPL_IF -->
+                </select></td></tr>
+            </table>
+            <ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen <strong>only</strong> by you.</li>
+                <li> A <strong>public</strong> virtual shelf can be seen by <strong>everybody</strong>, but managed only by you.</li>
+                <li>A <strong>free</strong> virtual shelf can be added to or changed by <strong>any</strong> user.</li></ul>
+            <p><input type="submit" value="Save Changes"></p>
 
-		</form>
+        </form>
 <!-- /TMPL_IF -->
 <h3>Virtual Shelves</h3>
 
@@ -126,14 +202,52 @@
 <tr><th>Shelf Name</th><th>Category</th><th>Content Size</th><th>&nbsp;</th></tr>
 <!-- TMPL_LOOP Name="shelvesloop" -->
 <tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->><td><a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_IF NAME="category1" -->Private<!-- /TMPL_IF --><!-- TMPL_IF NAME="category2" -->Public<!-- /TMPL_IF --><!-- TMPL_IF NAME="category3" -->Free<!-- /TMPL_IF --></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td><td><!-- TMPL_IF name="mine" --><a href="opac-shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Modify</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
-			<!-- /TMPL_LOOP -->
-		</table>
-		<p><form action="opac-shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" value="Add or Remove Book Shelves" /></form></p>
-	<!-- /TMPL_IF -->
+            <!-- /TMPL_LOOP -->
+        </table>
+        <p><form action="/cgi-bin/koha/opac-shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" value="Add or Remove Book Shelves" /></form></p>
+    <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
 <br clear="both" />
-</div>
-</body>
-</html>
 
+<script type="text/javascript" language="javascript">
+    // Set the focus the barcode input if it exists.
+    var barcodeInput;
+    if (barcodeInput = document.getElementById('addbarcode')) {
+        barcodeInput.focus();
+    }
+    /**
+     *  Function checkForm
+     *  This function check the form beform submited it.
+     *  If there are items to add to bookbag then add it there.
+     */
+    function checkForm(form){
+        if( form.addToBookBag.checked ) { // add to BookBag
+            AddCheckedToBookBag(form);
+        }
+        return true;
+    }
+
+    /**
+     *  Function AddCheckedToBookBag
+     *  This function add the checked item to bookbag.
+     */
+        function AddCheckedToBookBag(form) {
+            var inputs = form.getElementsByTagName('input');
+            for(var i=0,num=inputs.length; i < num; i++){
+                var input = inputs[i].getAttribute('type');
+                if (input == "checkbox") {
+                    if( inputs[i].checked ) {
+                        var itemnumber   = inputs[i].getAttribute('name');
+                        var regexp       = /MOD-/;
+                        if(itemnumber.match(regexp)){
+                            var biblionumber = inputs[i+1].value;
+                            addRecord(biblionumber,null,1); // function from basket.js
+                        }
+                    }
+                }
+            }
+        }
+</script>
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc"-->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl
index 5db9dbb7ec..277e8835ef 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-suggestions.tmpl
@@ -1,155 +1,109 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- 
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- 
 <!-- TMPL_IF name="op_add" -->Enter a new purchase suggestion<!-- /TMPL_IF -->
 <!-- TMPL_IF name="op_else" -->Purchase Suggestions<!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-<div id="main">
 <!-- TMPL_IF name="op_add" -->
-	<h1>Enter a new purchase suggestion</h1>
+    <h1>Enter a new purchase suggestion</h1>
 
-	<p>Fill this form to suggest the library a new acquisition. You will be emailed when the library processes your purchase suggestion</p>
-	<p>No fields are mandatory. Enter whatever information you have. The "Notes" field can be used to provide any additional information.</p>
-	<form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
-	<table>
-	<tr><th scope="row"><label for="">Title</label></th><td><input type="text" id="title" name="title" size="50" maxlentgh="80" /></td></tr>
-	<tr><th scope="row"><label for="">Author</label></th><td><input type="text" id="author" name="author" size="50" maxlength="80" /></td></tr>
-	<tr><th scope="row"><label for="">Copyright date</label></th><td><input type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" /></td></tr>
-	<tr><th scope="row"><label for="">Publisher</label></th><td><input type="text" id="publishercode" name="publishercode" size="50" maxlength="80" /></td></tr>
-	<tr><th scope="row"><label for="">Notes</label></th><td><textarea name="note" id="note" rows="5" cols="40"></textarea></td></tr>
-	</table>
-		<p><input type="hidden" name="op" value="add_confirm" /><input type="submit" value="Submit Your Suggestion" /></p>
-	</form>
+    <p>Fill this form to suggest the library a new acquisition. You will be emailed when the library processes your purchase suggestion</p>
+    <p>No fields are mandatory. Enter whatever information you have. The "Notes" field can be used to provide any additional information.</p>
+    <form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
+    <table>
+    <tr><th scope="row"><label for="">Summary</label></th><td><input type="text" id="title" name="title" size="50" maxlentgh="80" /></td></tr>
+    <tr><th scope="row"><label for="">Author</label></th><td><input type="text" id="author" name="author" size="50" maxlength="80" /></td></tr>
+    <tr><th scope="row"><label for="">Copyright date</label></th><td><input type="text" id="copyrightdate" name="copyrightdate" size="4" maxlength="4" /></td></tr>
+    <tr><th scope="row"><label for="">Publisher</label></th><td><input type="text" id="publishercode" name="publishercode" size="50" maxlength="80" /></td></tr>
+    <tr><th scope="row"><label for="">Notes</label></th><td><textarea name="note" id="note" rows="5" cols="40"></textarea></td></tr>
+    </table>
+        <p><input type="hidden" name="op" value="add_confirm" /><input type="submit" value="Submit Your Suggestion" /></p>
+    </form>
 
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="op_else" -->
-	<h1>Purchase Suggestions</h1>
-	<!-- TMPL_IF NAME="suggestions_loop" -->
-	<table>
-		<tr>
-			<th>&nbsp;</th>
-			<th>Title</th>
-			<th>Author</th>
-			<th>&copy;</th>
-			<th>Publisher</th>
-			<th>Status</th>
-			<th>Suggested by</th>
-			<th>Managed by</th>
-			<th>Note</th>
-		</tr>
-		<tr>
-			<form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
-				<th>
-					Filter by:
-				</th>
-				<td>
-					<input type="text" name="title" value="<!-- TMPL_VAR name="title"-->" />
-				</td>
-				<td>
-					<input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" />
-				</td>
-				<td>
-					&nbsp;
-				</td>
-				<td>
-					<input type="text" name="publishercode" value="<!-- TMPL_VAR name="publishercode"-->" />
-				</td>
-				<td>
-<select name="status">
-						<option value="">Any</option>
-						<!-- TMPL_IF name="ASKED" -->
-							<option value="ASKED" selected="selected">Requested</option>
-						<!-- TMPL_ELSE -->
-							<option value="ASKED">Asked</option>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="ACCEPTED" -->
-							<option value="ACCEPTED" selected="selected">Accepted</option>
-						<!-- TMPL_ELSE -->
-							<option value="ACCEPTED">Accepted</option>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="ORDERED" -->
-							<option value="ORDERED" selected="selected">Ordered</option>
-						<!-- TMPL_ELSE -->
-							<option value="ORDERED">Ordered</option>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="REJECTED" -->
-							<option value="REJECTED" selected="selected">Declined</option>
-						<!-- TMPL_ELSE -->
-							<option value="REJECTED">Declined</option>
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF name="AVAILABLE" -->
-							<option value="AVAILABLE" selected="selected">Available</option>
-						<!-- TMPL_ELSE -->
-							<option value="AVAILABLE">Available</option>
-						<!-- /TMPL_IF -->
-					</select>
-				</td>
-				<td>
-					<select name="suggestedbyme">
-						<!-- TMPL_IF NAME="suggestedbyme" --><option value="1" selected="selected"><!-- TMPL_ELSE --><option value="1"><!-- /TMPL_IF -->Me</option>
-						<!-- TMPL_UNLESS name="suggestedbyme" --><option value="0" selected="selected"><!-- TMPL_ELSE --><option value="0"><!-- /TMPL_UNLESS -->Anybody</option>
-					</select>
-				</td>
-				<td>
-					&nbsp;
-				</td>
-				<td>
-					<input type="submit" value="Set Filter" />
-				</td>
-			</form>
-		</tr>
-		<form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
-			<input type="hidden" name="op" value="delete_confirm" />
-		<!-- TMPL_LOOP NAME="suggestions_loop" -->
-			<!-- TMPL_IF name="even" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
-				<td>
-					<input type="checkbox" name="delete_field" value="<!--TMPL_VAR name="suggestionid" -->" />
-				</td>
-				<td>
-					<!-- TMPL_VAR NAME="title" -->
-				</td>
-				<td>
-					<!-- TMPL_VAR NAME="author" -->
-				</td>
-				<td>
-					<!-- TMPL_VAR NAME="copyrightdate" -->
-				</td>
-				<td>
-					<!-- TMPL_VAR name="publishercode" -->
-				</td>
-				<td>
-					<!-- TMPL_IF name="ASKED" -->Requested<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="ORDERED" -->Ordered by the library<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="REJECTED" -->Suggestion declined<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="AVAILABLE" -->Available in the library<!-- /TMPL_IF -->
-				</td>
-				<td>
-					<!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
-				</td>
-				<td>
-					<!-- TMPL_VAR name="usermanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamemanagedby" -->
-				</td>
-				<td>
-					<!-- TMPL_VAR name="note" -->
-				</td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-		<tr>
-			<td colspan="9">
-				<input type="submit" value="Delete Checked Items" />
-			</td>
-		</tr>
-		</form>
-	</table>
-	<!-- TMPL_ELSE --><div class="content-block">There are no pending purchase suggestions</div><!-- /TMPL_IF -->
-	<form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
-		<input type="hidden" name="op" value="add" />
-		<input type="submit" value="Enter a new purchase suggestion" />
-	</form>
-	<p>Note : if you're viewing purchase suggestions submitted by anybody, the results will contain only <em>new</em> purchase suggestions. Suggestions being processed by a librarian will not be shown.</p>
+    <h1>Purchase Suggestions</h1>
+    <!-- TMPL_IF NAME="suggestions_loop" -->
+    <table>
+        <tr>
+            <th>&nbsp;</th>
+            <th>Summary</th>
+            <th>Status</th>
+            <th>Suggested by</th>
+            <th>Managed by</th>
+            <th>Note</th>
+        </tr>
+        <tr>
+            <form action="/cgi-bin/koha/opac-suggestions.pl" method="get">
+                <th>
+                    Filter by:
+                </th>
+                <td>
+                    <input type="text" name="title" value="<!-- TMPL_VAR name="title"-->" />
+                </td>
+                <td>
+                &nbsp;
+                </td>
+                <td>
+                    <select name="suggestedbyme">
+                        <option value="0">Anyone</option>
+                        <option value="1">Me</option>
+                    </select>
+                </td>
+                <td>
+                    &nbsp;
+                </td>
+                <td>
+                    <input type="submit" value="Set Filter" />
+                </td>
+            </form>
+        </tr>
+        <form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
+            <input type="hidden" name="op" value="delete_confirm" />
+        <!-- TMPL_LOOP NAME="suggestions_loop" -->
+            <!-- TMPL_IF name="even" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+                <td>
+                    <input type="checkbox" name="delete_field" value="<!--TMPL_VAR name="suggestionid" -->" />
+                </td>
+                <td>
+                    <p><!-- TMPL_VAR NAME="title" --></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 -->
+                    </p>
+                </td>
+                <td>
+                    <!-- TMPL_IF name="ASKED" -->Requested<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="ACCEPTED" -->Accepted by the library<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="ORDERED" -->Ordered by the library<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="REJECTED" -->Suggestion declined <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="AVAILABLE" -->Available in the library<!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="reason" -->(<!-- TMPL_VAR name="reason" -->)<!-- /TMPL_IF -->
+                </td>
+                <td>
+                    <!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
+                </td>
+                <td>
+					<!-- TMPL_VAR name="surnamemanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamemanagedby" -->
+                </td>
+                <td>
+                    <!-- TMPL_VAR name="note" -->
+                </td>
+            </tr>
+        <!-- /TMPL_LOOP -->
+        <tr>
+            <td colspan="9">
+                <input type="submit" value="Delete Checked Items" />
+            </td>
+        </tr>
+        </form>
+    </table>
+    <!-- TMPL_ELSE --><div class="content-block">There are no pending purchase suggestions</div><!-- /TMPL_IF -->
+    <form action="/cgi-bin/koha/opac-suggestions.pl" method="post">
+        <input type="hidden" name="op" value="add" />
+        <input type="submit" value="Enter a new purchase suggestion" />
+    </form>
 <!-- /TMPL_IF -->
-</div>
-</body>
-</html>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl
index ecb050c120..32f89e495a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-user.tmpl
@@ -1,138 +1,183 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Library Home for  <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE name="doc-head-open.inc" -->
+<!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Library Home for
+<!-- TMPL_LOOP name="BORROWER_INFO" -->
+    <!-- TMPL_VAR name="firstname" --><!-- TMPL_VAR name="surname" -->
+<!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
 <!-- CONTENT -->
-<div id="main">
-<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
-<h2>Welcome <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<a href="/cgi-bin/koha/opac-logout.pl">Click here</a> if you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->)</h2>
-<ul><li>	 <a href="/cgi-bin/koha/opac-account.pl">my fines</a> </li> <li> 
-	<a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a>		<!-- TMPL_IF name="OpacPasswordChange" --> </li> <li> <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- /TMPL_IF --><!-- TMPL_IF NAME="opacreadinghistory" --></li> <li> <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF -->	<!-- TMPL_IF name="virtualshelves" --> </li> <li> <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" --></li> <li> <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></li></ul>
-		<!-- TMPL_IF name="textmessaging"-->
-			<h3>Message from the library</h3>
-			<p><!-- TMPL_VAR name="textmessaging" --></p>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="flagged" --><ul><!-- TMPL_IF NAME="debarred" --><li><strong>Please note:</strong> Your account has been frozen. 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.</li><!--
- /TMPL_IF -->
- <!-- TMPL_IF NAME="gonenoaddress" --><li><strong>Please note:</strong> According to our records, we don't have up-to-date <a href="/cgi-bin/koha/opac-userdetails.pl">contact information</a> on file.  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)</li><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="lost" --><li><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</li><!-- /TMPL_IF --></ul><!-- /TMPL_IF -->
-<!-- FINES BOX -->
-<!-- TMPL_IF NAME="amountoverfive" -->
-<h3>Fines and Charges</h3>
-<table>
-<tr><th colspan="2">Amount</th></tr>
-<tr><td>You currently owe fines and charges amounting to:</td><td><a href="/cgi-bin/koha/opac-account.pl"><!-- TMPL_VAR NAME="amountoutstanding" --></a></td></tr>
-</table>
-<!-- /TMPL_IF -->
+    <!-- TMPL_LOOP NAME="BORROWER_INFO" -->
+        <br />
+        <h2>
+            Welcome <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> 
+        </h2>
+        (<a href="/cgi-bin/koha/opac-logout.pl">Click here</a> if you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->)
+        <!-- TMPL_IF name="textmessaging"-->
+            <h3>Message from the library</h3>
+            <p><!-- TMPL_VAR name="textmessaging" --></p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="flagged" -->
+        <ul>
+            <!-- TMPL_IF NAME="debarred" -->
+                <li><strong>Please note:</strong> Your account has been frozen. 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.</li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="gonenoaddress" -->
+                <li><strong>Please note:</strong> According to our records, we don't have up-to-date <a href="/cgi-bin/koha/opac-userdetails.pl">contact information</a> on file.  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)</li>
+            <!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="lost" -->
+                <li><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</li>
+            <!-- /TMPL_IF -->
+        </ul>
+        <!-- /TMPL_IF -->
+        <!-- FINES BOX -->
+        <!-- TMPL_IF NAME="amountoverfive" -->
+            <h3>Fines and Charges</h3>
+            <table>
+                <tr><th colspan="2">Amount</th></tr>
+                <tr>
+                    <td>You currently owe fines and charges amounting to:</td>
+                    <td><a href="/cgi-bin/koha/opac-account.pl"><!-- TMPL_VAR NAME="amountoutstanding" --></a></td>
+                </tr>
+            </table>
+        <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME="amountoverzero" -->
-<h3>Fines and Charges</h3>
-<table>
-<tr><th colspan="2">Amount</th></tr>
-<tr><td>You currently owe fines and charges amounting to:</td>
- <td><a href="/cgi-bin/koha/opac-account.pl"><!-- TMPL_VAR NAME="amountoutstanding" --></a></td></tr>
-</table>
-<!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="amountoverzero" -->
+            <h3>Fines and Charges</h3>
+            <table>
+                <tr><th colspan="2">Amount</th></tr>
+                <tr><td>You currently owe fines and charges amounting to:</td>
+                <td><a href="/cgi-bin/koha/opac-account.pl"><!-- TMPL_VAR NAME="amountoutstanding" --></a></td></tr>
+            </table>
+        <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME"amountlessthanzero" -->
-<h3>Credits</h3>
-<table>
-<tr><th colspan="2">Amount</th></tr>
-<tr><td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl"><!-- TMPL_VAR NAME="amountoutstanding" --></a></td></tr>
-</table>
-<!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME"amountlessthanzero" -->
+            <h3>Credits</h3>
+            <table>
+            <tr><th colspan="2">Amount</th></tr>
+            <tr><td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl"><!-- TMPL_VAR NAME="amountoutstanding" --></a></td></tr>
+            </table>
+        <!-- /TMPL_IF -->
 	
-<!-- /TMPL_LOOP -->
-
-<!-- TMPL_IF NAME="waiting_count" -->
-<h3>Reserved Items Waiting</h3>
-	<table>
-		<tr>
-			<th colspan="2">Title</th>
-			<th>Reserve date</th>
-			<th>Pick Up Branch</th>
-		</tr>
-		<!-- TMPL_LOOP NAME="WAITING" -->
-			<!-- TMPL_IF NAME="atdestination" --><tr>
-			<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></td>
-				<td>
-					<a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
-<!-- TMPL_VAR NAME="author" --></span></td><td><!-- TMPL_VAR NAME="reservedate" --></td><td><!-- TMPL_IF NAME="atdestination" -->
-				<strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" -->
-				<!-- TMPL_ELSE -->
-				In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" -->
-				<!-- /TMPL_IF --></td>
-			</tr><!-- /TMPL_IF -->
-		<!-- /TMPL_LOOP -->
-	</table>
-<!-- /TMPL_IF -->
-
-
-
-<!-- TMPL_IF NAME="issues_count" -->
-<h3>Issues (<!-- TMPL_VAR NAME="issues_count" --> total)</h3>
-<table>
-<!-- ISSUES TABLE ROWS --><tr>
-<th colspan="2">Title</th>
-<th>Call No.</th>
-<th>Due</th>
-<th>Renew</th>
-<th>Fines</th>
-</tr>
+    <!-- /TMPL_LOOP -->
 
-<!-- TMPL_LOOP NAME="ISSUES" -->
-
-<!-- TMPL_IF NAME="overdue" --><tr class="overdue"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
-<td><!-- Display for NPL // <!-- TMPL_IF NAME="isbn" --><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.THUMBZZZ.jpg" alt="Book Cover Image" class="thumbnail" /></a><!-- /TMPL_IF --> //Display for NPL --><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
-<!-- TMPL_VAR NAME="author" --></span></td>
-<td><!-- TMPL_VAR NAME="classification" --></td>
-<!-- TMPL_IF NAME="overdue" --><td class="overdue"><!-- TMPL_VAR NAME="date_due" --></td><!-- TMPL_ELSE --><td><!-- TMPL_VAR NAME="date_due" --></td><!-- /TMPL_IF -->
-<td>
-<!-- TMPL_IF NAME="status" -->
-<a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->">Renew</a>
-<!-- TMPL_ELSE -->
-Not renewable
-<!-- /TMPL_IF -->
-</td>
-<td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
-
-	<!-- TMPL_ELSE -->
-	<table>
-		<caption>Issues</caption>
-		<tr><td>You have nothing checked out</td></tr>
-	</table>
-	<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="reserves_count" -->
-<h3>Reserves (<!-- TMPL_VAR NAME="reserves_count" --> total)</h3>
-<table>
-<!-- RESERVES TABLE ROWS -->
-<tr>
-<th>Title</th>
-<th>Placed On</th>
-<th>Pick Up Location</th>
-<th>Status</th>
-</tr>
-<!-- TMPL_LOOP NAME="RESERVES" -->
-<tr>
-<td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
-<!-- TMPL_VAR NAME="author" --></td>
-<td><!-- TMPL_VAR NAME="reservedate" --></td>
-<td><!-- TMPL_VAR Name="branch" --></td>
-<td><!-- TMPL_IF NAME="atdestination" -->
-				Waiting at <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="holdingbranch" -->In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --><!-- /TMPL_IF --></td>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
+    <!-- TMPL_IF NAME="waiting_count" -->
+    <!-- TMPL_IF NAME="atdestination" -->
+    <h3>Reserved Items Waiting</h3>
+        <table>
+            <tr>
+                <th colspan="2">Title</th>
+                <th>Reserve date</th>
+                <th>Pick Up Branch</th>
+            </tr>
+            <!-- TMPL_LOOP NAME="WAITING" -->
+                <tr>
+                    <td>
+                        <img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" />
+                    </td>
+                    <td>
+                        <a href="opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+                            <!-- TMPL_VAR NAME="waiting_title" -->
+                        </a>
+                        <span class="item-details">
+                            <!-- TMPL_VAR NAME="author" -->
+                        </span>
+                    </td>
+                    <td>
+                        <!-- TMPL_VAR NAME="reservedate" -->
+                    </td>
+                    <td>
+                        <!-- TMPL_IF NAME="atdestination" -->
+                        <strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" -->
+                        <!-- TMPL_ELSE -->
+                        In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" -->
+                        <!-- /TMPL_IF -->
+                    </td>
+                </tr>
+            <!-- /TMPL_LOOP -->
+        </table>
+        <!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
 
-<p>If you no longer want a reserve, please send us an e-mail, or go to the circulation desk at your library to get it removed.</p>
+    <!-- TMPL_IF NAME="issues_count" -->
+        <h3>Issues (<!-- TMPL_VAR NAME="issues_count" --> total)</h3>
+        <table>
+        <!-- ISSUES TABLE ROWS --><tr>
+        <th colspan="2">Title</th>
+        <th>Call No.</th>
+        <th>Due</th>
+        <th>Renew</th>
+        <th>Fines</th>
+        </tr>
+        <!-- TMPL_LOOP NAME="ISSUES" -->
+            <!-- TMPL_IF NAME="overdue" -->
+                <tr class="overdue">
+            <!-- TMPL_ELSE -->
+                <tr>
+            <!-- /TMPL_IF -->
+                <td>
+                    <!-- TMPL_IF name="imageurl" -->
+                        <img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->"/>
+                    <!-- TMPL_ELSE -->
+                        <!-- TMPL_VAR name="description" -->
+                    <!-- /TMPL_IF -->
+                </td>
+                <td>
+                    <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
+                    <span class="item-details">
+                        <!-- TMPL_VAR NAME="author" -->
+                    </span>
+                </td>
+                <td><!-- TMPL_VAR NAME="classification" --></td>
+                <!-- TMPL_IF NAME="overdue" -->
+                    <td class="overdue"><!-- TMPL_VAR NAME="date_due" --></td>
+                <!-- TMPL_ELSE -->
+                    <td><!-- TMPL_VAR NAME="date_due" --></td>
+                <!-- /TMPL_IF -->
+                <td>
+                    <!-- TMPL_IF NAME="status" -->
+                        <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Renew</a>
+                    <!-- TMPL_ELSE -->
+                        Not renewable
+                    <!-- /TMPL_IF -->
+                </td>
+                <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+            </tr>
+        <!-- /TMPL_LOOP -->
+        </table>
+    <!-- TMPL_ELSE -->
+        <table>
+            <caption>Issues</caption>
+            <tr><td>You have nothing checked out</td></tr>
+        </table>
+    <!-- /TMPL_IF -->
 
-<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="reserves_count" -->
+        <h3>Reserves (<!-- TMPL_VAR NAME="reserves_count" --> total)</h3>
+        <table>
+            <!-- RESERVES TABLE ROWS -->
+            <tr>
+                <th>Title</th>
+                <th>Placed On</th>
+                <th>Pick Up Location</th>
+                <th>Status</th>
+            </tr>
+            <!-- TMPL_LOOP NAME="RESERVES" -->
+            <tr>
+                <td>
+                    <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="reserves_title" --></a>
+                    <!-- TMPL_VAR NAME="author" -->
+                </td>
+                <td><!-- TMPL_VAR NAME="reservedate" --></td>
+                <td><!-- TMPL_VAR Name="branch" --></td>
+                <td><!-- TMPL_IF NAME="atdestination" -->
+                                Waiting at <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="holdingbranch" -->In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --><!-- /TMPL_IF --></td>
+            </tr>
+            <!-- /TMPL_LOOP -->
+        </table>
+        <p>If you no longer want a reserve, please send us an e-mail, or go to the circulation desk at your library to get it removed.</p>
+    <!-- /TMPL_IF -->
 
-</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl
index da2e641bc3..3df4a565a6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-userdetails.tmpl
@@ -1,15 +1,12 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Personal Details for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Personal Details for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
-
 <!--CONTENT-->
-<div id="main">
-<h2>Personal Details: <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h2>
 
-<ul><li>	 <a href="/cgi-bin/koha/opac-account.pl">my fines</a> </li> <li> 
-	<a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a>		<!-- TMPL_IF name="OpacPasswordChange" --> </li> <li> <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- /TMPL_IF --><!-- TMPL_IF NAME="opacreadinghistory" --></li> <li> <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF -->	<!-- TMPL_IF name="virtualshelves" --> </li> <li> <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" --></li> <li> <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></li></ul>
+    <!-- TMPL_INCLUDE name="usermenu.inc" -->
+<h2>Personal Details: <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h2>
 
 
 <table>
@@ -22,19 +19,19 @@ Card Number:</th><td><!-- TMPL_VAR NAME="cardnumber" --></td></tr>
 <h3>Contact Details</h3>
 
 <table>
-<tr><th scope="row">Mailing Address:</th><td><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="city" --></td></tr>
+<tr><th scope="row">Mailing Address:</th><td><!-- TMPL_VAR NAME="address" -->, <!-- TMPL_VAR NAME="city" --></td></tr>
 
-<tr><th scope="row">Permanent Address:</th><td> <!-- TMPL_VAR NAME="altstreetaddress" -->, <!-- TMPL_VAR NAME="altcity" --></td></tr>
+<tr><th scope="row">Permanent Address:</th><td> <!-- TMPL_VAR NAME="B_address" -->, <!-- TMPL_VAR NAME="B_city" --></td></tr>
 
 <tr><th scope="row">Phone (Home):</th><td><!-- TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
-<tr><th scope="row">Phone (Daytime):</th><td><!-- TMPL_IF NAME="phoneday" --><!-- TMPL_VAR NAME="phoneday" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
+<tr><th scope="row">Phone (Daytime):</th><td><!-- TMPL_IF NAME="mobile" --><!-- TMPL_VAR NAME="mobile" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
-<tr><th scope="row">Fax:</th><td><!-- TMPL_IF NAME="faxnumber" --><!-- TMPL_VAR NAME="faxnumber" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
+<tr><th scope="row">Fax:</th><td><!-- TMPL_IF NAME="fax" --><!-- TMPL_VAR NAME="fax" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
-<tr><th scope="row">E-mail:</th><td><!-- TMPL_IF NAME="emailaddress" --><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
+<tr><th scope="row">E-mail:</th><td><!-- TMPL_IF NAME="email" --><a href="mailto:<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="email" --></a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
-<tr><th scope="row">Textmessaging:</th><td><!-- TMPL_IF NAME="textmessaging" --><!-- TMPL_VAR NAME="textmessaging" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
+<tr><th scope="row">Textmessaging:</th><td><!-- TMPL_IF NAME="opacnote" --><!-- TMPL_VAR NAME="opacnote" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 </table>
 
 
@@ -44,43 +41,39 @@ Card Number:</th><td><!-- TMPL_VAR NAME="cardnumber" --></td></tr>
 
 <tr><th scope="row">Membership Category:</th><td>  <!-- TMPL_VAR NAME="categorycode" --></td></tr>
 
-<!-- <td>Area:</th><td>  <!-- TMPL_VAR NAME="area" --></td> -->
-
 <!-- <td>Fee:</th><td>  /year, Paid</td> -->
 
 <tr><th scope="row">Joined:</th><td><!-- TMPL_VAR NAME="dateenrolled" --></td></tr>
 
-<tr><th scope="row">Expires:</th><td><!-- TMPL_VAR NAME="expiry" --></td></tr>
+<tr><th scope="row">Expires:</th><td><!-- TMPL_VAR NAME="dateexpiry" --></td></tr>
 
 <!-- TMPL_IF NAME="joiningbranch" --><tr><th>Joining Branch:</th><td><!-- TMPL_VAR NAME="joiningbranch" --></td></tr><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></table>
 
 
-
 <h3>Identity Details</h3>
 
 <table><tr><th scope="row">DoB:</th><td> <!-- TMPL_IF NAME="dateofbirth" --><!-- TMPL_VAR NAME="dateofbirth" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
 <tr><th scope="row">Sex:</th><td><!-- TMPL_IF NAME="sex" --><!-- TMPL_VAR NAME="sex" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr></table>
 
-
 <h3>Alternate Contact Details</h3>
-
-
+<!-- TMPL_IF NAME="contactname"-->
 <table><tr><th scope="row">Alternate Contact:</th><td> <!-- TMPL_IF NAME="contactname" --><!-- TMPL_VAR NAME="contactname" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
-<tr><th scope="row">Phone:</th><td> <!-- TMPL_IF NAME="altphone" --><!-- TMPL_VAR NAME="altphone" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
+<tr><th scope="row">Phone:</th><td> <!-- TMPL_IF NAME="B_phone" --><!-- TMPL_VAR NAME="B_phone" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
 
-<tr><th scope="row">Relationship:</th><td> <!-- TMPL_IF NAME="altrelationship" --><!-- TMPL_VAR NAME="altrelationship" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->  </td></tr>
+<tr><th scope="row">Relationship:</th><td> <!-- TMPL_IF NAME="relationship" --><!-- TMPL_VAR NAME="relationship" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->  </td></tr>
 
-<tr><th scope="row">Notes:</th><td> <!-- TMPL_IF NAME="altnotes" --><!-- TMPL_VAR NAME="altnotes" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --> </td></tr>
+<tr><th scope="row">Notes:</th><td> <!-- TMPL_IF NAME="contactnote" --><!-- TMPL_VAR NAME="contactnote" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --> </td></tr>
 
-<tr><th scope="row">Guarantor:</th><td> <!-- TMPL_IF NAME="guarantor" --><!-- TMPL_VAR NAME="guarantor" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --> </td></tr></table>
+<tr><th scope="row">Guarantor:</th><td> <!-- TMPL_IF NAME="guarantorid" --><!-- TMPL_VAR NAME="guarantorid" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --> </td></tr></table>
 
+<!-- TMPL_ELSE -->
+No alternate contact.<br /><br />
+<!-- /TMPL_IF -->
 
 <form action="/cgi-bin/koha/opac-userupdate.pl" method="post">
 <input type="submit" name="Modify" value="Modify Your Record" />
 </form>
 
-</div>
-</body>
-</html>
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc"-->
diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl
index 078c7f0332..a3fd45e8b5 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-userupdate.tmpl
@@ -1,13 +1,9 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Updating Details for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Updating Details for <!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE name="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 <!-- TMPL_INCLUDE name="navigation.inc" -->
 
-<!--CONTENT-->
-<ul><li>	 <a href="/cgi-bin/koha/opac-account.pl">my fines</a> </li> <li> 
-	<a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a>		<!-- TMPL_IF name="OpacPasswordChange" --> </li> <li> <a href="/cgi-bin/koha/opac-passwd.pl">change my password</a> <!-- /TMPL_IF --><!-- TMPL_IF NAME="opacreadinghistory" --></li> <li> <a href="/cgi-bin/koha/opac-readingrecord.pl">my reading history</a><!-- /TMPL_IF -->	<!-- TMPL_IF name="virtualshelves" --> </li> <li> <a href="/cgi-bin/koha/opac-shelves.pl" class="button">my book lists</a> <!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" --></li> <li> <a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a><!-- /TMPL_IF --></li></ul>
-
-<div id="main">
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
 <!-- TMPL_LOOP name="BORROWER_INFO" -->
 <h3>Updating Details for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h3>
 <p>Please make any necessary changes to your record.  Submitting the form will notify a library staff member, who will make the changes permanent.</p>
@@ -18,22 +14,26 @@
 
 <tr><th><label for="firstname">First Name</label></th><td><input id="firstname" type="text"  size="25" value="<!-- TMPL_VAR name="firstname" -->"  name="firstname"></td></tr>
 
-<tr><th><label for="streetaddress">Mailing Address</label></th><td><input id="streetaddress" type="text"  size="25" value="<!-- TMPL_VAR name="streetaddress" -->"  name="streetaddress"></td></tr>
+<tr>
+    <th><label for="streetaddress">Mailing Address</label></th>
+    <td>
+        <textarea id="streetaddress" cols="25"  name="streetaddress"><!--TMPL_VAR NAME="streetnumber"--> <!-- TMPL_VAR name="address" --> <!-- TMPL_VAR NAME="zipcode"--></textarea>
+    </td>
+</tr>
 
 <tr><th><label for="city">City, State</label></th><td><input id="city" type="text"  size="25" value="<!-- TMPL_VAR name="city" -->"  name="city"></td></tr>
 
 <tr><th><label for="phone">Home Phone</label></th><td><input id="phone" type="text"  size="25" value="<!-- TMPL_VAR name="phone" -->"  name="phone"></td></tr>
 
-<tr><th><label for="faxnumber">Work/Fax phone</label></th><td><input id="faxnumber"  type="text"  size="25" value="<!-- TMPL_VAR name="faxnumber" -->"  name="faxnumber"></td></tr>
+<tr><th><label for="faxnumber">Work/Fax phone</label></th><td><input id="faxnumber"  type="text"  size="25" value="<!-- TMPL_VAR name="fax" -->"  name="faxnumber"></td></tr>
 
-<tr><th><label for="emailaddress">Email</label></th><td><input id="emailaddress" type="text"  size="40" value="<!-- TMPL_VAR name="emailaddress" -->"  name="emailaddress"></td></tr>
+<tr><th><label for="emailaddress">Email</label></th><td><input id="emailaddress" type="text"  size="25" value="<!-- TMPL_VAR name="email" -->"  name="emailaddress"></td></tr>
 </table>
 <p>Clicking 'Submit Changes' will send an email to a library staff member with the information you've entered.  You will then be returned to your patron record.</p>
 <p><input type="submit" value="Submit Changes"></p>
 </form>
 
-
 <!-- /TMPL_LOOP -->
-</div>
+
 </body>
 </html>
-- 
2.39.5