[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en admin/admi...

paul poulain paul at koha-fr.org
Fri Mar 9 15:47:41 CET 2007


CVSROOT:	/sources/koha
Module name:	koha
Changes by:	paul poulain <tipaul>	07/03/09 14:47:39

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/admin: admin-home.tmpl 
	                                       aqbookfund.tmpl 
	                                       aqbudget.tmpl 
	                                       auth_subfields_structure.tmpl 
	                                       auth_tag_structure.tmpl 
	                                       authorised_values.tmpl 
	                                       authtypes.tmpl 
	                                       branches.tmpl 
	                                       categorie.tmpl 
	                                       checkmarc.tmpl 
	                                       itemtypes.tmpl 
	                                       roadtype.tmpl 
	                                       systempreferences.tmpl 
	                                       thesaurus.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/authorities: auth_finder.tmpl 
	                                             authorities-home.tmpl 
	                                             authorities.tmpl 
	                                             blinddetail-biblio-search.tmpl 
	                                             blinddetail-linker.tmpl 
	                                             detail.tmpl 
	                                             linkresultlist-auth.tmpl 
	                                             searchresultlist-auth.tmpl 
	                                             searchresultlist.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/barcodes: barcodes.tmpl 
	                                          printerConfig.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/bookshelves: 
	                                             addbookbybiblionumber.tmpl 
	                                             shelves.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/catalogue: ISBDdetail.tmpl 
	                                           MARCdetail.tmpl 
	                                           detail.tmpl 
	                                           moredetail.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/cataloguing: addbiblio.tmpl 
	                                             addbooks.tmpl 
	                                             additem.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/circ: branchreserves.tmpl 
	                                      branchtransfers.tmpl 
	                                      circulation.tmpl 
	                                      currenttransfers.tmpl 
	                                      returns.tmpl 
	                                      selectbranchprinter.tmpl 
	                                      waitingreservestransfers.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/includes: doc-head-close.inc 
	                                          holidays-top.inc 
	                                          intranet-bottom.inc 
	                                          intranet.css 
	                                          menu-acqui.inc 
	                                          menu-admin.inc 
	                                          menu-authorities.inc 
	                                          menu-catalogue.inc 
	                                          menu-circ.inc 
	                                          menu-members.inc 
	                                          menu-serials.inc 
	                                          menu-tools.inc 
	                                          menus.inc 
	koha-tmpl/intranet-tmpl/prog/en/members: boraccount.tmpl 
	                                         deletemem.tmpl 
	                                         guarantor_search.tmpl 
	                                         mancredit.tmpl 
	                                         maninvoice.tmpl 
	                                         member-flags.tmpl 
	                                         member-quicksearch-results.tmpl 
	                                         member-quicksearch.tmpl 
	                                         member.tmpl 
	                                         memberentryA.tmpl 
	                                         memberentryC.tmpl 
	                                         memberentryI.tmpl 
	                                         memberentryP.tmpl 
	                                         members-home.tmpl 
	                                         moremember-print.tmpl 
	                                         moremember-receipt.tmpl 
	                                         moremember.tmpl 
	                                         pay.tmpl 
	                                         readingrec.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/reports: acquisitions_stats.tmpl 
	                                         bor_issues_top.tmpl 
	                                         borrowers_out.tmpl 
	                                         borrowers_stats.tmpl 
	                                         cat_issues_top.tmpl 
	                                         catalogue_out.tmpl 
	                                         catalogue_stats.tmpl 
	                                         inventory.tmpl 
	                                         issues_avg_stats.tmpl 
	                                         issues_by_borrower_category.tmpl 
	                                         issues_stats.tmpl 
	                                         itemtypes.tmpl 
	                                         reports-home.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/reserve: request.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/reviews: reviewswaiting.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/serials: 
	                                         acqui-search-result.tmpl 
	                                         acqui-search.tmpl 
	                                         claims.tmpl 
	                                         distributedto.tmpl 
	                                         member-search.tmpl 
	                                         receipt-search-result.tmpl 
	                                         result.tmpl 
	                                         routing-preview-slip.tmpl 
	                                         routing-preview.tmpl 
	                                         routing.tmpl 
	                                         serial-issues-full.tmpl 
	                                         serial-issues.tmpl 
	                                         serials-home.tmpl 
	                                         subscription-add.tmpl 
	                                         subscription-bib-search.tmpl 
	                                         subscription-detail.tmpl 
	                                         subscription-renew.tmpl 
	                                         viewalerts.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/suggestion: acceptorreject.tmpl 
	                                            mail_suggestion_REJECTED.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/tools: barcodes.tmpl export.tmpl 
	                                       holidays.tmpl import.tmpl 
	                                       koha-news.tmpl 
	                                       letter.tmpl 
	                                       tools-home.tmpl 
	koha-tmpl/intranet-tmpl/prog/en/z3950: searchresult.tmpl 

Log message:
	rel_3_0 moved to HEAD

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/aqbudget.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-linker.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/linkresultlist-auth.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/barcodes/barcodes.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/barcodes/printerConfig.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/bookshelves/addbookbybiblionumber.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/ISBDdetail.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-authorities.inc?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/mancredit.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl?cvsroot=koha&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember-print.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember-receipt.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/acquisitions_stats.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_stats.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/inventory.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/itemtypes.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/reviews/reviewswaiting.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/distributedto.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/receipt-search-result.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/result.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview-slip.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/routing.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues-full.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-renew.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/suggestion/acceptorreject.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/suggestion/mail_suggestion_REJECTED.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/tools/barcodes.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/tools/holidays.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/tools/import.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/tools/tools-home.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/z3950/searchresult.tmpl?cvsroot=koha&r1=1.2&r2=1.3

Patches:
Index: admin/admin-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/admin-home.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- admin/admin-home.tmpl	27 Sep 2006 21:40:47 -0000	1.6
+++ admin/admin-home.tmpl	9 Mar 2007 14:47:38 -0000	1.7
@@ -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>
+	<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>
-</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>
+	<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/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" -->

Index: admin/aqbookfund.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/aqbookfund.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- admin/aqbookfund.tmpl	27 Sep 2006 21:40:47 -0000	1.4
+++ admin/aqbookfund.tmpl	9 Mar 2007 14:47:38 -0000	1.5
@@ -71,9 +71,9 @@
       <!-- /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 -->
@@ -191,7 +191,11 @@
         <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_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 @@
 
   <p>
     <input type="button" value="Submit" onclick="Check(this.form); return false;" />
-    <input type="reset" value="Reset" />
   </p>
 </form>
 <!-- /TMPL_IF --> <!-- add_form -->
@@ -221,6 +224,10 @@
     <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>
   </tr>
@@ -233,6 +240,7 @@
 <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" />

Index: admin/aqbudget.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/aqbudget.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- admin/aqbudget.tmpl	27 Sep 2006 21:40:47 -0000	1.4
+++ admin/aqbudget.tmpl	9 Mar 2007 14:47:38 -0000	1.5
@@ -87,7 +87,7 @@
         Calendar.setup(
           {
             inputField : "filter_startdate",
-            ifFormat : "%Y-%m-%d",
+            ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
             button : "filter_startdate_button"
           }
         );
@@ -119,7 +119,7 @@
         Calendar.setup(
           {
             inputField : "filter_enddate",
-            ifFormat :"%Y-%m-%d",
+            ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
             button : "filter_enddate_button"
           }
         );
@@ -170,10 +170,6 @@
     </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 @@
             Calendar.setup(
               {
                 inputField : "startdate",
-                ifFormat : "%Y-%m-%d",
+                ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                 button : "startdate_button"
               }
             );
@@ -278,7 +274,7 @@
             Calendar.setup(
               {
                 inputField : "enddate",
-                ifFormat : "%Y-%m-%d",
+                ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                 button : "enddate_button"
               }
             );

Index: admin/auth_subfields_structure.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- admin/auth_subfields_structure.tmpl	11 Sep 2006 17:41:55 -0000	1.3
+++ admin/auth_subfields_structure.tmpl	9 Mar 2007 14:47:38 -0000	1.4
@@ -3,41 +3,33 @@
 
 <!-- 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 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" />
@@ -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="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 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-->
 	</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" -->
+<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" -->
+      </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 -->
+
 <!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
+
 
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: admin/auth_tag_structure.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- admin/auth_tag_structure.tmpl	19 May 2006 17:35:53 -0000	1.2
+++ admin/auth_tag_structure.tmpl	9 Mar 2007 14:47:38 -0000	1.3
@@ -10,7 +10,7 @@
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	function isNotNull(f,noalert) {
 		if (f.value.length ==0) {
-   return false;
+return false;
 		}
 		return true;
 	}
@@ -59,20 +59,34 @@
 
 <!-- TMPL_IF NAME="add_form" -->
 
-	<h1>
+    <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 -->
-	</h1>
+    </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="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>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>
@@ -101,6 +115,8 @@
 
 	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 -->

Index: admin/authorised_values.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/authorised_values.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- admin/authorised_values.tmpl	24 Feb 2006 11:18:17 -0000	1.1
+++ admin/authorised_values.tmpl	9 Mar 2007 14:47:38 -0000	1.2
@@ -1,17 +1,22 @@
-<!-- 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>
@@ -24,8 +29,11 @@
 		<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>
+        <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 @@
 	<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">

Index: admin/authtypes.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/authtypes.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- admin/authtypes.tmpl	24 Feb 2006 11:18:17 -0000	1.1
+++ admin/authtypes.tmpl	9 Mar 2007 14:47:38 -0000	1.2
@@ -77,6 +77,7 @@
 		<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 @@
 	<tr>
 		<th>Code</th>
 		<th>Description</th>
-		<th>summary</th>
+		<th>Summary</th>
 		<th>Tag reported</th>
 		<th>&nbsp;</th>
 		<th>Edit</th>

Index: admin/branches.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- admin/branches.tmpl	12 Jun 2006 09:38:52 -0000	1.3
+++ admin/branches.tmpl	9 Mar 2007 14:47:38 -0000	1.4
@@ -8,72 +8,53 @@
 <!-- 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="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="5" maxlength="5" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
+                <input type="text" name="branchcode" size="10" maxlength="10" 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>
+        </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 -->
-<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>	
+        <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>
-		</td>
-	</tr>
-</table><p><input type="submit" value="Submit" /></p>
-</form>
+        <p><input type="submit" value="Submit" /></p>
+    </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_confirm" -->
@@ -90,10 +71,19 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="else" -->
+    <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 -->
 	
-	<!-- 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>
@@ -142,17 +132,10 @@
 					<!-- 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>
+                    <a href="<!-- TMPL_VAR name=action -->?op=edit&branchcode=<!-- TMPL_VAR name=value escape="HTML" -->">Edit</a>
 				</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" />
+                    <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>
@@ -163,6 +146,7 @@
 		<input type="submit" value="Add New Branch" /></p>
 	</form>
 	
+    <!-- TMPL_IF NAME="branchcategories" -->
 	<table>
 	<caption>Branches Categories</caption>
 	<tr>
@@ -192,7 +176,13 @@
 		</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
-	</table><form action="<!-- TMPL_VAR name="action" -->" method="post"><p>
+    </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>

Index: admin/categorie.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- admin/categorie.tmpl	6 Jun 2006 08:38:18 -0000	1.3
+++ admin/categorie.tmpl	9 Mar 2007 14:47:38 -0000	1.4
@@ -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">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>

Index: admin/checkmarc.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- admin/checkmarc.tmpl	11 Sep 2006 17:41:55 -0000	1.2
+++ admin/checkmarc.tmpl	9 Mar 2007 14:47:38 -0000	1.3
@@ -1,87 +1,76 @@
 <!-- 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>
+
+<h1>MARC Checking</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" -->
+<!-- -->
+<!-- TMPL_IF name="itemnum" -->
 	<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>
+        <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 itemnumber is mapped to a  MARC field </td>
+        <td>itemnum : the field itemnumber is mapped to a field in tab -1</td>
 	</tr>
 <!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="barcode" -->
+<!-- -->
+<!-- TMPL_IF name="itemfields" -->
 	<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>
+        <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>The field barcode is mapped to a  MARC field </td>
+        <td>All item fields are in the same tag and in item tab</td>
 	</tr>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="isbn" -->
+<!-- -->
+    <!-- TMPL_IF NAME="itemtags" -->
 	<tr>
-		<td>ISBN NOT mapped</td>
-		<td>isbn  MUST :<br />
-			<ul><li>be mapped to a MARC subfield,</li>
-		 </ul></td>
+            <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 -->
+    <!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
-		<td>ISBN defined</td>
+            <td>Only 1 MARC tag mapped to items</td>
 	</tr>
-<!-- /TMPL_IF -->
-
-
+    <!-- /TMPL_IF -->
+    <!--  -->
 <!-- TMPL_IF name="itemtype" -->
 	<tr>
 		<td>itemtype NOT mapped</td>
-		<td>itemtype field MUST :<br />
+        <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>
+        <td>biblioitems.itemtype defined</td>
 	</tr>
 <!-- /TMPL_IF -->
 <!-- -->
 <!-- TMPL_IF name="branch" -->
 	<tr>
 		<td>homebranch NOT mapped</td>
-		<td>homebranch  MUST :<br />
+        <td>the items.homebranch field MUST :<br />
 			<ul><li>be mapped to a MARC subfield,</li>
-		 </ul></td>
+            <li>the correspounding subfield MUST have authorised value=branches</li></ul></td>
 	</tr>
 <!-- TMPL_ELSE -->
 	<tr>
@@ -93,7 +82,7 @@
 <!-- TMPL_IF name="holdingbranch" -->
 	<tr>
 		<td>holdingbranch NOT mapped</td>
-		<td>the holdingbranch  MUST :<br />
+        <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>
@@ -104,6 +93,32 @@
 	</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" -->
@@ -114,7 +129,7 @@
 </table>
 <!-- TMPL_ELSE -->
 	</table>
-		<p>Configuration OK, you don't have errors in your MARC parameters </p>
+        <p><b>Configuration OK, you don't have errors in your MARC parameters table</b></p>
 <!-- /TMPL_IF -->
 
 

Index: admin/itemtypes.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/itemtypes.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- admin/itemtypes.tmpl	7 Apr 2006 11:10:25 -0000	1.2
+++ admin/itemtypes.tmpl	9 Mar 2007 14:47:38 -0000	1.3
@@ -36,9 +36,9 @@
   <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 @@
   <!-- 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 @@
     <!-- 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 -->
-              <img src="<!-- TMPL_VAR name="KohaImageSrc" -->">
+    <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="KohaImageSrc" -->
+              <img src="<!-- TMPL_VAR name="KohaImageSrc" -->" alt="">
+        <!-- TMPL_ELSE -->
+              <br />
+        <!-- /TMPL_IF -->
             </label>
   <!-- /TMPL_LOOP -->
           </p>
@@ -151,6 +157,16 @@
           <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">

Index: admin/roadtype.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/roadtype.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- admin/roadtype.tmpl	23 May 2006 11:44:23 -0000	1.1
+++ admin/roadtype.tmpl	9 Mar 2007 14:47:38 -0000	1.2
@@ -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">

Index: admin/systempreferences.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/systempreferences.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- admin/systempreferences.tmpl	11 Sep 2006 17:41:55 -0000	1.2
+++ admin/systempreferences.tmpl	9 Mar 2007 14:47:38 -0000	1.3
@@ -76,7 +76,7 @@
 			<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" -->" />
+                    <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>
@@ -141,90 +141,20 @@
 	
 	<!-- 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>
-
+    <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>

Index: admin/thesaurus.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/thesaurus.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- admin/thesaurus.tmpl	11 Sep 2006 17:41:55 -0000	1.2
+++ admin/thesaurus.tmpl	9 Mar 2007 14:47:38 -0000	1.3
@@ -1,19 +1,17 @@
 <!-- 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>
+<table>
+    <caption>Thesaurus management</caption>
 	<tr>
-		<td><b>Values related to <!-- TMPL_VAR name="stdlib" --> (<!-- TMPL_VAR name="category" -->)</b></td>
+        <td>Values related to <!-- TMPL_VAR name="stdlib" --> (<!-- TMPL_VAR name="category" -->)</td>
 	</tr>
 	</table>
-	<br/><br/>
+
 	<table>
 	<tr>
 		<th>Other forms</th>
@@ -34,7 +32,7 @@
 	<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>
+    <input type="submit" value="Add thesaurus entry" />
 	</form>
 <!-- /TMPL_IF -->
 
@@ -70,7 +68,12 @@
 			<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>
+            <!-- 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 -->
 
 
@@ -78,8 +81,8 @@
 <!-- -->
 		<table>
 		<tr>
-			<td><b>lib</b></td>
-			<td><b><!-- TMPL_VAR name="search_category" --></b></td>
+            <td>lib</td>
+            <td><!-- TMPL_VAR name="search_category" --></td>
 		</tr>
 		<tr><td>Value</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
 		<tr><td>
@@ -88,7 +91,7 @@
 				<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 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>
@@ -99,14 +102,14 @@
 <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>
+        <li>Dig: see data dependent on this one</li>
+        <li>Related: see other forms of this authority entry</li>
 	</ul>
-<div class="tabitem">	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="post">
+    <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>
+        <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 />
@@ -130,8 +133,8 @@
 		<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>
+        <td><a href="<!-- TMPL_VAR name="edit" -->">Edit</a></td>
+        <td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
 	</tr>
 	<!-- /TMPL_LOOP -->
 	</table>
@@ -144,10 +147,10 @@
 	<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" />
+    <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" -->

Index: authorities/auth_finder.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/auth_finder.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- authorities/auth_finder.tmpl	27 Sep 2006 21:40:47 -0000	1.2
+++ authorities/auth_finder.tmpl	9 Mar 2007 14:47:38 -0000	1.3
@@ -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" -->">
+			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+		</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 id="value_mainmainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="resultstring" -->">
 		</p>
 		<p>
-			<label class="label100">Main heading(a)</label><input type="text" name="value" value="<!-- TMPL_VAR name="resultstring" -->">
+          <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="all">All words</option>
-				<option value="phrase">Phrase</option>
+            <option value="contains">contains</option>
+            <option value="start">starts by</option>
+            <option value="is">is exactly</option>
 			</select>
-			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+          <input id="value_mainentry" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
 		</p>
 		<p>
-			<label class="label100">Sub heading</label><input type="text" name="value">
+          <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="all">All words</option>
-				<option value="phrase">Phrase</option>
+            <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" -->
 

Index: authorities/authorities-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- authorities/authorities-home.tmpl	27 Sep 2006 21:40:47 -0000	1.3
+++ authorities/authorities-home.tmpl	9 Mar 2007 14:47:38 -0000	1.4
@@ -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" 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" -->">
+  <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>
+
+    <div id="action">
+      <input type="submit" value="Add" class="button authority">
+    </div>
+  </form>
+</fieldset>
 			
-			</td></tr></table></div>
-		<p>
-			<input type="submit" value="Start search" class="submit">
-		</p>
-</form>
-
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: authorities/authorities.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- authorities/authorities.tmpl	27 Sep 2006 21:40:47 -0000	1.4
+++ authorities/authorities.tmpl	9 Mar 2007 14:47:38 -0000	1.5
@@ -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" -->
 
-<!-- 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>
+<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" 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" -->">
+  <form method="post" name="f">
 		<input type="hidden" name="op" value="add">
-		<input type="hidden" name="addfield_field">
+    <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" -->">
-	<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>
 
-
-<! -- 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="action">
+<!-- TMPL_IF name="authid" -->
+      <input type="button" value="Save" onClick="Check(this.form)" accesskey="w">
 <!-- TMPL_ELSE -->
-    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:visible">
+      <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w">
 <!-- /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>
+    </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>
-					
-					<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>
+			<p><input type="checkbox" value=1 name="confirm_not_duplicate">confirm it's not a duplicate (and click on <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority"> again)</p>
+			<p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->" >original authority</a></p>
 				</ul>
 			</div>
-		<!-- /TMPL_IF -->
-  <!-- /TMPL_UNLESS -->
-    <!-- TMPL_LOOP NAME="innerloop" -->
-		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
-        <!-- TMPL_IF name="tag" -->
-        <p class="MARCtag">
+<!-- /TMPL_IF -->
+
+<!-- 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='#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>
+	<!-- 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 -->
+<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 -->
+<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";
-			}
-			}
 		} 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";
-			}
-			}
-		}
 	}
 }
-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 @@
 
 	// 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";
+			document.getElementById("error"+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) + ")");
-			}
-
 			}
 		} 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 @@
 		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];
-		}
 		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;
 	}
-
-	newin=window.open(link+"&result="+defaultvalue,"",'width=550,height=550,toolbar=false,scrollbars=yes');
-
+		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("../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 original = document.getElementById(index); //original <div>
  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); 
+
+    // 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 @@
 	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

Index: authorities/blinddetail-biblio-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-biblio-search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- authorities/blinddetail-biblio-search.tmpl	11 Sep 2006 17:41:55 -0000	1.1
+++ authorities/blinddetail-biblio-search.tmpl	9 Mar 2007 14:47:38 -0000	1.2
@@ -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 @@
 }
 </script>
 <script language="javascript" type="text/javascript">
-window.onload=goforward();
+window.onload = go();
 </script>
-
-
 </body>
 </html>

Index: authorities/blinddetail-linker.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/blinddetail-linker.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- authorities/blinddetail-linker.tmpl	11 Sep 2006 17:41:55 -0000	1.2
+++ authorities/blinddetail-linker.tmpl	9 Mar 2007 14:47:38 -0000	1.3
@@ -13,8 +13,46 @@
 //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;

Index: authorities/detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- authorities/detail.tmpl	27 Sep 2006 21:40:47 -0000	1.3
+++ authorities/detail.tmpl	9 Mar 2007 14:47:38 -0000	1.4
@@ -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 -->
+
+<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 name="0XX" id="0XX" class="tab" style="visibility:visible">
-	<!-- TMPL_LOOP NAME="0XX" -->
-			<p class="MARCtag">
+<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 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>
+                    <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 -->
+
+<!-- /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" -->

Index: authorities/linkresultlist-auth.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/linkresultlist-auth.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- authorities/linkresultlist-auth.tmpl	11 Sep 2006 17:41:55 -0000	1.2
+++ authorities/linkresultlist-auth.tmpl	9 Mar 2007 14:47:38 -0000	1.3
@@ -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>	

Index: authorities/searchresultlist-auth.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- authorities/searchresultlist-auth.tmpl	27 Sep 2006 21:40:47 -0000	1.2
+++ authorities/searchresultlist-auth.tmpl	9 Mar 2007 14:47:38 -0000	1.3
@@ -1,25 +1,82 @@
-<!-- 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" -->
+<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" -->&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" --><!-- 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" -->
-						<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+                        <!-- TMPL_VAR NAME="number" -->
 					<!-- 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" --><!-- 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" -->&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" --><!-- 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>
@@ -36,10 +93,9 @@
 					<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>&nbsp;</td>
 					<td>
 						<a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=0&amp;index=<!-- TMPL_VAR NAME="index" -->')" class="button authority">
@@ -51,9 +107,8 @@
 						<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>
+                            <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=<!-- TMPL_VAR NAME="authid" -->&amp;index=<!-- TMPL_VAR NAME="index" -->')">choose</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>
@@ -62,32 +117,32 @@
 		<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 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" -->
-						<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
+                        <!-- TMPL_VAR NAME="number" -->
 					<!-- 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>
+                        <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" -->&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>
+                    <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><a href="auth_finder.pl?index=<!-- TMPL_VAR NAME="index" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" -->">Search again</a>	
 	</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" -->

Index: authorities/searchresultlist.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/searchresultlist.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- authorities/searchresultlist.tmpl	27 Sep 2006 21:40:47 -0000	1.3
+++ authorities/searchresultlist.tmpl	9 Mar 2007 14:47:38 -0000	1.4
@@ -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>
+<h1 class="authority">Authority search results</h1>
 				
-			</tr>
-			<!-- TMPL_LOOP NAME="result" -->
-				<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 				
-					<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>
+<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>
 					
-					<td><!-- TMPL_VAR NAME="authid" -->&nbsp;
+<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:do_delete('authorities-home.pl?op=delete&authid=<!-- TMPL_VAR NAME="authid" -->')">Delete</a>
+        <a href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="authid" -->)">Delete</a>
 						<!-- /TMPL_UNLESS -->
 					</td>
-					
 				</tr>
-			<!-- /TMPL_LOOP -->
+<!-- /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">
-
-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>
-					
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+</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
+
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: barcodes/barcodes.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/barcodes/barcodes.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- barcodes/barcodes.tmpl	4 Aug 2005 19:43:45 -0000	1.1
+++ barcodes/barcodes.tmpl	9 Mar 2007 14:47:38 -0000	1.2
@@ -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">

Index: barcodes/printerConfig.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/barcodes/printerConfig.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- barcodes/printerConfig.tmpl	4 Aug 2005 19:43:45 -0000	1.1
+++ barcodes/printerConfig.tmpl	9 Mar 2007 14:47:38 -0000	1.2
@@ -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>

Index: bookshelves/addbookbybiblionumber.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/bookshelves/addbookbybiblionumber.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- bookshelves/addbookbybiblionumber.tmpl	20 Jul 2005 18:55:20 -0000	1.1
+++ bookshelves/addbookbybiblionumber.tmpl	9 Mar 2007 14:47:38 -0000	1.2
@@ -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>
+<!-- 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" -->">
-<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">
+    
+    <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>
+<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></td></tr>
-	</table>
-	</div>
+            </select>
+        </p>
 	<input type="submit" value="Add to virtual shelf" class="submit" />
 </form>
-<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
+
+</body>
+</html>

Index: bookshelves/shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- bookshelves/shelves.tmpl	20 Jul 2005 18:55:20 -0000	1.1
+++ bookshelves/shelves.tmpl	9 Mar 2007 14:47:38 -0000	1.2
@@ -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_INCLUDE NAME="menus.inc" -->
+<!-- TMPL_INCLUDE NAME="menu-bookshelves.inc" -->
 
-<!-- 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 Name="viewshelf" -->
+
+<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 -->
-				</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 -->
+</div>
 
-<!-- TMPL_IF Name="viewshelf" -->
-	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post" name="mainform">
+<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>
-			<caption>Contents of <!-- TMPL_VAR NAME="shelfname" --></caption>
+        <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
+        <input type="hidden" name="modifyshelfcontents" value="1" />
 			<tr>
-					<!-- TMPL_IF name="manageshelf" --><th><a href="/cgi-bin/koha/shelves.pl" onclick="CheckAll(); return false;">Check All</a></th><!-- /TMPL_IF -->
+                <th>
+                    <a href="javascript:CheckAll();">
+                        <small>(Un)Check All</small>
+                    </a>
+                </th>
+                <th>&nbsp;</th>
 					<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>
+                <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>
-			<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_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" -->
-		<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 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 -->
-		<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="submit" value="Return to Virtual Shelves" /></form>
+        <!-- /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" -->
+            <p class="error"><!-- TMPL_VAR Name="string1" --></p>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_LOOP Name="paramsloop" -->
 			<!-- TMPL_IF Name="status" -->
-				<!-- TMPL_VAR NAME="string" -->
+                <p class="error"><!-- TMPL_VAR Name="string" --></p>
 			<!-- /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="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>
-
-			<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
-				<input type="hidden" name="shelves" value="1" />
+    <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>
-				<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">
+        <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 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 -->
+                                    </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>
-			<caption>Virtual Shelves</caption>
-				<tr>
-					<th>Shelf Name</th>
-					<th>Category</th>
-					<th>Content size</th>
-					<th>&nbsp;</th>
-				</tr>
+                        <tr><th>&nbsp;</th><th>Shelf Name</th><th>Contents</th></tr>
 				<!-- TMPL_LOOP Name="shelvesloop" -->
-				<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="canmanage" -->
+                        <tr>
 					<td>
-						<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
-							<!-- TMPL_VAR NAME="shelfname" -->
-						</a>
+                                <input type="checkbox" name="DEL-<!-- TMPL_VAR Name="shelf" -->" />
 					</td>
 					<td>
-						<!-- TMPL_IF NAME="category1" -->
-							Private
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF NAME="category2" -->
-							Public
-						<!-- /TMPL_IF -->
-						<!-- TMPL_IF NAME="category3" -->
-							Free
-						<!-- /TMPL_IF -->
+                                <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)
+                                <!-- 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_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_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>
+<!-- /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>
-		<form action="shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" value="Add or Remove Book Shelves" />				
+        <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"-->

Index: catalogue/ISBDdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/ISBDdetail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- catalogue/ISBDdetail.tmpl	11 Sep 2006 17:41:55 -0000	1.3
+++ catalogue/ISBDdetail.tmpl	9 Mar 2007 14:47:38 -0000	1.4
@@ -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" -->
-
-<div id="main">
-
-<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>
+<!-- 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" -->
+
+
+<h1 class="catalogue">MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --></h1>
 
-	<div class="isbd">
-		<p><!-- TMPL_VAR NAME="ISBD" --></p>
+<!-- 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" -->

Index: catalogue/MARCdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- catalogue/MARCdetail.tmpl	11 Sep 2006 17:41:55 -0000	1.4
+++ catalogue/MARCdetail.tmpl	9 Mar 2007 14:47:38 -0000	1.5
@@ -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_UNLESS name="popup" -->
+    <h1>
+        MARC biblio : <!-- TMPL_VAR NAME="biblionumber" -->
+    </h1>
+    
+<!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
+
+<!-- /TMPL_UNLESS -->
+
+    <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>
+
+    <div name="0XX" id="0XX" class="content_visible">
 	<!-- TMPL_LOOP NAME="0XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+                <!-- TMPL_IF name="tag" -->
+                    <p class="tag">
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
 	<!-- 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 -->">
+                <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 --></td> 
-	</tr>
+                    <!-- /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 -->
-     </table>
-<!-- /TMPL_IF -->
+    </div>
 
-<!-- TMPL_IF NAME="1XX" -->
-    <table class="marc">
+    <div id="1XX" class="content_hidden">
 	<!-- TMPL_LOOP NAME="1XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
 	<!-- 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 -->">
+                <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 --></td> 
-       </tr>
+                    <!-- /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 -->
-     </table>
-	 <!-- /TMPL_IF -->
+    </div>
 	 
-<!-- TMPL_IF NAME="2XX" -->
-    <table class="marc">
+    <div id="2XX" class="content_hidden">
 	<!-- TMPL_LOOP NAME="2XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
 	<!-- 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 -->">
+                <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 --></td> 
-       </tr>
+                    <!-- /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 -->
-     </table>
-	 <!-- /TMPL_IF -->
+    </div>
 	 
-<!-- TMPL_IF NAME="3XX" -->
-    <table class="marc">
+    <div id="3XX" class="content_hidden">
 	<!-- TMPL_LOOP NAME="3XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
 	<!-- 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 -->">
+                <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 --></td> 
-       </tr>
+                    <!-- /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 -->
-     </table>
-	 <!-- /TMPL_IF -->
+    </div>
 
-<!-- TMPL_IF NAME="4XX" -->
-    <table class="marc">
+    <div id="4XX" class="content_hidden">
 	<!-- TMPL_LOOP NAME="4XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
 	<!-- 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 -->">
+                <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 --></td> 
+                    <!-- /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 -->
-     </table>
-	 <!-- /TMPL_IF -->
+    </div>
 
-<!-- TMPL_IF NAME="5XX" -->
-    <table class="marc">
+    <div  id="5XX" class="content_hidden">
 	<!-- TMPL_LOOP NAME="5XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
 	<!-- 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 -->">
+                <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 --></td> 
-       </tr>
+                    <!-- /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 -->
-     </table>
-	 <!-- /TMPL_IF -->
+    </div>
 
-<!-- TMPL_IF NAME="6XX" -->
-    <table class="marc">
+    <div id="6XX" class="content_hidden">
 	<!-- TMPL_LOOP NAME="6XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
 	<!-- 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 -->">
+                <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 --></td> 
-       </tr>
+                    <!-- /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 -->
-     </table>
-	 <!-- /TMPL_IF -->
+    </div>
 
-<!-- TMPL_IF NAME="7XX" -->
-    <table class="marc">
+    <div  id="7XX" class="content_hidden">
 	<!-- TMPL_LOOP NAME="7XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
 	<!-- 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 -->">
+                <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 --></td> 
-       </tr>
+                    <!-- /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 -->
-     </table>
-	 <!-- /TMPL_IF -->
-
+    </div>
 	 
-<!-- TMPL_IF NAME="8XX" -->
-    <table class="marc">
+    <div id="8XX" class="content_hidden">
 	<!-- TMPL_LOOP NAME="8XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
 	<!-- 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 -->">
+                <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 --></td> 
-       </tr>
+                    <!-- /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 -->
-     </table>
-<!-- /TMPL_IF -->
+    </div>
 
-<!-- TMPL_IF NAME="9XX" -->
-    <table class="marc">
+    <div id="9XX" class="content_hidden">
 	<!-- TMPL_LOOP NAME="9XX" -->
-	<tr><th colspan="5"><!-- TMPL_VAR NAME="tag" --></th></tr>
+                <!-- TMPL_IF name="tag" -->
+                    <p>
+                        <!-- TMPL_VAR NAME="tag" -->
+                    </p>
+                <!-- TMPL_ELSE -->
+                    <br />
+                <!-- /TMPL_IF -->
 	<!-- 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 -->">
+                <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 --></td> 
-       </tr>
+                    <!-- /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 -->
-     </table>
-<!-- /TMPL_IF -->
-
+    </div>
 
-<!-- TMPL_IF NAME="item_loop" -->    <table>
+    <div id="10XX" class="content_hidden">
+        <br/>
+        <table class="noborder">
 		<tr>
-			<!-- TMPL_LOOP NAME="item_header_loop" --><th><!-- TMPL_VAR NAME="header_value" --></th><!-- /TMPL_LOOP -->
+                    <!-- 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><!-- /TMPL_IF -->
-
+        </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?');
+    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;oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->";
+        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

Index: catalogue/detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/detail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- catalogue/detail.tmpl	11 Sep 2006 17:41:55 -0000	1.3
+++ catalogue/detail.tmpl	9 Mar 2007 14:47:38 -0000	1.4
@@ -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 -->
-
-			<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>
+    <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>
 
-<div class="table"><table>
+<!-- TMPL_IF name="count" -->
+    <div id="catalogue_detail_items">
+        <h2><!-- TMPL_VAR NAME="count" --> items</h2>
+        <table>
 	<tr>
-		<th>Item Type</th>
-		<th>LC Classifiction</th>
+                <th>Item type</th>
 		<th>Location</th>
+                <th>Status</th>
 		<th>Date Due</th>
-		<th>Last Seen</th>
+                <th>Last seen</th>
 		<th>Barcode</th>
 		<th>Volume</th>
 	</tr>
-	
-<!-- TMPL_IF NAME="ITEM_RESULTS" -->
-<!-- TMPL_LOOP 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="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="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> 
-		
+                    <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 --><!-- 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_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" -->

Index: catalogue/moredetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/moredetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- catalogue/moredetail.tmpl	11 Sep 2006 17:41:55 -0000	1.1
+++ catalogue/moredetail.tmpl	9 Mar 2007 14:47:38 -0000	1.2
@@ -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" -->

Index: cataloguing/addbiblio.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbiblio.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cataloguing/addbiblio.tmpl	22 Sep 2006 00:11:37 -0000	1.3
+++ cataloguing/addbiblio.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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" -->" />
+<div id="action">
 		<!-- TMPL_IF name="biblionumber" -->
-			<input type="button" value="Save Bibliographic Record and go to Items" onclick="Check(this.form);" accesskey="w" class="submit" />
+        <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-->
+        <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" class="submit" onclick="PopupZ3950(); return false;" / >
+    <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" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
+                <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 -->
+                <!-- 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="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 @@
 	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";
+
+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 {
-			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";
-			}
+            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,53 +266,37 @@
 		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 {
 			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 {
 			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 { 
 			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'].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 {
@@ -327,50 +304,60 @@
 			}
 		      }
 		}
-	}
 	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 original = document.getElementById(index); //original <div>
  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); 
+
+    // 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 @@
 	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" -->

Index: cataloguing/addbooks.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cataloguing/addbooks.tmpl	11 Sep 2006 17:13:58 -0000	1.2
+++ cataloguing/addbooks.tmpl	9 Mar 2007 14:47:39 -0000	1.3
@@ -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>
-
-		<!-- 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">
+</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>
+					<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>
-			
+			</select>
+			<input type="submit" value="Add Record Without Search" />
+		</p>
+		</form>
 		<!-- /TMPL_IF -->
+</div>
 
 
+<!-- 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" -->

Index: cataloguing/additem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/cataloguing/additem.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cataloguing/additem.tmpl	22 Sep 2006 00:11:37 -0000	1.3
+++ cataloguing/additem.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -1,31 +1,38 @@
 <!-- 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"-->
+
+<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>
+
+<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" -->
-			<div name="10XX" id="10XX">
-			<table class="editing">
-			<caption>Existing Items</caption>
+        <h2>Existing items</h2>
+        <table>
 				<tr>
 					<!-- TMPL_LOOP NAME="item_header_loop" -->
-						<th><!-- TMPL_VAR NAME="header_value" --></th>
+                    <th>
+                        <!-- TMPL_VAR NAME="header_value" -->
+                    </th>
 					<!-- /TMPL_LOOP -->
 					<th colspan="2">&nbsp;</th>
 				</tr>
@@ -37,52 +44,39 @@
 					</tr>
 					<!-- /TMPL_LOOP -->
 			</table>
-			</div>
+    <!-- /TMPL_IF -->
+</div>
 
+<div id="cataloguing_additem_newitem">
+    <!-- TMPL_IF name="opisadd" -->
+        <h2>Add Item</h2>
+    <!-- TMPL_ELSE -->
+        <h2>Edit Item</h2>
 	<!-- /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" -->">
+            <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" -->
- 	         <div class="error">ERROR: Barcode already exists!</div>
+        ERROR : Barcode already exists !
  	 <!-- /TMPL_IF -->
-	
 	<!-- TMPL_IF name="opisadd" -->
-	<input type="button" value="Add item" onClick="Check(this.form)" accesskey="w" class="submit">
+    <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" class="submit">
+    <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>
-</div>
 
 <script language="JavaScript" type="text/javascript">
-
-	
-	<!--TMPL_IF name="exit"-->
-var	finished=CloseMe(<!--TMPL_VAR NAME="serialid"-->,<!--TMPL_VAR NAME="itemnumber"-->,"<!--TMPL_VAR NAME="holdingbranch"-->");
-	<!--/TMPL_IF-->
-
 function _(s) { return s } // dummy function for gettext
 function active(numlayer)
 {
@@ -127,35 +121,10 @@
 	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?'));
+    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

Index: circ/branchreserves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchreserves.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- circ/branchreserves.tmpl	6 Jun 2006 12:30:43 -0000	1.2
+++ circ/branchreserves.tmpl	9 Mar 2007 14:47:39 -0000	1.3
@@ -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" 
+							<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>

Index: circ/branchtransfers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/branchtransfers.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- circ/branchtransfers.tmpl	11 Sep 2006 17:41:55 -0000	1.5
+++ circ/branchtransfers.tmpl	9 Mar 2007 14:47:39 -0000	1.6
@@ -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" />
+	<input type="submit" value="Do transfer" />
+	</form>
 
-	<div class="form"><table>
+	<!-- 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" -->

Index: circ/circulation.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/circulation.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- circ/circulation.tmpl	27 Sep 2006 21:40:47 -0000	1.8
+++ circ/circulation.tmpl	9 Mar 2007 14:47:39 -0000	1.9
@@ -1,215 +1,598 @@
-<!-- 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 -->
+<!-- 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" -->
 	
-	<!-- RESULT OF ISSUING REQUEST -->
+<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="DEBT" -->
+    <li>The patron has a debt of $<!-- TMPL_VAR name="DEBT" --></li>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="RENEW_ISSUE" -->
+    <li>Item is currently issued to this patron.  Renew?</li>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="RESERVE_WAITING" -->
+    <li>Item is consigned for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></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>
+
+<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_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" -->
+<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" -->
-		<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>				
+            <li><span class="problem">The due date is invalid</span></li>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
-				
-				<li>Barcode Unkown</li>
+            <li><span class="problem">The barcode was not found</span></li>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
 				
-				<li>NOT FOR LOAN</li>
+        <!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
+            <li><span class="problem">Item not for loan</span></li>
 			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF NAME="WTHDRAWN" -->
-				<li>Item is cancelled</li>
+            <li><span class="problem">Item is cancelled</span></li>
 			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF NAME="GNA" -->
-				<li>Patron's address is in doubt</li>
+            <li><span class="problem">Patron's address is in doubt</span></li>
 			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF NAME="CARD_LOST" -->
-				<li>Patron's card is lost</li>
+            <li><span class="problem">Patron's card is lost</span></li>
 			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF NAME="DEBARRED" -->
-				<li>Patron is debarred</li>
+            <li><span class="problem">Patron is debarred</span></li>
 			<!-- /TMPL_IF -->
+
 			<!-- TMPL_IF NAME="NO_MORE_RENEWALS" -->
-				<li>No more renewals possible</li>
+            <li><span class="problem">No more renewals possible</span></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>
+            <li><span class="problem">Patron's card is expired</span></li>
 			<!-- /TMPL_IF -->
 			</ul>
-		</div>
+</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="NEEDSCONFIRMATION" -->
+            <!-- TMPL_IF NAME="day2" -->
+                <option value="2" selected="selected">2</option>
+            <!-- TMPL_ELSE -->
+                <option value="2">2</option>
+            <!-- /TMPL_IF -->
 		
-		<div class="error">
-		<h3>Please Confirm Issue:</h3>
+            <!-- TMPL_IF NAME="day3" -->
+                <option value="3" selected="selected">3</option>
+            <!-- TMPL_ELSE -->
+                <option value="3">3</option>
+            <!-- /TMPL_IF -->
 		
-			<!-- TMPL_IF NAME="DEBT" -->
-				<p>The patron has a debt of <!-- TMPL_VAR name="DEBT" --> YTL</p>
+            <!-- TMPL_IF NAME="day4" -->
+                <option value="4" selected="selected">4</option>
+            <!-- TMPL_ELSE -->
+                <option value="4">4</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="RENEW_ISSUE" -->
-				<p>You are trying RE-ISSUE.  USE RENEW</p>
+            
+            <!-- TMPL_IF NAME="day5" -->
+                <option value="5" selected="selected">5</option>
+            <!-- TMPL_ELSE -->
+                <option value="5">5</option>
 			<!-- /TMPL_IF -->	
-			<!-- TMPL_IF NAME="SUCCESFUL_RENEW" -->
-				<p>Succesfully renewd items</p>
+            
+            <!-- TMPL_IF NAME="day6" -->
+                <option value="6" selected="selected">6</option>
+            <!-- TMPL_ELSE -->
+                <option value="6">6</option>
 			<!-- /TMPL_IF -->	
-			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
-				<p>Item is consigned for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></p>
+            
+            <!-- TMPL_IF NAME="day7" -->
+                <option value="7" selected="selected">7</option>
+            <!-- TMPL_ELSE -->
+                <option value="7">7</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="RESERVED" -->
-				<p>Item is on reserve for <!-- TMPL_VAR NAME="RESERVED" --></p>
+            
+            <!-- TMPL_IF NAME="day8" -->
+                <option value="8" selected="selected">8</option>
+            <!-- TMPL_ELSE -->
+                <option value="8">8</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
-				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return and issue?</p>
+            
+            <!-- TMPL_IF NAME="day9" -->
+                <option value="9" selected="selected">9</option>
+            <!-- TMPL_ELSE -->
+                <option value="9">9</option>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF NAME="TOO_MANY" -->
-				<p>Too many issues (already issued / max : <!-- TMPL_VAR name="TOO_MANY" -->)</p>
+            
+            <!-- TMPL_IF NAME="day10" -->
+                <option value="10" selected="selected">10</option>
+            <!-- TMPL_ELSE -->
+                <option value="10">10</option>
 			<!-- /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 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="RESERVE_WAITING" -->
-					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
+            <!-- TMPL_IF NAME="day14" -->
+                <option value="14" selected="selected">14</option>
+            <!-- TMPL_ELSE -->
+                <option value="14">14</option>
 				<!-- /TMPL_IF -->
-				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
 				
+            <!-- TMPL_IF NAME="day15" -->
+                <option value="15" selected="selected">15</option>
+            <!-- TMPL_ELSE -->
+                <option value="15">15</option>
+            <!-- /TMPL_IF -->
 		
-				<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 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="issued" -->
-			<div class="error"><p>Item issued</p></div>
+            <!-- TMPL_IF NAME="day18" -->
+                <option value="18" selected="selected">18</option>
+            <!-- TMPL_ELSE -->
+                <option value="18">18</option>
 		<!-- /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 NAME="day19" -->
+                <option value="19" selected="selected">19</option>
+            <!-- TMPL_ELSE -->
+                <option value="19">19</option>
 	<!-- /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_IF NAME="day20" -->
+                <option value="20" selected="selected">20</option>
 	<!-- 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>
+                <option value="20">20</option>
+            <!-- /TMPL_IF -->
 
-	<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="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="flagged" -->
-</div><div class="details">
-<ul>
-<!-- TMPL_IF NAME="gna" -->
-<li><span class="error">Address:</span> Patron's address in doubt</li>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="lost" -->
-<li><span class="error">Lost:</span> Patron's card is lost</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 -->
-<!-- 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 -->
-</ul>
+            <!-- TMPL_IF NAME="day25" -->
+                <option value="25" selected="selected">25</option>
+            <!-- TMPL_ELSE -->
+                <option value="25">25</option>
+            <!-- /TMPL_IF -->
 
-<dl>
+            <!-- TMPL_IF NAME="day26" -->
+                <option value="26" selected="selected">26</option>
+            <!-- TMPL_ELSE -->
+                <option value="26">26</option>
+            <!-- /TMPL_IF -->
 		
-<!-- 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 NAME="day27" -->
+                <option value="27" selected="selected">27</option>
+            <!-- TMPL_ELSE -->
+                <option value="27">27</option>
 		<!-- /TMPL_IF -->
 
-		<!-- TMPL_IF name="notes" -->
-					<dt>Notes:</dt> <dd class="error"><!-- TMPL_VAR name="notesmsg" --></dd>
+            <!-- TMPL_IF NAME="day28" -->
+                <option value="28" selected="selected">28</option>
+            <!-- TMPL_ELSE -->
+                <option value="28">28</option>
 				<!-- /TMPL_IF -->
-</dl>
-<!-- /TMPL_IF -->
+            
+            <!-- TMPL_IF NAME="day29" -->
+                <option value="29" selected="selected">29</option>
 	<!-- 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>
+                <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 -->
-	</div>
 
-<!-- BARCODE ENTRY -->
+            <!-- TMPL_IF NAME="day31" -->
+                <option value="31" selected="selected">31</option>
+            <!-- TMPL_ELSE -->
+                <option value="31">31</option>
+            <!-- /TMPL_IF -->
+            </select>
 
-<!-- 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" -->" />
+        <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" />
@@ -217,67 +600,298 @@
 			<input type="hidden" name="charges" value="yes" />
 			<input type="hidden" name="oldamount" value="<!-- TMPL_VAR NAME="amountold" -->" />
 		<!-- /TMPL_IF -->
-		</p>
-	</form>
+
+    <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>
 
+<!-- /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 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" -->" />
+<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>
-		<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>
+    <tr>
 			<th>Title</th>
-			<th>Author</th>
-			<th>Call No</th>
+        <th>Due date</th>
+        <th>Itemtype</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>
+    <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><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="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 -->
-	
-<!-- /TMPL_IF -->
-
+    <!-- /TMPL_LOOP --> <!-- todayissues -->
+    <!-- /TMPL_IF --> <!-- todayissues -->
 <!-- TMPL_IF NAME="previssues" -->
-		<tr><th colspan="7"><a name="previous" id="previous">Previous Issues</a></th></tr>
+    <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="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>
+    <!-- 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="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> checked="checked"<!-- /TMPL_IF --> /></td></tr>
-		<!-- /TMPL_LOOP -->
+        <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>
 	
-	<p><input type="submit" class="submit" value="Renew Checked Items" /></p>
-<!-- /TMPL_IF -->
+    <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 -->
 
+<script type="text/JavaScript" language="JavaScript">
 	
-</div>
+    /**
+    *  _(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 -->
+    <!-- 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 -->
 
+</script>
 
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
-

Index: circ/currenttransfers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/currenttransfers.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- circ/currenttransfers.tmpl	19 May 2006 17:01:03 -0000	1.1
+++ circ/currenttransfers.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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 -->	

Index: circ/returns.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/returns.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- circ/returns.tmpl	27 Sep 2006 21:40:47 -0000	1.6
+++ circ/returns.tmpl	9 Mar 2007 14:47:39 -0000	1.7
@@ -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>
+<!-- case of a reservation found, and display info -->
+
 		<!-- TMPL_IF Name="waiting" -->
-		<div class="items">
+        <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?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
+                        <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>
-	<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" -->
+        </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="bornum" -->" />
+                <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 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><br>
-    	<div class="item">
+            <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></div><form method="post" action="returns.pl" name="mainform" id="mainform"><input type="submit" value="OK" />
+        </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="bornum" -->" />
+                    <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 -->
 		<!-- TMPL_IF Name="reserved" -->
-			<div class="items">
+        	<!-- 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?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
-			<li><!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" --></li>
+                        <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>
-			<!-- 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_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="bornum" -->" />
+			<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="bornum" -->" />
-			<input type="hidden" name="resbarcode" value="<!-- TMPL_VAR Name="barcode" -->" /></form>
+		<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" />
+            <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="bornum" -->" />
+                <input type="hidden" name="bn-<!-- TMPL_VAR Name="counter" -->" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
 			<!-- /TMPL_LOOP -->
-		</form><!-- TMPL_IF NAME="errmsgloop" --><!-- TMPL_LOOP Name="errmsgloop" -->
-				<div class="error">
+            </fieldset>
+        </form>
+    <!-- TMPL_IF NAME="errmsgloop" -->
+    <fieldset>
+        <legend>Error</legend>
+        <!-- TMPL_LOOP Name="errmsgloop" -->
 				<!-- TMPL_IF Name="badbarcode" -->
-					No Item with barcode: <!-- TMPL_VAR Name="msg" -->
+                        <p class="problem">No Item with barcode: <!-- TMPL_VAR Name="msg" --></p>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF Name="ispermanent" -->
-					Please return to  <!-- TMPL_VAR Name="msg" -->
+                        <p class="problem">Please return to  <!-- TMPL_VAR Name="msg" --></p>
 				<!-- /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 -->
+                        <p class="problem">Not On Issue.</p>
+                    <!-- /TMPL_IF -->
 				<!-- TMPL_IF Name="waslost" -->
-					Item was lost, now found.
+                        <p class="problem">Item was lost, now found.</p>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_IF Name="withdrawn" -->
-					Item Cancelled
+                        <p class="problem">Item Cancelled</p>
+                    <!-- /TMPL_IF -->
+            <!-- /TMPL_LOOP -->
 				<!-- /TMPL_IF -->
-				</div>
-			<!-- /TMPL_LOOP --><!-- /TMPL_IF -->
-</div>
+    </fieldset>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF Name="returned" -->
-<div class="table"><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>
+        </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">
+        <h2>Returned Items</h2>
 		<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>
+        <tr>
+            <th>Title</th>
+            <th>Itemtype</th>
+            <th>Due Date</th>
+            <th>Barcode</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>
+            <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>
-			<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>
+                <!-- TMPL_VAR Name="barcode" -->
+            </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" -->
+                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="borrowernumber" -->">
+                    <!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" -->
+                </a>
 			<!-- 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" -->
+                                Not on issue.
 			<!-- /TMPL_IF -->
 			</td></tr>
 		<!-- /TMPL_LOOP -->
 		</table>
-	</div>
+        
 <!-- /TMPL_IF -->
 
+<script type="text/JavaScript" language="JavaScript">
+	document.mainform.barcode.focus();
+</script>
 
 <!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

Index: circ/selectbranchprinter.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- circ/selectbranchprinter.tmpl	22 Jun 2006 08:43:07 -0000	1.3
+++ circ/selectbranchprinter.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -17,18 +17,19 @@
 	</select>
 
 
-<label for="printer">Choose a Network Printer:</label>
-<!--printerselection-->
-<select name="printer" id="printer">
+<!-- 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>
-<input type="hidden" name="setcookies" value="1" />
-<input type="submit" value="Submit" name="changesettings" />
+<!-- /TMPL_IF -->
+    <input type="hidden" name="setcookies" value="1" />
+    <input type="submit" value="Submit" name="changesettings" />
 </form>
 
 
-
 <!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
 

Index: circ/waitingreservestransfers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/circ/waitingreservestransfers.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- circ/waitingreservestransfers.tmpl	6 Jun 2006 12:30:43 -0000	1.2
+++ circ/waitingreservestransfers.tmpl	9 Mar 2007 14:47:39 -0000	1.3
@@ -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>

Index: includes/doc-head-close.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- includes/doc-head-close.inc	13 Feb 2006 16:39:33 -0000	1.2
+++ includes/doc-head-close.inc	9 Mar 2007 14:47:39 -0000	1.3
@@ -1,8 +1,16 @@
 </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"> 
+<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>
 

Index: includes/holidays-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- includes/holidays-top.inc	14 Apr 2006 09:36:51 -0000	1.1
+++ includes/holidays-top.inc	9 Mar 2007 14:47:39 -0000	1.2
@@ -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 {

Index: includes/intranet-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- includes/intranet-bottom.inc	12 Oct 2005 15:04:45 -0000	1.1
+++ includes/intranet-bottom.inc	9 Mar 2007 14:47:39 -0000	1.2
@@ -1,2 +1,3 @@
-</body>
+        </div>
+    </body>
 </html>
\ No newline at end of file

Index: includes/intranet.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- includes/intranet.css	27 Sep 2006 19:40:43 -0000	1.8
+++ includes/intranet.css	9 Mar 2007 14:47:39 -0000	1.9
@@ -3,10 +3,14 @@
 	font-size : .9em;
 }
 
+h2 {
+    display:block;
+    clear:left;
+/*     float:none; */
+}
 table {
-	border-collapse : collapse;
-	border-top : 1px solid #CCCCCC;
-	border-right : 1px solid #CCCCCC;
+    border-collapse : inherit;
+    border : 1px solid #CCCCCC;
 	margin : 1em 0;
 }
 
@@ -17,8 +21,9 @@
 }
 
 td,th {
-	border-left : 1px solid #CCCCCC;
-	border-bottom : 1px solid #CCCCCC;
+    /*border-left : 1px solid #CCCCCC;
+    border-bottom : 1px solid #CCCCCC;*/
+    border : 1px solid #CCCCCC;
 	padding : 5px;
 }
 
@@ -33,6 +38,9 @@
 	text-align : right;
 }
 
+p {
+    margin:0px 0px 0px 0px;
+}
 input {
 	font-size:0.9em;
 }
@@ -42,16 +50,46 @@
 }
 
 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;
 }
 
+.here {
+    color: black;
+    text-decoration:none;
+}
+
+#problem {
+    color: red;
+    background-color:white;
+    font-weight : bold;
+}
+
 #admin_stopwords_select UL {
    width: 600px;
 }
@@ -68,6 +106,7 @@
 .problem {
 	color: white;
 	background-color:red;
+    font-weight : bold;
 }
 
 /* css styles for reserves color alerts */
@@ -91,44 +130,207 @@
 	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 */
 
 /* 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 */
 #librarian_information {
 /*     position:absolute; */
@@ -136,41 +338,125 @@
     font-size:10pt;
 }
 
-#main {
-	background-color : #C2CED3;
-	border-left : 1px solid #000000;
-	margin-left : 20%;
-	margin-right : 1%;
-	margin-top : 2%;
-	padding : 10px;
+/* 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;
 }
 
-#facetsmenu {
-position : absolute;
-left : 1px;
-width : 15%;
+/* 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%;
+
+/* the style of tag description */
+p.tag {
+    font-weight:bold;
 }
-#facetsmenu ul li {
+/* the style of subfield paragraph */
+p.subfield {
+    
+}
+
 	
-	list-style : none;
-	padding : 1px;
-	text-align : right;
 	
+.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;
 }

Index: includes/menu-acqui.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- includes/menu-acqui.inc	11 Aug 2006 09:51:45 -0000	1.3
+++ includes/menu-acqui.inc	9 Mar 2007 14:47:39 -0000	1.4
@@ -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">

Index: includes/menu-admin.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- includes/menu-admin.inc	11 Aug 2006 09:51:45 -0000	1.4
+++ includes/menu-admin.inc	9 Mar 2007 14:47:39 -0000	1.5
@@ -1,18 +1,23 @@
 <div id="submenu">
+    <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/authorised_values.pl">Authorised values</a>
-	<a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus</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>
-	<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>
+    </p>
 </div>
\ No newline at end of file
+
+<div id="main">

Index: includes/menu-authorities.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-authorities.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- includes/menu-authorities.inc	4 Apr 2006 10:05:48 -0000	1.1
+++ includes/menu-authorities.inc	9 Mar 2007 14:47:39 -0000	1.2
@@ -13,3 +13,5 @@
 	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">

Index: includes/menu-catalogue.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- includes/menu-catalogue.inc	11 Aug 2006 09:51:45 -0000	1.3
+++ includes/menu-catalogue.inc	9 Mar 2007 14:47:39 -0000	1.4
@@ -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 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/serials/lateissues.pl">Late issues</a>
 	<a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a>
+    <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Manage reviews</a>
 </div>
\ No newline at end of file
+
+<div id="main">

Index: includes/menu-circ.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- includes/menu-circ.inc	11 Aug 2006 09:51:45 -0000	1.2
+++ includes/menu-circ.inc	9 Mar 2007 14:47:39 -0000	1.3
@@ -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>
+    </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>
\ No newline at end of file
+
+<div id="main">

Index: includes/menu-members.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- includes/menu-members.inc	11 Aug 2006 09:51:45 -0000	1.3
+++ includes/menu-members.inc	9 Mar 2007 14:47:39 -0000	1.4
@@ -1,3 +1,4 @@
+<!-- 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>
@@ -5,3 +6,5 @@
  	<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 id="main">

Index: includes/menu-serials.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- includes/menu-serials.inc	11 Aug 2006 09:51:45 -0000	1.3
+++ includes/menu-serials.inc	9 Mar 2007 14:47:39 -0000	1.4
@@ -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">

Index: includes/menu-tools.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- includes/menu-tools.inc	11 Aug 2006 16:33:01 -0000	1.3
+++ includes/menu-tools.inc	9 Mar 2007 14:47:39 -0000	1.4
@@ -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>
+    <a href="/cgi-bin/koha/tools/overduerules.pl">overdue rules</a>
+    <a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a>
 </div>
\ No newline at end of file
+
+<div id="main">

Index: includes/menus.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- includes/menus.inc	11 Aug 2006 09:51:45 -0000	1.6
+++ includes/menus.inc	9 Mar 2007 14:47:39 -0000	1.7
@@ -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>
+<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>
-	<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>
-</div>
+    <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>
 
-<div id="librarian_information">
-<p><!-- TMPL_VAR name="loggedinusername" -->, from <!-- TMPL_VAR name="branchname" --></p>
+    <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>
\ No newline at end of file

Index: members/boraccount.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/boraccount.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- members/boraccount.tmpl	22 Sep 2006 00:18:00 -0000	1.3
+++ members/boraccount.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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" -->

Index: members/deletemem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- members/deletemem.tmpl	19 Jul 2005 20:47:06 -0000	1.1
+++ members/deletemem.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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.

Index: members/guarantor_search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/guarantor_search.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- members/guarantor_search.tmpl	12 Jun 2006 08:35:58 -0000	1.2
+++ members/guarantor_search.tmpl	9 Mar 2007 14:47:39 -0000	1.3
@@ -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>

Index: members/mancredit.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/mancredit.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- members/mancredit.tmpl	22 Sep 2006 00:18:00 -0000	1.1
+++ members/mancredit.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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

Index: members/maninvoice.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/maninvoice.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- members/maninvoice.tmpl	22 Sep 2006 00:18:00 -0000	1.1
+++ members/maninvoice.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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>
 
 
 

Index: members/member-flags.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- members/member-flags.tmpl	18 Jan 2006 17:23:32 -0000	1.2
+++ members/member-flags.tmpl	9 Mar 2007 14:47:39 -0000	1.3
@@ -6,8 +6,8 @@
 <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" />
+    <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>

Index: members/member-quicksearch-results.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- members/member-quicksearch-results.tmpl	19 Jul 2005 20:47:06 -0000	1.1
+++ members/member-quicksearch-results.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -15,6 +15,7 @@
 	}
 </script>
 
+<div class="searchresults">
 <table>
   <tr>
   	<th>&nbsp;</th>
@@ -31,10 +32,12 @@
     <!-- /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><!-- 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 -->
 
 

Index: members/member-quicksearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2

Index: members/member.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- members/member.tmpl	18 Jan 2006 17:23:32 -0000	1.2
+++ members/member.tmpl	9 Mar 2007 14:47:39 -0000	1.3
@@ -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" -->
+	<!-- 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

Index: members/memberentryA.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- members/memberentryA.tmpl	23 Aug 2006 14:40:48 -0000	1.12
+++ members/memberentryA.tmpl	9 Mar 2007 14:47:39 -0000	1.13
@@ -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" -->
@@ -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" -->
@@ -48,10 +46,11 @@
 		</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_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>

Index: members/memberentryC.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- members/memberentryC.tmpl	23 Aug 2006 14:40:48 -0000	1.10
+++ members/memberentryC.tmpl	9 Mar 2007 14:47:39 -0000	1.11
@@ -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_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>

Index: members/memberentryI.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryI.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- members/memberentryI.tmpl	23 Aug 2006 14:40:48 -0000	1.7
+++ members/memberentryI.tmpl	9 Mar 2007 14:47:39 -0000	1.8
@@ -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_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>

Index: members/memberentryP.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- members/memberentryP.tmpl	23 Aug 2006 14:40:48 -0000	1.8
+++ members/memberentryP.tmpl	9 Mar 2007 14:47:39 -0000	1.9
@@ -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_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,12 +428,13 @@
 		</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">
+				<option> </option>
 						<!-- TMPL_LOOP NAME="relshiploop" -->
 							<option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
 						<!-- /TMPL_LOOP -->
@@ -443,7 +442,7 @@
 		</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>

Index: members/members-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- members/members-home.tmpl	18 Jan 2006 17:23:32 -0000	1.2
+++ members/members-home.tmpl	9 Mar 2007 14:47:39 -0000	1.3
@@ -3,15 +3,47 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
-<h1>Member Search</h1>
+<h1>Borrowers 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" />
+    <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" -->

Index: members/moremember-print.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember-print.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- members/moremember-print.tmpl	19 Jul 2005 20:47:06 -0000	1.1
+++ members/moremember-print.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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>

Index: members/moremember-receipt.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember-receipt.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- members/moremember-receipt.tmpl	19 Jul 2005 20:47:06 -0000	1.1
+++ members/moremember-receipt.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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 @@
 	<!-- 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 @@
 	<!-- 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 -->

Index: members/moremember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- members/moremember.tmpl	27 Sep 2006 21:40:47 -0000	1.14
+++ members/moremember.tmpl	9 Mar 2007 14:47:39 -0000	1.15
@@ -1,40 +1,86 @@
-<!-- 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="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> 
+            <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/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 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=bornum -->">
-		Modify Member's Privileges
+        <a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME=borrowernumber -->">
+            Privileges
 	</a> 
-	<a href="javascript:confirm_deletion()">
-		Delete this Member
+        <a href="javascript:confirm_deletion();">
+            Delete
 	</a> 
-	<a href="/cgi-bin/koha/members/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
-		View Account
+    </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?bornum=<!-- TMPL_VAR NAME="bornum" -->">
+        <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
 		Pay Fines
 	</a> 
-	<a href="/cgi-bin/koha/members/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
-		Member's Reading Record
+        <a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">
+            Reading Record
 	</a>
-</ul>
-
+        <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 
+            <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" />
@@ -42,76 +88,123 @@
 			</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 -->
+        <!-- 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>
+    <!-- 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 -->
+    <!-- /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>
-	<!-- TMPL_UNLESS name="I" -->
 	<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>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>Expiration Date: </label><!-- TMPL_VAR NAME="dateexpiry" --></p>
-	<p><label>Registration Branch:</label><!-- TMPL_VAR NAME="branchname" --></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>
+    <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="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?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name --> - <!-- TMPL_VAR NAME="cardnumber" --></a></li><!-- /tmpl_loop --></ul></p>
+                <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?bornum=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorcardnumber" --></a></p>
+                <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 -->
-	<!-- /TMPL_UNLESS -->
+    
 </fieldset>
+
+<!-- /TMPL_UNLESS-->
+<!-- /TMPL_UNLESS-->
 <fieldset>
 	<legend>Fines &amp; Charges</legend>
 	<!-- TMPL_IF name="totaldue" -->
@@ -120,10 +213,10 @@
 		<p>No Outstanding Charges</p>
 	<!-- /TMPL_IF -->
 </fieldset>
-<fieldset>
-	<legend>Items On Loan</legend>
+    <div>
+    <h2>Items On Loan</h2>
 	<form action="/cgi-bin/koha/reserve/renewscript.pl" method="post">
-		<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" />
+        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
 	<table>
 		<tr>
 			<th scope="col">Title</th>
@@ -143,10 +236,11 @@
                   <!-- /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" -->
+                <!-- 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>
@@ -159,15 +253,20 @@
 			<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>
+                <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" -->"
-					<!-- TMPL_IF NAME="red" -->
 						checked="checked"
-					<!-- /TMPL_IF -->
 			/>
+            <!-- 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" -->"
@@ -179,67 +278,91 @@
 			<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>
+        <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>
-</fieldset>
-<fieldset>
-	<legend>Reserves</legend>
-	<form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
-		<input type="hidden" name="from" value="borrower" />
+    </div>
+<!-- TMPL_IF NAME="reservloop" -->
+<div id="circ_circulation_issue">
+	<h2>Borrower current reserves</h2>
 		<table>
 		<tr>
-			<th scope="row">Title</th>
-			<th scope="row">Requested</th>
-			<th scope="row">Remove</th>
+			<th>Reserve date</th>
+			<th>Barcode</th>
+			<th>Title</th>
+			<th>Author</th>
+			<th>Localisation</th>
+			<th>Details</th>
 		</tr>
-	
-		<!-- TMPL_LOOP name="reserveloop" -->
-                  <!-- TMPL_IF NAME="toggle" -->
-		<tr class="highlight">
-                  <!-- TMPL_ELSE -->
-                <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" -->" 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>
-				<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_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="reservedate2" --></td>
+					<td><!-- TMPL_VAR NAME="author" --></td>
+					<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
 			<td>
-				<select name="rank-request">
-				<option value="n">No</option>
-				<option value="del">Yes</option>
-				</select>
+					    <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">view reserves </a>
 			</td>
-			<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" />
 		</tr>
-		<!-- /tmpl_loop -->
+		<!-- /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 ?');
+    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=<!-- TMPL_VAR NAME="bornum" -->";
+            window.location='/cgi-bin/koha/members/deletemem.pl?member='+borrowernumbervalue+'';
 	}
 }
+
 function confirm_reregistration() {
-	var is_confirmed = confirm('Do you confirm re_registration ?');
+    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?bornum=<!-- TMPL_VAR NAME="bornum" -->&reregistration=y";
+    window.location='/cgi-bin/koha/members/moremember.pl?reregistration=y&borrowernumber='+borrowernumbervalue1+'';
 	}
 }
 </script>
+<!-- /TMPL_IF --> <!-- unknowuser -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: members/pay.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- members/pay.tmpl	22 Sep 2006 00:18:00 -0000	1.5
+++ members/pay.tmpl	9 Mar 2007 14:47:39 -0000	1.6
@@ -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_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

Index: members/readingrec.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- members/readingrec.tmpl	13 Jun 2006 09:54:30 -0000	1.3
+++ members/readingrec.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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" -->

Index: reports/acquisitions_stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/acquisitions_stats.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- reports/acquisitions_stats.tmpl	22 Jul 2005 16:39:56 -0000	1.1
+++ reports/acquisitions_stats.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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>

Index: reports/bor_issues_top.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/bor_issues_top.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- reports/bor_issues_top.tmpl	22 Jul 2005 16:39:57 -0000	1.1
+++ reports/bor_issues_top.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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 @@
 }
 </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 @@
 						<!-- 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 @@
 		</table>
 	<!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-	<h1>Koha : Top List borrowers for Issues  </h1>
+	<h1>Top List borrowers for Issues</h1>
 	<form method="post">
 	
 	<table>

Index: reports/borrowers_out.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_out.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- reports/borrowers_out.tmpl	22 Jul 2005 16:39:57 -0000	1.1
+++ reports/borrowers_out.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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 with No Issues </h1>
+        <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 NAME="loopfilter"-->
+        <!-- /TMPL_IF-->
 		
 		<table>
 			<tr >
@@ -35,11 +36,11 @@
 							</td>
 						<!-- /TMPL_LOOP -->
 					</tr>
-				<!-- /TMPL_LOOP NAME="looprow" -->
+                <!-- /TMPL_LOOP -->
 		</table>
 	<!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-	<h1>Koha : Borrowers with no Issues  </h1>
+    <h1>Borrowers with no Issues</h1>
 	<form method="post">
 	
 	<table>

Index: reports/borrowers_stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/borrowers_stats.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- reports/borrowers_stats.tmpl	22 Jul 2005 16:39:57 -0000	1.1
+++ reports/borrowers_stats.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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" -->

Index: reports/cat_issues_top.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/cat_issues_top.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- reports/cat_issues_top.tmpl	22 Jul 2005 16:39:57 -0000	1.1
+++ reports/cat_issues_top.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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 @@
 						<!-- 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 @@
 							</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>

Index: reports/catalogue_out.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_out.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- reports/catalogue_out.tmpl	22 Jul 2005 16:39:57 -0000	1.1
+++ reports/catalogue_out.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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>

Index: reports/catalogue_stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/catalogue_stats.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- reports/catalogue_stats.tmpl	22 Jul 2005 16:39:57 -0000	1.1
+++ reports/catalogue_stats.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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>

Index: reports/inventory.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/inventory.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- reports/inventory.tmpl	22 Jul 2005 16:39:57 -0000	1.1
+++ reports/inventory.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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 -->

Index: reports/issues_avg_stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_avg_stats.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- reports/issues_avg_stats.tmpl	22 Jul 2005 16:39:57 -0000	1.1
+++ reports/issues_avg_stats.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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 -->

Index: reports/issues_by_borrower_category.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_by_borrower_category.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- reports/issues_by_borrower_category.tmpl	22 Jul 2005 16:39:57 -0000	1.1
+++ reports/issues_by_borrower_category.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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" -->

Index: reports/issues_stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/issues_stats.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- reports/issues_stats.tmpl	22 Jul 2005 16:39:57 -0000	1.1
+++ reports/issues_stats.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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>

Index: reports/itemtypes.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/itemtypes.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- reports/itemtypes.tmpl	22 Jul 2005 16:39:57 -0000	1.1
+++ reports/itemtypes.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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>

Index: reports/reports-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reports/reports-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- reports/reports-home.tmpl	7 Jul 2006 08:56:05 -0000	1.3
+++ reports/reports-home.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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>

Index: reserve/request.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reserve/request.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- reserve/request.tmpl	31 May 2006 14:07:26 -0000	1.3
+++ reserve/request.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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 (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,41 +51,43 @@
 	}
 }
 </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">
+<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" -->
-    <table>
-      <tr>
-        <th>Member (number or name)</th>
-        <td>
+            <p>
+            <label>Member (number or name)</label>
           <input type="text" size="20" name="findborrower">
-        </td>
-      </tr>
-    </table>
-
+            </p>
     <div id="action">
-    <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="bib"-->">
+            <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="bib" value="<!-- TMPL_VAR NAME="bib"-->">
+            <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber"-->">
      <input type="submit" value="Select">
     </div>
   <!-- /TMPL_UNLESS -->
@@ -96,7 +99,7 @@
   <!-- TMPL_IF NAME="maxreserves" -->
       <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 -->
@@ -104,22 +107,22 @@
     <!-- TMPL_IF NAME="expiry" -->
     <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 -->
 
@@ -133,57 +136,30 @@
     <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"-->
+    <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 -->
-        </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>
+            Not defined yet
   <!-- /TMPL_IF -->
-<!-- /TMPL_LOOP -->
-          </select>
-        </td>
-      </tr>
-
-      <tr>
-        <th>
+    </p>
+    <p>
+    <label for="priority">Priority</label>
+     	<b> <!-- TMPL_VAR Name="fixedRank" --> </b>
+    </p>
+    <p>
           <label>Notes</label>
-        </th>
-        <td>
-          <textarea name="notes" cols="40" rows="5"></textarea>
-        </td>
-      </tr>
-
-      <tr>
-        <th>
-          <label>Place of retreat</label>
-        </th>
-        <td>
+        <textarea name="notes" cols="20" rows="2"></textarea>
+    </p>
+    <p>
+        <label>Pickup at</label>
           <!-- TMPL_VAR NAME="CGIbranch" -->
-        </td>
-      </tr>
-
-    </table>
+    </p>
   </fieldset>
 
   <fieldset>
@@ -196,10 +172,12 @@
     
     <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" -->">
@@ -207,12 +185,13 @@
           <!-- 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 @@
           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 @@
     
     <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 @@
 <!-- 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,25 +290,27 @@
           <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" -->
         <!-- TMPL_IF Name="selected" -->
@@ -325,8 +326,13 @@
         </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 @@
       </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>

Index: reviews/reviewswaiting.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/reviews/reviewswaiting.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- reviews/reviewswaiting.tmpl	8 Dec 2006 11:24:58 -0000	1.3
+++ reviews/reviewswaiting.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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,7 +23,7 @@
             &nbsp;
         </th>
     </tr>
-<!-- TMPL_LOOP NAME="reviews" -->
+    <!-- TMPL_LOOP NAME="reviews" -->
     <tr>
         <td>
             <!-- TMPL_VAR NAME="surname" --> 
@@ -40,10 +40,10 @@
             <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

Index: serials/acqui-search-result.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search-result.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- serials/acqui-search-result.tmpl	11 Sep 2006 17:41:55 -0000	1.3
+++ serials/acqui-search-result.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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" -->
+

Index: serials/acqui-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/acqui-search.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- serials/acqui-search.tmpl	11 Sep 2006 17:41:55 -0000	1.3
+++ serials/acqui-search.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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

Index: serials/claims.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/claims.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- serials/claims.tmpl	11 Sep 2006 17:41:55 -0000	1.3
+++ serials/claims.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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 @@
 	<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>
+                <!--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" -->,''); 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 -->

Index: serials/distributedto.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/distributedto.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- serials/distributedto.tmpl	11 Sep 2006 17:41:55 -0000	1.3
+++ serials/distributedto.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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" -->

Index: serials/member-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/member-search.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- serials/member-search.tmpl	20 Jul 2006 03:59:10 -0000	1.3
+++ serials/member-search.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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 @@
 </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" -->

Index: serials/receipt-search-result.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/receipt-search-result.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- serials/receipt-search-result.tmpl	11 Sep 2006 17:41:55 -0000	1.3
+++ serials/receipt-search-result.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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">

Index: serials/result.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/result.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- serials/result.tmpl	28 Sep 2006 14:25:22 -0000	1.4
+++ serials/result.tmpl	9 Mar 2007 14:47:39 -0000	1.5
@@ -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" -->
+<!-- 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>
-	<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">
+<!-- TMPL_IF NAME="total"-->
+<div class="searchresults">
 		<table>
 			<tr>
-			<th class="catalogue">Summary</th>
-			<th class="catalogue">&nbsp;</th>
+       <th>Title</th>
+       <th>Author</th>
+       <th>publisher</th>
+       <th>Publication year</th>
 			</tr>
-			<!-- TMPL_LOOP name="result" -->
+    <!-- TMPL_LOOP NAME="resultsloop" -->
 			<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>
+                <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_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>
+                <!-- TMPL_VAR NAME="publishercode" -->
+            </td>
+            <td>
+                <!-- TMPL_VAR NAME="publicationyear" -->
 				</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>	
-
+</div>
+<!-- TMPL_ELSE -->
+No result found for <b><!-- TMPL_VAR NAME="query" --></b>
+<!-- /TMPL_IF-->
+</div>
 
 
 <script language="Javascript">
 
 function GetIt(bibno,title)
 {
+    title = title.replace(/\?/,"\?");
+    title = title.replace(/"/,"\"");
+    title = title.replace(/'/,"\'");
   opener.document.f.biblionumber.value = bibno;
   opener.document.f.title.value = title;
-  self.close();
+    window.close();
 }
 </script>
\ No newline at end of file

Index: serials/routing-preview-slip.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview-slip.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- serials/routing-preview-slip.tmpl	20 Jul 2006 03:47:29 -0000	1.1
+++ serials/routing-preview-slip.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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>

Index: serials/routing-preview.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/routing-preview.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- serials/routing-preview.tmpl	11 Sep 2006 17:41:55 -0000	1.3
+++ serials/routing-preview.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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">

Index: serials/routing.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/routing.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- serials/routing.tmpl	11 Sep 2006 17:41:55 -0000	1.3
+++ serials/routing.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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 @@
 //-->
 </script>
 
-<div id="main">
+<div id="mainbloc">
 <!-- TMPL_IF NAME="op" -->
 <h1>Create Routing List</h1>
 <!-- TMPL_ELSE -->

Index: serials/serial-issues-full.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues-full.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- serials/serial-issues-full.tmpl	11 Sep 2006 17:41:55 -0000	1.3
+++ serials/serial-issues-full.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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 @@
 	}
 }
 
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
+</script>
+</body>
+</html>

Index: serials/serial-issues.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serial-issues.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- serials/serial-issues.tmpl	11 Sep 2006 17:41:55 -0000	1.4
+++ serials/serial-issues.tmpl	9 Mar 2007 14:47:39 -0000	1.5
@@ -1,11 +1,18 @@
-<!-- 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>
+    <h2>Subscription summary</h2>
 		<p>It began on <b><!-- TMPL_VAR name="histstartdate" --></b> and is issued every
 		<b>
 		<!--TMPL_IF name="periodicity1" -->
@@ -70,23 +77,23 @@
 			</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_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" -->
-			<h3 class="serial">Issues summary</h2>
+            <h2>Issues summary</h2>
 			<p>
 				<!-- TMPL_VAR name="opacnote" -->
 			</p>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="receivedlist" -->
-			<h3 class="serial">received issues</h2>
+        <!-- TMPL_IF name="recievedlist" -->
+            <h2>Recieved issues</h2>
 			<p>
-				<!-- TMPL_VAR name="receivedlist" -->
+                <!-- TMPL_VAR name="recievedlist" -->
 			</p>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF name="missinglist" -->
-			<h3 class="serial">Missing issues</h2>
+            <h2>Missing issues</h2>
 			<p>
 				<!-- TMPL_VAR name="missinglist" -->
 			</p>
@@ -94,13 +101,5 @@
 	</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" -->

Index: serials/serials-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/serials-home.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- serials/serials-home.tmpl	11 Sep 2006 17:41:55 -0000	1.6
+++ serials/serials-home.tmpl	9 Mar 2007 14:47:39 -0000	1.7
@@ -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>
+            <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" -->
+            <tr>
 	 <!-- TMPL_IF name="toggle" -->
-            <tr class="hilighted">
+                    <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>   
+                <!-- /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>
-               
+                <!-- 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="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 -->
+                <!-- 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="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial" title="subscription detail">Detail</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="serials-receive.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button serial" title="receive issues for this subscription">Receive</a>
+                <!-- /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" -->
 

Index: serials/subscription-add.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- serials/subscription-add.tmpl	11 Sep 2006 17:41:55 -0000	1.4
+++ serials/subscription-add.tmpl	9 Mar 2007 14:47:39 -0000	1.5
@@ -1,22 +1,26 @@
-<!-- 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;
 
@@ -40,7 +44,7 @@
 		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}';
+        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;
@@ -60,7 +64,7 @@
 		document.f.lastvalue1.value=1;
 		document.f.lastvalue2.value=1;
 		document.f.lastvalue3.value='';
-		document.f.numberingmethod.value='Vol {X}, No {Y}';
+        document.f.numberingmethod.value=_('Vol {X}, No {Y}');
 		moreoptions(text[1],text[0]);
 		display_table(0);
 		break;
@@ -80,7 +84,7 @@
 		document.f.lastvalue1.value=1;
 		document.f.lastvalue2.value=1;
 		document.f.lastvalue3.value='';
-		document.f.numberingmethod.value='Vol {X}, Issue {Y}';
+        document.f.numberingmethod.value=_('Vol {X}, Issue {Y}');
 		moreoptions(text[1],text[2]);
 		display_table(0);
 		break;
@@ -100,7 +104,7 @@
 		document.f.lastvalue1.value=1;
 		document.f.lastvalue2.value=1;
 		document.f.lastvalue3.value='';
-		document.f.numberingmethod.value='No {X}, Issue {Y}';
+        document.f.numberingmethod.value=_('No {X}, Issue {Y}');
 		moreoptions(text[0],text[2]);
 		display_table(0);
 		break;
@@ -123,13 +127,14 @@
 		document.f.lastvalue2.value='1';
 		document.f.lastvalue3.value='';
 		document.f.periodicity.value='8';
-		document.f.numberingmethod.value='{Y} {X}';
+        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:
@@ -215,13 +220,13 @@
 	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 \/>";
+        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 = '';
@@ -255,12 +260,14 @@
 		textbox +="<\/tr>\n";
 		if(y){
 			textbox +="<tr><td>"+text[6]+"<\/td>";
-			textbox +="<td><a href='javascript:irregularity_check()'>Irregularity?<\/a><\/td>\n";
+            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";
 	}
@@ -323,7 +330,7 @@
 		}
 		textbox +="<\/select><\/td><\/tr>\n";
 		textbox +="<tr><td>"+text[6]+"<\/td>";
-		textbox +="<td><a href='javascript:irregularity_check()'>Irregularity?<\/a><\/td>\n";
+        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";
 	}
@@ -333,14 +340,17 @@
 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;
+    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 \/>";
+    var errortext = _("<b>Warning irregularity detected<\/b><br \/>");
 	switch(periodicity){
 	case "1":
 		if(rollover < 365) expected =365;
@@ -417,14 +427,14 @@
 	}
 	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 \/>";
+            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 \/>";
+            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";
@@ -436,11 +446,11 @@
 		}
 	}
 	if(toobig){
-		errortext +=expectedover+" issues expected "+rollover+" were entered.<br \/> You seem to have indicated more issues per year than expected.";
+        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';
+        error=_('No irregularities noticed');
 	}
 	display_example(expected);
 	document.getElementById("irregularity").innerHTML = error;
@@ -452,8 +462,8 @@
 <!-- TMPL_IF 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 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;
@@ -513,7 +523,7 @@
 function irregular_order(){
 	var irregular = '<!-- TMPL_VAR NAME="irregularity" -->';
 	var periodicity = document.f.periodicity.value;
-	var irregarray = irregular.split('|');
+    var irregarray = irregular.split(',');
 	if(periodicity ==1){
 		for(j=0;j<irregarray.length;j++){
 		document.getElementById("irregular"+irregarray[j]).checked = true; 
@@ -537,7 +547,7 @@
 	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';
+    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;
@@ -586,9 +596,12 @@
 		}
 	}
 	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';
+        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>";
@@ -596,9 +609,9 @@
 }
 
 function isArray(obj) {
-   if (obj.constructor.toString().indexOf("Array") == -1)
+if (obj.constructor.toString().indexOf("Array") == -1)
       return false;
-   else
+else
       return true;
 }
 
@@ -611,6 +624,7 @@
 	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");
 	}
@@ -619,20 +633,20 @@
 
 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!=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");
+            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">
+    <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 -->
@@ -640,63 +654,84 @@
 	<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">
+<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">
 
 
-<div id="bloc25">
-	<h2>Subscription information</h2>
+<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="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>
+        <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=""></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 -->
+                    <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> (select a letter &amp; patrons will be able to "follow" this subscription and recieve a mail on every new issue)
 			</td>
-		<!-- /TMPL_IF -->
-		<td><label>Distributed to </label><a href="#" onClick="DistributedTo()">...</a></td><tr>
-
-
-
-
-
-
-
-
-
-	<tr><td><b>Warning:</b></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>
+                </ul>
+            </td>
+        </tr>
 	</table>
-</div>
-<div id="bloc25">
+<div>
 	<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="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 --> 
+        <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",
@@ -712,10 +747,16 @@
                                                 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">
+                </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>
 
@@ -777,9 +818,15 @@
 					<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()">
+                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>
@@ -816,14 +863,17 @@
 		<!-- 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 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 --> 
+                <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",
@@ -839,62 +889,32 @@
                                                 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>
+                </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="7">Sunday</option>
+                        <option value="<!-- TMPL_VAR NAME="name" -->">
 				<!-- /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>
+                        <!-- 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>
@@ -953,15 +973,46 @@
 				<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>
+            </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">
 <!-- TMPL_ELSE -->
 	<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,17 +1021,17 @@
 
 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');
 }
 
 
@@ -990,27 +1041,19 @@
 			document.f.submit();
 		} else {
 			if(f.numbering_pattern.value == ''){
-				alert("need to choose a numbering pattern");
+                alert(_("need to choose a numbering pattern"));
 			} else {
-				alert("need to check for irregularity by clicking 'Irregularity?'");
+                alert(_("need to check for irregularity by clicking 'Irregularity?'"));
 			}
 		}
 	} else {
-	 	alert('field marked with * are mandatory');
+        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');
-
-}
 </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" -->);
@@ -1018,7 +1061,7 @@
 </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>

Index: serials/subscription-bib-search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-bib-search.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- serials/subscription-bib-search.tmpl	28 Sep 2006 14:25:22 -0000	1.4
+++ serials/subscription-bib-search.tmpl	9 Mar 2007 14:47:39 -0000	1.5
@@ -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>
+    <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>

Index: serials/subscription-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-detail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- serials/subscription-detail.tmpl	11 Sep 2006 17:41:55 -0000	1.4
+++ serials/subscription-detail.tmpl	9 Mar 2007 14:47:39 -0000	1.5
@@ -1,65 +1,66 @@
-<!-- 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){
@@ -133,67 +134,44 @@
 
 -->
 </script>
+    <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 -->
 
-
-<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">
+    </fieldset>
 	<form name="f">
-	<h2>Planning</h2>
-	<p><label class="label100">Beginning date:</label> <!-- TMPL_VAR name="publisheddate" -->
+    <fieldset>
+        <legend>Planning</legend>
+            <p><label>Beginnning date:</label> <!-- TMPL_VAR name="startdate" -->
 	</p>
-	<p><label class="label100">Frequency (*):</label>
+            <p><label>Frequency (*):</label>
 		<!--TMPL_IF name="periodicity1" -->
 				1/day
 		<!-- /TMPL_IF -->
@@ -227,8 +205,9 @@
 		<!--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 class="label100">Number Pattern:</label>
+            <p><label>Number Pattern:</label>
 		<!-- TMPL_IF name="numberpattern1" -->
 			Number
 		<!-- /TMPL_IF -->
@@ -253,7 +232,7 @@
 	</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>
+                <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-->
@@ -261,7 +240,7 @@
 	    <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>
+            <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; 
@@ -274,7 +253,7 @@
 	    </td>
 	<!--/TMPL_IF-->
 	</tr>
-	<tr><td><p><label class="label100">Rollover:</label></p></td>
+            <tr><td><p><label>Rollover:</label></p></td>
 	    <td align="center">&nbsp;</td>
 	<!--TMPL_IF NAME="whenmorethan2"-->
 	    <td align="center">&nbsp; 
@@ -289,95 +268,87 @@
 	</tr>
 	</table>
 	<!-- TMPL_IF NAME="irregularity" -->
-	<p><label class="label100">Irregularity:</label>
+            <p><label>Irregularity:</label>
 		<div id="irreg"></div>
 	</p>
 	<!-- /TMPL_IF -->
-	<p><label class="label100">Begins on:</label>
+            <p><label>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">
+        <!-- TMPL_IF name="monthlength" --><p><label>Number of months:</label> <!-- TMPL_VAR name="monthlength" --></p><!-- /TMPL_IF -->
+    </fieldset>
 	<h2>Numbering calculation</h2>
-	<p><label class="label100">Numbering formula:</label> <!-- TMPL_VAR name="numberingmethod" --></p>
-</div>
-<div class="bloc25" id="basetable">
-	<table cellpadding="0" cellspacing="0" border="0" class="collapse">
+    <p><label>Numbering formula:</label> <!-- TMPL_VAR name="numberingmethod" --></p>
+    <table>
 		<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>
+            <th>&nbsp;</th>
+            <th>X</th>
+            <th>Y</th>
+            <th>Z</th>
 			</tr>
 			<tr>
-				<td class="cell">Add</td>
-				<td class="cell">
+                <td>Add</td>
+                <td>
 					<!-- TMPL_VAR name="add1" -->
 				</td>
-				<td class="cell">
+                <td>
 					<!-- TMPL_VAR name="add2" -->
 				</td>
-				<td class="cell">
+                <td>
 					<!-- 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>
+                <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 class="cell">When more than</td>
-				<td class="cell"><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br/>
+                <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 class="cell"><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br/>
+                <td><!-- 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/>
+                <td><!-- 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>
+                <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 class="cell">
+                <td>
 						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>
+                <td><!-- TMPL_VAR name="lastvalue1" --></td>
+                <td><!-- TMPL_VAR name="lastvalue2" --></td>
+                <td><!-- 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">
+</fieldset>
+<fieldset>
+    <legend>Serial issues</legend>
+    <table cellpadding="0" cellspacing="0">
 	<tr>
-		<th class="cell-header">Issue number</th>
-		<th class="cell-header">Planned date</th>
-		<th class="cell-header">Status</th>
+        <th>Issue number</th>
+        <th>Planned date</th>
+        <th>Status</th>
 	</tr>
 	<!-- TMPL_LOOP name="serialslist" -->
 		<tr>
-			<td class="cell">
+            <td>
 				<!-- TMPL_VAR name="serialseq" -->
 			</td>
-			<td class="cell">
+            <td>
 				<!-- TMPL_VAR name="planneddate" -->
 			</td>
-			<td class="cell">
+            <td>
 					<!--TMPL_IF name="status1" -->
 						Waited
 					<!-- /TMPL_IF -->
@@ -394,24 +365,35 @@
 		</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>
-</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";
 	}
 }
-window.onload = num_pattern();
-</script>
+function popup(link) {
+    newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
+}
 
+// window.onload = num_pattern();
+</script>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: serials/subscription-renew.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-renew.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- serials/subscription-renew.tmpl	11 Sep 2006 17:41:55 -0000	1.3
+++ serials/subscription-renew.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="popup-top.inc" -->
-
+<div id="mainbloc">
 
 <h1 class="serial">subscription renewal for <!-- TMPL_VAR name="bibliotitle" --></h1>
 

Index: serials/viewalerts.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/serials/viewalerts.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- serials/viewalerts.tmpl	11 Sep 2006 17:41:55 -0000	1.3
+++ serials/viewalerts.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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>

Index: suggestion/acceptorreject.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/suggestion/acceptorreject.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- suggestion/acceptorreject.tmpl	22 Jul 2005 16:46:26 -0000	1.1
+++ suggestion/acceptorreject.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -1,13 +1,26 @@
 <!-- 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" -->
 
-<!-- TMPL_IF name="op_else" -->
 	<h1>Suggestions Management</h1>
-	<form method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
+    
+    <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" -->
+    <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>
@@ -15,26 +28,160 @@
 			<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
 				<td>
 					<select name="aorr">
-						<option value=""> -- Choose Action --</option>
+                        <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>
+                <td>
+
+		            <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" -->
+                    <!-- 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" -->

Index: suggestion/mail_suggestion_REJECTED.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/suggestion/mail_suggestion_REJECTED.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- suggestion/mail_suggestion_REJECTED.tmpl	22 Jul 2005 16:46:27 -0000	1.1
+++ suggestion/mail_suggestion_REJECTED.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -2,7 +2,9 @@
 
 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" -->.
 

Index: tools/barcodes.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/tools/barcodes.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tools/barcodes.tmpl	24 Feb 2006 11:52:38 -0000	1.1
+++ tools/barcodes.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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">

Index: tools/export.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- tools/export.tmpl	11 Sep 2006 17:41:55 -0000	1.4
+++ tools/export.tmpl	9 Mar 2007 14:47:39 -0000	1.5
@@ -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" -->

Index: tools/holidays.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/tools/holidays.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tools/holidays.tmpl	3 Mar 2006 16:35:21 -0000	1.1
+++ tools/holidays.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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>
 

Index: tools/import.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/tools/import.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tools/import.tmpl	24 Feb 2006 11:52:38 -0000	1.1
+++ tools/import.tmpl	9 Mar 2007 14:47:39 -0000	1.2
@@ -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>

Index: tools/koha-news.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/tools/koha-news.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tools/koha-news.tmpl	11 Sep 2006 17:41:55 -0000	1.2
+++ tools/koha-news.tmpl	9 Mar 2007 14:47:39 -0000	1.3
@@ -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" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+    KOHA -- News Management
+<!-- TMPL_INCLUDE NAME="doc-head-close.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 -->
+<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" -->
+
+<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" -->">
-			<table style="border:0" cellspacing="0" cellpadding="2">
-			    <tr>
-			        <td>Language</td>
-			        </td>
-			        <td>
-						<select name="lang">
-				<option value="">All news</option>
+            <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" -->
-					
-						<option value="<!-- TMPL_VAR name="language" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="language" -->	</option>
+                    <!-- 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>
-					</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>
+            </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 -->
-
-		<!-- TMPL_IF NAME="opac_news_count" -->
-
-            <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
-			Language:
-			
+        <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 news</option>
+            <option value="">All</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_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>
-
-			<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>
+        </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 width="5%"><input type="checkbox" name="ids" value="<!-- TMPL_VAR NAME="idnew" -->"</td>
-							<td align="center"><!-- TMPL_VAR NAME="lang" --></td>
+                            <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 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><!-- 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">
+                <input type="hidden" name="op" value="del" />
+                <input type="submit" class="button" value="Delete selected" />
 			</form>
 		<!-- TMPL_ELSE -->
-			<h5>No news loaded</h5>
+            <p>No news loaded</p>
 		<!-- /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>
-	
-	
+        <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" -->

Index: tools/letter.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tools/letter.tmpl	11 Aug 2006 16:33:01 -0000	1.3
+++ tools/letter.tmpl	9 Mar 2007 14:47:39 -0000	1.4
@@ -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" -->
+						<!--TMPL_IF Name="catalogue"-->
 						<option value="catalogue" selected>Catalogue</option>
-					<!-- TMPL_ELSE -->
-						<option value="catalogue">Catalogue</option>
-					<!-- /TMPL_IF -->
-					<!-- TMPL_IF name="serial" -->
+						<!--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>

Index: tools/tools-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/tools/tools-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tools/tools-home.tmpl	27 Sep 2006 21:40:47 -0000	1.2
+++ tools/tools-home.tmpl	9 Mar 2007 14:47:39 -0000	1.3
@@ -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><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><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><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><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 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><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><a href="/cgi-bin/koha/tools/overduerules.pl">overdue rules</a></td>
 	<td>Rules for overdue books</td>
 </tr>
-<th><a href="/cgi-bin/koha/barcodes/cbarcodes.pl">Membership cards</a></th>
-		<td>create membership cards from member cardnumbers
-		</td>
+<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>
 </table>
 
 

Index: z3950/searchresult.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/z3950/searchresult.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- z3950/searchresult.tmpl	11 Sep 2006 17:41:55 -0000	1.2
+++ z3950/searchresult.tmpl	9 Mar 2007 14:47:39 -0000	1.3
@@ -1,42 +1,17 @@
-<!-- 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_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="refresh" -->
-		<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR NAME="refresh" -->" />
-	<!-- /TMPL_IF -->
-
-<div id="main-compact">
+    <!-- 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>
@@ -45,32 +20,27 @@
 		<th>&nbsp;</th>
 		<th>&nbsp;</th>
 	</tr>
-	<!-- TMPL_IF name="breeding_loop" -->
-	<!-- TMPL_LOOP name="breeding_loop" -->
+                <!-- TMPL_LOOP NAME="breeding_loop" -->
 		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
-			<td><!-- TMPL_VAR NAME="title" --></a>
+                        <td><!-- TMPL_VAR NAME="title" --></td>
 			<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> 
-		
+            <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 -->
-		<tr><td colspan="6">Nothing found</td></tr>
+                <p>Nothing found</p>
 	<!-- /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;
+    <!-- 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





More information about the Koha-cvs mailing list