[Koha-cvs] koha/koha-tmpl/intranet-tmpl/default fr/include... [R_2-2-7-1]

paul poulain paul at koha-fr.org
Mon May 7 15:55:56 CEST 2007


CVSROOT:	/sources/koha
Module name:	koha
Branch:		R_2-2-7-1
Changes by:	paul poulain <tipaul>	07/05/07 13:55:53

Modified files:
	koha-tmpl/intranet-tmpl/default/fr/includes/calendar: 
	                                                      calendar-setup.js 
	                                                      calendar.js 
	koha-tmpl/intranet-tmpl/default/fr/value_builder: 
	                                                  unimarc_field_4XX.tmpl 
	                                                  unimarc_field_60X.tmpl 
	koha-tmpl/intranet-tmpl/default/es: about.tmpl auth.tmpl 
	                                    bookcount.tmpl 
	                                    boraccount.tmpl charges.tmpl 
	                                    default.tmpl 
	                                    intranet-main.tmpl 
	                                    mancredit.tmpl 
	                                    maninvoice.tmpl modbib.tmpl 
	                                    modbibitem.tmpl moditem.tmpl 
	                                    modwebsites.tmpl 
	                                    opac-main.tmpl overdue.tmpl 
	                                    reports.tmpl request.tmpl 
	                                    reservereport.tmpl 
	                                    searchheader.tmpl 
	                                    shelves.tmpl stats.tmpl 
	                                    thesaurus_popup.tmpl 
	                                    updatebiblio.tmpl 
	koha-tmpl/intranet-tmpl/default/es/acqui: acqui-home.tmpl 
	                                          acquire.tmpl 
	                                          basket.tmpl 
	                                          newbasket2.tmpl 
	                                          newbiblio.tmpl 
	                                          order.tmpl 
	                                          recieve.tmpl 
	                                          recieveorder.tmpl 
	                                          supplier.tmpl 
	koha-tmpl/intranet-tmpl/default/es/acqui.simple: addbiblio.tmpl 
	                                                 addbooks.tmpl 
	                                                 additem.tmpl 
	                                                 isbnsearch.tmpl 
	                                                 marcimport.tmpl 
	koha-tmpl/intranet-tmpl/default/es/catalogue: MARCdetail.tmpl 
	                                              catalogue-home.tmpl 
	                                              cmsdsearchresults.tmpl 
	                                              detail-opac.tmpl 
	                                              detail.tmpl 
	                                              moredetail.tmpl 
	                                              searchresults.tmpl 
	                                              subject.tmpl 
	koha-tmpl/intranet-tmpl/default/es/circ: branchtransfers.tmpl 
	                                         circulation.tmpl 
	                                         returns.tmpl 
	                                         selectbranchprinter.tmpl 
	koha-tmpl/intranet-tmpl/default/es/export: marc.tmpl 
	koha-tmpl/intranet-tmpl/default/es/images: koha-front-koha.gif 
	koha-tmpl/intranet-tmpl/default/es/includes: 
	                                             acquisitions-bottom.inc 
	                                             acquisitions-top.inc 
	                                             cat-bottom.inc 
	                                             cat-class-list.inc 
	                                             cat-top.inc 
	                                             circulation-bottom.inc 
	                                             circulation-top.inc 
	                                             issues-bottom.inc 
	                                             members-bottom.inc 
	                                             members-top.inc 
	                                             opac-bottom.inc 
	                                             opac-top.inc 
	                                             parameters-bottom.inc 
	                                             parameters-top.inc 
	                                             reports-bottom.inc 
	                                             reports-top.inc 
	koha-tmpl/intranet-tmpl/default/es/marcimport: 
	                                               AcceptBiblioitem.tmpl 
	                                               AcceptItemCopy.tmpl 
	                                               AcceptMarcUpload.tmpl 
	                                               ListFileRecords.tmpl 
	                                               mainmenu.tmpl 
	                                               marcimportdetail.tmpl 
	                                               uploadmarc.tmpl 
	koha-tmpl/intranet-tmpl/default/es/members: imemberentry.tmpl 
	                                            jmemberentry.tmpl 
	                                            member-password.tmpl 
	                                            member.tmpl 
	                                            memberentry.tmpl 
	                                            members-home.tmpl 
	                                            moremember.tmpl 
	                                            pay.tmpl 
	                                            readingrec.tmpl 
	koha-tmpl/intranet-tmpl/default/es/parameters: admin-home.tmpl 
	                                               aqbookfund.tmpl 
	                                               aqbudget.tmpl 
	                                               authorised_values.tmpl 
	                                               branches.tmpl 
	                                               categorie.tmpl 
	                                               categoryitem.tmpl 
	                                               checkmarc.tmpl 
	                                               currency.tmpl 
	                                               itemtypes.tmpl 
	                                               koha2marclinks.tmpl 
	                                               marc_subfields_structure.tmpl 
	                                               marctagstructure.tmpl 
	                                               printers.tmpl 
	                                               stopwords.tmpl 
	                                               systempreferences.tmpl 
	                                               thesaurus.tmpl 
	                                               z3950servers.tmpl 
	koha-tmpl/intranet-tmpl/default/es/reports: reports-home.tmpl 
	koha-tmpl/intranet-tmpl/default/es/search.marc: result.tmpl 
	                                                search.tmpl 
	koha-tmpl/intranet-tmpl/default/es/user: userpage.tmpl 
	koha-tmpl/intranet-tmpl/default/es/value_builder: 
	                                                  unimarc_field_100.tmpl 
	                                                  unimarc_field_225a.tmpl 
	                                                  unimarc_field_700-4.tmpl 
	koha-tmpl/intranet-tmpl/default/uk_UA: about.tmpl 
	koha-tmpl/intranet-tmpl/default/uk_UA/acqui: newbiblio.tmpl 
	koha-tmpl/intranet-tmpl/default/uk_UA/help/bull: 
	                                                 subscription-add.tmpl 
	                                                 subscription-detail.tmpl 
	koha-tmpl/intranet-tmpl/default/uk_UA/help/reports: 
	                                                    borrowers_stats.tmpl 
	koha-tmpl/intranet-tmpl/default/uk_UA/includes/calendar: 
	                                                         calendar-setup.js 
	                                                         calendar.js 
	koha-tmpl/intranet-tmpl/default/uk_UA/members: jmemberentry.tmpl 
	                                               memberentry.tmpl 
	                                               moremember.tmpl 
	                                               newjmember.tmpl 
	koha-tmpl/intranet-tmpl/default/uk_UA/parameters: 
	                                                  marctagstructure.tmpl 
	koha-tmpl/intranet-tmpl/default/uk_UA/value_builder: 
	                                                     unimarc_field_100.tmpl 
	                                                     unimarc_field_105.tmpl 
	                                                     unimarc_field_106.tmpl 
	                                                     unimarc_field_110.tmpl 
	                                                     unimarc_field_115a.tmpl 
	                                                     unimarc_field_115b.tmpl 
	                                                     unimarc_field_116.tmpl 
	                                                     unimarc_field_117.tmpl 
	                                                     unimarc_field_120.tmpl 
	                                                     unimarc_field_121a.tmpl 
	                                                     unimarc_field_121b.tmpl 
	                                                     unimarc_field_122.tmpl 
	                                                     unimarc_field_123a.tmpl 
	                                                     unimarc_field_123d.tmpl 
	                                                     unimarc_field_123g.tmpl 
	                                                     unimarc_field_124a.tmpl 
	                                                     unimarc_field_124b.tmpl 
	                                                     unimarc_field_124c.tmpl 
	                                                     unimarc_field_124d.tmpl 
	                                                     unimarc_field_124g.tmpl 
	                                                     unimarc_field_125a.tmpl 
	                                                     unimarc_field_125b.tmpl 
	                                                     unimarc_field_126a.tmpl 
	                                                     unimarc_field_126b.tmpl 
	                                                     unimarc_field_127.tmpl 
	                                                     unimarc_field_128a.tmpl 
	                                                     unimarc_field_128b.tmpl 
	                                                     unimarc_field_128c.tmpl 
	                                                     unimarc_field_130.tmpl 
	                                                     unimarc_field_135a.tmpl 
	                                                     unimarc_field_140.tmpl 
	                                                     unimarc_field_141.tmpl 
	                                                     unimarc_field_225a.tmpl 
	                                                     unimarc_field_4XX.tmpl 
	                                                     unimarc_field_60X.tmpl 
	                                                     unimarc_field_700-4.tmpl 
	koha-tmpl/intranet-tmpl/default/pl: about.tmpl auth.tmpl 
	                                    bookcount.tmpl 
	                                    boraccount.tmpl charges.tmpl 
	                                    default.tmpl 
	                                    intranet-main.tmpl 
	                                    mancredit.tmpl 
	                                    maninvoice.tmpl modbib.tmpl 
	                                    modbibitem.tmpl moditem.tmpl 
	                                    modwebsites.tmpl 
	                                    opac-main.tmpl overdue.tmpl 
	                                    reports.tmpl request.tmpl 
	                                    reservereport.tmpl 
	                                    searchheader.tmpl 
	                                    shelves.tmpl stats.tmpl 
	                                    thesaurus_popup.tmpl 
	                                    updatebiblio.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/acqui: acqui-home.tmpl 
	                                          acquire.tmpl 
	                                          basket.tmpl 
	                                          newbasket2.tmpl 
	                                          newbiblio.tmpl 
	                                          order.tmpl 
	                                          recieve.tmpl 
	                                          recieveorder.tmpl 
	                                          supplier.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/acqui.simple: 
	                                                 addbiblio-nomarc.tmpl 
	                                                 addbiblio.tmpl 
	                                                 addbooks.tmpl 
	                                                 additem-nomarc.tmpl 
	                                                 additem.tmpl 
	                                                 isbnsearch.tmpl 
	                                                 marcimport.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/bookshelves: shelves.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/catalogue: MARCdetail.tmpl 
	                                              catalogue-home.tmpl 
	                                              cmsdsearchresults.tmpl 
	                                              detail-opac.tmpl 
	                                              detail.tmpl 
	                                              detailprint.tmpl 
	                                              moredetail.tmpl 
	                                              searchresults.tmpl 
	                                              subject.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/circ: branchtransfers.tmpl 
	                                         circulation.tmpl 
	                                         returns.tmpl 
	                                         selectbranchprinter.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/export: marc.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/import: breeding.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/includes: about-bottom.inc 
	                                             about-top.inc 
	                                             acquisitions-bottom.inc 
	                                             acquisitions-top.inc 
	                                             cat-bottom.inc 
	                                             cat-top.inc 
	                                             circulation-bottom.inc 
	                                             circulation-top.inc 
	                                             common-style.css 
	                                             issues-bottom.inc 
	                                             members-bottom.inc 
	                                             members-top.inc 
	                                             opac-bottom.inc 
	                                             opac-top.inc 
	                                             parameters-bottom.inc 
	                                             parameters-top.inc 
	                                             reports-bottom.inc 
	                                             reports-top.inc 
	koha-tmpl/intranet-tmpl/default/pl/maint: catmaintain.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/marcimport: 
	                                               AcceptBiblioitem.tmpl 
	                                               AcceptItemCopy.tmpl 
	                                               AcceptMarcUpload.tmpl 
	                                               ListFileRecords.tmpl 
	                                               mainmenu.tmpl 
	                                               marcimportdetail.tmpl 
	                                               uploadmarc.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/members: imemberentry.tmpl 
	                                            jmemberentry.tmpl 
	                                            member-flags.tmpl 
	                                            member-password.tmpl 
	                                            member.tmpl 
	                                            memberentry.tmpl 
	                                            members-home.tmpl 
	                                            moremember.tmpl 
	                                            newimember.tmpl 
	                                            newjmember.tmpl 
	                                            newmember.tmpl 
	                                            pay.tmpl 
	                                            readingrec.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/parameters: admin-home.tmpl 
	                                               aqbookfund.tmpl 
	                                               aqbudget.tmpl 
	                                               authorised_values.tmpl 
	                                               branches.tmpl 
	                                               categorie.tmpl 
	                                               categoryitem.tmpl 
	                                               checkmarc.tmpl 
	                                               currency.tmpl 
	                                               itemtypes.tmpl 
	                                               koha2marclinks.tmpl 
	                                               marc_subfields_structure.tmpl 
	                                               marctagstructure.tmpl 
	                                               printers.tmpl 
	                                               stopwords.tmpl 
	                                               systempreferences.tmpl 
	                                               thesaurus.tmpl 
	                                               z3950servers.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/reports: inventory.tmpl 
	                                            issues_by_borrower_category.tmpl 
	                                            itemtypes.tmpl 
	                                            reports-home.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/search.marc: result.tmpl 
	                                                search.tmpl 
	                                                suggest.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/user: userpage.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/value_builder: 
	                                                  unimarc_field_100.tmpl 
	                                                  unimarc_field_105.tmpl 
	                                                  unimarc_field_225a.tmpl 
	                                                  unimarc_field_60X.tmpl 
	                                                  unimarc_field_700-4.tmpl 
	koha-tmpl/intranet-tmpl/default/pl/z3950: searchresult.tmpl 

Log message:
	translations for 2.2.9

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/calendar/calendar-setup.js?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.2.2.2&r2=1.1.2.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/includes/calendar/calendar.js?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.2.2.2&r2=1.1.2.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_4XX.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.1.6.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_60X.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.5&r2=1.5.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/about.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/auth.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/bookcount.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/boraccount.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/charges.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/default.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/intranet-main.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/mancredit.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/maninvoice.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/modbib.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/modbibitem.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/moditem.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/modwebsites.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/opac-main.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/overdue.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/reports.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/request.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/reservereport.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/searchheader.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/shelves.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/stats.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/thesaurus_popup.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/updatebiblio.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/acqui/acqui-home.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/acqui/acquire.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/acqui/basket.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/acqui/newbasket2.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/acqui/newbiblio.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/acqui/order.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/acqui/recieve.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/acqui/recieveorder.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/acqui/supplier.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/acqui.simple/addbiblio.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/acqui.simple/addbooks.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/acqui.simple/additem.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/acqui.simple/isbnsearch.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/acqui.simple/marcimport.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/MARCdetail.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/catalogue-home.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/cmsdsearchresults.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/detail-opac.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/detail.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/moredetail.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/searchresults.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/subject.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/circ/branchtransfers.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/circ/circulation.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/circ/returns.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/circ/selectbranchprinter.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/export/marc.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/images/koha-front-koha.gif?cvsroot=koha&only_with_tag=R_2-2-7-1&rev=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/acquisitions-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/acquisitions-top.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/cat-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/cat-class-list.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/cat-top.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/circulation-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/circulation-top.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/issues-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/members-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/members-top.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/opac-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/opac-top.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/parameters-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/parameters-top.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/reports-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/includes/reports-top.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/marcimport/AcceptBiblioitem.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/marcimport/AcceptItemCopy.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/marcimport/AcceptMarcUpload.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/marcimport/ListFileRecords.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/marcimport/mainmenu.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/marcimport/marcimportdetail.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/marcimport/uploadmarc.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/members/imemberentry.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/members/jmemberentry.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/members/member-password.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/members/member.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/members/memberentry.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/members/members-home.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/members/moremember.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.5&r2=1.5.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/members/pay.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/members/readingrec.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/admin-home.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/aqbookfund.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/aqbudget.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/authorised_values.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/branches.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/categorie.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/categoryitem.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/checkmarc.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/currency.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/itemtypes.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/koha2marclinks.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/marc_subfields_structure.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/marctagstructure.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/printers.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/stopwords.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/systempreferences.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/thesaurus.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/parameters/z3950servers.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/reports/reports-home.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/search.marc/result.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/search.marc/search.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/user/userpage.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/value_builder/unimarc_field_100.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/value_builder/unimarc_field_225a.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/es/value_builder/unimarc_field_700-4.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/about.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1.2.1&r2=1.1.2.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/acqui/newbiblio.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1.2.1&r2=1.1.2.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/help/bull/subscription-add.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1.2.1&r2=1.1.2.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/help/bull/subscription-detail.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1.2.1&r2=1.1.2.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/help/reports/borrowers_stats.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1.2.1&r2=1.1.2.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/includes/calendar/calendar-setup.js?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1.2.1&r2=1.1.2.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/includes/calendar/calendar.js?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1.2.1&r2=1.1.2.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/members/jmemberentry.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/members/memberentry.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/members/moremember.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/members/newjmember.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/parameters/marctagstructure.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1.2.1&r2=1.1.2.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_100.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_105.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_106.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_110.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_115a.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_115b.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_116.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_117.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_120.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_121a.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_121b.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_122.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_123a.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_123d.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_123g.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_124a.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_124b.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_124c.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_124d.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_124g.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_125a.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_125b.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_126a.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_126b.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_127.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_128a.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_128b.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_128c.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_130.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_135a.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_140.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_141.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_225a.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_4XX.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_60X.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/unimarc_field_700-4.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/about.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/auth.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/bookcount.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/boraccount.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/charges.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/default.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/intranet-main.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/mancredit.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/maninvoice.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/modbib.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/modbibitem.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/moditem.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.5&r2=1.5.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/modwebsites.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/opac-main.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/overdue.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/reports.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/request.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/reservereport.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/searchheader.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/shelves.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/stats.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/thesaurus_popup.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/updatebiblio.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/acqui-home.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/acquire.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/basket.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/newbasket2.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/newbiblio.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/order.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/recieve.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/recieveorder.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/supplier.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/addbiblio-nomarc.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/addbiblio.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.5&r2=1.5.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/addbooks.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/additem-nomarc.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/additem.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/isbnsearch.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.5&r2=1.5.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/marcimport.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/bookshelves/shelves.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/MARCdetail.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/catalogue-home.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/cmsdsearchresults.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/detail-opac.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/detail.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/detailprint.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/moredetail.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/searchresults.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/subject.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/circ/branchtransfers.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/circ/circulation.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/circ/returns.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/circ/selectbranchprinter.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/export/marc.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/import/breeding.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/about-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/about-top.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/acquisitions-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/acquisitions-top.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/cat-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/cat-top.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/circulation-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/circulation-top.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/common-style.css?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.12.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/issues-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/members-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/members-top.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/opac-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/opac-top.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/parameters-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/parameters-top.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/reports-bottom.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/includes/reports-top.inc?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/maint/catmaintain.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/AcceptBiblioitem.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/AcceptItemCopy.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/AcceptMarcUpload.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/ListFileRecords.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/mainmenu.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/marcimportdetail.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/uploadmarc.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/members/imemberentry.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/members/jmemberentry.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/members/member-flags.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/members/member-password.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/members/member.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/members/memberentry.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/members/members-home.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/members/moremember.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.5&r2=1.5.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/members/newimember.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/members/newjmember.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/members/newmember.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/members/pay.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/members/readingrec.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/admin-home.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/aqbookfund.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/aqbudget.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/authorised_values.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/branches.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.4&r2=1.4.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/categorie.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/categoryitem.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/checkmarc.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/currency.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/itemtypes.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/koha2marclinks.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/marc_subfields_structure.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/marctagstructure.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/printers.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/stopwords.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/systempreferences.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.3&r2=1.3.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/thesaurus.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/z3950servers.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/reports/inventory.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/reports/issues_by_borrower_category.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/reports/itemtypes.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/reports/reports-home.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/search.marc/result.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/search.marc/search.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/search.marc/suggest.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.1&r2=1.1.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/user/userpage.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/value_builder/unimarc_field_100.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/value_builder/unimarc_field_105.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/value_builder/unimarc_field_225a.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/value_builder/unimarc_field_60X.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/value_builder/unimarc_field_700-4.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/pl/z3950/searchresult.tmpl?cvsroot=koha&only_with_tag=R_2-2-7-1&r1=1.2&r2=1.2.10.1

Patches:
Index: fr/includes/calendar/calendar-setup.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/calendar/Attic/calendar-setup.js,v
retrieving revision 1.1.2.2.2.2
retrieving revision 1.1.2.2.2.3
diff -u -b -r1.1.2.2.2.2 -r1.1.2.2.2.3
--- fr/includes/calendar/calendar-setup.js	7 May 2007 09:08:31 -0000	1.1.2.2.2.2
+++ fr/includes/calendar/calendar-setup.js	7 May 2007 13:55:49 -0000	1.1.2.2.2.3
@@ -19,7 +19,7 @@
  * than modifying calendar.js itself).
  */
 
-// $Id: calendar-setup.js,v 1.1.2.2.2.2 2007/05/07 09:08:31 tipaul Exp $
+// $Id: calendar-setup.js,v 1.1.2.2.2.3 2007/05/07 13:55:49 tipaul Exp $
 
 /**
  *  This function "patches" an input field (or other element) to use a calendar

Index: fr/includes/calendar/calendar.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/fr/includes/calendar/Attic/calendar.js,v
retrieving revision 1.1.2.2.2.2
retrieving revision 1.1.2.2.2.3
diff -u -b -r1.1.2.2.2.2 -r1.1.2.2.2.3
--- fr/includes/calendar/calendar.js	7 May 2007 09:08:31 -0000	1.1.2.2.2.2
+++ fr/includes/calendar/calendar.js	7 May 2007 13:55:49 -0000	1.1.2.2.2.3
@@ -10,7 +10,7 @@
  * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
  */
 
-// $Id: calendar.js,v 1.1.2.2.2.2 2007/05/07 09:08:31 tipaul Exp $
+// $Id: calendar.js,v 1.1.2.2.2.3 2007/05/07 13:55:49 tipaul Exp $
 
 /** The Calendar object constructor. */
 Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {

Index: fr/value_builder/unimarc_field_4XX.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/Attic/unimarc_field_4XX.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.6.1
diff -u -b -r1.1.2.1 -r1.1.2.1.6.1
--- fr/value_builder/unimarc_field_4XX.tmpl	5 Jan 2006 15:24:47 -0000	1.1.2.1
+++ fr/value_builder/unimarc_field_4XX.tmpl	7 May 2007 13:55:50 -0000	1.1.2.1.6.1
@@ -7,129 +7,83 @@
 			function go() {
 			var index_start = <!-- TMPL_VAR NAME="index" -->;
 			var whichfield = opener.opener.document.f.tag[index_start].value;
-			i=index_start
+                var parentField = opener.opener.document.f.tag[index_start].parentNode.parentNode.parentNode;
+//                 alert("PARENT "+parentField);
 			// go forward, until reaching the end of the field.
-			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="subfield_value_9" -->";
+                var subfieldcode='';
+                var whichsubfields=parentField.getElementsByTagName("div");
+                for(var i=0; i<whichsubfields.length;i++) {
+                    // get every <input>
+                    change_value=whichsubfields[i].getElementsByTagName("input");
+                    for(j=0;j<change_value.length;j++) {
+//                         change_value=whichsubfields[j].getElementsByTagName("input");
+                        // if this <input> if the subfield code, store if for future use !
+                        if (change_value[j].getAttribute("name") == 'subfield') {
+                            subfieldcode=subfield_value=change_value[j].value;
+            //				alert("subfieldcode ="+subfieldcode);
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '0') {
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_0" -->";
+                        // if this <input> is for field_value => replace it by the correct value
+                        if (change_value[j].getAttribute("name") == 'field_value') {
+/*alert("subfieldcode="+subfieldcode);*/
+                            if (subfieldcode == '9') {
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_9" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'a') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_a" -->";
+                            if (subfieldcode == '9') {
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_9" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'c') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_c" -->";
+                            if (subfieldcode == '0') {
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_0" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'd') 
+                            if (subfieldcode == 'a') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_d" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_a" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'e') 
+                            if (subfieldcode == 'c') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_e" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_c" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'h') 
+                            if (subfieldcode == 'd') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_h" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_d" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'i') 
+                            if (subfieldcode == 'e') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_i" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_e" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'p') 
+                            if (subfieldcode == 'h') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_p" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_h" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 't') 
+                            if (subfieldcode == 'i') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_t" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_i" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'u') 
+                            if (subfieldcode == 'p') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_u" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_p" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'v') 
+                            if (subfieldcode == 't') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_v" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_t" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'x') 
+                            if (subfieldcode == 'u') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_x" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_u" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'y') 
+                            if (subfieldcode == 'v') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_y" -->";
-				}
-				if (opener.opener.document.f.tag[i].value != whichfield) {
-					i=opener.opener.document.f.field_value.length;
-				}
-				i++;
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_v" -->";
 			}
-			// 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 == '0') {
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_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="subfield_value_9">";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'a') 
+                            if (subfieldcode == 'x') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_a" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_x" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'c') 
+                            if (subfieldcode == 'y') 
 				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_c" -->";
+                                change_value[j].value = "<!-- TMPL_VAR NAME="subfield_value_y" -->";
 				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'd') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_d" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'e') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_e" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'h') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_h" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'i') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_i" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'p') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_p" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 't') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_t" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'u') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_u" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'v') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_v" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'x') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_x" -->";
-				}
-				if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == 'y') 
-				{
-					opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR NAME="subfield_value_y" -->";
 				}
-				if (opener.opener.document.f.tag[i].value != whichfield) {
-					i=0;
 				}
-				i--;
 			}
 				return false;
 			}
@@ -143,7 +97,7 @@
 <!-- TMPL_ELSE -->
 	<head>
 		<title>KOHA:INTRANET : Biblio Search</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+	<!-- 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=iso-8859-1"><!-- /TMPL_IF -->
 	
 	<script language="JavaScript" type="text/javascript">
 	function Help() {

Index: fr/value_builder/unimarc_field_60X.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/Attic/unimarc_field_60X.tmpl,v
retrieving revision 1.5
retrieving revision 1.5.10.1
diff -u -b -r1.5 -r1.5.10.1
--- fr/value_builder/unimarc_field_60X.tmpl	5 Jan 2005 14:35:23 -0000	1.5
+++ fr/value_builder/unimarc_field_60X.tmpl	7 May 2007 13:55:50 -0000	1.5.10.1
@@ -37,7 +37,7 @@
 	<table>
 	<tr>
 		<td valign="top">
-		<h2>Results</h2>
+		<h2>Résultat</h2>
 			<table>
 				<!-- TMPL_LOOP name="results" -->
 					<tr>

Index: es/about.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/about.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/about.tmpl	16 Jul 2003 05:07:14 -0000	1.2
+++ es/about.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,31 +1,81 @@
-<TMPL_INCLUDE name="cat-top.inc">
+<!-- TMPL_INCLUDE NAME="about-top.inc" -->
 
-<TMPL_VAR NAME=about>
-
-<p>En esta pantalla se presentarán datos generales acerca del Koha, sus sistema operativo y otros.
-
-<center>
-<table border=1>
-  <tr bgcolor="white">
-      <td width=25%>versión del Koha:</td>
-      <td><TMPL_VAR ESCAPE=HTML NAME=kohaVersion></td>
-  </tr>
-  <tr bgcolor="white">
-      <td>versión del SO:</td>
-      <td><TMPL_VAR ESCAPE=HTML NAME=osVersion></td>
-  </tr>
-  <tr bgcolor="white">
-      <td>versión de Perl:</td>
-      <td><TMPL_VAR ESCAPE=HTML NAME=perlVersion></td>
-  </tr>
-  <tr bgcolor="white">
-      <td>versión de Mysql:</td>
-      <td><TMPL_VAR ESCAPE=HTML NAME=mysqlVersion></td>
-  </tr>
-  <tr bgcolor="white">
-      <td>versión de Apache:</td>
-      <td><TMPL_VAR ESCAPE=HTML NAME=apacheVersion></td>
-  </tr>
-</table>
-</center>
-<TMPL_INCLUDE name="cat-bottom.inc">
+<div id="mainbloc">
+	<!-- TMPL_VAR NAME="about" --> <h1>Datos acerca de la versi&oacute;n actual de Koha para el informe de errores (o inter&eacute;s general).</h1>
+	<div id="bloc25">
+		<h2>Informaci&oacute;n del servidor</h2>
+		<p><label class="label100">Versi&oacute;n de Koha</label><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></p>
+		<p><label class="label100">versi&oacute;n de SO (seg&uacute;n 'uname -a'):</label><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></p>
+		<p><label class="label100">Versi&oacute;n de Perl:</label><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></p>
+		<p><label class="label100">Versi&oacute;n de MySQL:</label><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></p>
+		<p><label class="label100">Versi&oacute;n de Apache</label><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></p>
+	</div>
+	<div id="bloc25">
+		<h2>Especial agradecimiento a las bibliotecas siguientes</h2>
+		<p><b>Horowhenua Library Trust</b>, Nueva Zelanda, y Rosalie Blake, Jefe de Bibliotecas, (Koha 1.0)</p>
+		<p>Joshua Ferraro &amp; the <b>Nelsonville Public Library</b> (MARC features funders)</p>
+		<p><b>EMN (Ecole des Mines de Nantes)</b>, Francia (Sugerencias, m&oacute;dulos stats y un ldap mejorado con financiaci&oacute;n de apoyo)</p>
+		<p><b>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</b>, France (biblio frameworks, MARC authorities, OPAC basket, Serials support funding)</p>
+	</div>
+	<div id="bloc25">
+		<h2>Equipo central para 2.2</h2>
+		<p><b>Rachel Hamilton-Williams</b>, Kaitiaki</p>
+		<p><b>Paul Poulain</b>, 2.2 release manager (desarrollador MARC)</p>
+		<p>Joshua Ferraro &amp; the <b>Nelsonville Public Library</b> (MARC features funders)</p>
+		<p><b>Comunicaciones Katipo</b> (desarrolladores Koha 1.0)</p>
+		<ul>
+			<p>Rachel Hamilton-Williams, General Manager (Webmistress)</p>
+			<p>Chris Cormack, 1.2 release manager</p>
+			<p>y Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson,</p>
+			<p>Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</p>
+		</ul>
+		<p>Emiliano Marmonti, Mat&iacute;as Veleda & Sebastian Cata&ntilde;eda <b>La Plata University, Argentina</b> (impresi&oacute;n del c&oacute;digo de barras)</p>
+		<p>MJ Ray y <b>Turo Tecnolog&iaacute;i LLP</b>, (control de calidad, programa infom&aacute;tico, liberaci&oacute;n maintainer 2.0)</p>
+		<p>Nicholas Rosasco, (Documentation Compiler)</p>
+		<p>Mike Hansen</p>
+		<p><b>Pate Eyler</b> (Kaitiaki a partir de 2002 hasta 2004)</p>
+	</div>
+	<div id="bloc25">
+	<h2>Gracias a</h2>
+					<p>Adam Thick</p>
+					<p>Andrew Hooper</p>
+					<p>Al Banks</p>
+					<p>Ambrose Li (herramienta de traducci&oacute;n)</p>
+					<p>Andrew Arensburger (peque&ntilde;o &amp; gran C4::m&oacute;dulo de Contexto)</p>
+					<p>Benedykt P. Barszcz (Polish for 2.0)</p>
+					<p>Brig C. McCoy</p>
+					<p>Daniel Holth</p>
+					<p>David Strainchamps</p>
+					<p>Dorian Meid (Traducci&oacute;n alemana)</p>
+					<p>doXulting (Matthieu Branlat) cesta OPAC</p>
+					<p>Ed Summers (Alg&uacute;n c&oacute;digo y paquetes Perl como MARC::Record)</p>
+					<p>Escuela de Esiee (J&eacute;rome Vizcaino, Michel Lerenard, Pierre Cauchois)</p>
+					<p>Florian Bischof</p>
+					<p>Francisco M. Marzoa Alonso</p>
+					<p>Glen Stewart</p>
+					<p>Henri-Damien Laurent</p>
+					<p>Jo Ransom</p>
+					<p>Kip DeGraaf</p>
+					<p>Marco Gaiarin</p>
+					<p>Md. Aftabuddin</p>
+					<p>Michaes Herman</p>
+					<p>Mike Johnson</p>
+					<p>Mike Mylonas</p>
+					<p>Nicolas Morin (Taducci&oacute;n francesa en 2.0)</p>
+					<p>Pawel Skuza (Polish for 1.2)</p>
+					<p>Regula Sebastiao</p>
+					<p>Roger Buck</p>
+					<p>Ron Wickersham</p>
+					<p>Sebastiaan Durand</p>
+					<p><b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)</p>
+					<p>Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)</p>
+	</div>
+	<div id="bloc25">
+	<h2>Traducci&oacute;n</h2>
+		<p><label>Franc&eacute;s</label>Pascale Nalon (ENSMP) y Jean Yves Lemaire (Chatel Saint Germain)</p>
+		<p><label>Chino</label>Ambrose Li</p>
+		<p><label>Espa&ntilde;ol</label>Andres Tarallo</p>
+		<p><label>Italiano</label>Giuseppe Angilella</p>
+	</div>
+</div>
+<!-- TMPL_INCLUDE NAME="about-bottom.inc" -->

Index: es/auth.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/auth.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/auth.tmpl	3 Jun 2003 22:04:40 -0000	1.1
+++ es/auth.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,42 +1,42 @@
+<!-- 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 -->
 
-<TMPL_IF NAME="nopermission">
+<!-- TMPL_IF NAME="nopermission" -->
 <!-- This is what is displayed if user doesn't have permission -->
-<h2>Usted no tiene permisos para acceder a la página seleccionada</h2>
-</TMPL_IF>
+<h2>Lo siento, Koha no cree que usted tenga permiso para ver esta p&aacute;gina.</h2>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME="timed_out">
+<!-- TMPL_IF NAME="timed_out" -->
 <!-- This is what is displayed if login has timed out -->
-<h2>Su sesión ha expirado, por favor ingrese su Identificacón y clave nuevamente</h2>
-</TMPL_IF>
+<h2>Lo siento, su sesi&oacute;n ya ha terminado. Por favor, reg&iacute;strese nuevamente.</h2>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME="different_ip">
+<!-- TMPL_IF NAME="different_ip" -->
 <!-- This is what is displayed if user's IP has changed -->
-<h2>Usted está accediendo a Koha desde otro número de IP, por favor Identifiquese nuevamente</h2>
-</TMPL_IF>
+<h2>Tiene acceso a Koha sobre una direcci&oacute;n de ip diferente! Por favor reg&iacute;strese otra vez.</h2>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME="invalid_username_or_password">
+<!-- TMPL_IF NAME="invalid_username_or_password" -->
 <!-- This is what is displayed if the username or password doesn't work -->
-<h2>Usted ha ingresado una Identificación o Clave incorrecta. Por favor reintente</h2>
-</TMPL_IF>
+<h2>Ha ingresado un nombre de usuario o una clave incorrecta. Por favor intentelo nuevamente.</h2>
+<!-- /TMPL_IF -->
 
 
-<TMPL_IF NAME="loginprompt">
+<!-- TMPL_IF NAME="loginprompt" -->
 <!-- login prompt time-->
 
-<center>
 
-<form action='<TMPL_VAR NAME="url">' method="post">
-<TMPL_LOOP NAME="INPUTS">
-  <input type="hidden" name='<TMPL_VAR NAME="name">' value='<TMPL_VAR NAME="value">'>
-</TMPL_LOOP>
-<table border="0" cellpadding="10" cellspacing="0" width="60%">
+<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
+<!-- TMPL_LOOP NAME="INPUTS" -->
+  <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->">
+<!-- /TMPL_LOOP -->
+<table border="0" cellpadding="10" cellspacing="0" width="60%" align="center">
     <tr><td align="center" valign="top">
 
     <table border="0" bgcolor="#dddddd" cellpadding="10" cellspacing="0">
-    <tr><th colspan="2" background="/images/background-mem.gif"><font size="+2">Ingreso al software Koha</font></th></tr>
-    <tr><td>Identificación:</td><td><input name="userid"></td></tr>
+    <tr><th colspan="2"><font size="+2">Entrar a Koha</font></th></tr>
+    <tr><td>N&uacute;mero de Carnet:</td><td><input name="userid"></td></tr>
     <tr><td>Clave:</td><td><input type="password" name="password"></td></tr>
-    <tr><td colspan="2" align="center"><input type="submit" value="Enviar"></td></tr>
+    <tr><td colspan="2" align="center"><input type="submit" value="entrar"></td></tr>
     </table>
     </td><td align="center" valign="top">
 
@@ -46,4 +46,4 @@
 </form>
 
 
-</TMPL_IF>
+<!-- /TMPL_IF -->

Index: es/bookcount.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/bookcount.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -u -b -r1.3 -r1.3.12.1
--- es/bookcount.tmpl	3 Jun 2003 21:41:12 -0000	1.3
+++ es/bookcount.tmpl	7 May 2007 13:55:50 -0000	1.3.12.1
@@ -1,41 +1,36 @@
-<TMPL_INCLUDE Name="reports-top.inc">
-<CENTER>
-<br>
-<FONT SIZE=6><em>
-<a href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="bib">&type="intra"> <TMPL_VAR Name="title"> (<TMPL_VAR Name="author">)</a></em></FONT><P>
-<p>
-<img src="/images/holder.gif" width=16 height=200 align=left>
+<!-- TMPL_INCLUDE Name="reports-top.inc" -->
+<h1><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="bib" -->&amp;type=intra"> <!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)</a></h1><p>&nbsp;</p>
 
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 width=440 >
-	<TR VALIGN=TOP>
-		<TD  bgcolor="99cc33" background="/images/background-mem.gif">
-			<B>BARCODE <TMPL_VAR Name="barcode"></B>
-		</TD>
-	</TR>
-	<TR VALIGN=TOP  >
-		<TD width=440 >
+<table  cellspacing="0"  cellpadding="5" border="1" width="440">
+	<tr valign="top">
+		<td  bgcolor="#99cc33" background="/images/background-mem.gif">
+			<b>CODIGO DE BARRAS <!-- TMPL_VAR NAME="barcode" --></b>
+		</td>
+	</tr>
+	<tr valign="top">
+		<td width="440">
 
-		<b>Biblioteca de orígen: </b> <TMPL_VAR Name="homebranch"> <br>
-		<b>Biblioteca actual: </b> <TMPL_VAR Name="holdingbranch"><br>
-		<b>Fecha arribo a la biblioteca actual: </b> <TMPL_VAR Name="lastdate"> <br>
-		<b>Número de préstamos desde el día de llegada: </b> <TMPL_VAR Name="count"> <br>
+		<b>Sede Propietaria: </b> <!-- TMPL_VAR NAME="homebranch" --> <br>
+		<b>Sede Actual: </b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
+		<b>Fecha de llegada a la sede actual: </b> <!-- TMPL_VAR NAME="lastdate" --> <br>
+		<b>Cantidad de pr&eacute;stamos desde la fecha:</b> <!-- TMPL_VAR NAME="count" --> <br>
 
-		<table cellspacing =0 cellpadding=5 border=1 width = 440>
-			<TR>
-				<TD> <b>Biblioteca</b></td>
-				<TD> <b>Número de Préstamos</b></td>
-				<TD> <b>Ultima localización en biblioteca</b></td>
-			</TR>
-			<TMPL_LOOP Name="branchloop">
-				<TR>
-					<TD> <b> <TMPL_VAR Name="branchname"> </b></td>
-					<TD> <b> <TMPL_VAR Name="issues"> </b></td>
-					<TD> <b> <TMPL_VAR Name="seen"> </b></td>
-				</TR>
-			</TMPL_LOOP>
+		<table cellspacing="0" cellpadding="5" border="1" width="440">
+			<tr>
+				<th>Sede</th>
+				<th>Cant. de pr&eacute;stamos</th>
+				<th>Visto por &uacute;ltima vez en la sede</th>
+			</tr>
+			<!-- TMPL_LOOP Name="branchloop" -->
+				<tr>
+					<td> <b> <!-- TMPL_VAR NAME="branchname" --> </b></td>
+					<td> <b> <!-- TMPL_VAR NAME="issues" --> </b></td>
+					<td> <b> <!-- TMPL_VAR NAME="seen" --> </b></td>
+				</tr>
+			<!-- /TMPL_LOOP -->
 		</table>
-		</TD>
-	</TR>
+		</td>
+	</tr>
 </table>
 
-<TMPL_INCLUDE Name="reports-bottom.inc">
\ No newline at end of file
+<!-- TMPL_INCLUDE Name="reports-bottom.inc" -->

Index: es/boraccount.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/boraccount.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -u -b -r1.3 -r1.3.12.1
--- es/boraccount.tmpl	3 Jun 2003 21:41:12 -0000	1.3
+++ es/boraccount.tmpl	7 May 2007 13:55:50 -0000	1.3.12.1
@@ -1,50 +1,37 @@
-<TMPL_INCLUDE NAME="members-top.inc">
-
-<!-- The manual invoice and credit buttons -->
-
-<FONT SIZE=6><em>Cuenta de <TMPL_VAR NAME=firstname> <TMPL_VAR NAME=surname></em></FONT><P>
-<a href="/cgi-bin/koha/maninvoice.pl?bornum=<TMPL_VAR NAME=bornum>"><image src=/images/create-man-invoice.gif border=0></a>
-&nbsp;
-<a href="/cgi-bin/koha/mancredit.pl?bornum=<TMPL_VAR NAME=bornum>"><image src=/images/create-man-credit.gif border=0></a>
-<center>
-<p>
-
-<!-- The table with the account items -->
-
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-
-  <TR VALIGN=TOP>
-    <td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan=2><B>Cargos en la cuenta</TD>
-    <td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan=1><B>Monto</TD>
-    <td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan=1><B>Aun se debe</TD>
-  </TR>
-
-  <TMPL_LOOP NAME=accounts>
-
-    <tr VALIGN=TOP>
-      <td><TMPL_VAR NAME=date></td>
-      <td><TMPL_VAR NAME=description><TMPL_IF NAME=printtitle> <TMPL_VAR NAME=title></TMPL_IF></td>
-      <td><TMPL_VAR NAME=amount></td>
-      <td><TMPL_VAR NAME=amountoutstanding></td>
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
+<div id="mainbloc">
+	<!-- The manual invoice and credit buttons -->
+	
+	<h1>Cuenta para <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></h1><P>
+	<a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Crear Factura manual</a> &nbsp; <a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Crear Cr&eacute;dito Manual </a>
+	<!-- The table with the account items -->
+	
+	<table>
+	
+	<tr>
+		<th>Cuentas &amp; Cargos</th>
+		<th>MONTO</th>
+		<th>TODAVIA DEBE</th>
     </tr>
 
-  </TMPL_LOOP>
+	<!-- TMPL_LOOP NAME="accounts" -->
 
-  <tr VALIGN=TOP  >
-    <td></td>
-    <td colspan=2><b>Total actual:</b></td>
-    <td><b><TMPL_VAR NAME=total></b></td>
+		<tr>
+		<td><!-- TMPL_VAR NAME="date" --> <!-- TMPL_VAR NAME="description" --><!-- TMPL_IF NAME="printtitle" --> <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
+		<td><!-- TMPL_VAR NAME="amount" --></td>
+		<td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
   </tr>
 
-</table>
+	<!-- /TMPL_LOOP -->
 
-<br clear=all>
-<p> &nbsp; </p>
-
-<!-- endmenu (member) -->
+	<tr>
+		<th>Deuda Total</th>
+		<th colspan="2"><!-- TMPL_VAR NAME="total" --></th>
+	</tr>
 
-<TMPL_INCLUDE NAME="members-bottom.inc">
+	</table>
 
-</body>
-</HTML>
+	<!-- endmenu (member) -->
+</div>
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
 

Index: es/charges.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/charges.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/charges.tmpl	3 Jun 2003 21:41:12 -0000	1.2
+++ es/charges.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,32 +1,32 @@
-<HTML>
+<html>
 
-<TMPL_VAR NAME=startmenuissue>
+<!-- TMPL_VAR NAME="startmenuissue" -->
 
 <p>
-Each box needs to be filled in with fine,time to start charging,charging cycle<br>
-eg 1,7,7 = $1 fine, after 7 days, every 7 days.<p>
+Cada campo debe ser llenado con plazo para iniciar la cuenta, ciclo de renovaci&oacute;n de la cuenta<br>
+por ej 1,7,7 = $1 de multa, despu&eacute;s de 7 d&iacute;as, cada 7 d&iacute;as.<p>
 
 <table>
   <tr bgcolor="white">
-    <TMPL_LOOP NAME=firstrowloop>
-      <td><TMPL_VAR NAME=description></td>
-    </TMPL_LOOP>
+    <!-- TMPL_LOOP NAME="firstrowloop" -->
+      <td><!-- TMPL_VAR NAME="description" --></td>
+    <!-- /TMPL_LOOP -->
   </tr>
-  <form action=/cgi-bin/koha/updatecharges.pl method=post>
-  <TMPL_LOOP NAME=tablebodyloop>
+  <form action="/cgi-bin/koha/updatecharges.pl" method="post">
+  <!-- TMPL_LOOP NAME="tablebodyloop" -->
     <tr bgcolor="whitw">
-      <td><TMPL_VAR NAME=description></td>
-      <TMPL_LOOP NAME=rowloop>
-        <td><input type=text name="<TMPL_VAR NAME=name>" value="<TMPL_VAR NAME=value>" size=6></td>
-      </TMPL_LOOP>
+      <td><!-- TMPL_VAR NAME="description" --></td>
+      <!-- TMPL_LOOP NAME="rowloop" -->
+        <td><input type="text" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->" size="6"></td>
+      <!-- /TMPL_LOOP -->
     </tr>
-  </TMPL_LOOP>
+  <!-- /TMPL_LOOP -->
 </table>
 
-<input type=submit>
+<input type="submit">
 </form>
 
-<TMPL_VAR NAME=endmenuissue>
+<!-- TMPL_VAR NAME="endmenuissue" -->
 
 </body>
-</HTML>
\ No newline at end of file
+</html>
\ No newline at end of file

Index: es/default.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/default.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/default.tmpl	3 Jun 2003 21:41:12 -0000	1.2
+++ es/default.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,28 +1,27 @@
-<TMPL_INCLUDE NAME="/usr/share/koha/intranet/htdocs/includes/cat-top.inc">
-<center>
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 
-<table border=0 cellspacing=0 cellpadding=2>
-<tr bgcolor=#ccccff background="/images/background-mem.gif">
-<th>Título</th><th>Autor</th><th>Cantidad de Items</th><th>Id de la Publicación</th></tr>
-<TMPL_LOOP NAME=SEARCH_RESULTS>
+<table border="0" cellspacing="0" cellpadding="2">
+<tr bgcolor="#ccccff" background="/images/background-mem.gif">
+<th>T&iacute;tulo</th><th>Autor</th><th>Cantidad de Ejemplares</th><th>Biblionumber</th></tr>
+<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
   <tr>
-  <td><a href=/cgi-bin/koha/detail.pl?type=intra&bib=<TMPL_VAR NAME=biblionumber ESCAPE=HTML>><TMPL_VAR NAME=title></a></td>
-  <td> <TMPL_VAR NAME=author> </td>
-  <td align=center> <TMPL_VAR NAME=itemcount> </td>
-  <td> <TMPL_VAR NAME=biblionumber> </td>
+  <td><a href="/cgi-bin/koha/detail.pl?type=intra&amp;bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=HTML -->"><!-- TMPL_VAR NAME="title" --></a></td>
+  <td> <!-- TMPL_VAR NAME="author" --> </td>
+  <td align="center"> <!-- TMPL_VAR NAME="itemcount" --> </td>
+  <td> <!-- TMPL_VAR NAME="biblionumber" --> </td>
   </tr>
-</TMPL_LOOP>
-<tr bgcolor=#ccccff backgound="/images/background-mem.gif"><td colspan=4>
-    <table border=0 cellpadding=0 cellspacing=0 width=100% background="/images/background-mem.gif">
-    <tr><td align=left>
-    <a href=search.pl?template=<TMPL_VAR NAME="template">&startfrom=<TMPL_VAR NAME="prevstartfrom">>Registros Anteriores</a>
-    </td><td align=right>
-    <a href=search.pl?template=<TMPL_VAR NAME="template">&startfrom=<TMPL_VAR NAME="nextstartfrom">>Registros Siguientes</a>
+<!-- /TMPL_LOOP -->
+<tr bgcolor="#ccccff" backgound="/images/background-mem.gif"><td colspan="4">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" background="/images/background-mem.gif">
+    <tr><td align="left">
+    <a href="search.pl?template=<!-- TMPL_VAR NAME="template" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Registros Anteriores</a>
+    </td><td align="right">
+    <a href="search.pl?template=<!-- TMPL_VAR NAME="template" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Pr&oacute;ximos Registros</a>
     </td></tr>
     </table>
 </td></tr>
 </table>
 <br>
-Resultados <TMPL_VAR NAME="startfrom"> hasta <TMPL_VAR NAME="endat"> of <TMPL_VAR NAME="numrecords"> registros.
+Resultados <i><!-- TMPL_VAR NAME="startfrom" --></i> hasta <i><!-- TMPL_VAR NAME="endat" --></i> de <i><!-- TMPL_VAR NAME="numrecords" --></i> registros.
 <hr>
-<TMPL_INCLUDE NAME="/usr/share/koha/intranet/htdocs/includes/cat-bottom.inc">
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: es/intranet-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/intranet-main.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/intranet-main.tmpl	3 Jun 2003 21:41:12 -0000	1.2
+++ es/intranet-main.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,191 +1,246 @@
-<HTML>
-<TITLE>Bienvenido al Software Koha</TITLE>
-
-
-<style type="text/css">
-<!--
-input{font-size:16px}
-
--->
-
-</style>
-<script language=javascript>
-<!--
-if (document.images){
-search=new Image;
-search.src ="<TMPL_VAR NAME='themelang'>/images/front-mouseover-search.gif"
-members=new Image;
-members.src ="<TMPL_VAR NAME='themelang'>/images/front-mouseover-member.gif"
-acquisitions=new Image;
-acquisitions.src ="<TMPL_VAR NAME='themelang'>/images/front-mouseover-acquisitions.gif"
-reports=new Image;
-reports.src ="<TMPL_VAR NAME='themelang'>/images/front-mouseover-reports.gif"
-circulation=new Image;
-circulation.src ="<TMPL_VAR NAME='themelang'>/images/front-mouseover-circulation.gif"
-}
-//-->
-</script>
-
-</HEAD>
-
-<BODY
-	BGCOLOR="#99cc33"
-	text="black"
-
-
-	alink="#663366"
-	leftmargin=0
-	topmargin=0
-	marginheight=0
-	marginwidth=0 >
-
-<center>
-<table cellspacing=0 cellpadding=0 border=0 >
-
-  <tr valign=top >
-	<td background="<TMPL_VAR NAME='themelang'>/images/koha-front-background.gif"><img src="/images/holder.gif"
-	width=1 height=420 align=left alt=" " hspace=0 vspace=0 >
-	<table cellspacing=0 cellpadding=0 border=0 >
-		<!----ROW THAT SETS THE GRID FOR THE REST OF THE TABLE--->
-		<tr valign=top >
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=150 height=42
-			alt=" " hspace=0 vspace=0 ></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=30 height=42
-			alt=" " hspace=0 vspace=0 ></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=25 height=42
-			alt=" " hspace=0 vspace=0></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=25 height=42
-			alt=" " hspace=0 vspace=0></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=30 height=42
-			alt=" " hspace=0 vspace=0></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=20 height=42
-			alt=" " hspace=0 vspace=0></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=20 height=42
-			alt=" " hspace=0 vspace=0></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=10 height=42
-			alt=" " hspace=0 vspace=0></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=10 height=42
-			alt=" " hspace=0 vspace=0></td>
-			<td background=""><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=90 height=42
-			alt=" " hspace=0 vspace=0></td>
-		</tr>
-
-<!--------CATALOGUE SEARCH----->
-
-		<tr valign=top >
-			<td background="" colspan=5><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif"
-			width=1 height=1 hspace=0 vspace=0></td>
-
-			<td background="" colspan=5><a href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet" onMouseOver="if(document.images)document.search.src='<TMPL_VAR NAME='themelang'>/images/front-mouseover-search.gif'" 		onMouseOut="if(document.images)document.search.src='<TMPL_VAR NAME='themelang'>/images/front-search.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/front-search.gif" width=320 	height=37 name="search"
-			hspace=0 vspace=0 border=0></a></td>
-		</tr>
-		<FORM ACTION="/cgi-bin/koha/loadmodules.pl" method=post>
-		<tr valign=top >
-			<td background="" rowspan=3 align="right" colspan=5>
-				<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif"
-				width=1 height=35
-				alt=" " hspace=0 vspace=0><br>
-				<img src="<TMPL_VAR NAME='themelang'>/images/koha-front-koha.gif" width=200 height=128
-				alt="Koha: Horowhenua Library Trust" hspace=0 vspace=0></td>
-			<td></td>
-			<td></td>
-			<td background="" colspan=3>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+	<title>BIENVENIDO A LA INTRANET DE KOHA </title>
+	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/intranet-main.css">
+	<!-- 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 -->
+<!-- JAVASCRIPT SCRIPTS -->
+	<script language="JavaScript" type="text/javascript">
+		var IE = document.all?true:false;
+		if (!IE) document.captureEvents(Event.MOUSEMOVE)
+		document.onmousemove = getMouseXY;
+		var mouseX = 0;
+		var mouseY = 0;
+		function getMouseXY(e) {
+			if (IE) {
+				mouseX = event.clientX + document.body.scrollLeft;
+				mouseY = event.clientY + document.body.scrollTop;
+			}
+			else {
+				mouseX = e.pageX;
+				mouseY = e.pageY;
+			}  
+			if (mouseX < 0){mouseX = 0;}
+			if (mouseY < 0){mouseY = 0;}  
+			return true;
+		}
+		function MM_findObj(n, d) { //v4.0
+			var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+			d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+			if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+			for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+			if(!x && document.getElementById) x=document.getElementById(n); return x;
+		}
+		function SetOn(item) {
+			for(i=1;i<=7;i++) {
+				SetOff(i);
+			}
+			if (!(layer = MM_findObj('Hint' + item))) return;
+			layer.style.visibility = 'visible';
+		}
+		function SetOff(item) {
+			if (!(layer = MM_findObj('Hint' + item))) return;
+			layer.style.visibility = 'hidden';
+		}
+		function addauthority() {
+			X = document.forms["f"].authtype.value;
+			window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X;
+		}
+		function searchauthority() {
+			X = document.forms["f"].authtype2.value;
+			Y = document.forms["f"].value.value;
+			window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
+		}
+	</script>
+	<script language="javascript" type="text/javascript">
+	var blnOk=true;
+	function Load() {
+		if(document.body.style.backgroundColor!="") { blnOk=false; }
+		if(document.body.style.color!="") { blnOk=false; }
+		if(document.body.style.marginTop!="") { blnOk=false; }
+		if(blnOk) {
+			for(i=1;i<=6;i++) {
+				SetOff(i);
+			}
+
+			}
+		}
+	</script>
+
+</head>
+<body onload="Load();">
+<div id="mainbloc">
+	<div class="image">
+		<p class="kohalogo">Koha</p>
+		<p class="kohalogo2">Sistema de Biblioteca de C&oacute;digo Abierto</p>
+		<p class="kohalogo2">Interfaz para bibliotecarios</p>
+		<hr width="50%" />
+		<p class="kohalogo2">Koha : regalo, donaci&oacute;n o contribuci&oacute;n</p>
+	</div>
+	<div id="menus">
+<!-- RIGHT (disappearing) BLOC -->
+		<div id="Hint1" class="hint">
+			<h1 class="catalogue">Cat&aacute;logo</h1>
+			<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="catalogue">Buscar en el Cat&aacute;logo</a>
+				<p>Buscar un registro. Cuando este registro sea encontrado, puede verificar su estado, reservarlo, o ver d&oacute;nde est&aacute;</p>
+			<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="catalogue">A&ntilde;adir art&iacute;culo</a>
+				<p>A&ntilde;adir un art&iacute;culo directamente al cat&aacute;logo de la biblioteca</p>
+			<a class="catalogue" href="/cgi-bin/koha/bull-home.pl">Series</a>
+				<p>Administre suscripciones a series y pr&eacute;stamos</p>
+			<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="catalogue">Estantes Virtuales</a>
+				<p>Los estantes virtuales pueden ser usados por el bibliotecario o los patrones para construir bibliotecas virtuales dentro de una "real". El estante virtual puede ser usado por un profesor para ayudar a sus estudiantes a buscar la informaci&oacute;n sobre un tema espec&iacute;fico. Esto puede ser usado por una biblioteca para definir "los libros m&aacute;s valiosos para &lt;alguna categor&iacute;a de patr&oacute;n&gt;"</p>
+			<!-- TMPL_IF NAME="NOTMARC" -->
+				<form action="/cgi-bin/koha/loadmodules.pl" method="post">
 				<input type="hidden" name="module" value="search">
 				<input type="hidden" name="type" value="intranet">
-				<input type=text size="27" name="keyword"><input type=reset value="clr"><br>
-
-			<font size=1 face="arial,helvetica" ><b>Escriba en la linea de ingreso y oprima Enter</b><br>
-			<a href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">
-			<font size=2 face="arial narrow,arial,helvetica">
-			<img src="<TMPL_VAR NAME='themelang'>/images/front-arrow-purple.gif" width=27 height=22
-			alt="-" hspace=0 vspace=0 border=0 align=middle >Búsqueda avanzada (mas opciones)</a><br>
-
-			<img src="/images/holder.gif" width=1 height=8
-			alt=" " hspace=0 vspace=0></td>
-
-		</tr>
+					<input type="text" name="keyword" size="27">
+					<input type="reset" value="Borrar"><br>
+					<p>Escriba en el campo y presione la tecla Enter.</p>
+					<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet" class="catalogue">B&uacute;squeda Avanzada (M&aacute;s opciones)</a><br>
+				</form>
+			<!-- /TMPL_IF -->
+		</div>
+		<div id="Hint2" class="hint">
+			<h1 class="members">Usuarios</h1>
+			<h2 class="members">Buscar</h2>
+			<form action="/cgi-bin/koha/members/member.pl" method="post">
+				<input type="text" size="27" name="member">
+				<input type="submit" value="ACEPTAR"><br>
+				<p>Escriba en el campo y presione la tecla Enter.</p>
+				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
 		</form>
 
-		<!--------MEMBER SEARCH----->
-
-		<tr valign=top >
-			<td></td>
-			<form action="/cgi-bin/koha/member.pl" method=post >
-			<td background=""  colspan=4>
-				<a href="/cgi-bin/koha/members-home.pl" onMouseOver="if(document.images)document.member.src='<TMPL_VAR NAME='themelang'>/images/front-mouseover-member.gif'" 		onMouseOut="if(document.images)document.member.src='<TMPL_VAR NAME='themelang'>/images/front-member.gif'">
-				<img src="<TMPL_VAR NAME='themelang'>/images/front-member.gif" width=304 height=37 name="member"
-				hspace=0 vspace=0 border=0>
-			</td>
-
-		</tr>
-		<tr valign=top >
-			<td></td>
-			<td></td>
-			<form action="/cgi-bin/koha/member.pl" method=post >
-
-			<td background="" colspan=3 >
-			<input type=text size="27" name="member">
-			<input type=reset value="clr"><br>
-			<font size=1 face="arial,helvetica" ><b>Escriba en la línea de ingreso y oprima Enter</b><br>
-			<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=12
-			alt=" " hspace=0 vspace=0></td>
+			<a href="/cgi-bin/koha/members/members-home.pl" class="members">P&aacute;gina principal de Usuarios</a>
+			<p>Ir a la p&aacute;gina principal de usuarios</p>
+			<a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add" class="members">A&ntilde;adir usuario</a>
+			<p>A&ntilde;adir un usuario a la biblioteca. El usuario puede ser vinculado con cualquiera de las sedes del sistema. El o ella pueden, tambi&eacute;n, tener hijos.</p>
+			<a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add" class="members">A&ntilde;adir Instituci&oacute;n</a>
+			<p>A&ntilde;adir una instituci&oacute;n a la biblioteca. Este tipo de usuario no tiene la misma informaci&oacute;n que presenta un usuario "f&iacute;sico".</p>
+		</div>
+		
+		<div id="Hint3" class="hint">
+			<h1 class="acquisition">Adquisiciones</h1>
+			Pida art&iacute;culos, reciba pedidos, establezca presupuestos...
+			<form action="/cgi-bin/koha/acqui/order.pl" method="post">
+			Nombre del Proveedor : <input type="text"  size="25"   name="supplier">
+			<input type="submit" class="button acquisition" value="ACEPTAR">
+			</form>
+			<p>o <a href="acqui/histsearch.pl" class="button acquisition">Busque en el historial de pedidos</a></p>
 
+		</div>
+		<div id="Hint4" class="hint">
+			<h1 class="reports">Informes</h1>
+			Todos los informes del sistema
+			<div id="bloc25">
+			<h2 class="reports">Estad&iacute;sticas</h2>
+			<ul>
+			<li>sobre cat&aacute;logo
+				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/inventory.pl">Inventario</a></p>
+				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Cat&aacute;logo por tipo de art&iacute;culo</a></p>
+			<li>sobre pr&eacute;stamos
+				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=yesterday">Hasta la reconciliaci&oacute;n:</a>  Informe diario (ayer)</p>
+				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=today">Hasta la reconciliaci&oacute;n:</a> Informe diario (hoy)</p>
+				<p class="little"><a class="reports little" href="/cgi-bin/koha/overdue.pl">Ejemplares atrasados</a></p>
+			</ul>
+			</div>
+			<div id="bloc25">
+			<h2 class="reports">Estad&iacute;sticas Compuestas</h2>
+			<table>
+			<tr>
+			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/acquisitions_stats.pl">Adquisiciones</a></td>
+			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/borrowers_stats.pl">Usuarios</a></td>
+			</tr>
+			<tr>
+			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/catalogue_stats.pl">Cat&aacute;logo</a></td>
+			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/issues_stats.pl">Circulaci&oacute;n</a></td>
 		</tr>
+			</table>
+			</div>
+			<div id="bloc25">
+			<h2 class="reports">Infomes principales</h2>
+				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/bor_issues_top.pl">Los usuarios con m&aacute;s pr&eacute;stamos</a></p>
+				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/cat_issues_top.pl">Los ejemplares m&aacute;s prestados</a></p>
+			</div>
+		</div>
+		
+		<div id="Hint5" class="hint">
+			<h1 class="authority">Autoridades</h1>
+			Administraci&oacute;n de autoridades &amp; b&uacute;squedas
+			<form name="f" >
+				<h2 >
+					<select name="authtype">
+					<!-- TMPL_LOOP NAME="authtypesloop" -->
+						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+							<!-- TMPL_VAR NAME="authtypetext" -->
+						</option>
+					<!-- /TMPL_LOOP -->
+					</select>
+					<a href="javascript:addauthority()" class="authority">A&ntilde;adir Autoridad</a>
+				</h2>
+				<h2>Buscar <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->"> en
+					<select name="authtype2">
+					<!-- TMPL_LOOP NAME="authtypesloop" -->
+						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+							<!-- TMPL_VAR NAME="authtypetext" -->
+						</option>
+					<!-- /TMPL_LOOP -->
+					</select>
+				</h2>
+				<input type="hidden" name="marclist" value="">
+				<input type="hidden" name="and_or" value="and">
+				<input type="hidden" name="excluding" value="">
+				<input type="hidden" name="operator" value="contains">
+				<input type="hidden" name="op" value="do_search">
+				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
+				<a href="javascript:searchauthority()" class="authority">
+					Buscar
+				</a>
+			</form>
+		</div>
+		<div id="Hint6" class="hint">
+			<h1 class="parameters">Par&aacute;metros</h1>
+			<h2 class="parameters"><a href="barcodes/barcodes.pl">Generador de C&oacute;digo de barras</a></h2>
+			<h2 class="parameters"><a href="admin/aqbookfund.pl">Fondos Bibliogr&aacute;ficos</a></h2>
+			<h2 class="parameters"><a href="import/breeding.pl">Importar al dep&oacute;sito</a></h2>
+		</div>
+		<div id="Hint7" class="hint">
+			<h1 class="circulation">Circulaci&oacute;n</h1>
+			Trabaje en el mostrador con pr&eacute;stamos y devoluciones usando solamente un lector de c&oacute;digo de barras y un rat&oacute;n
+				<h2 class="circulation">
+					Pr&eacute;stamo
+				</h2>
+				<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+					<p>Inserte N&uacute;mero de carnet del usuario o parte de su apellidos <input name="findborrower">
+					<input type="submit" value="ACEPTAR" class="button circulation"></p>
+				</form>
+				<h2 class="circulation">
+					Devoluci&oacute;n
+				</h2>
+				<form method="post" action="/cgi-bin/koha/circ/returns.pl">
+				<p>Inserte el C&oacute;digo de Barras del ejemplar</p>
+				<label class="label20">C&oacute;digo de barras del ejemplar:</label><input name="barcode" size="10">
+				<input type="submit" value="ACEPTAR" class="button circulation">
+				</form>
 
- <!--------ACQUISITIONS----->
-		<tr valign=top >
-			<td></td>
-			<td></td>
-			<td></td>
-			<td></td>
-			<td></td>
-			<td background="" colspan=5><A href="/cgi-bin/koha/loadmodules.pl?module=acquisitions" onMouseOver="if(document.images)document.acquisitions.src='<TMPL_VAR NAME='themelang'>/images/front-mouseover-acquisitions.gif'" 		onMouseOut="if(document.images)document.acquisitions.src='<TMPL_VAR NAME='themelang'>/images/front-acquisitions.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/front-acquisitions.gif" width=320 		height=36 name="acquisitions"
-			hspace=0 vspace=0 border=0></a><br>
-			<img src="/images/holder.gif" width=1 height=12
-			alt=" " hspace=0 vspace=0 ></td>
-
+		</div>
+<!-- MAIN MENU -->
+		<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions" class="acquisition" onMouseOver="SetOn(3);">Adquisiciones</a><br/>
 
-		</tr>
+		<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet" class="catalogue" onMouseOver="SetOn(1);">Cat&aacute;logo</a><br/>
 
+		<a href="/cgi-bin/koha/circ/circulation.pl" class="circulation" onMouseOver="SetOn(7);">Circulaci&oacute;n</a><br/>
 
-<!--------REPORTS----->
-		<tr valign=top >
-			<td></td>
-			<td></td>
-			<td></td>
-			<td></td>
-			<td background="" colspan=6> <A href="/cgi-bin/koha/reports-home.pl" onMouseOver="if(document.images)document.reports.src='<TMPL_VAR NAME='themelang'>/images/front-mouseover-reports.gif'" 		onMouseOut="if(document.images)document.reports.src='<TMPL_VAR NAME='themelang'>/images/front-reports.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/front-reports.gif" width=346 		height=37 name="reports"
-			hspace=0 vspace=0 border=0></a><br>
-			<img src="/images/holder.gif" width=1 height=12
-			alt=" " hspace=0 vspace=0 ></td>
-		</tr>
+		<a href="/cgi-bin/koha/members/members-home.pl" class="members" onMouseOver="SetOn(2);">Usuarios</a><br/>
 
-<!--------ADMIN----->
-		<tr valign=top >
+		<a href="/cgi-bin/koha/authorities/authorities-home.pl" class="reports" onMouseOver="SetOn(5);">Autoridades</a><br/>
 
-			<td></td>
-			<td></td>
-			<td></td>
-			<td background="" colspan=7> <A href="/cgi-bin/koha/admin-home.pl" onMouseOver="if(document.images)document.admin.src='<TMPL_VAR NAME='themelang'>/images/front-mouseover-admin.gif'" 		onMouseOut="if(document.images)document.admin.src='<TMPL_VAR NAME='themelang'>/images/front-admin.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/front-admin.gif" width=346 		height=37 name="admin"
-			hspace=0 vspace=0 border=0></a><br>
-			<img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=12
-			alt=" " hspace=0 vspace=0 ></td>
+		<a href="/cgi-bin/koha/reports-home.pl" class="reports" onMouseOver="SetOn(4);">Informes</a><br/>
 
+		<a href="/cgi-bin/koha/admin-home.pl" class="parameters" onMouseOver="SetOn(6);">Par&aacute;metros</a><br/>
 
-		</tr>
 
-<!--------CIRCULATION----->
-		<tr valign=top >
 
-			<td></td>
-			<td background="" colspan=9> <A href="/cgi-bin/koha/circ/circulation.pl" onMouseOver="if(document.images)document.circulation.src='<TMPL_VAR NAME='themelang'>/images/front-mouseover-circulation.gif'" 		onMouseOut="if(document.images)document.circulation.src='<TMPL_VAR NAME='themelang'>/images/front-circulation.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/front-circulation.gif" width=346 		height=37 name="circulation"
-			hspace=0 vspace=0 border=0></a>
-			</td>
-		</tr>
-	</table>
-	</td>
-</tr>
-</table>
-</center>
+	</div>
+</div>
 </body>
 </html>

Index: es/mancredit.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/mancredit.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/mancredit.tmpl	3 Jun 2003 21:41:12 -0000	1.2
+++ es/mancredit.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,22 +1,20 @@
-<TMPL_INCLUDE Name="members-top.inc">
-
-<Center><h3>Crédito Manual</h3></center>
-<form action=/cgi-bin/koha/mancredit.pl method=post>
-<table cellpadding=2 cellspacing=0 border=0>
-<input type=hidden name="bornum" value="<TMPL_VAR Name="bornum">">
-<tr><td><b>Id del usuario:<b></td><td><TMPL_VAR Name="bornum"></td></tr>
-<tr><td><b>Tipo Movimiento</b></td><Td>
-<select name=type>
-<option value=C>Credito</option>
-<option value=BAY>Ajuste</option>
-<option value=WORK>Worked off</option>
-</select>
-</td></tr>
-<tr><td><b>Número de Item</b></td><td><input type=text name=itemnum></td></tr>
-<tr><td><b>Descripción</b></td><td><input type=text name=desc size=50></td></tr>
-<tr><td><b>Monto</b></td><td><input type=text name=amount></td></tr>
-<tr><td><input type=submit name=add value=Add></td></tr>
-</table>
-</form>
-
-<TMPL_INCLUDE Name="members-bottom.inc">
\ No newline at end of file
+<!-- TMPL_INCLUDE Name="members-top.inc" -->
+<div id="mainbloc">
+	<h1 class="member">Cr&eacute;dito manual</h1>
+	<form action="/cgi-bin/koha/mancredit.pl" method="post">
+		<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
+		<p><label class="label100">N&uacute;mero de usuario</label><!-- TMPL_VAR NAME="bornum" --></p>
+		<p><label class="label100">Tipo</label>
+			<select name="type">
+				<option value="C">Cr&eacute;dito</option>
+				<option value="BAY">Baycorp Adjustment</option>
+				<option value="WORK">Trabajado apagado</option>
+			</select>
+		</p>
+		<p><label class="label100">N&uacute;mero de ejemplar</label><input type="text" name="itemnum"></p>
+		<p><label class="label100">Descripci&oacute;n</label><input type="text" name="desc" size="50"></p>
+		<p><label class="label100">Monto</label><input type="text" name="amount"></p>
+		<p><input type="submit" name="add" value="A&ntilde;adir" class="button"></p>
+	</form>
+</div>
+<!-- TMPL_INCLUDE Name="members-bottom.inc" -->
\ No newline at end of file

Index: es/maninvoice.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/maninvoice.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/maninvoice.tmpl	3 Jun 2003 21:41:12 -0000	1.2
+++ es/maninvoice.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,25 +1,25 @@
-<TMPL_INCLUDE Name="members-top.inc">
-
-<Center><h3>Factura Manual</h3></center>
-<form action=/cgi-bin/koha/maninvoice.pl method=post>
-<table cellpadding=2 cellspacing=0 border=0>
-<input type=hidden name=bornum value="<TMPL_VAR Name="bornum">">
-<tr><td><b>Id del Usuario<b></td><td><TMPL_VAR Name="bornum"></td></tr>
-<tr><td><b>Tipo</b></td><Td>
-<select name=type>
-<option value=L>Item perdido</option>
-<option value=F>Fine</option>
-<option value=A>Cargo por Administración</option>
-<option value=N>Tarjeta Nueva</option>
-<option value=M>Sundry</option>
-<option value=REF>Cash Refund</option>
-</select>
-</td></tr>
-<tr><td><b>Numero de Item</b></td><td><input type=text name=itemnum></td></tr>
-<tr><td><b>Descripción</b></td><td><input type=text name=desc size=50></td></tr>
-<tr><td><b>Monto</b></td><td><input type=text name=amount></td></tr>
-<tr><td><input type=submit name=add value=Add></td></tr>
-</table>
-</form>
-
-<TMPL_INCLUDE Name="members-bottom.inc">
+<!-- TMPL_INCLUDE Name="members-top.inc" -->
+<div id="mainbloc">
+	<h1 class="member">Factura Manual</h1>
+	<form action="/cgi-bin/koha/maninvoice.pl" method="post">
+	<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
+	<p><label class="label100">N&uacute;mero de usuario </label><!-- TMPL_VAR NAME="bornum" --></p>
+	<p>
+		<label class="label100"><b>Tipo</label>
+		<select name="type">
+			<option value="L">Ejemplar perdido</option>
+			<option value="F">Cuenta</option>
+			<option value="A">Costo de administraci&oacute;n de cuenta</option>
+			<option value="N">Nuevo Carnet</option>
+			<option value="M">Sundry</option>
+			<option value="REF">Devoluci&oacute;n en Efectivo</option>
+		</select>
+	</p>
+	<p><label class="label100">N&uacute;mero de ejemplar</label><input type="text" name="itemnum"></p>
+	<p><label class="label100">Descripci&oacute;n</label><input type="text" name="desc" size="50"></p>
+	<p><label class="label100">Monto</label><input type="text" name="amount"></p>
+	<p><label class="label100"><input type="submit" class="button" name="add" value="A&ntilde;adir"></p>
+	</table>
+	</form>
+</div>
+<!-- TMPL_INCLUDE Name="members-bottom.inc" -->

Index: es/modbib.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/modbib.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/modbib.tmpl	3 Jun 2003 21:56:29 -0000	1.1
+++ es/modbib.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,64 +1,63 @@
-<TMPL_INCLUDE Name="cat-top.inc">
+<!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
-<a href="modwebsites.pl?biblionumber=<TMPL_VAR Name="biblionumber">">Modificación de Links del Sitio</a>
+<a href="modwebsites.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Modificar Enlaces Web</a>
 <form action="updatebiblio.pl" method="post" name="f">
-<input type="hidden" name="biblionumber" value="<TMPL_VAR Name="biblionumber">">
-<input type="hidden" name="biblioitemnumber" value="<TMPL_VAR Name="biblioitemnumber">">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+<input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
 <table border="0" cellspacing="0" cellpadding="5">
 <tr valign="top">
 <td>Autor</td>
-<td><input type="text" name="author" value="<TMPL_VAR Name="author" ESCAPE=HTML>"></td>
+<td><input type="text" name="author" value="<!-- TMPL_VAR NAME="author" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
-<td>Título</td>
-<td><input type="text" name="title" value="<TMPL_VAR Name="title" ESCAPE=HTML>"></td>
+<td>T&iacute;tulo</td>
+<td><input type="text" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
-<td>Abstract</td>
-<td><textarea name="abstract" cols="40" rows="4"><TMPL_VAR Name="abstract"></textarea></td>
+<td>Resumen</td>
+<td><textarea name="abstract" cols="40" rows="4"><!-- TMPL_VAR NAME="abstract" --></textarea></td>
 </tr>
 <tr valign="top">
-<td>Materias/Descriptores</td>
-<td><textarea name="subject" cols="40" rows="4"><TMPL_VAR Name="subject"></textarea>
-<a href="javascript:Dopop()">...</a>
+<td>Tema</td>
+<td><textarea name="subject" cols="40" rows="4"><!-- TMPL_VAR NAME="subject" --></textarea>
 </td>
 </tr>
 <tr valign="top">
-<td>Fecha Copyright</td>
-<td><input type="text" name="copyrightdate" value="<TMPL_VAR Name="copyrightdate" ESCAPE=HTML>"></td>
+<td>Fecha de Copyright</td>
+<td><input type="text" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
-<td>Título de la serie</td>
-<td><input type="text" name="seriestitle" value="<TMPL_VAR Name="seriestitle" ESCAPE=HTML>"></td>
+<td>T&iacute;tulo de Serie</td>
+<td><input type="text" name="seriestitle" value="<!-- TMPL_VAR NAME="seriestitle" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
-<td>Otro Autor</td>
-<td><input type="text" name="additionalauthor" value="<TMPL_VAR Name="additionalauthor" ESCAPE=HTML>"></td>
+<td>Autor Adicional</td>
+<td><input type="text" name="additionalauthor" value="<!-- TMPL_VAR NAME="additionalauthor" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
-<td>Subtítulo</td>
-<td><input type="text" name="subtitle" value="<TMPL_VAR Name="subtitle" ESCAPE=HTML>"></td>
+<td>Subt&iacute;tulo</td>
+<td><input type="text" name="subtitle" value="<!-- TMPL_VAR NAME="subtitle" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
-<td>Título unificado</td>
-<td><input type="text" name="unititle" value="<TMPL_VAR Name="untitle" ESCAPE=HTML>"></td>
+<td>T&iacute;tulo unificado</td>
+<td><input type="text" name="unititle" value="<!-- TMPL_VAR NAME="unititle" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Notas</td>
-<td><textarea name="notes" cols="40" rows="4"><TMPL_VAR Name="notes" ESCAPE=HTML></textarea></td>
+<td><textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR NAME="notes" ESCAPE=HTML --></textarea></td>
 </tr>
 <tr valign="top">
-<td>Número Inventario</td>
-<td><input type="text" name="serial" value="<TMPL_VAR Name="serial" ESCAPE=HTML>"></td>
+<td>Serie</td>
+<td><input type="text" name="serial" value="<!-- TMPL_VAR NAME="serial" ESCAPE=HTML -->"></td>
 </tr>
 </table>
 <br>
-<input type="submit" name="submit" value="Save Changes">
+<input type="submit" name="submit" value="Guardar Cambios">
 </form>
-<script>
+<script language="javascript" type="text/javascript">
 function Dopop() {
         newin=window.open("thesaurus_popup.pl?subject="+document.f.subject.value,"thesaurus",'width=500,height=400,toolbar=false,scrollbars=yes');
 }
 </script>
 
-<TMPL_INCLUDE Name="cat-bottom.inc">
+<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->

Index: es/modbibitem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/modbibitem.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/modbibitem.tmpl	3 Jun 2003 21:56:29 -0000	1.1
+++ es/modbibitem.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,114 +1,106 @@
-<TMPL_INCLUDE Name="cat-top.inc">
-
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Identificado como: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>Salir</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/userpage.pl>Entrar</a> a Koha</p>
-</TMPL_IF>
-
-<BLOCKQUOTE><FONT SIZE=6>
-<em><a href=/cgi-bin/koha/detail.pl?bib="<TMPL_VAR Name="biblionumber">"&type=intra><TMPL_VAR Name="title"> (<TMPL_VAR Name="author">)</a><br>
-Modificar Grupo - <TMPL_VAR Name="description"></em></FONT><br>
-
-<form action=updatebibitem.pl method=post>
-	<table border=0 cellspacing=0 cellpadding=5 align=left>
-
-		<TR VALIGN=TOP  bgcolor="99cc33">
-			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2 ><b><input type=radio name=existing value=YES > Re asignar a un grupo ya existente</b></td>
-		</tr>
-
-		<tr valign=top>
-			<td colspan=3>
-				<select name=existinggroup><br>
-					<TMPL_LOOP Name="bibitemloop">
-						<option value="<TMPL_VAR Name="biblioitemnumber">"><TMPL_VAR Name="description"> - <TMPL_VAR Name="isbn"><br>
-					</TMPL_LOOP>
+<!-- TMPL_INCLUDE Name="cat-top.inc" -->
+<h1><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)</a><br>
+Modificar Grupo - <!-- TMPL_VAR NAME="description" --></h1><br>
+
+<form action="updatebibitem.pl" method="post">
+	<table border="0" cellspacing="0" cellpadding="5" align="left">
+
+		<tr valign="top"  bgcolor="#99cc33">
+			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="2" ><b><input type="radio" name="existing" value="YES" > RE-ASIGNAR A UN GRUPO EXISTENTE</b></td>
+		</tr>
+
+		<tr valign="top">
+			<td colspan="3">
+				<select name="existinggroup"><br>
+					<!-- TMPL_LOOP Name="bibitemloop" -->
+						<option value="<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="description" --> - <!-- TMPL_VAR NAME="isbn" --><br>
+					<!-- /TMPL_LOOP -->
 				</select>
 			</td>
 		</tr>
 
-		<TR VALIGN=TOP  bgcolor="99cc33">
-			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2 ><b><input type=radio name=existing value=NO checked >OR MODIFY DETAILS</b></td>
+		<tr valign="top"  bgcolor="#99cc33">
+			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="2" ><b><input type="radio" name="existing" value="NO" checked >O MODIFICAR DETALLES</b></td>
 		</tr>
 
-		<tr valign=top bgcolor=white><td>Tipo de Item:</td><td><input type=text name=Item Type value="<TMPL_VAR Name="itemtype">" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Tipo de art&iacute;culo</td><td><input type="text" name="Item" value="<!-- TMPL_VAR NAME="itemtype" -->" size="20"></td></tr>
 
 		<tr valign="top" bgcolor="white">
 			<td>URL</td>
-			<td><input type="text" name="url" value="<TMPL_VAR Name="url">" size="20"></td>
+			<td><input type="text" name="url" value="<!-- TMPL_VAR NAME="url" -->" size="20"></td>
 		</tr>
 
-		<tr valign=top bgcolor=white><td>Clase</td><td><input type=text name=Class value="<TMPL_VAR Name="classification"><TMPL_VAR Name="dewey"><TMPL_VAR Name="subclass">" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Clase</td><td><input type="text" name="Class" value="<!-- TMPL_VAR NAME="classification" --><!-- TMPL_VAR NAME="dewey" --><!-- TMPL_VAR NAME="subclass" -->" size="20"></td></tr>
 
 
 
-		<tr valign=top bgcolor=white><td>Editor</td><td><input type=text name=Publisher value="<TMPL_VAR Name="publishercode">" size=20></td></tr>
-		<tr valign=top bgcolor=white><td>Lugar</td><td><input type=text name=Place value="<TMPL_VAR Name="place">" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Editor</td><td><input type="text" name="Publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="20"></td></tr>
+		<tr valign="top" bgcolor="white"><td>Lugar</td><td><input type="text" name="Place" value="<!-- TMPL_VAR NAME="place" -->" size="20"></td></tr>
 
 
-		<tr valign=top bgcolor=white><td>ISBN</td><td><input type=text name=ISBN value="<TMPL_VAR Name="isbn">" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>ISBN</td><td><input type="text" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" size="20"></td></tr>
+		<tr valign="top" bgcolor="white"><td>ISSN</td><td><input type="text" name="ISSN" value="<!-- TMPL_VAR NAME="issn" -->" size="20"></td></tr>		
 
-		<tr valign=top bgcolor=white><td>Año de Publicación</td><td><input type=text name=Publication Year value="<TMPL_VAR Name="publicationyear">" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>A&ntilde;o de Publicaci&oacute;n</td><td><input type="text" name="Publication" Year value="<!-- TMPL_VAR NAME="publicationyear" -->" size="20"></td></tr>
 
-		<tr valign=top bgcolor=white><td>Paginas</td><td><input type=text name=Pages value="<TMPL_VAR Name="pages">" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>P&aacute;ginas</td><td><input type="text" name="Pages" value="<!-- TMPL_VAR NAME="pages" -->" size="20"></td></tr>
 
-		<tr valign=top bgcolor=white><td>Ilustraciones</td><td><input type=text name=Illustrations value="<TMPL_VAR Name="illustration">" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Ilustraciones</td><td><input type="text" name="Illustrations" value="<!-- TMPL_VAR NAME="illustration" -->" size="20"></td></tr>
 
-		<tr valign=top bgcolor=white><td>Volumen</td>
-		<td><input type=text name=Volume value="<TMPL_VAR Name="volumeddesc">" size=20></td></tr>
-		<tr valign=top bgcolor=white><td>Notas</td>
-		<td><input name="Notes" size="20" value="<TMPL_VAR name="bnotes">"></td></tr>
-		<tr valign=top bgcolor=white><td>Tamaño</td>
-		<td><input type=text name=Size value="<TMPL_VAR Name="size">" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Volumen</td>
+		<td><input type="text" name="Volume" value="<!-- TMPL_VAR NAME="volumeddesc" -->" size="20"></td></tr>
+		<tr valign="top" bgcolor="white"><td>Notas</td>
+		<td><input name="Notes" size="20" value="<!-- TMPL_VAR NAME="bnotes" -->"></td></tr>
+		<tr valign="top" bgcolor="white"><td>Tama&ntilde;o</td>
+		<td><input type="text" name="Size" value="<!-- TMPL_VAR NAME="size" -->" size="20"></td></tr>
 
-		<input type=hidden name=bibnum value="<TMPL_VAR Name="biblionumber">">
+		<input type="hidden" name="bibnum" value="<!-- TMPL_VAR NAME="biblionumber" -->">
 
-		<input type=hidden name=bibitemnum value="<TMPL_VAR Name="biblioitemnumber">">
+		<input type="hidden" name="bibitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
 
 	</table>
 
-	<img src="/images/holder.gif" width=16 height=500 align=left>
+	<img src="/images/holder.gif" width="16" height="500" align="left">
 
 
 
 
-	<TABLE  cellspacing=0 cellpadding=5 border=0 >
+	<table  cellspacing="0" cellpadding="5" border="0" >
 
-		<TR VALIGN=TOP  bgcolor="99cc33">
-			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=5 ><b>Los cambios afectarán a los siguientes items<br>
-			Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.</td>
+		<tr valign="top"  bgcolor="#99cc33">
+			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="5" ><b>CAMBIA PARA AFECTAR ESTOS C&Oacute;DIGOS DE BARRA<br>
+			Marque TODOS los c&oacute;digos de barras a los cuales se aplicar&aacute;n los cambios. Aquellos que no est&eacute;n marcados mantendr&aacute;n el registro de grupo original.</td>
 		</tr>
 
-		<tr valign=top bgcolor=99cc33>
+		<tr valign="top" bgcolor="#99CC33">
 			<td background="/images/background-mem.gif">&nbsp;</td>
-			<td background="/images/background-mem.gif">Codigo de Barras</td>
-			<td background="/images/background-mem.gif">Ubicacion</td>
-			<td background="/images/background-mem.gif">Desde Dia</td>
-			<td background="/images/background-mem.gif">Ultima fecha localizado</td>
+			<td background="/images/background-mem.gif">C&oacute;digo de barras</td>
+			<td background="/images/background-mem.gif">Ubicaci&oacute;n</td>
+			<td background="/images/background-mem.gif">Fecha de Devoluci&oacute;n</td>
+			<td background="/images/background-mem.gif">Visto por &uacute;ltima vez</td>
 		</tr>
 
-		<TMPL_LOOP Name="itemloop">
-			<tr valign=top gcolor=#ffffcc>
-				<td><input type=checkbox name="<TMPL_VAR Name="barcode">"></td>
-				<td><a href="/cgi-bin/koha/moredetail.pl?item="<TMPL_VAR Name="itemnumber">"&bib="<TMPL_VAR Name="biblionumber">"&bi="<TMPL_VAR Name="biblioitemnumber">""><TMPL_VAR Name="barcode"></a></td>
-				<td><TMPL_VAR Name="holdingbranch"></td>
+		<!-- TMPL_LOOP Name="itemloop" -->
+			<tr valign="top" gcolor="#ffffcc">
+				<td><input type="checkbox" name="check_group_<!-- TMPL_VAR NAME="barcode" -->"></td>
+				<td><a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+				<td><!-- TMPL_VAR NAME="holdingbranch" --></td>
 				<td></td>
-				<td><TMPL_VAR Name="datelastseen"></td>
+				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
 			</tr>
-		</TMPL_LOOP>
+		<!-- /TMPL_LOOP -->
 	</table>
 	<p>
 
-	<input type=image  name=submit src=/images/save-changes.gif border=0 width=187 height=42>
+	<input type="image" name="submit" src="/images/save-changes.gif" border="0" width="187" height="42">
 
 
 </form>
 <p>
 
 
-<B>Ayuda:</B> Usted <b>debe</b> hacer click en el boton circular apropiado(dentro del rectangulo verde), y elegir si reasignar el item a un grupo existente, o modificar el registro.  Si sus cambios se aplican solo
- a algunos items, elija los apropiados y un nuevo grupo será creado para ellos.
- <br clear=all>
+<b>AYUDA:</b> Usted <b>debe</b> pinchar en la opci&oacute;n adecuada (en los cuadros verdes), y elegir entre re-asignar el(los) art&iacute;culo(s) a un registro existente en el sistema , o modificar este registro. Si sus cambios s&oacute;lo se aplican a algunos art&iacute;culos, seleccione los que corresponda y se crear&aacute; autom&aacute;ticamente un nuevo grupo de registros para ellos.
+ <br clear="all">
  <p> &nbsp; </p>
 
-<TMPL_INCLUDE Name="cat-bottom.inc">
+<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->

Index: es/moditem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/moditem.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/moditem.tmpl	3 Jun 2003 21:56:29 -0000	1.1
+++ es/moditem.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,52 +1,40 @@
-<TMPL_INCLUDE Name="cat-top.inc">
+<!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Identificado como: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>Salir</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/userpage.pl>Ingresar</a> a Koha</p>
-</TMPL_IF>
-
-<FONT SIZE=6><em><TMPL_VAR Name="title"> (<TMPL_VAR Name="author">)</em></FONT><br>
-<table border=0 cellspacing=0 cellpadding=5>
-<tr valign=top bgcolor=white><td><form action=updateitem.pl method=post>
-<table border=0 cellspacing=0 cellpadding=5>
-<tr valign=top bgcolor=white><td>Código de Barras</td><td><input type=text name=Barcode value="<TMPL_VAR Name="barcode">" size=40></td></tr>
-<input type=hidden name=Class value="<TMPL_VAR Name="classification">">
-<input type=hidden name=Publisher value="<TMPL_VAR Name="publisher">">
-<input type=hidden name=ISBN value="<TMPL_VAR Name="isbn">">
-<input type=hidden name=Publication Year value="<TMPL_VAR Name="publicationyear">">
-<input type=hidden name=Pages value="<TMPL_VAR Name="pages">">
-<input type=hidden name=Illustrations value="<TMPL_VAR Name="illustration">">
-<tr valign=top bgcolor=white><td>Notas del Item</td><td><textarea name=ItemNotes cols=40 rows=4><TMPL_VAR Name="itemnotes"></textarea></td></tr>
-<input type=hidden name=Volume value="<TMPL_VAR Name="volumeddesc">">
-<tr valign=top bgcolor=white><td>Biblioteca de Origen</td><td><input type=text name=Home Branch value="<TMPL_VAR Name="homebranch">" size=40></td></tr>
-<tr valign=top bgcolor=white>
+<h1><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)</h1><br>
+<table border="0" cellspacing="0" cellpadding="5">
+<tr valign="top" bgcolor="white"><td><form action=updateitem.pl method="post">
+<table border="0" cellspacing="0" cellpadding="5">
+<tr valign="top" bgcolor="white"><td>C&oacute;digo de barras</td><td><input type="text" name="Barcode" value="<!-- TMPL_VAR NAME="barcode" -->" size="40"></td></tr>
+<input type="hidden" name="Class" value="<!-- TMPL_VAR NAME="classification" -->">
+<input type="hidden" name="Publisher" value="<!-- TMPL_VAR NAME="publisher" -->">
+<input type="hidden" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
+<input type="hidden" name="Publication Year" value="<!-- TMPL_VAR NAME="publicationyear" -->">
+<input type="hidden" name="Pages" value="<!-- TMPL_VAR NAME="pages" -->">
+<input type="hidden" name="Illustrations" value="<!-- TMPL_VAR NAME="illustration" -->">
+<tr valign="top" bgcolor="white"><td>Notas del Ejemplar</td><td><textarea name="ItemNotes" cols="40" rows="4"><!-- TMPL_VAR NAME="itemnotes" --></textarea></td></tr>
+<input type="hidden" name="Volume" value="<!-- TMPL_VAR NAME="volumeddesc" -->">
+<tr valign="top" bgcolor="white"><td>Sede Propietaria</td><td><input type="text" name="Home" Branch value="<!-- TMPL_VAR NAME="homebranch" -->" size="40"></td></tr>
+<tr valign="top" bgcolor="white">
 
 <td>Perdido</td>
 <td>
-<input type=radio name=Lost value=1 <TMPL_IF Name="itemlost">  checked </TMPL_IF> >
-Si
-<input type=radio name=Lost value=0 <TMPL_UNLESS Name="itemlost"> checked </TMPL_UNLESS> >
-No
+<input type="radio" name="Lost" value="1" <!-- TMPL_IF Name="itemlost" -->  checked <!-- /TMPL_IF --> > Si <input type="radio" name="Lost" value="0" <!-- TMPL_UNLESS Name="itemlost" --> checked <!-- /TMPL_UNLESS --> > No
 </td>
 </tr>
-<tr valign=top bgcolor=white>
+<tr valign="top" bgcolor="white">
 <td>Cancelado</td>
-<td><input type=radio name=withdrawn value=1 <TMPL_IF Name="withdrawn"> checked </TMPL_IF> >
-Si
-<input type=radio name=withdrawn value=0 <TMPL_UNLESS Name="withdrawn"> checked </TMPL_UNLESS> >
-No
+<td><input type="radio" name="withdrawn" value="1" <!-- TMPL_IF Name="itemwithdrawn" --> checked <!-- /TMPL_IF --> > Si <input type="radio" name="withdrawn" value="0" <!-- TMPL_UNLESS Name="itemwithdrawn" --> checked <!-- /TMPL_UNLESS --> > No
 </td>
 </tr>
-<input type=hidden name=bibnum value="<TMPL_VAR Name="biblionumber">">
-<input type=hidden name=bibitemnum value="<TMPL_VAR Name="biblioitemnumber">">
-<input type=hidden name=itemnumber value="<TMPL_VAR Name="itemnumber">">
-<tr valign=top bgcolor=white><td></td><td>
+<input type="hidden" name="bibnum" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+<input type="hidden" name="bibitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
+<tr valign="top" bgcolor="white"><td></td><td>
 
-<input type=image  name=submit src=<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filesave.png border=0></td></tr>
+<input type="image"  name="submit" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filesave.png" border="0"></td></tr>
 </table>
 </form></td></tr>
 </table>
 
 
-<TMPL_INCLUDE Name="cat-bottom.inc">
+<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->

Index: es/modwebsites.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/modwebsites.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/modwebsites.tmpl	3 Jun 2003 21:56:29 -0000	1.1
+++ es/modwebsites.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,42 +1,42 @@
-<TMPL_INCLUDE Name="acquisitions-top.inc">
+<!-- TMPL_INCLUDE Name="acquisitions-top.inc" -->
 <p>
-<a href="detail.pl?type=intra&bib=<TMPL_VAR Name="biblionumber">">Volver a la página de detalles</a>
-EOF
+<a href="detail.pl?type=intra&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->">Regresar a la P&aacute;gina de Detalles</a>
 
-<TMPL_LOOP Name="websitesloop">
+
+<!-- TMPL_LOOP Name="websitesloop" -->
 <p>
 <form action="updatewebsite.pl" method="post">
-<input type="hidden" name="biblionumber" value="<TMPL_VAR Name="biblionumber">">
-<input type="hidden" name="websitenumber" value="<TMPL_VAR Name="websitenumber">">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+<input type="hidden" name="websitenumber" value="<!-- TMPL_VAR NAME="websitenumber" -->">
 <table>
 <tr valign="top">
-<td>Título</td>
-<td><input type="text" name="title" value="<TMPL_VAR Name="title">"></td>
+<td>T&iacute;tulo</td>
+<td><input type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->"></td>
 </tr>
 <tr valign="top">
-<td>Descripcion</td>
-<td><textarea name="description" cols="40" rows="4"><TMPL_VAR Name="description"></textarea></td>
+<td>Descripci&oacute;n</td>
+<td><textarea name="description" cols="40" rows="4"><!-- TMPL_VAR NAME="description" --></textarea></td>
 </tr>
 <tr valign="top">
 <td>URL</td>
-<td><input type="text" name="url" value="<TMPL_VAR Name="url">"></td>
+<td><input type="text" name="url" value="<!-- TMPL_VAR NAME="url" -->"></td>
 </tr>
 </table>
-<input type="submit" value="Actualizar el link">   <input type="submit" name="delete" value="Delete this Website link">
+<input type="submit" value="Actualizar este Enlace a Sitio Web">   <input type="submit" name="delete" value="Borrar este enlace a P&aacute;gina Web">
 </form>
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 
 <p>
-<h2><b>Agregar otro link</b></h2>
+<h2><b>A&ntilde;adir otro enlace a p&aacute;gina web</b></h2>
 <form action="addwebsite.pl" method="post">
-<input type="hidden" name="biblionumber" value="<TMPL_VAR Name="biblionumber">">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
 <table>
 <tr valign="top">
-<td>Titulo</td>
+<td>T&iacute;tulo</td>
 <td><input type="text" name="title"></td>
 </tr>
 <tr valign="top">
-<td>Descripcion</td>
+<td>Descripci&oacute;n</td>
 <td><textarea name="description" cols="40" rows="4"></textarea></td>
 </tr>
 <tr valign="top">
@@ -44,8 +44,8 @@
 <td><input type="text" name="url"></td>
 </tr>
 </table>
-<input type="submit" value="Agregar este Link">
+<input type="submit" value="A&ntilde;adir este enlace a p&aacute;gina web">
 </form>
-EOF
 
-<TMPL_INCLUDE Name="acquisitions-bottom.inc">
+
+<!-- TMPL_INCLUDE Name="acquisitions-bottom.inc" -->

Index: es/opac-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/opac-main.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/opac-main.tmpl	3 Jun 2003 21:41:12 -0000	1.2
+++ es/opac-main.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,5 +1,5 @@
 <HTML>
-<TITLE>Bienvenido al OPAC de Koha </TITLE>
+<TITLE>BIENVENIDO AL OPAC DE KOHA </TITLE>
 
 
 <style type="text/css">
@@ -20,65 +20,64 @@
 	alink="#663366" 
 	leftmargin=0 
 	topmargin=0
-	marginheight=0
-	marginwidth=0 >
+	marginheight="0"
+	marginwidth="0" >
 
 <center>
-<table cellspacing=0 cellpadding=0 border=0 >
+<table cellspacing="0" cellpadding="0" border="0" >
 	
-  <tr valign=top >
+  <tr valign="top" >
 	<td background="/images/front-background-med.gif"><img src="/images/holder.gif" 
-	width=1 height=440 align=left alt=" " hspace=0 vspace=0><table
-cellspacing=0 cellpadding=0 border=0 >
+	width="1" height="440" align="left" alt="" hspace="0" vspace="0"><table
+cellspacing="0" cellpadding="0" border="0" >
 	
-  <tr valign=top >
-	<td background=" "><img src="/images/holder.gif" width=228 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=57 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=47 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=1 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=1 height=88 
-	alt=" " hspace=0 vspace=0></td>
+  <tr valign="top" >
+	<td><img src="/images/holder.gif" width="228" height="88" 
+	alt="" hspace="0" vspace="0"></td>
+	<td><img src="/images/holder.gif" width="57" height="88" 
+	alt="" hspace="0" vspace="0"></td>
+	<td><img src="/images/holder.gif" width="47" height="88" 
+	alt="" hspace="0" vspace="0"></td>
+	<td><img src="/images/holder.gif" width="1" height="88" 
+	alt="" hspace="0" vspace="0"></td>
+	<td><img src="/images/holder.gif" width="1" height="88" 
+	alt="" hspace="0" vspace="0"></td>
   </tr>
 
-  <tr valign=top >
-	<td background=" " rowspan=2 align="right" colspan=2><img src="/images/holder.gif"
- 	width=1 height=30
-	alt=" " hspace=0 vspace=0><br>
-	<img src="/images/koha.gif" width=200 height=128
-	alt="Koha: Horowhenua Library Trust Catalogue and Member Services" hspace=0 vspace=0></td>
+  <tr valign="top" >
+	<td rowspan=2 align="right" colspan="2"><img src="/images/holder.gif"
+ 	width="1" height="30"
+	alt="" hspace="0" vspace="0"><br>
+	<img src="/images/koha.gif" width="200" height="128"
+	alt="Koha: Horowhenua Library Trust Catalogue and Member Services" hspace="0" vspace="0"></td>
 
-	<td background=" "  colspan=3><font size=+2><a href="/cgi-bin/koha/catalogue-home.pl"><img src="/images/heading-search.gif" width=272 	height=38
-	alt="Search the Catalogue" hspace=0 vspace=0 border=0></a></font></td>
+	<td  colspan="3"><font size=+2><a href="/cgi-bin/koha/catalogue-home.pl"><img src="/images/heading-search.gif" width="272" height="38" alt="Buscar en el Cat&aacute;logo" hspace="0" vspace="0" border="0"></a></font></td>
 
   </tr>
 
 
-<tr valign=top >
+<tr valign="top" >
 	<td>&nbsp; &nbsp; </td>
-	<FORM ACTION="/cgi-bin/koha/search.pl" name=catsearch>
-	<input type=hidden name=type value=opac>
-	<td background=" " >
+	<form action="/cgi-bin/koha/search.pl" name="catsearch">
+	<input type="hidden" name="type" value="opac">
+	<td >
 
-	<input type=text size="27" name="keyword"><br>
+	<input type="text" size="27" name="keyword"><br>
 	</font>
-	<b>Ingrese el texto a buscar y oprima Enter</b><br>
+	<b>Escriba en el campo y presione la tecla Enter.</b><br>
 	<a href="/cgi-bin/koha/catalogue-home.pl">
       
-	<img src="/images/front-arrow.gif" width=27 height=22
-	alt="-" hspace=0 vspace=0 border=0 align=middle >Advanced Search (More Options)</a><br>
+	<img src="/images/front-arrow.gif" width="27" height="22"
+	alt="-" hspace="0" vspace="0" border="0" align=middle >B&uacute;squeda Avanzada (M&aacute;s opciones)</a><br>
 
-	<img src="/images/holder.gif" width=1 height=8
-	alt=" " hspace=0 vspace=0>
+	<img src="/images/holder.gif" width="1" height="8"
+	alt="" hspace="0" vspace="0">
 	<p>
-	<TMPL_IF NAME="loggedinuser">
-	    <p align=left>Identificado en Koha como: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>Salir</a>]</p>
-	<TMPL_ELSE>
-	    <p align=left><a href=/cgi-bin/koha/userpage.pl>Ingresar </a> a Koha</p>
-	</TMPL_IF>
+	<!-- TMPL_IF NAME="loggedinuser" -->
+	    <p align="left">Registrado como: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/logout.pl>Salir</a>]</p>
+	<!-- TMPL_ELSE -->
+	    <p align="left"><a href=/cgi-bin/koha/userpage.pl>Entrar</a> a Koha</p>
+	<!-- /TMPL_IF -->
 	</td>
 	</form>
   </tr>
@@ -87,37 +86,37 @@
  
 
 <!--
-  <tr valign=top ><form action="/cgi-bin/member.pl" method=get >
-	<td background=" "  colspan=3><img src="/images/heading-login.gif" width=279 		height=38
-	alt="Member Login" hspace=0 vspace=0 border=0></td>
+  <tr valign="top" ><form action="/cgi-bin/member.pl" method="get" >
+	<td  colspan="3"><img src="/images/heading-login.gif" width="279" 		height="38"
+	alt="Member Login" hspace="0" vspace="0" border="0"></td>
 
   </tr>
-<tr valign=top >
+<tr valign="top" >
         <td></td>
-	<form action="/cgi-bin/member.pl" method=get >
-	<td background=" " >
-	<font size=3 face="arial narrow,arial,helvetica">Card Number &nbsp;</font></td>
-	<td background=" " ><input type=text size="12" name="card"></td>
+	<form action="/cgi-bin/member.pl" method="get" >
+	<td >
+	<font size="3" face="arial narrow,arial,helvetica">Card number &nbsp;</font></td>
+	<td ><input type="text" size="12" name="card"></td>
 
   </tr>
 
-  <tr valign=top><td></td>
+  <tr valign="top"><td></td>
 	<td></td>
 	<td></td>
-	<td background=" " >
-	<font size=3 face="arial narrow,arial,helvetica">Password</font></td>
-	<td background=" " ><input type=password size="12" name="password"><br>
-	<input type=submit value="OK"><br>
+	<td >
+	<font size="3" face="arial narrow,arial,helvetica">Password</font></td>
+	<td ><input type=password size="12" name="password"><br>
+	<input type="submit" value="OK"><br>
 
-	<img src="/images/holder.gif" width=1 height=8
-	alt=" " hspace=0 vspace=0></td>
+	<img src="/images/holder.gif" width="1" height="8"
+	alt="" hspace="0" vspace="0"></td>
 	</font>
  </tr>
 
-  <tr valign=top >
+  <tr valign="top" >
 	<td></td>
-	<td background=" " colspan=4><A href="join.html"><img src="/images/heading-member.gif" width=331 		height=38
-	alt="Become a Website Member" hspace=0 vspace=0 border=0></a>
+	<td colspan="4"><A href="join.html"><img src="/images/heading-member.gif" width="331" 		height="38"
+	alt="Become a Website Member" hspace="0" vspace="0" border="0"></a>
 	</td>
 	<td>
 	</td>

Index: es/overdue.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/overdue.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/overdue.tmpl	3 Jun 2003 21:41:12 -0000	1.2
+++ es/overdue.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,39 +1,57 @@
-<HTML>
+<!-- TMPL_INCLUDE NAME="reports-top.inc" -->
+<div id="mainbloc">
+	<h1 class="reports">Ejemplares atrasados en fecha <!-- TMPL_VAR NAME="todaysdate" --></h1>
+	<form method="post" action="/cgi-bin/koha/overdue.pl">
+	<p>Filtrar por :<br />
+	 	<div class="label100">Nombre o n&uacute;mero de carnet :</div> <input type="text" name="borname" value="<!--TMPL_VAR Name="borname"-->"><br />
+		<div class="label100">Categor&iacute;a de usuario :</div><select name="borcat" id="borcat"><option value="">Cualquiera</option>
+			<!-- TMPL_LOOP name="borcatloop" -->
+				<option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="catname" --></option>
+			<!-- /TMPL_LOOP -->
+			</select><br />
+		<div class="label100">Permisos de usuario :</div><!--TMPL_VAR Name="CGIflags" --><br />
+	  	<div class="label100">Tipo de art&iacute;culo :</div><select name="itemtype" id="itemtype"><option value="">Cualquiera</option>
+			<!-- TMPL_LOOP name="itemtypeloop" -->
+				<option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="itemtypename" --></option>
+			<!-- /TMPL_LOOP -->
+			</select><br />
+		<div class="label100">Sede :</div><select name="branch" id="branch">
+				<option value="">Cualquiera</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>
+<br />
+		<div class="label100">Mostrar art&iacute;culos actualmente prestados:</div><input type="checkbox" name="showall" value="mostrar" checked="checked"><br /><br />
+		<div class="label100">Ordenar por</div><select name="order" tabindex="0" size="1" id="order">
+<option <!--TMPL_UNLESS name="order"-->selected<!-- /TMPL_UNLESS--> value="">Fecha de Devoluci&oacute;n</option>
+<option <!--TMPL_IF name="order"-->selected<!-- /TMPL_IF--> value="borrower">Usuario</option>
+</select><br />
+			<input type="submit" value="Aplicar Filtro" class="button reports">
+	</form>
+	</p>
 
-<!-- startmenu -->
-<TMPL_VAR NAME="startmenureport">
-
-<!-- the site -->
-
-<FONT SIZE=6><em>Items atrasados en su devolución hasta fecha <TMPL_VAR NAME="todaysdate"></em></FONT><br><P>
-
-<TABLE  cellspacing=0 cellpadding=5 border=1 align=center>
-  <TR VALIGN=TOP>
-    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Dia Limite</b></td>
-    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Patron</b></td>
-    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Telefono</b></td>
-    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Titulo</b></td>
-    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Autor</b></td>
+	<table>
+	<tr>
+		<th class="reports">Fecha de Devoluci&oacute;n </th>
+		<th class="reports">Usuario </th>
+		<th class="reports">Tel&eacute;fono</th>
+		<th class="reports">T&iacute;tulo / Autor</th>
   </tr>
 
-  <TMPL_LOOP NAME=overdueloop>
+	<!-- TMPL_LOOP NAME="overdueloop" -->
     <tr>
-      <td><TMPL_VAR NAME="duedate"></td>
-    <TMPL_IF NAME=email>
-      <td><a href="mailto:<TMPL_VAR NAME="email">?subject=Prestamo Atrasado: <TMPL_VAR NAME="title">"><TMPL_VAR NAME="name"></a></td>
-    <TMPL_ELSE>
-      <td><TMPL_VAR NAME="name"></td>
-    </TMPL_IF>
-      <td><TMPL_VAR NAME="phone"></td>
-      <td><TMPL_VAR NAME="title"></td>
-      <td><TMPL_VAR NAME="author"></td>
+			<td><!-- TMPL_VAR NAME="duedate" --></td>
+			<!-- TMPL_IF NAME="email" -->
+			<td><a href="members/moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->"><!-- TMPL_VAR NAME="name" --></a> <a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->"><i>(correo)</i></a>
+			</td>
+			<!-- TMPL_ELSE -->
+			<td><!-- TMPL_VAR NAME="name" --></td>
+			<!-- /TMPL_IF -->
+			<td><!-- TMPL_VAR NAME="phone" --></td>
+			<td><p><b><!-- TMPL_VAR NAME="title" --></b>, <!-- TMPL_VAR NAME="author" --></p></td>
     </tr>
-  </TMPL_LOOP>
-</table>
-
-
-<!-- endmenu -->
-<TMPL_VAR NAME="endmenureport">
-
-</body>
-</HTML>
\ No newline at end of file
+	<!-- /TMPL_LOOP -->
+	</table>
+</div>
+<!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->

Index: es/reports.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/reports.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/reports.tmpl	3 Jun 2003 21:56:29 -0000	1.1
+++ es/reports.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,8 +1,8 @@
-<TMPL_INCLUDE Name="issues-top.inc">
+<!-- TMPL_INCLUDE Name="issues-top.inc" -->
 
-<H1> <TMPL_VAR Name="type"> reports </H1>
+<h1> <!-- TMPL_VAR NAME="type" --> informes </h1>
 
-<TMPL_LOOP Name="dataloop">
-	<TMPL_VAR Name="value">
-</TMPL_LOOP>
-<TMPL_INCLUDE Name="issues-bottom.inc">
+<!-- TMPL_LOOP Name="dataloop" -->
+	<!-- TMPL_VAR NAME="value" -->
+<!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE Name="issues-bottom.inc" -->

Index: es/request.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/request.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/request.tmpl	3 Jun 2003 21:56:29 -0000	1.1
+++ es/request.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,168 +1,150 @@
-<TMPL_INCLUDE Name="cat-top.inc">
-
-<form action="placerequest.pl" method=post>
-<INPUT TYPE="image" name="submit"  VALUE="request" height=42  WIDTH=187 BORDER=0 src="<TMPL_VAR name="themelang">/images/place-request.gif" align=right >
-<input type=hidden name=biblio value="<TMPL_VAR Name="bib">">
-<input type=hidden name=type value=str8>
-<input type=hidden name=title value="<TMPL_VAR Name="title">">
-<FONT SIZE=6><em>Reservando:
-<a href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="bib">><TMPL_VAR Name="title"></a>
-<TMPL_VAR Name="author">)</em></FONT><P>
-<p>
-
-
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Numero de Orden</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Id Usuario</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Notas</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Fecha</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Retira en</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Reserva</b></TD>
-	</TR>
-	<tr VALIGN=TOP  >
-		<td>
-			<select name=rank-request>
+<!-- TMPL_INCLUDE Name="cat-top.inc" -->
+<div id="mainbloc">
+	<form action="placerequest.pl" method="post">
+	<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="bib" -->">
+	<input type="hidden" name="type" value="str8">
+	<input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->">
+	<h1 class="catalogue">
+		Reservando: <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="bib" -->"><!-- TMPL_VAR NAME="title" --></a> <!-- TMPL_VAR NAME="author" -->
+	</h1>
+	<div id="bloc25">
+		<h2 class="catalogue">Reserva</h2>
+		<p>
+		<label class="label100">Orden</label>
+			<select name="rank-request">
 			<!--$priorityoptions-->
-			<TMPL_LOOP Name="optionloop">
-				<option value="<TMPL_VAR Name="num">" <TMPL_IF Name="selected"> selected</TMPL_IF>>
-					<TMPL_VAR Name="num">
+			<!-- TMPL_LOOP Name="optionloop" -->
+				<option value="<!-- TMPL_VAR NAME="num" -->" <!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->>
+					<!-- TMPL_VAR NAME="num" -->
 				</option>
-			</TMPL_LOOP>
+			<!-- /TMPL_LOOP -->
 			</select>
+		</p>
+		<p><label class="label100">N&uacute;mero de Usuario</label><input type="text" size="10" name="member"></p>
+		<p><label class="label100">Notas</label><input type="text" size="20" name="notes"></p>
+		<p><label class="label100">Fecha</label><!-- TMPL_VAR NAME="date" --></p>
+		<p><label class="label100">Retirar</label><!-- TMPL_VAR NAME="CGIbranch" --></p>
+		<p>
+			<label class="label100">Reserva</label><input type="checkbox" name="request" value="ning&uacute;">Pr&oacute;ximo Disponible, o elija de la l&iacute;sta
+		</p>
+		<table class="small">
+			<tr>
+				<th class="catalogue">Reserva</th>
+				<th class="catalogue">Tipo de art&iacute;culo</th>
+				<th class="catalogue">Clasificaci&oacute;n</th>
+				<th class="catalogue">Volumen</th>
+				<th class="catalogue">Fecha de Publicaci&oacute;n</th>
+				<th class="catalogue">Copias</th>
+			</tr>
+			<!--$bibitemrows-->
+			<!-- TMPL_LOOP Name="bibitemloop" -->
+				<tr>
+					<td>
+						<!-- TMPL_IF Name="itemlost" -->
+							No puede ser seleccionado
+						<!-- TMPL_ELSE -->
+							<input type="checkbox" name="reqbib" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+							<input type="hidden" name="biblioitem" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+						<!-- /TMPL_IF -->
 		</td>
-		<td><input type=text size=10 name=member></td>
-		<td><input type=text size=20 name=notes></td>
-		<td><TMPL_VAR Name=date></td>
-		<td><TMPL_VAR name="CGIbranch"></td>
 		<td>
-			<input type=checkbox name=request value=any>Próximo disponible,<br>(o elija de la lista inferior)
+						<!-- TMPL_VAR NAME="description" -->
 		</td>
-	</tr>
-</table>
-
-
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-<TR VALIGN=TOP>
-	<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Reserva</b></TD>
-	<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Tipo de Item</b></TD>
-	<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Clasificacion</b></TD>
-	<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Volumen</b></TD>
-	<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Fecha de Publicación</b></TD>
-	<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Copias</b></TD>
-</TR>
-<!--$bibitemrows-->
-<TMPL_LOOP Name="bibitemloop">
-	<tr VALIGN=TOP>
-		<TD>
-			<TMPL_IF Name="itemlost">
-				Ese item no puede ser seleccionado
-			<TMPL_ELSE>
-				<input type=checkbox name=reqbib value=<TMPL_VAR Name="biblioitemnumber">>
-				<input type=hidden name=biblioitem value=<TMPL_VAR Name="biblioitemnumber">>
-			</TMPL_IF>
-		</td>
-		<TD>
-			<TMPL_VAR Name="description">
-		</td>
-		<TD>
-			<TMPL_VAR Name="class">
-		</td>
-		<td>
-			<TMPL_VAR Name="volumeddesc">
-		</td>
-		<td>
-			<TMPL_VAR Name="publicationyear">
-		</td>
-		<td>
-			<TMPL_LOOP Name="barcodeloop">
-				<TMPL_VAR Name="barcode"> <TMPL_VAR Name="message"><br>
-			</TMPL_LOOP>
+					<td>
+						<!-- TMPL_VAR NAME="class" -->
+					</td>
+					<td>
+						<!-- TMPL_VAR NAME="volumeddesc" -->
+					</td>
+					<td>
+						<!-- TMPL_VAR NAME="publicationyear" -->
+					</td>
+					<td>
+						<!-- TMPL_LOOP Name="barcodeloop" -->
+							<!-- TMPL_VAR NAME="barcode" --> <!-- TMPL_VAR NAME="message" --><br>
+						<!-- /TMPL_LOOP -->
 		</td>
 	</tr>
-</TMPL_LOOP>
-
-</table>
-
-</form>
-<p>&nbsp;</p>
-
-
-<form name=T<TMPL_VAR Name="time"> action=modrequest.pl method=post>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=7><B>Modificar las reservas existentes </b></TD>
-	</TR>
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Orden</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Usuario</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Notas</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Fecha</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Retira en</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Reserva</b></TD>
-	</TR>
+			<!-- /TMPL_LOOP -->
+		</table>
+		<input type="submit" value="petici&oacute;n" class="button catalogue">
+		</form>
+	</div>
+	<!-- TMPL_IF name="reserveloop" -->
+		<div id="bloc25">
+			<form name="T<!-- TMPL_VAR NAME="time" -->" action="modrequest.pl" method="post">
+			<h2 class="catalogue">MODIFICAR RESERVAS EXISTENTES </h2>
+			<table class="small">
+				<tr>
+					<th class="catalogue">Orden</th>
+					<th class="catalogue">Usuario</th>
+					<th class="catalogue">Notas</th>
+					<th class="catalogue">Fecha</th>
+					<th class="catalogue">Retirar</th>
+					<th class="catalogue">Reserva</th>
+				</tr>
 	<!--$existingreserves-->
-	<TMPL_LOOP Name="reserveloop">
-		<tr VALIGN=TOP>
-			<TD>
-			<input type=hidden name=borrowernumber value=<TMPL_VAR Name="borrowernumber">>
-			<input type=hidden name=biblio value=<TMPL_VAR Name="biblionumber">>
-			<select name=rank-request>
-				<TMPL_IF Name="wait">
-					<option value=W selected>Esperando</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_LOOP Name="reserveloop" -->
+					<tr>
+						<td>
+							<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+							<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+							<select name="rank-request">
+								<!-- TMPL_IF Name="wait" -->
+									<option value="W" selected>Esperando</option>
+								<!-- /TMPL_IF -->
+								<!-- TMPL_LOOP Name="optionloop" -->
+									<option value="<!-- TMPL_VAR NAME="num" -->" <!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+										<!-- TMPL_VAR NAME="num" -->
 					</option>
-				</TMPL_LOOP>
-				<option value=del>Eliminar</option>
-			</select></td>
-			<TD>
-			<a href=/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="borrowernumber">><TMPL_VAR Name="firstname"> <TMPL_VAR Name="surname"></a>
-			</td>
-			<td><TMPL_VAR Name="notes"></td>
-			<TD><TMPL_VAR Name="date"></td>
-			<TD><TMPL_IF Name="wait">
-				Item waiting at <b> <TMPL_VAR Name="wbrname"></b> <input type=hidden name=pickup value=<TMPL_VAR Name="wbrcd">>
-				<TMPL_ELSE>
-					<select name=pickup>
-						<TMPL_LOOP Name="branchloop">
-							<option value=<TMPL_VAR Name="branch">
-								<TMPL_IF Name="selected">
-									selected
-								</TMPL_IF>
-							><TMPL_VAR Name="branchname"></option>
-						</TMPL_LOOP>
+								<!-- /TMPL_LOOP -->
+								<option value="del">Borrar</option>
 					</select>
-				</TMPL_IF>
 			</td>
-			<TD>
-				<TMPL_IF Name="wait">
-					<a href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name=''biblionumber"> &type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">
-						<TMPL_VAR Name="barcode">
+						<td>
+						<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>
+						</td>
+						<td><!-- TMPL_VAR NAME="notes" --></td>
+						<td><!-- TMPL_VAR NAME="date" --></td>
+						<td><!-- TMPL_IF Name="wait" -->
+							El ejemplar est&aacute; esperando en <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value=<!-- TMPL_VAR NAME="wbrcd" -->>
+							<!-- TMPL_ELSE -->
+								<select name="pickup">
+									<!-- TMPL_LOOP Name="branchloop" -->
+										<option value="<!-- TMPL_VAR NAME="branch" -->"<!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->>
+											<!-- TMPL_VAR NAME="branchname" -->
+										</option>
+									<!-- /TMPL_LOOP -->
+								</select>
+							<!-- /TMPL_IF -->
+						</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>
-				<TMPL_ELSE>
-					<TMPL_IF Name="constrainttypea">
-						Próximo disponible
-					<TMPL_ELSE>
-						<TMPL_IF Name="constrainttypeo">
-							Solo este tipo <TMPL_VAR Name="volumeddesc"> <TMPL_VAR Name="itemtype">
-						</TMPL_IF>
-					</TMPL_IF>
-				</TMPL_IF>
-				$type
+							<!-- TMPL_ELSE -->
+								<!-- TMPL_IF Name="constrainttypea" -->
+									<i>Pr&oacute;ximo Disponible</i>
+								<!-- TMPL_ELSE -->
+									<!-- TMPL_IF Name="constrainttypeo" -->
+										S&oacute;lo este tipo : <b><!-- TMPL_VAR NAME="volumeddesc" --> <!-- TMPL_VAR NAME="itemtype" --></b>
+									<!-- /TMPL_IF -->
+								<!-- /TMPL_IF -->
+							<!-- /TMPL_IF -->
+			
 			</td>
 		</tr>
-	</TMPL_LOOP>
-	<tr VALIGN=TOP>
-	<TD colspan=6 align=right>
-	Elimine una reserva oprimiendo Del en la lista de ordenes.
-	<INPUT TYPE="image" name="submit"  VALUE="Reserva" BORDER=0 src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png"></td>
+				<!-- /TMPL_LOOP -->
+				<tr>
+					<td colspan="6" align="right">
+						Borre una reserva eligiendo "Borrar" en la lista de posiciones.
+						<input type="image" name="submit" value="petici&oacute;n" border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/2rightarrow.png">
+					</td>
 	</tr>
-</table>
-<P>
-<br>
-</form>
-
-<TMPL_INCLUDE Name="cat-bottom.inc">
+			</table>
+			</form>
+		</div>
+	<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->

Index: es/reservereport.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/reservereport.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/reservereport.tmpl	3 Jun 2003 21:56:29 -0000	1.1
+++ es/reservereport.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,29 +1,28 @@
-<TMPL_INCLUDE Name="reports-top.inc">
+<!-- TMPL_INCLUDE Name="reports-top.inc" -->
 
-<CENTER>
-<table border=0 cellspacing=0 cellpadding=5>
-	<TMPL_LOOP Name="dataloop">
-		<tr valign=top bgcolor='white'>
+<table border="0" cellspacing="0" cellpadding="5" align="center">
+	<!-- TMPL_LOOP Name="dataloop" -->
+		<tr valign="top" bgcolor="white">
 			<td>
-				<TMPL_VAR Name="name">
+				<!-- TMPL_VAR NAME="name" -->
 			</td>
 			<td>
-				<TMPL_VAR Name="reservedate">
+				<!-- TMPL_VAR NAME="reservedate" -->
 			</td>
 			<td>
-				<TMPL_VAR Name="title">
+				<!-- TMPL_VAR NAME="title" -->
 			</td>
 			<td>
-				<TMPL_VAR Name="classification">
+				<!-- TMPL_VAR NAME="classification" -->
 			</td>
 		</tr>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
 	<tr>
 		<td>
-			<TMPL_VAR Name="count">
+			<!-- TMPL_VAR NAME="count" -->
 		</td>
 		<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
 	</tr>
-</TABLE>
+</table>
 
-<TMPL_INCLUDE Name="reports-bottom.inc">
+<!-- TMPL_INCLUDE Name="reports-bottom.inc" -->

Index: es/searchheader.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/searchheader.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/searchheader.tmpl	3 Jun 2003 21:41:12 -0000	1.2
+++ es/searchheader.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,2 +1,2 @@
-<a href=search.pl?template=cmsdsearchresults.tmpl&startfrom=<TMPL_VAR NAME="startfrom">>Resultados con dewey</a> | <a href=search.pl?template=searchresults.tmpl&startfrom=<TMPL_VAR NAME="startfrom">>Resultados con Numero Bibliografico</a>
+<a href="search.pl?template=cmsdsearchresults.tmpl&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->">Resultados con dewey</a> | <a href="search.pl?template=searchresults.tmpl&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->">Resultados con biblionumber</a>
 <hr>

Index: es/shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/shelves.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/shelves.tmpl	3 Jun 2003 21:56:29 -0000	1.1
+++ es/shelves.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,102 +1,137 @@
-<TMPL_INCLUDE Name="cat-top.inc">
+<!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
-<p align=left>Identificado como: <TMPL_VAR Name="loggedinuser"> [<a href="/cgi-bin/koha/logout.pl">Salir</a>]</p>
-
-
-<TMPL_IF Name="viewshelf">
-    <center>
-    <form>
-    <a href=shelves.pl>Shelf List</a><p>
-    <table border=0 cellpadding=0 cellspacing=0>
-		<tr><td colspan=7>
-			<table>
-			<tr><td>Agregar un libro por código de barras:</td><td><input name=addbarcode></td></tr>
+<!-- TMPL_IF Name="viewshelf" -->
+<form>
+    <table border="0" cellpadding="2" cellspacing="0" align="center">
+    		<tr>
+			<th colspan="4" bgcolor="<!-- TMPL_VAR NAME="headerbackgroundcolor" -->">
+				<font color="white">Contenido de <!-- TMPL_VAR NAME="shelfname" --></font>
+			</th>
+		</tr>
+		<!-- TMPL_LOOP Name="itemsloop" -->
+			<tr>
+				<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
+				<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
+				<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="title" --></td>
+				<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
+			</tr>
+		<!-- /TMPL_LOOP -->
 			</table>
 			<br>
-			<table border=0 cellpadding=5 cellspacing=0 width=100%>
-			<tr><th bgcolor="<TMPL_VAR Name="headerbackgroundcolor">">
-			<font color=white>Contenido de <TMPL_VAR Name="shelfname"> shelf</font>
-			</th></tr>
-			</table>
-		</td></tr>
-		<TMPL_LOOP Name="itemsloop">
-			<tr>
-				<td bgcolor="<TMPL_VAR Name="color">"><input type=checkbox name="REM-<TMPL_VAR Name="itemnumber">"></td>
-				<td bgcolor="<TMPL_VAR Name="color">" width=10 align=center><img src=/images/blankdot.gif></td>
-				<td bgcolor="<TMPL_VAR Name="color">"><TMPL_VAR Name="barcode"></td>
-				<td bgcolor="<TMPL_VAR Name="color">" width=10 align=center><img src=/images/blankdot.gif></td>
-				<td bgcolor="<TMPL_VAR Name="color">"><TMPL_VAR Name="title"></td>
-				<td bgcolor="<TMPL_VAR Name="color">" width=10 align=center><img src=/images/blankdot.gif></td>
-				<td bgcolor="<TMPL_VAR Name="color">"><TMPL_VAR Name="author"></td>
+	<a href="shelves.pl" class="button">Lista de Estantes</a>
+	<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="submit" value="Borrar Items Seleccionados" class="button">
+</form>
+<form>
+	<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" -->">
+	<table>
+		<tr>
+			<td>
+				A&ntilde;adir un libro por C&oacute;digo de Barras en <!-- TMPL_VAR NAME="shelfname" -->:
+			</td>
+			<td>
+				<input name="addbarcode">
+				<input type="hidden" name="modifyshelfcontents" value="1">
+				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
+				<input type="submit" value="Guardar" class="button">
+			</td>
 			</tr>
-		</TMPL_LOOP>
     </table>
-    <br>
-    <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=submit value="Eliminar los items seleccionados">
+</form>
+<!-- TMPL_ELSE -->
+	<!-- TMPL_IF Name="shelves" -->
+		<!-- TMPL_IF Name="status1" -->
+			<font color="red"><!-- TMPL_VAR NAME="string1" --></font><p>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_LOOP Name="paramsloop" -->
+			<!-- TMPL_IF Name="status" -->
+				<font color="red"><!-- TMPL_VAR NAME="string" --></font><p>
+			<!-- /TMPL_IF -->
+		<!-- /TMPL_LOOP -->
+		<h1>Estantes</h1>
+		<table border="0" cellpadding="7" align="center">
+			<tr>
+				<td align="center" valign="bottom">
+					<form>
+						<p>
+							<a href="shelves.pl" class="button">Lista de Estantes</a>
+						</p>
     </form>
-<TMPL_ELSE>
-	<TMPL_IF Name="shelves">
-		<TMPL_IF Name="status1">
-			<font color=red><TMPL_VAR Name="string1"></font><p>
-		</TMPL_IF>
-		<TMPL_LOOP Name="paramsloop">
-			<TMPL_IF Name="status">
-				<font color=red><TMPL_VAR Name="string"></font><p>
-			</TMPL_IF>
-		</TMPL_LOOP>
-		<center>
-		<a href=shelves.pl>Modificar contenidos de Shelves</a><p>
-		<h1>Bookshelves</h1>
-		<table border=0 cellpadding=7>
-			<tr><td align=center>
-				<form method=post>
-				<input type=hidden name=shelves value=1>
-				<table border=0 cellpadding=0 cellspacing=0>
-				<tr><th bgcolor="<TMPL_VAR Name="headerbackgroundcolor">">
-				<font color=white>Seleccione Shelves para eliminar</font>
-			</th></tr>
-			<TMPL_LOOP Name="shelvesloop">
-				<tr>
-					<td bgcolor="<TMPL_VAR Name="color">">
-						<input type=checkbox name="DEL-<TMPL_VAR Name="shelf">">
-						<TMPL_VAR Name="shelfname"> (<TMPL_VAR Name="shelfbookcount"> libros)
-					</td>
-				</tr>
-			</TMPL_LOOP>
-    </table>
-    <p><input type=submit value="Eliminar Shelves"><p>
-    </td><td align=center valign=top>
-    <form method=post>
-    <input type=hidden name=shelves value=1>
-    <p>Add Shelf: <input name=addshelf size=25><p>
-    <p><input type=submit value="Agregar Shelf"><p>
+				</td>
+				<td align="center" valign="bottom">
+					<form method="post">
+					<input type="hidden" name="shelves" value="1">
+					<table border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<th bgcolor="<!-- TMPL_VAR NAME="headerbackgroundcolor" -->">
+								<font color="white">Seleccionar Estantes a Borrar</font>
+							</th>
+						</tr>
+						<!-- TMPL_LOOP Name="shelvesloop" -->
+						<tr>
+							<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
+								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
+								<!-- TMPL_VAR NAME="shelfname" --> (<!-- TMPL_VAR NAME="shelfbookcount" --> libros)
+							</td>
+						</tr>
+						<!-- /TMPL_LOOP -->
+					</table>
+					<p>
+						<input type="submit" value="Borrar Estantes" class="button"></form>
+					</p>
+				</td>
+				<td align="center" valign="bottom">
+					<form method="post">
+					<input type="hidden" name="shelves" value="1">
+					<table border="0" cellpadding="0" cellspacing="0">
+						<tr>
+							<th bgcolor="<!-- TMPL_VAR NAME="headerbackgroundcolor" -->">
+								<font color="white">A&ntilde;adir Estante</font>
+							</th>
+						</tr>
+						<tr>
+							<td>
+								<p><input name="addshelf" size="25"></p>
+							</td>
+						</tr>
+					</table>
+								<p><input type="submit" value="A&ntilde;adir Nuevo Estante" class="button"></p>
     </form>
-    </td></tr></table>
+				</td>
+			</tr>
+		</table>
 
-	<TMPL_ELSE>
+	<!-- TMPL_ELSE -->
 		<center>
-		<table border=0 cellpadding=4 cellspacing=0>
-			<tr><td bgcolor="<TMPL_VAR Name="headerbackgroundcolor">">
-				<table border=0 cellpadding=5 cellspacing=0 width=100%>
-					<tr><th bgcolor="<TMPL_VAR Name="headerbackgroundcolor">">
-					<font color=white>Lista de Shelf</font>
-					</th></tr>
-				</table>
-			</td></tr>
-			<TMPL_LOOP Name="shelvesloop">
-				<tr><td bgcolor="<TMPL_VAR Name="color">">
-					<a href="shelves.pl?viewshelf=<TMPL_VAR Name="shelf">">
-						<TMPL_VAR Name="shelfname">(<TMPL_VAR Name="shelfbookcount"> libros)
+		<table border="0" cellpadding="4" cellspacing="0">
+			<tr>
+				<td bgcolor="<!-- TMPL_VAR NAME="headerbackgroundcolor" -->">
+					<table border="0" cellpadding="5" cellspacing="0" width="100%">
+						<tr>
+							<th bgcolor="<!-- TMPL_VAR NAME="headerbackgroundcolor" -->">
+								<font color="white">Lista de Estantes</font>
+							</th>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<!-- TMPL_LOOP Name="shelvesloop" -->
+			<tr>
+				<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
+					<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
+						<!-- TMPL_VAR NAME="shelfname" -->(<!-- TMPL_VAR NAME="shelfbookcount" --> libros)
 					</a>
-				</td></tr>
-			</TMPL_LOOP>
+				</td>
+			</tr>
+			<!-- /TMPL_LOOP -->
 		</table>
-		<P><a href=shelves.pl?shelves=1>Agregar o remover libros Shelves</a>
-	</TMPL_IF>
-
-</TMPL_IF>
-
-<TMPL_INCLUDE Name="cat-bottom.inc">
\ No newline at end of file
+		<P>
+			<a href="shelves.pl?shelves=1" class="button">A&ntilde;adir o Eliminar Estantes</a>
+		</p>
+	<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->

Index: es/stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/stats.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/stats.tmpl	3 Jun 2003 21:56:29 -0000	1.1
+++ es/stats.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,40 +1,34 @@
-<TMPL_INCLUDE NAME="reports-top.inc">
+<!-- TMPL_INCLUDE NAME="reports-top.inc" -->
+
+<div id="mainbloc">
+	<table border="0" cellspacing="0" cellpadding="5" align="center">
+		<tr bgcolor="#99cc33">
+			<th>Nombre</th>
+			<th>Descripci&oacute;n</th>
+			<th>Tipo</th>
+			<th>Fecha/hora</th>
+			<th>Monto</th>
+			<th>Sede</th>
 
-<CENTER>
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr bgcolor='#99cc33'>
-			<td background='/images/background-mem.gif'><b>Nombre</b></td>
-			<td background='/images/background-mem.gif'><b>Tipo</b></td>
-			<td background='/images/background-mem.gif'><b>Fecha/Hora</b></td>
-			<td background='/images/background-mem.gif'><b>Monto</b></td>
-			<td background='/images/background-mem.gif'><b>Biblioteca</b></td>
-		<tr>
-		<TMPL_LOOP name=loop1>
 		<tr>
-			<td><TMPL_VAR NAME=name></td>
-			<td><TMPL_VAR NAME=type></td>
-			<td><TMPL_VAR NAME=time></td>
-			<td><TMPL_VAR NAME=amount></td>
-			<td><TMPL_VAR NAME=branch></td>
-		</tr>
-		</TMPL_LOOP>
+		<!-- TMPL_LOOP NAME=loop1 -->
 		<tr>
-			<td></td>
-			<td></td>
-			<td></td>
-			<td></td>
-			<td></td>
+			<td><!-- TMPL_VAR NAME="name" --></td>
+			<td><!-- TMPL_VAR NAME="description" --></td>
+			<td><!-- TMPL_VAR NAME="type" --></td>
+			<td><!-- TMPL_VAR NAME="time" --></td>
+			<td><!-- TMPL_VAR NAME="amount" --></td>
+			<td><!-- TMPL_VAR NAME="branch" --></td>
 		</tr>
+		<!-- /TMPL_LOOP -->
 	</table>
-</CENTER>
 
 
 <p>
-	<b>Total ingresado: <TMPL_VAR NAME=total></b>
+	<b>Total pagado: <!-- TMPL_VAR NAME="total" --></b>
 	<br>
-	<b>Total egresado: <TMPL_VAR NAME=totalw></b>
+	<b>Total condonado: <!-- TMPL_VAR NAME="totalw" --></b>
 </p>
 
-<TMPL_INCLUDE NAME="reports-bottom.inc">
-</BODY>
-</HTML>
+</div>
+<!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->
\ No newline at end of file

Index: es/thesaurus_popup.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/thesaurus_popup.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/thesaurus_popup.tmpl	3 Jun 2003 21:41:12 -0000	1.2
+++ es/thesaurus_popup.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,40 +1,46 @@
-	<html>
-	<head>
-	<title>Constructor de valores de tesauro para categoria <TMPL_VAR name="category"></title>
-	</head>
-	<body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+	<title>Constructor de valor de Tesauro para categor&iacute;a <!-- TMPL_VAR NAME="category" --></title>
+</head>
+<body>
 	<form name="f_pop" action="thesaurus_popup.pl" method="post">
-	<textarea name="result" rows=10 cols=60><TMPL_VAR name="result"></textarea></br>
-	<p><input type="text" name="search_string" value="<TMPL_VAR name="search_string">">
-	<input type="hidden" name="category" value="<TMPL_VAR name="category">">
-	<input type="hidden" name="index" value="<TMPL_VAR name="index">">
+		<textarea name="result" rows="10" cols="60"><!-- TMPL_VAR NAME="result" --></textarea></br>
+		<br/><input type="button" value="ACEPTAR" onclick="javascript:report()">
+		<p>
+			<input type="text" name="search_string" value="<!-- TMPL_VAR NAME="search_string" -->">
+			<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
+			<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
+			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
 	<input type="hidden" name="op" value="search">
 	<input type="submit" value="Buscar">
-	<input type="button" value="END" onClick="javascript:report()">
+		</p>
 	</form>
-<TMPL_IF name="search_string">
+<!-- TMPL_IF NAME="search_string" -->
 	<form name="f2_pop" action="thesaurus_popup.pl" method="post">
-	<TMPL_VAR name="select_list">
-	<input type="hidden" name="category" value="<TMPL_VAR name="category">">
-	<input type="hidden" name="index" value="<TMPL_VAR name="index">">
+	<!-- TMPL_VAR NAME="select_list" -->
+	<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
+	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
+	<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
 	<input type="hidden" name="op" value="select">
-	<input type="hidden" name="result" value="<TMPL_VAR name="result">">
-	<input type="submit" name="Aceptar" value="OK">
+	<input type="hidden" name="result" value="<!-- TMPL_VAR NAME="result" -->">
+	<input type="submit" name="OK" value="ACEPTAR">
 	</form>
-</TMPL_IF>
-	<form name="f3_pop"  action="thesaurus_popup.pl" method="post">
-	<input type="hidden" name="index" value="<TMPL_VAR name="index">">
-	<input type="hidden" name="category" value="<TMPL_VAR name="category">">
+<!-- /TMPL_IF -->
+<form name="f3_pop"  action="thesaurus_popup.pl" method="post">
+	<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+	<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
+	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
 	<input type="hidden" name="op" value="add">
-	insert a new authority : <input type="text" name="insert">
-	<input type="submit" name="Nuevo" value="NEW">
+	inserte una nueva autoridad : <input type="text" name="insert">
+	<input type="submit" name="NEW" value="NUEVO">
 	</form>
-		<script>
+	<script language="javascript" type="text/javascript">
 		function report() {
-			opener.document.f.field_value[<TMPL_VAR name="index">].value= document.f_pop.result.value;
+			opener.document.f.field_value[<!-- TMPL_VAR NAME="index" -->].value= document.f_pop.result.value;
 			self.close();
 			return false;
 		}
 		</script>
-		</body>
-		</html>
+</body>
+</html>

Index: es/updatebiblio.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/Attic/updatebiblio.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/updatebiblio.tmpl	3 Jun 2003 21:49:32 -0000	1.1
+++ es/updatebiblio.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,18 +1,18 @@
-<TMPL_INCLUDE Name="cat-top.inc">
+<!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
 
-<TMPL_VAR Name="error">
-<p> Haga click para enviar la materia/descriptor
+<!-- TMPL_VAR NAME="error" -->
+<p> Haga click en Enviar para forzar el tema
 <br>
-
-<table border=0 cellspacing=0 cellpadding=5>
-<TMPL_LOOP Name="dataloop">
-	<input type=hidden name="<TMPL_VAR NAME="name">" value="<TMPL_VAR NAME="value">">
-</TMPL_LOOP>
-	<input type=hidden name="Force" value="<TMPL_VAR NAME="substring">">
-<TR><TD><input type=submit></TD></TR>
-</TABLE>
+<form action="/cgi-bin/koha/updatebiblio.pl" method="post">
+<table border="0" cellspacing="0" cellpadding="5">
+<!-- TMPL_LOOP Name="dataloop" -->
+	<input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->">
+<!-- /TMPL_LOOP -->
+	<input type="hidden" name="Force" value="<!-- TMPL_VAR NAME="substring" -->">
+<tr><td><input type="submit"></td></tr>
+</table>
 </form>
 
 
-<TMPL_INCLUDE Name="cat-bottom.inc">
+<!-- TMPL_INCLUDE Name="cat-bottom.inc" -->

Index: es/acqui/acqui-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui/Attic/acqui-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/acqui/acqui-home.tmpl	3 Jun 2003 21:49:32 -0000	1.1
+++ es/acqui/acqui-home.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,114 +1,94 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
+<div id="mainbloc">
 
-<FONT SIZE=6><em>Acquisitions</em></FONT><br>
-
-<TABLE align="left" width="40%" cellspacing=0 cellpadding=5 border=1 >
-<TR VALIGN=TOP>
-	<TD  bgcolor="ffdf61" colspan=2>
-		<b>START, RECEIVE, MODIFY ANY ORDER</b>
-	</TD>
-</TR>
-<TR VALIGN=TOP>
-	<TD>Supplier ID or Name</TD>
-	<TD>
-		<form action="/cgi-bin/koha/acqui/order.pl" method=post>
-		<INPUT TYPE="text"  SIZE="25"   NAME="supplier">
-		</form>
-	</TD>
-</TR>
-</table>
-<TABLE width="40%" cellspacing=0 cellpadding=5 border=1 >
-<TR VALIGN=TOP>
-	<TD  bgcolor="ffdf61" colspan=2>
-		<b>RECEIVE OR MODIFY PERIODICAL ORDER</b>
-	</TD>
-</TR>
-<TR VALIGN=TOP>
-	<TD>Title Search</TD>
-	<TD>
-		<FORM ACTION="/cgi-bin/koha/acqui/acquire.pl" method=post>
-		<INPUT TYPE="text"  SIZE="25"   NAME="recieve">
+<h1 class="acquisition">Adquisiciones</h1>
+<div id="bloc25">
+	<h2 class="acquisition">Iniciar, recibir, modificar pedidos</h2>
+	<!-- TMPL_IF name="nobudget" -->
+		<p class="problem">Debe definir un presupuesto en par&aacute;metros</p>
+	<!-- TMPL_ELSE -->
+		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
+			Nombre del Proveedor : <input type="text"  size="25"   name="supplier">
+			<input type="submit" class="button acquisition" value="ACEPTAR">
 		</form>
-	</TD>
-</TR>
-</table>
-
-<br />
+	<p>o <a href="histsearch.pl" class="button acquisition">Busque en el historial de pedidos</a></p>
+	<!-- /TMPL_IF -->
+</div>
 
 <!-- currencies-->
-<TABLE align="left" cellspacing=0 cellpadding=5 border=1 >
-	<FORM ACTION="/cgi-bin/koha/currency.pl">
-	<input type=hidden name=type value=change>
-	<TR VALIGN=TOP>
-		<TD  bgcolor="ffdf61" colspan=2><b>EXCHANGE RATES </b></TD>
-	</TR>
-	<TMPL_LOOP name="loop_currency">
-		<TR VALIGN=TOP>
-			<TD>
-				<TMPL_VAR name="currency">
-			</td>
-			<td>
-				<INPUT TYPE="text"  SIZE="10"   NAME="<TMPL_VAR name="currency">" value=<TMPL_VAR name="rate">>
-			</td>
-		</TR>
-	</TMPL_LOOP>
-	<tr>
-		<td colspan=2 align="center"><input type=submit value="Save"></TD>
-	</tr>
-	</form>
-</table>
+<div id="bloc25">
+	<form action="/cgi-bin/koha/currency.pl">
+	<input type="hidden" name="type" value="change">
+	<h2 class="acquisition">tasas de cambio</h2>
+	<!-- TMPL_LOOP NAME="loop_currency" -->
+		<p>
+			<label><!-- TMPL_VAR NAME="currency" --></label>
+			<input type="text"  size="10"  name="<!-- TMPL_VAR NAME="currency" -->" value=<!-- TMPL_VAR NAME="rate" -->>
+		</p>
+	<!-- /TMPL_LOOP -->
+	<input type="submit" value="Guardar" class="button acquisition">
+</div>
+
+<!-- suggestions -->
+<div id="bloc25">
+	<h2 class="acquisition">Sugerencias para revisar</h2>
+		<!-- TMPL_IF name="suggestion" -->
+			<!--TMPL_VAR NAME="suggestion" --> esperando sugerencias <a href="/cgi-bin/koha/suggestion/acceptorreject.pl" class="button acquisition">Administrar</a>
+		<!-- TMPL_ELSE -->
+			No hay sugerencias esperando
+		<!-- /TMPL_IF -->
+</div>
 
 <!-- showbudget-->
-<TABLE  width="40%"  cellspacing=0 cellpadding=5 border=1 >
-<FORM ACTION="/cgi-bin/koha/search.pl">
-<TR VALIGN=TOP>
-	<TD  bgcolor="ffdf61" colspan=2><b>BUDGETS AND BOOKFUNDS</b></TD>
-</TR>
-<TR VALIGN=TOP>
-	<TD colspan=2>
-		<table cellspacing=0 cellpadding=2 border=1>
+<div id="bloc25">
+	<h2 class="acquisition">presupuestos y fondos de libros</h2>
+	<!-- TMPL_IF name="nobudget" -->
+		<p class="problem">Debe definir un presupuesto en par&aacute;metros</p>
+	<!-- TMPL_ELSE -->
+		<table class="noborder">
 			<tr>
-				<td><b>Budgets</B></TD>
-				<TD><b>Total</B></TD>
-				<TD><b>Spent</B></TD>
-				<TD><b>Comtd</B></TD>
-				<TD><b>Avail</B></TD>
-			</TR>
-			<TMPL_LOOP name="loop_budget">
+				<th class="acquisition">Presupuestos</th>
+				<th class="acquisition">Desde</th>
+				<th class="acquisition">A</th>
+				<th class="acquisition">Total</th>
+				<th class="acquisition">Gastado</th>
+				<th class="acquisition">Comtd</th>
+				<th class="acquisition">Aval</th>
+			</tr>
+			<!-- TMPL_LOOP NAME="loop_budget" -->
 				<tr>
-					<td><TMPL_VAR name="bookfundname"></TD>
-					<TD><TMPL_VAR name="budgetamount"></TD>
-					<TD><TMPL_VAR name="spent"></TD>
-					<TD><TMPL_VAR name="comtd"></TD>
-					<TD><TMPL_VAR name="avail"></TD>
-				</TR>
-			</TMPL_LOOP>
+					<td><!-- TMPL_VAR NAME="bookfundname" --></td>
+					<td align="right"><!-- TMPL_VAR NAME="startdate" --></td>
+					<td align="right"><!-- TMPL_VAR NAME="enddate" --></td>
+					<td align="right"><!-- TMPL_VAR NAME="budgetamount" --></td>
+					<td align="right"><!-- TMPL_VAR NAME="spent" --></td>
+					<td align="right"><!-- TMPL_VAR NAME="comtd" --></td>
+					<td align="right"><!-- TMPL_VAR NAME="avail" --></td>
+				</tr>
+			<!-- /TMPL_LOOP -->
 			<tr>
-				<td><b>Total</b></TD>
-				<TD><b><TMPL_VAR name="total"></b></TD>
-				<TD><b><TMPL_VAR name="totspent"></b></TD>
-				<TD><b><TMPL_VAR name="totcomtd"></b></TD>
-				<TD><b><TMPL_VAR name="totavail"></b></TD>
-			</TR>
-		</table><br>
-		Use your reload button [ctrl + r] to get the most recent figures.
-		Committed figures are approximate only, as exchange rates will affect the amount actually paid.
-	</TD>
-</TR>
-</form>
-</table>
-
-<br />
-<TABLE cellspacing=0 cellpadding=5 border=1 >
-<TR VALIGN=TOP>
-	<TD  bgcolor="ffdf61" colspan=2>
-		<b>HELP</b><br>
-		<b>Ordering:</b> <p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, you will be asked to check their details, and enter your name which  will set up a "shopping basket" for you. (Why is this you might ask... well because we want to know that it's really you ordering things - not just your computer).</p>
-		<p>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.  </p>
-		<p>To start a new shopping basket with a new supplier return to this page and just start a new supplier search.</p>
-		<p>To close off a shopping basket click on "view shopping baskets" or search above, and the click on "confirm basket".</p>
-	</td>
-</TR>
-</table>
+				<th class="acquisition" align="right" colspan="3">Total</th>
+				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="total" --></th>
+				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totspent" --></th>
+				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totcomtd" --></th>
+				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totavail" --></th>
+			</tr>
+		</table>
+		<p>
+		Use el bot&oacute; recargar para conseguir las figuras m&aacute;s recientes. Las figuras comprometidas s&oacute;lo son aproximadas, como las tasas de cambio afectar&aacuten la cantidad en realidad pagada.
+		</p>
+	<!-- /TMPL_IF -->
+</div>
+
+<div id="bloc25">
+	<h2 class="acquisition">AYUDA sobre Ordenes</h2>
+	<ul>
+		<p>Para comenzar una adquisici&oacute;n, si una orden, una compra local o una donaci&oacute;n primero busque en el suministrador, a&ntilde;ada uno nuevo si lo necesita.</p>
+		<p>Entonces seleccione el anterior carrito de compra o cree uno nuevo. Dese cuenta que el carrito ser&aacute; asignado al usuario con el que se ha registrado </p>
+		<p>Para ordenar un art&iacute;culo necesita establecer una biblio ya existente, y luego a&ntilde;adir un art&iacute;culo, o establezca una nuevo biblio y luego a&ntilde;ada el art&iacute;culo.</p>
+		<p>Para cerrar un carrito de compra pulse sobre "ver carrito de compra" o busque encima, y luego pulse sobre "confirmar carrito".</p>
+	</ul>
+</div>
 
-<TMPL_INCLUDE name="acquisitions-bottom.inc">
+</div>
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: es/acqui/acquire.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui/Attic/acquire.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/acqui/acquire.tmpl	3 Jun 2003 21:49:32 -0000	1.1
+++ es/acqui/acquire.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,162 +1,118 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
-
-<div align=right>
-Invoice: <TMPL_VAR name="invoice"><br>
-Received By: <TMPL_VAR name="user"><br>
-<TMPL_VAR name="date">
-</div>
-<FONT SIZE=6><em>Receipt Summary for : <TMPL_VAR name="name"> Invoice, <TMPL_VAR name="invoice"></em></FONT>
-<CENTER>
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
+<div id="mainbloc">
+<h1 class="acquisition">Resumen de Recibo para: <i><!-- TMPL_VAR NAME="name" --></i> Factura <i><!-- TMPL_VAR NAME="invoice" --></i></h1>
 
-<TMPL_IF name="count">
-	<script language="javascript" type="text/javascript">
-	<!--
-	function messenger(X,Y,etc){
-	win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
-	win.focus();
-	win.document.close();
-	win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size=2><p><br>");
-	win.document.write(etc);
-	win.document.write("<center><form><input type=button onclick='self.close()' value=Close></form></center>");
-	win.document.write("</font></body></html>");
-	}
-	//-->
-	</script>
-	<form action="/cgi-bin/koha/acqui/finishreceive.pl" method=post>
-	<FONT SIZE=6><em><TMPL_VAR name="ordernumber"> - Receive Order</em></FONT><br>
-	Shopping Basket For: <TMPL_VAR name="name">
-	<br> Order placed: <TMPL_VAR name="date">
-	<P>
-	<CENTER>
-	<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
-		<tr valign=top bgcolor=#99cc33>
-			<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2>
-				<B>CATALOGUE DETAILS</B>
-			</td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD><b>Title *</b></td>
-			<td><input type=text size=20 name=title value="<TMPL_VAR name="title">" >
-			</td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Author</td>
-			<td><input type=text size=20 name=author value="<TMPL_VAR name="author">" >
-			</td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Copyright Date</td>
-			<td><input type=text size=20 name=copyright value="<TMPL_VAR name="copyrightdate">" >
-			</td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Format</td>
-			<td><TMPL_VAR name="CGIitemtype"></td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>ISBN</td>
-			<td><input type=text size=20 name=ISBN value="<TMPL_VAR name="isbn">"></td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Series</td>
-			<td><input type=text size=20 name=Series value="<TMPL_VAR name="seriestitle">"></td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Branch</td>
-			<td><TMPL_VAR name="CGIbranch"></td>
-		</tr>
-		<TR VALIGN=TOP bgcolor=#ffffcc >
-			<TD><B>Item Barcode *</B></td>
-			<td><input type=text size=20 name=barcode value="<TMPL_VAR name="barcode">"></td>
-		</tr>
-		<TR VALIGN=TOP bgcolor=#ffffcc >
-			<TD><B>Volume Info (for serials) *</B></td>
-			<td><input type=text size=20 name=volinf></td>
-		</tr>
-		<TR VALIGN=TOP>
-			<td colspan=2 align="center">
-				<input type=hidden name=biblio value=<TMPL_VAR name="biblionumber">>
-				<input type=hidden name=ordnum value=<TMPL_VAR name="ordernumber">>
-				<input type=hidden name=biblioitemnum value=<TMPL_VAR name="biblioitemnumber">>
-				<input type=hidden name=id value="<TMPL_VAR name="booksellerid">">
-				<input type=hidden name=freight value="<TMPL_VAR name="freight">">
-				<input type=hidden name=gst value="<TMPL_VAR name="gst">">
-				<TMPL_IF name="catview">
-					<input type=image  name=submit src="/<TMPL_VAR name="theme">/images/filesave.png" border=0 title="continue" alt="save" border=0 border=0>
-				<TMPL_ELSE>
-					<a href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<TMPL_VAR name="ordernumber">&id=<TMPL_VAR name="booksellerid">><img src="/<TMPL_VAR name="theme">/images/fileopen.png" border=0 title="edit" alt="edit" border=0 border=0></a>
-				</TMPL_IF>
-			</td>
-		</tr>
-	</table>
-	<table border=1 cellspacing=0 cellpadding=5 width="40%">
-		<tr valign=top bgcolor=#99cc33>
-			<td background="/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD><B>Bookfund *</B></td>
-			<td><TMPL_VAR name="CGIbookfund">
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Quantity Ordered</td>
-			<td><input type=text size=20 name=quantity value="<TMPL_VAR name="quantity">">
-			</td>
-		</tr>
-		<TR VALIGN=TOP bgcolor=#ffffcc>
-			<TD><B>Quantity Received *</B></td>
-			<td><input type=text size=20 name=quantityrec value="<TMPL_VAR name="quantityreceived">">
-			</td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Replacement Cost</td>
-			<td><input type=text size=20 name=rrp value="<TMPL_VAR name="rrp">">
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Budgeted Cost </td>
-			<td><input type=text size=20 name=ecost value="<TMPL_VAR name="ecost">"></td>
-		</tr>
-		<TR VALIGN=TOP bgcolor=#ffffcc>
-			<TD><B>Actual Cost *</B></td>
-			<td><input type=text size=20 name=cost value="<TMPL_VAR name="unitprice">"></td>
-		</tr>
-		<TR VALIGN=TOP bgcolor=#ffffcc>
-			<TD>Invoice Number</td>
-			<td>
-				<TMPL_VAR name="invoice">
-				<input type=hidden name=invoice value="<TMPL_VAR name="invoice">">
-			</td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Notes</td>
-			<td><input type=text size=20 name=notes value="<TMPL_VAR name="notes">"></td>
-		</tr>
-	</table>
+	<!-- TMPL_IF name="count" -->
+		<form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post">
+		<h1 class="acquisition"><!-- TMPL_VAR NAME="ordernumber" --> - Recibir Pedido</h1>
+		Carrito de Compra para: <!-- TMPL_VAR NAME="name" -->
+		<br> Pedido Realizado: <!-- TMPL_VAR NAME="date" -->
+		<div id="bloc25">
+				<h2 class="acquisition">detalles de cat&aacute;logo</h2>
+			<p>
+				<label class="label100">T&iacute;tulo </label>
+				<!-- TMPL_VAR NAME="title" -->
+			</p>
+			<p>
+				<label class="label100">Autor</label>
+				<!-- TMPL_VAR NAME="author" -->
+			</p>
+			<p>
+				<label class="label100">Fecha de Copyright</label>
+				<!-- TMPL_VAR NAME="copyrightdate" -->
+			</p>
+			<p>
+				<label class="label100">Formato</label>
+				<!-- TMPL_VAR NAME="itemtype" -->
+			</p>
+			<p>
+				<label class="label100">ISBN</label>
+				<!-- TMPL_VAR NAME="isbn" -->
+			</p>
+			<p>
+				<label class="label100">Series</label>
+				<!-- TMPL_VAR NAME="seriestitle" -->
+			</p>
+			<p>Inserte c&oacute;digo(s) de barras y sede, si quiere a&ntilde;adir art&iacute;culo(s) inmediatamente</p>
+			<p>
+				<label class="label100">Sede</label>
+				<!-- TMPL_VAR NAME="CGIbranch" -->
+			</p>
+			<p>
+				<label class="label100">C&oacute;digo de barras del ejemplar *</label>
+				<input type=text size=20 name=barcode value="<!-- TMPL_VAR name="barcode" -->">
+			</p>
+		</div>
+		<div id="bloc25">
+			<h2 class="acquisition">Detalles contables</h2>
+			<p>
+				<label class="label100">Fondo Bibliogr&aacute;fico</label>
+				<!-- TMPL_VAR NAME="bookfund" -->
+			</p>
+			<p>
+				<label class="label100">Cantidad Pedida</label>
+				<!-- TMPL_VAR NAME="quantity" -->
+				<input type="hidden" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->">
+			</p>
+			<p>
+				<label class="label100">Cantidad Recibida *</label>
+				<input type="text" size="20" name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->">
+			</p>
+			<p>
+				<label class="label100">Costo de Restituci&oacute;n</label>
+				<input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->">
+			</p>
+			<p>
+				<label class="label100">Costo presupuestado </label>
+				<!-- TMPL_VAR NAME="ecost" -->
+			</p>
+			<p>
+				<label class="label100">Costo Real *</label>
+				<input type="text" size="20" name="cost" value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->">
+			</p>
+			<p>
+				<label class="label100">N&uacute;mero de Factura</label>
+					<!-- TMPL_VAR NAME="invoice" -->
+                <input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->">
+                <input type="hidden" name="datereceived" value="<!-- TMPL_VAR NAME="datereceived" -->">
+                </p>
+			<p>
+				<label class="label100">Notas</label>
+				<!-- TMPL_VAR NAME="notes" -->
+			</p>
+			<p>
+				<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+				<input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->">
+				<input type="hidden" name="biblioitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+				<input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->">
+				<input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->">
+				<input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->">
+                <input type="submit" class="button acquisition" value="Guardar"> (que todos los costos son para 1 art&iacute;culo)
+			</p>
+		</div>
 	</form>
-	</center>
-	<br clear=all>
-	<p> &nbsp; </p>
-<TMPL_ELSE>
-	<br />
-	<center>
-	<table width=80%>
-	<tr valign=top bgcolor="#ffdf61">
-		<td><b>Basket</b></td>
-		<td><b>ISBN</b></td>
-		<td><b>TITLE</b></td>
-		<td><b>AUTHOR</b></td>
-		<td><b>Qty</b></td>
-		<td><b>Recieved</b></td>
+	<!-- TMPL_ELSE -->
+		<table>
+		<tr>
+			<th class="acquisition">CANASTA</th>
+			<th class="acquisition">ISBN</th>
+			<th class="acquisition">TITULO</th>
+			<th class="acquisition">AUTOR</th>
+			<th class="acquisition">Cant</th>
+			<th class="acquisition">Recibido</th>
 	</tr>
-	<TMPL_LOOP name="loop">
+		<!-- TMPL_LOOP NAME="loop" -->
 		<tr>
-			<TD><TMPL_VAR name="basketno"></td>
-			<TD><TMPL_VAR name="isbn"></td>
-			<td><a href=acquire.pl?recieve=<TMPL_VAR name="ordernumber">&biblio=<TMPL_VAR name="biblionumber">&invoice=<TMPL_VAR name="invoice">&freight=<TMPL_VAR name="freight">&gst=<TMPL_VAR name="gst">&id=<TMPL_VAR name="id">><TMPL_VAR name="title"></a></td>
-			<td><TMPL_VAR name="author"></td>
-			<td><TMPL_VAR name="quantity"></td>
-			<td><TMPL_VAR name="quantityrecieved"></td>
+				<td><!-- TMPL_VAR NAME="basketno" --></td>
+				<td><!-- TMPL_VAR NAME="isbn" --></td>
+				<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+				<td><!-- TMPL_VAR NAME="author" --></td>
+				<td><!-- TMPL_VAR NAME="quantity" --></td>
+				<td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
 		</tr>
-	</TMPL_LOOP>
+		<!-- /TMPL_LOOP -->
 	</table>
-</TMPL_IF>
+	<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: es/acqui/basket.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui/Attic/basket.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/acqui/basket.tmpl	3 Jun 2003 21:49:32 -0000	1.1
+++ es/acqui/basket.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,80 +1,158 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<FONT SIZE=6><em>Shopping Basket <TMPL_VAR name="basket"> for <a href=supplier.pl?id=<TMPL_VAR name="booksellerid">></a> <TMPL_VAR name="name"></em></FONT><br />
-(Our Reference: <TMPL_VAR name="entrydate">, #<TMPL_VAR name="basket">, authorised by: <TMPL_VAR name="authorisedby">)<br />
-<CENTER>
-<!--<FORM ACTION="/cgi-bin/koha/search.pl" method=post>
-<b>Search ISBN, Title or Author:</b> <INPUT TYPE="text"  SIZE="25"   NAME="recieve">
-</form> -->
-<p>
-<FORM ACTION="/cgi-bin/koha/acqui/modorders.pl" method=post name=orderform>
-<table border=0 cellspacing=0 cellpadding=5>
-	<tr valign=top bgcolor="#ffdf61">
-		<td width="5%"><b>Order</b></td>
-		<td width="10%"><b>Isbn</b></td>
-		<td width="30%"><b>Title</b></td>
-		<td width="20%"><b>Author</b></td>
-		<td width="6%"><b>$ rrp</b></td>
-		<td width="8%"><b>$est</b></td>
-		<td width="8%"><b>Qty</b></td>
-		<td width="8%"><b>Total</b></td>
-	</tr>
-	<TMPL_LOOP name="books_loop">
-		<tr valign=top bgcolor="<TMPL_VAR name="color">">
-			<td><TMPL_VAR name="ordernumber"></td>
-			<td><TMPL_VAR name="isbn"></td>
-			<td><a href="newbiblio.pl?ordnum=<TMPL_VAR name="ordernumber">&id=<TMPL_VAR name="booksellerid">&basket=<TMPL_VAR name="basket">"><TMPL_VAR name="title"></a></td>
-			<td><TMPL_VAR name="author"></td>
-			<td><input type=text name=rrp<TMPL_VAR name="i"> size=6 value="<TMPL_VAR name="rrp">"></td>
-			<td><input type=text name=eup<TMPL_VAR name="i"> size=6 value="<TMPL_VAR name="ecost">"></td>
-			<td><input type=text name=quantity<TMPL_VAR name="i"> size=6 value="<TMPL_VAR name="quantity">" onchange='update(this.form)'></td>
-			<td><input type=text name=total<TMPL_VAR name="i"> size=10 value=<TMPL_VAR name="line_total">></td>
-			<input type=hidden name=ordnum<TMPL_VAR name="i"> value=<TMPL_VAR name="ordernumber">>
-			<input type=hidden name=bibnum<TMPL_VAR name="i"> value=<TMPL_VAR name="biblionumber">>
-		</tr>
-	</TMPL_LOOP>
-	<input type=hidden name=number value=<TMPL_VAR name="count">>
-	<input type=hidden name=basketno value="<TMPL_VAR name="basket">">
-	<tr valign=top bgcolor=white>
-		<td colspan=6 rowspan=3  bgcolor="#ffdf61">
-  			<b>HELP</b><br>
-  			To cancel an order, just change the quantity to 0 and click "save changes".<br>
-			To change any of the catalogue or accounting information attached to an order,  click on the title.<br>
+<div id="mainbloc">
+	<h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->Nuevo <!-- /TMPL_UNLESS -->carrito de compra <b><!-- TMPL_VAR NAME="basketno" --> </b>para <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
+	<!-- TMPL_UNLESS name="closedate" -->
+	<!-- TMPL_IF name="basketno" -->
+		<div id="bloc25">
+			<h2 class="acquisition doNotPrint">Canasta info</h2>
+			<p class="doNotPrint"><label class="label100">Administrado por<label><!-- TMPL_VAR NAME="authorisedbyname" --></p>
+			<p><label class="label100">N&uacute;mero de Canasta<label> <!-- TMPL_VAR NAME="basketno" --></p>
+			<p><label class="label100">abierto sobre<label> <!-- TMPL_VAR NAME="creationdate" --></p>
+			<!-- TMPL_IF name="closedate" -->
+				Cerrada el <!-- TMPL_VAR name="closedate" -->
+			<!-- TMPL_ELSE -->
+			<p class="doNotPrint"><a href="/cgi-bin/koha/acqui/order.pl?op=close&amp;basket=<!-- TMPL_VAR NAME="basketno" -->&supplier=<!-- TMPL_VAR name="booksellerid" -->" class="button acquisition">Cesta cerrada</a></p>
+			<!-- /TMPL_IF -->
+		</div>
+    <!-- /TMPL_IF -->
+	<!-- /TMPL_UNLESS -->
+		<div id="bloc25">
+			<p><!-- TMPL_VAR name="name" --></p>
+			<p><!-- TMPL_VAR name="postal" --></p>
+			<p><!-- TMPL_VAR name="address2" --></p>
+			<p><!-- TMPL_VAR name="address3" --></p>
+			<p><!-- TMPL_VAR name="address4" --></p>
+		</div>
+		<div id="bloc25" style="float:right">
+		   <p><!-- TMPL_VAR name="branchname" --></p>
+		   <p><!-- TMPL_VAR name="branchaddress1" --></p>
+		   <p><!-- TMPL_VAR name="branchaddress2" --></p>
+		   <p><!-- TMPL_VAR name="branchaddress3" --></p>
+	     </div>
+	
+	<div id="bloc100">
+	<h2 class="acquisition">Pedido</h2>
+	<!-- TMPL_IF name="books_loop" -->
+		<table>
+			<tr valign="top" bgcolor="#ffdf61">
+				<th class="acquisition doNotPrint">Pedido</th>
+				<th class="acquisition">Editor<span class="doNotPrint"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition">[Pedido]</a></span></th>
+				<th class="acquisition">T&iacute;tulo</th>
+				<th class="acquisition doNotPrint" title="Costo Recomendado de Restituci&oacute;n:">RRP</th>
+				<th class="acquisition">est</th>
+				<th class="acquisition">Cant</th>
+				<th class="acquisition">Total</th>
+				<th class="acquisition doNotPrint">Fondo <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[orden]</a></th>
+				<!-- TMPL_IF name="active" -->
+		              <!-- TMPL_UNLESS name="closedate" -->
+                        <th class="acquisition doNotPrint">Borrar</th>
+                        <th class="acquisition doNotPrint">Editar</th>
+                    <!-- /TMPL_UNLESS -->
+				<!-- /TMPL_IF -->
+			</tr>
+			<!-- TMPL_LOOP NAME="books_loop" -->
+				<!-- TMPL_IF name="odd" -->
+				<tr class="hilighted">
+				<!-- TMPL_ELSE -->
+				<tr>
+				<!-- /TMPL_IF -->
+					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
+					<td><!-- TMPL_VAR NAME="publishercode" --></td>
+					<!-- TMPL_IF name="closedate" -->
+						<td>
+							<b><!-- TMPL_VAR NAME="title" --></b><br/>
+								<!-- TMPL_VAR NAME="author" -->
+								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
+								<!-- TMPL_IF name="notes" --><p class="doNotPrint"><i><!--TMPL_VAR name="notes" --></i></p><!-- /TMPL_IF -->
 		</td>
-  		<td><b>SubTotal</b></td>
-  		<td>$<input type=text name=subtotal size=10 value=<TMPL_VAR name="sub_total">></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td><b>GST</b></td>
-		<td>$<input type=text name=gst size=10 value=<TMPL_VAR name="gist">></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td><b>TOTAL</b></td>
-		<td>$<input type=text name=grandtotal size=10 value=<TMPL_VAR name="grand_total">></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td></td>
-		<td></td>
-		<td></td>
-		<td></td>
-		<td></td>
-		<td></td>
-		<td colspan=3>
-			<input type=image  name=submit src=/images/save-changes.gif border=0 width=187 height=42 align=right>
-			</form>
+					<!-- TMPL_ELSE -->
+						<td>
+							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
+								<!-- TMPL_VAR NAME="author" -->
+								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
+								<!-- TMPL_IF name="notes" --></p><p class="doNotPrint"><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
+						</td>
+					<!-- /TMPL_IF -->
+					<td class="doNotPrint number"><p><!-- TMPL_VAR NAME="rrp" --></p></td>
+					<td class="number"><p><!-- TMPL_VAR NAME="ecost" --></p></td>
+					<td class="number"><p><!-- TMPL_VAR NAME="quantity" --></p></td>
+					<td class="number"><p><!-- TMPL_VAR NAME="line_total" --></p></td>
+					<td class="doNotPrint"><p><!-- TMPL_VAR NAME="bookfundid" --></p></td>
+					<!-- TMPL_IF name="active" -->
+		              <!-- TMPL_UNLESS name="closedate" -->
+                        <td class="doNotPrint">
+                                <a href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&quantity=0&biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
+                                    <img src="/intranet-tmpl/default/images/edittrash.png" alt="Borrar del carrito" title="Borrar del carrito" width="32" hspace="0" vspace="0" border="0">
+                                </a>
 		</td>
+                            <td class="doNotPrint">
+                                <a href="newbiblio.pl?sub=&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&ordnum=<!-- TMPL_VAR NAME="ordernumber" --><!--TMPL_IF name="closedate"-->&close=1<!--/TMPL_IF -->">
+                                    <img src="/intranet-tmpl/default/images/fileopen.png" alt="Editar" title="Borrar del carrito" width="32" hspace="0" vspace="0" border="0">
+                                </a>
+                            </td>
+                        <!-- /TMPL_UNLESS -->
+					<!-- /TMPL_IF -->
 	</tr>
-	<tr valign=top bgcolor=white>
-		<td colspan=9>
-			<FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
-				<input type=hidden name=id value="<TMPL_VAR name="id">">
-				<input type=hidden name=basket value="<TMPL_VAR name="basket">">
-				<b> Add order : enter keyword or title: </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
-			</form>
+			<!-- /TMPL_LOOP -->
+			<input type="hidden" name="number" value=<!-- TMPL_VAR NAME="count" -->>
+			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
+			<tr>
+				<td class="acquisition doNotPrint">
+					&nbsp;
+				</td>
+				<td class="acquisition">
+					&nbsp;
+				</td>
+				<td class="acquisition number">
+					<!-- TMPL_IF NAME="GST" --><p>Sub total</p>
+					<p>GST</p><!-- /TMPL_IF -->
+					<p>TOTAL (<!-- TMPL_VAR NAME="currency" -->)</p>
+				</td>
+				<td class="acquisition number">
+					<!-- TMPL_IF NAME="GST" --><p><!-- TMPL_VAR NAME="sub_total_est" --></p>
+					<p><!-- TMPL_VAR NAME="gist_est" --></p><!-- /TMPL_IF -->
+					<p><!-- TMPL_VAR NAME="grand_total_est" --></p>
+				</td>
+				<td class="doNotPrint acquisition">
+					<!-- TMPL_IF NAME="GST" --><p>&nbsp;</p>
+					<p>&nbsp;</p><!-- /TMPL_IF -->
+					<p>&nbsp;</p>
+				</td>
+				<td class="acquisition number">
+					<!-- TMPL_IF NAME="GST" --><p><!-- TMPL_VAR name="qty_total" --></p>
+					<p>&nbsp;</p><!-- /TMPL_IF -->
+					<p>&nbsp;</p>
+				</td>
+				<td class="acquisition number">
+					<!-- TMPL_IF NAME="GST" --><p><!-- TMPL_VAR NAME="sub_total" --></p>
+					<p><!-- TMPL_VAR NAME="gist" --></p><!-- /TMPL_IF -->
+					<p><!-- TMPL_VAR NAME="grand_total" --></p>
+				</td>
+				<td colspan="3" class="acquisition">
+					<!-- TMPL_IF NAME="GST" --><p>&nbsp;</p>
+					<p>&nbsp;</p><!-- /TMPL_IF -->
+					<p>&nbsp;</p>
 		</td>
 	</tr>
-
-</table>
-</CENTER>
-
-<TMPL_INCLUDE name="acquisitions-bottom.inc">
+		</table>
+	<!-- TMPL_ELSE -->
+		<p>Canasta vac&iacute;a</p>
+	<!-- /TMPL_IF -->
+	</div>
+	<!-- TMPL_IF name="active" -->
+		<!-- TMPL_UNLESS name="closedate" -->
+		<div id="bloc25">
+			<h2 class="acquisition doNotPrint">A&ntilde;adir l&iacute;nea de orden</h2>
+			<form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
+				<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->">
+				<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
+				<p class="doNotPrint" >de un art&iacute;culo existente: </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Buscar"></p>
+				<p class="doNotPrint">o <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition"> a partir de una sugerencia </a> <a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition"> Nuevo art&iacute;culo</a>
+				</p>
+			</form>
+		</div>
+		<!-- /TMPL_UNLESS -->
+	<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: es/acqui/newbasket2.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui/Attic/newbasket2.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/acqui/newbasket2.tmpl	3 Jun 2003 21:41:13 -0000	1.2
+++ es/acqui/newbasket2.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,100 +1,97 @@
-<TMPL_INCLUDE NAME="acquisitions-top.inc">
+<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+<div id="mainbloc">
+	<h1 class="acquisition">Carrito de Compra <!-- TMPL_VAR name="basketno" --> para: <!-- TMPL_VAR NAME="bookselname" --></h1>
+		<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;sub=<!-- TMPL_VAR NAME="parsub" -->">
+		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" border="0" alt="A&ntilde;adir Nuevo Art&iacute;culo"></a>
+	<a href="basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">
+		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1uparrow.png" border="0" alt="Ver Carrito">
+	</a>
+	<form action="/cgi-bin/koha/acqui/newbasket2.pl">
+	<input type="hidden" name="booksellerid" value=<!-- TMPL_VAR NAME="booksellerid" -->>
+	<input type="hidden" name="basketno" value=<!-- TMPL_VAR NAME="basketno" -->>
+	<b>Nueva B&uacute;squeda </b><input="text"  size="25"   name="search">
+	<input type="submit" value="Buscar" class="button acquisition">
+	</form>
+
+	Usted busc&oacute;
+	<b>
+	<!-- TMPL_LOOP NAME="loopsearch" -->
+		<!-- TMPL_VAR NAME="key" --> <!-- TMPL_VAR NAME="value" -->
+	<!-- /TMPL_LOOP -->
+	</b>
+	<br>
+	<!-- TMPL_VAR NAME="count" --> resultados encontrados.
+	
+	<br> Resultados <i><!-- TMPL_VAR NAME="dispnum" --></i> a <i><!-- TMPL_VAR NAME="offset2" --></i> mostrados.
+	
+	<table>
+		<tr>
+			<th class="acquisition">TITULO</th>
+			<th class="acquisition">AUTOR</th>
+			<th class="acquisition">&copy;</th>
+			<th class="acquisition">CONTEO</th>
+			<th class="acquisition">UBICACION</th>
+		</tr>
+	
+	<!-- TMPL_LOOP NAME="loopresult" -->
+		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+			<td>
+					<a href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR NAME="sub" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
+					<!-- TMPL_VAR NAME="title" -->
+					</a>
+			</td>
+			<td>
+				<!-- TMPL_VAR NAME="author" -->
+			</td>
+			<td>
+				<!-- TMPL_VAR NAME="copyright" -->
+			</td>
+			<td>
+				<!-- TMPL_VAR NAME="itemcount" -->
+			</td>
+			<td>
+				<!-- TMPL_IF name="use-location-flags-p" -->
+				<!-- TMPL_IF name="location-only" --><!-- TMPL_VAR NAME="location-only" --><br><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="on-loan-p" -->Prestado<br><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="lost-p" -->Perdido<br><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="mending-p" -->Reparaci&oacute;n<br><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="in-transit-p" -->En Tr&aacute;nsito<br><!-- /TMPL_IF -->
+				<!-- TMPL_ELSE -->
+				<!-- TMPL_VAR NAME="location" -->
+				<!-- /TMPL_IF -->
+			</td>
+		</tr>
 
- <H1>Shopping Basket For: <TMPL_VAR name="bookselname"></H1>
+	<!-- /TMPL_LOOP -->
 
-<TMPL_IF name ="testdonation">
-	<a href="newbiblio.pl?id=<TMPL_VAR name="id">&basket=<TMPL_VAR name="basket">&sub=<TMPL_VAR name="parsub">">
-	<img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" border=0 align=right alt="Add New Biblio"></a>
-<TMPL_ELSE>
-	<a href="newdonation.pl?id=<TMPL_VAR name="id">&basket=<TMPL_VAR name="basket">&sub=<TMPL_VAR name="parsub">">
-	<img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png"  border=0 align=right alt="Add New Biblio"></a>
-</TMPL_IF>
-
-<a href="basket.pl?basket=<TMPL_VAR name="basket">">
-<img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/1uparrow.png"  border=0 align=right alt="View Basket"></a>
-<FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl">
-<input type=hidden name=id value=<TMPL_VAR name="id">>
-<input type=hidden name=basket value=<TMPL_VAR name="basket">>
-<b>New Search: </b><INPUT TYPE="text"  SIZE="25"   NAME="search"></form>
-<br clear=all>
-
-<CENTER>
-
-You searched on
-<B>
-<TMPL_LOOP name="loopsearch">
-	<TMPL_VAR name="key"> <TMPL_VAR name="value">
-</TMPL_LOOP>
-</B>
-<BR>
-<TMPL_VAR name="count">  results found.
-
-<br> Results <TMPL_VAR name="dispnum"> to <TMPL_VAR name="offset2"> displayed.
-
-<TABLE  CELLSPACING=0  CELLPADDING=6 border=0>
-	<TR  VALIGN=TOP bgcolor="#ffdf61">
-		<TD><b>TITLE</b></TD>
-		<TD><b>AUTHOR</b></TD>
-		<TD><b>&copy;</b></TD>
-		<TD><b>COUNT</b></TD>
-		<TD><b>LOCATION</b></TD>
-	</TR>
-
-<TMPL_LOOP name="loopresult">
-	<TR VALIGN=TOP bgcolor="<TMPL_VAR name="toggle">">
-		<TD>
-			<TMPL_IF name="testdonation">
-				<A HREF="/cgi-bin/koha/acqui/newbiblio.pl?sub=<TMPL_VAR name="sub">&author=<TMPL_VAR name="author2">&copyright=<TMPL_VAR name="copyright">&id=<TMPL_VAR name="id">&basket=<TMPL_VAR name="basket">&biblio=<TMPL_VAR name="biblionumber">&title=<TMPL_VAR name="title2">">
-				<TMPL_VAR name="title">
-				</A>
-			<TMPL_ELSE>
-				<A HREF="/cgi-bin/koha/acqui/newdonation.pl?author=<TMPL_VAR name="author2">&copyright=<TMPL_VAR name="copyright">&id=<TMPL_VAR name="id">&basket=<TMPL_VAR name="basket">&biblio=<TMPL_VAR name="biblionumber">&title=<TMPL_VAR name="title2">">
-				<TMPL_VAR name="title">
-				</A>
-			</TMPL_IF>
-		</TD>
-		<TD>
-			<A HREF="/cgi-bin/koha/search.pl?author=<TMPL_VAR name="word">&type=<TMPL_VAR name="type">">
-			<TMPL_VAR name="author">
-			</A>
-		</TD>
-		<TD>
-			<TMPL_VAR name="copyright">
-		</TD>
-		<TD>
-			<TMPL_VAR name="itemcount">
-		</TD>
-		<TD>
-			<TMPL_VAR name="location">
-		</TD>
-	</TR>
-
-</TMPL_LOOP>
-
-	<TR VALIGN=TOP bgcolor="#ffdf61">
-		<TD>
+		<tr bgcolor="#ffdf61">
+			<td>
 			&nbsp;
-		</TD>
-		<TD>
+			</td>
+			<td>
 			&nbsp;
-		</TD>
-		<TD>
+			</td>
+			<td>
 			&nbsp;
-		</TD>
-		<TD>
+			</td>
+			<td>
 			&nbsp;
-		</TD>
-		<TD>
+			</td>
+			<td>
 			&nbsp;
-		</TD>
-	</TR>
-</TABLE>
-
-<TMPL_IF name="offsetover">
-<A HREF="/cgi-bin/koha/acqui/newbasket2.pl?num=<TMPL_VAR name="num">&offset=<TMPL_VAR name="offset">&type=<TMPL_VAR name="type">&id=<TMPL_VAR name="id">&basket=<TMPL_VAR name="basket">&search=<TMPL_VAR name="title">&author=<TMPL_VAR name="author">">
-Next
-</A>
-</TMPL_IF>
-</CENTER>
-
-<TMPL_INCLUDE NAME="acquisitions-bottom.inc">
+			</td>
+		</tr>
+	</table>
+	
+	<!-- TMPL_IF name="previous" -->
+	<a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR NAME="num" -->&amp;offset=<!-- TMPL_VAR NAME="previous" -->&amp;type=<!-- TMPL_VAR NAME="type" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;search=<!-- TMPL_VAR NAME="title" -->&amp;author=<!-- TMPL_VAR NAME="author" -->">
+	&lt; Anterior
+	</a>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="offsetover" -->
+	<a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR NAME="num" -->&amp;offset=<!-- TMPL_VAR NAME="offset" -->&amp;type=<!-- TMPL_VAR NAME="type" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;search=<!-- TMPL_VAR NAME="title" -->&amp;author=<!-- TMPL_VAR NAME="author" -->">
+	Next &gt;
+	</a>
+	<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->

Index: es/acqui/newbiblio.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui/Attic/newbiblio.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/acqui/newbiblio.tmpl	3 Jun 2003 21:49:32 -0000	1.1
+++ es/acqui/newbiblio.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,10 +1,13 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 <script language="javascript" type="text/javascript">
 
 <!--
 function update(f){
   //collect values
   quantity=f.quantity.value
+  if (quantity ==0) {
+  	alert("Quantity must be >0");
+  }
   discount=f.discount.value
   listinc=parseInt(f.listinc.value)
   currency=f.currency.value
@@ -22,151 +25,228 @@
   ecost=rrp*(100-discount)/100
   GST=0;
   if (gst_on){
-    rrp=rrp*1.125;
-    GST=ecost*0.125
+    rrp=rrp*(1+<!-- TMPL_VAR NAME="gstrate" -->);
+    GST=ecost*(<!-- TMPL_VAR NAME="gstrate" -->);
   }
 
   total=(ecost+GST)*quantity
 
-
-  f.rrp.value=display(rrp)
-  f.ecost.value=display(ecost)
-  f.GST.value=display(GST)
-  f.total.value=display(total)
-
+  f.rrp.value=rrp;
+  f.ecost.value=ecost;
+  f.GST.value=GST;
+  f.total.value=total;
+  return true;
 }
 
 
 
 function messenger(X,Y,etc){
-win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
-win.focus();
-win.document.close();
-win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size=2><p><br>");
-win.document.write(etc);
-win.document.write("<center><form><input type=button onclick='self.close()' value=Close></form></center>");
-win.document.write("</font></body></html>");
+	win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
+	win.focus();
+	win.document.close();
+	win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size='2'><p><br>");
+	win.document.write(etc);
+	win.document.write("<center><form><input type=button onclick='self.close()' value='Close'></form></center>");
+	win.document.write("</font></body></html>");
 }
-//-->
 
-</script>
-<form action=/cgi-bin/koha/acqui/addorder.pl method=post name=frusin>
-<TMPL_UNLESS name="existing"><input type=hidden name=existing value=no></TMPL_UNLESS>
-<!-- <TMPL_VAR name="title"> -->
-<input type=hidden name=ordnum value="<TMPL_VAR name="ordnum">">
-<input type=hidden name=basket value="<TMPL_VAR name="basket">">
-<input type=hidden name=supplier value="<TMPL_VAR name="id">">
-<input type=hidden name=biblio value="<TMPL_VAR name="biblio">">
-<input type=hidden name=bibitemnum value="<TMPL_VAR name="biblioitemnumber">">
-<input type=hidden name=oldtype value="<TMPL_VAR name="itemtype">">
-<input type=hidden name=discount value="<TMPL_VAR name="discount">">
-<input type=hidden name=listinc value="<TMPL_VAR name="listincgst">">
-<input type=hidden name=currency value="<TMPL_VAR name="listprice">">
-<input type=hidden name=applygst value="<TMPL_VAR name"gstreg">">
-<TMPL_LOOP name="loop_currencies">
-	<input type=hidden name="<TMPL_VAR name="currency">" value="<TMPL_VAR name="rate">">
-</TMPL_LOOP>
-<TMPL_IF name="orderexists"><input type=hidden name=orderexists value=yes></TMPL_IF>
-<a href=basket.pl?basket=<TMPL_VAR name="basket">><img src=<TMPL_VAR name="themelang">/images/view-basket.gif width=187 heigth=42 border=0 align=right alt="View Basket"></a>
-<FONT SIZE=6><em><TMPL_VAR name="ordnum"> - Order Details </em></FONT><br>
-Shopping Basket For: <TMPL_VAR name="name">
-<P>
-<CENTER>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
-	<tr valign=top bgcolor=#99cc33>
-		<td background="/images/background-mem.gif" colspan=2><B>CATALOGUE DETAILS</B></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD><b>Title *</b></td>
-		<td><input type=text size=20 name=title value="<TMPL_VAR name="title">"></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Author</td>
-		<td><input type=text size=20 name=author value="<TMPL_VAR name="author">" ></td>
-	</tr>
-	<TR VALIGN=TOP>
-	<TD>Copyright Date</td>
-	<td><input type=text size=20 name=copyright value="<TMPL_VAR name="copyrightdate">">
-	</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Format</td>
-		<td><TMPL_VAR name="CGIitemtype"></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>ISBN</td>
-		<td><input type=text size=20 name=ISBN value="<TMPL_VAR name="isbn">"></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Series</td>
-		<td><input type=text size=20 name=Series value="<TMPL_VAR name="seriestitle">"></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Branch</td>
-		<td><TMPL_VAR name="CGIbranch"></td>
-	</tr>
-	<TR VALIGN=TOP  bgcolor=#ffffcc>
-		<TD >Item Barcode</td>
-		<td><input type=text size=20 name=barcode value="<TMPL_VAR name="barcode">"></td>
-	</tr>
-</table>
-<img src="<TMPL_VAR name="themelang">/images/holder.gif" width=32 height=250 align=left>
-<table border=1 cellspacing=0 cellpadding=5 width="40%">
-	<tr valign=top bgcolor=#99cc33><td background="/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td></tr>
-	<TR VALIGN=TOP>
-		<TD>Quantity</td>
-		<td><input type=text size=20 name=quantity value="<TMPL_VAR name="quantity">" onchange='update(this.form)' ></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Bookfund</td>
-		<td><TMPL_VAR name="CGIbookfund"></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Suppliers List Price</td>
-		<td><input type=text size=20 name=list_price value="<TMPL_VAR name="listprice">" onchange='update(this.form)'></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Replacement Cost <br><FONT SIZE=2></td>
-		<td><input type=text size=20 name=rrp value="<TMPL_VAR name="rrp">" onchange='update(this.form)'>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Budgeted Cost<BR><FONT SIZE=2>(NZ\$ ex GST, inc discount)</FONT> </td>
-		<td><input type=text size=20 name=ecost value="<TMPL_VAR name="ecost">" onchange='update(this.form)'></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Budgeted GST</td>
-		<td><input type=text size=20 name=GST value="" onchange='update(this.form)'></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD><B>BUDGETED TOTAL</B></td>
-		<td><input type=text size=20 name=total value="" onchange='update(this.form)'></td>
-	</tr>
-	<TR VALIGN=TOP  bgcolor=#ffffcc>
-		<TD>Actual Cost</td>
-		<td><input type=text size=20 name=cost></td>
-	</tr>
-	<TR VALIGN=TOP  bgcolor=#ffffcc>
-		<TD>Invoice Number *</td>
-		<td><input type=text size=20 name=invoice ></td>
-	<TR VALIGN=TOP>
-		<TD>Notes</td>
-		<td><input type=text size=20 name=notes value="<TMPL_VAR name="notes">"></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD colspan=2><input type=image  name=submit src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png" border=0 align=right>	</td>
-	</tr>
-</table>
-</form>
-</center>
-<table>
-<tr><td bgcolor=#cccc99  background="/images/background-mem.gif"><B>HELP</B><br>
-<UL>
-<LI>If ordering more than one copy of an item you will be prompted to  choose additional bookfunds, and put in additional barcodes at the next screen<P>
-<LI><B>Bold</B> fields must be filled in to create a new bibilo and item.<p>
-<LI>Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also  be entered into the database as the quantity received.
-</UL>
-</td></tr></table>
-<p> &nbsp; </p>
-<TMPL_INCLUDE name="acquisitions-bottom.inc">
+function check(f) {
+  quantity=f.quantity.value
+  title=f.title.value
+  if (title == "") {
+  	alert("Title can't be empty");
+	return false;
+  }
+  if (quantity ==0) {
+  	alert("Quantity must be >0");
+	return false;
+  }
+	document.frusin.submit();
+}
 
+//-->
 
+</script>
+<div id="mainbloc">
+	<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin">
+	<!-- TMPL_UNLESS name="existing" --><input type="hidden" name="existing" value="no"><!-- /TMPL_UNLESS -->
+	<!-- <!-- TMPL_VAR NAME="title" --> -->
+	<input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordnum" -->">
+	<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
+	<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->">
+	<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblio" -->">
+	<input type="hidden" name="bibitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+	<input type="hidden" name="oldtype" value="<!-- TMPL_VAR NAME="itemtype" -->">
+	<input type="hidden" name="discount" value="<!-- TMPL_VAR NAME="discount" -->">
+	<input type="hidden" name="listinc" value="<!-- TMPL_VAR NAME="listincgst" -->">
+	<input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="currency" -->">
+	<input type="hidden" name="applygst" value="<!-- TMPL_VAR NAME="gstreg" -->">
+	<input type="hidden" name="suggestionid" value="<!-- TMPL_VAR NAME="suggestionid" -->">
+	<!-- TMPL_LOOP NAME="loop_currencies" -->
+		<input type="hidden" name="<!-- TMPL_VAR NAME="currency" -->" value="<!-- TMPL_VAR NAME="rate" -->">
+	<!-- /TMPL_LOOP -->
+	<a href="basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">Ver Carrito</a> <h1 class="acquisition">
+		<!-- TMPL_IF name="ordnum" -->
+			Modificar detalles de pedido (linea #<!-- TMPL_VAR NAME="ordnum" -->)
+		<!-- TMPL_ELSE -->
+			Nueva l&iacute;nea de pedido
+		<!-- /TMPL_IF -->
+		 <!-- TMPL_IF name="suggestionid" -->(definido desde sugerencia #<!-- TMPL_VAR NAME="suggestionid" -->)<!-- /TMPL_IF -->
+	</h1>
+	Carrito de Compra para <!-- TMPL_VAR NAME="name" -->
+	<div id="bloc25">
+		<h2 class="acquisition">Detalles de cat&aacute;logo</h2>
+		<p>
+			<label class="label100"><b>T&iacute;tulo *</b></label>
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="title" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->">
+			<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Autor</label>
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->"><!-- TMPL_VAR NAME="author" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->">
+			<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100"> Editor</label>
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->"><!-- TMPL_VAR NAME="publishercode" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->">
+			<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Fecha de Copyright</label>
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->"><!-- TMPL_VAR NAME="copyrightdate" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->">
+			<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Formato</label>
+			<!-- TMPL_VAR NAME="CGIitemtype" -->
+		</p>
+		<p>
+			<label class="label100">ISBN</label>
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->"><!-- TMPL_VAR NAME="isbn" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
+			<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Series</label>
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->">
+			<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Sede</label>
+			<!-- TMPL_VAR NAME="CGIbranch" -->
+		</p>
+	</div>
+	<div id="bloc25">
+		<h2 class="acquisition">Detalles contables</h2>
+		<p>
+			<label class="label100">Cantidad</label>
+			<!-- TMPL_IF name="close" -->
+				<input type="hidden" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->"><!-- TMPL_VAR NAME="quantity" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);">
+		  	<!--/TMPL_IF-->
+		</p>
+		<p>
+			<label class="label100">Fondo Bibliogr&aacute;fico</label>
+			<!-- TMPL_IF name="close" -->
+				<input type="hidden" size="20" name="bookfund" value="<!-- TMPL_VAR NAME="bookfundid" -->"><!-- TMPL_VAR NAME="bookfundname" -->
+			<!-- TMPL_ELSE -->
+				<!-- TMPL_VAR NAME="CGIbookfund" -->
+		  	<!--/TMPL_IF-->
+		</p>
+		<p>
+			<label class="label100">Precio de Lista del Proveedor</label>
+			<!-- TMPL_IF name="close" -->
+				<input type="hidden" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->"><!-- TMPL_VAR NAME="listprice" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)">
+		  	<!--/TMPL_IF-->
+		</p>
+		<p>
+			<label class="label100">Costo de Restituci&oacute;n </label>
+			<!-- TMPL_IF name="close" -->
+				<input type="hidden" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->"><!-- TMPL_VAR NAME="rrp" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->">
+		  	<!--/TMPL_IF-->
+		</p>
+		<p>
+			<label class="label100">Costo presupuestado</label>
+			<!-- TMPL_IF name="close" -->
+                            <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly >
+			<!-- TMPL_ELSE -->
+                            <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->">
+			<!--/TMPL_IF-->
+		</p>
+<!-- TMPL_IF NAME="GST" -->		<p>
+			<label class="label100">GST presupuestado</label>
+			<!-- TMPL_IF name="close" -->
+                            <input type="text" size="20" name="GST" value="<!-- TMPL_VAR NAME="GST" -->" readonly >
+			<!-- TMPL_ELSE -->
+                            <input type="text" size="20" name="GST" value="<!-- TMPL_VAR NAME="GST" -->" >
+			<!--/TMPL_IF-->
+		</p><!-- TMPL_ELSE --><input type="hidden" name="GST" value="0"><!-- /TMPL_IF -->
+		<p>
+			<label class="label100"><b>TOTAL PRESUPUESTADO</b></label>
+			<!-- TMPL_IF name="close" -->
+                            <input type="text" size="20" name="total" value="" readonly >
+                        <!-- TMPL_ELSE -->
+                            <input type="text" size="20" name="total" value="" readonly >
+			<!--/TMPL_IF-->
+		</p>
+		<p>
+			<label class="label100">Costo Real</label>
+			<!-- TMPL_IF name="close" -->
+                            <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" readonly >
+			<!-- TMPL_ELSE -->
+                            <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" >
+			<!--/TMPL_IF-->
+		</p>
+		<p>
+			<label class="label100"><i>c&oacute;digo de paquete</i></label>
+			<input type="text" size="20" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->">
+		<p>
+			<label class="label100">Notas</label>
+			<input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->">
+		</p>
+		<p>Los siguientes 2 campos est&aacute;n disponibles para su uso interno. Pueden ser &uacute;tiles para prop&oacute;sitos estad&iacute;sticos</p>
+		<p>
+			<label class="label100">Campo de control 1</label>
+			<!-- TMPL_IF Name="CGIsort1" -->
+				<!-- TMPL_VAR Name="CGIsort1" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
+			<!--/TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Campo de control 2</label>
+			<!-- TMPL_IF Name="CGIsort2" -->
+				<!-- TMPL_VAR Name="CGIsort2" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
+			<!--/TMPL_IF -->
+		</p>
+		<p>
+			<input type="button" value="ACEPTAR" class="button acquisition" onclick="check(this.form)">
+		</p>
+	</form>
+	</div>
+</div>
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: es/acqui/order.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui/Attic/order.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/acqui/order.tmpl	3 Jun 2003 21:49:32 -0000	1.1
+++ es/acqui/order.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,47 +1,68 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
-<FONT SIZE=6><em>Supplier Search Results</em></FONT><br />
-<a href="supplier.pl?id=0"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/filenew.png" title="Add supplier" ALT="Add" BORDER=0 ></a>
-<CENTER>
-You searched on <b>supplier <TMPL_VAR name="supplier">,</b> <TMPL_VAR name="count"> results found<p>
-<table border=0 cellspacing=0 cellpadding=5 width="80%">
-<tr valign=top bgcolor="#ffdf61">
-	<td width="10%"><b>Order</b></td>
-	<td width="10%"><b>Recieve<b></td>
-	<td width="30%"><b>Company</b></td>
-	<td width="50%">
-		<table width="100%" border=0 cellspacing=0 cellpadding=5>
-			<tr>
-				<td width="15%"><b>Basket</b></td>
-				<td width="15%"><b>Items</b></td>
-				<td width="40%"><b>Staff</b></td>
-				<td width="30%"><b>Date</b></td>
-			</tr>
-		</table>
-	</td>
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
+<div id="mainbloc">
+<h1 class="acquisition">Usted busc&oacute; <b>proveedor <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> resultados encontrados</h1>
+<div id="bloc100">
+<table>
+<tr>
+	<th class="acquisition">Pedido</th>
+	<th class="acquisition">Recibir</th>
+	<th class="acquisition">Proveedor</th>
+	<th class="acquisition">CANASTA</th>
 </tr>
 
-<TMPL_LOOP name="loop_suppliers">
-	<tr valign=top bgcolor=<TMPL_VAR name="color">>
+<!-- TMPL_LOOP name="loop_suppliers" -->
+	<tr valign="top">
 		<td>
-			<a href="basket.pl?id=<TMPL_VAR name="id">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/mail_send.png" title="Add order" ALT="Add" BORDER=0 ></a>
+			<!-- TMPL_IF name="active" -->
+				<a href="basket.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_send.png" title="A&ntilde;adir Orden" alt="A&ntilde;adir" border=0></a>
+			<!-- TMPL_ELSE -->
+				Inactivo
+			<!-- /TMPL_IF -->
 		</td>
 		<td>
-			<a href="recieveorder.pl?id=<TMPL_VAR name="id">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/mail_get.png" title="recieve" ALT="Add" BORDER=0 ></a>
+			<a href="recieveorder.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_get.png" title="recibir" alt="A&ntilde;adir" border=0></a>
 		</td>
-		<td><a href="supplier.pl?id=<TMPL_VAR name="id">"><TMPL_VAR name="name"></a></td>
+		<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->&op=display"><!-- TMPL_VAR name="name" --></a></td>
 		<td>
-			<table width="100%" cellspacing=0 cellpadding=5 border=0>
-				<TMPL_LOOP name="loop_basket">
+			<table>
+			     <!-- TMPL_IF name="loop_basket" -->
 					<tr>
-						<td width="15%"><a href="/cgi-bin/koha/acqui/basket.pl?basket=<TMPL_VAR name="basketno">"><TMPL_VAR name="basketno"></a></td>
-						<td width="15%"><TMPl_VAR name="total"></td>
-						<td width="40%"><TMPL_VAR name="authorisedby"></td>
-						<td width="30%"><TMPL_VAR name="entrydate"></td>
+						<th class="acquisition">CANASTA</th>
+						<th class="acquisition">Ejemplares</th>
+						<th class="acquisition">Creado por</th>
+						<th class="acquisition">Fecha</th>
+						<th class="acquisition">&nbsp;</th>
 					</tr>
-				</TMPL_LOOP>
+				<!-- TMPL_ELSE -->
+				    </p>Sin cesta pendiente</p>
+                <!-- /TMPL_IF -->
+					<!-- TMPL_LOOP NAME="loop_basket" -->
+						<tr>
+							<td><!-- TMPL_VAR NAME="basketno" --></a></td>
+							<td><TMPL_VAR NAME="total"></td>
+							<td>
+								<!-- TMPL_VAR name="firstname" -->
+									<!-- TMPL_VAR name="surname" -->
+							</td>
+							<td><!-- TMPL_VAR NAME="creationdate" --></td>
+							<td>
+								<!-- TMPL_IF name="closedate" -->
+									cerrado el <!-- TMPL_VAR NAME="closedate" --> <a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">Ver</a>
+								<!-- TMPL_ELSE -->
+									<!-- TMPL_IF name="active" -->
+										<a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">Modificar</a>
+									<!-- TMPL_ELSE -->
+										<a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">Ver</a>
+									<!-- /TMPL_IF -->
+								<!-- /TMPL_IF -->
+							</td>
+						</tr>
+					<!-- /TMPL_LOOP -->
 			</table>
 	</tr>
-</TMPL_LOOP>
-</table>
-</CENTER>
-<TMPL_INCLUDE name="acquisitions-bottom.inc">
+	<!-- /TMPL_LOOP -->
+	</table>
+	</div>
+	<a class="button acquisition" href="supplier.pl?supplierid=0">A&ntilde;adir proveedor</a>
+</div>
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: es/acqui/recieve.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui/Attic/recieve.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/acqui/recieve.tmpl	3 Jun 2003 21:49:32 -0000	1.1
+++ es/acqui/recieve.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,75 +1,94 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<div align=right>
-Invoice: <TMPL_VAR name="invoice"><br>
-Received By: <TMPL_VAR name="user"><br>
-<TMPL_VAR name="date">
-</div>
-<FONT SIZE=6><em>Receipt Summary for : <TMPL_VAR name="name">, Invoice <TMPL_VAR name="invoice"></em></FONT>
-<CENTER>
+<div id="mainbloc">
+	<h1 class="acquisition">
+			Paquete recibido para <i><!-- TMPL_VAR NAME="name" --></i>
+	</h1>
 
-<FORM ACTION="/cgi-bin/koha/acqui/acquire.pl">
-<input type=hidden name=id value="<TMPL_VAR name="id">">
-<input type=hidden name=gst value="<TMPL_VAR name="gst">">
-<input type=hidden name=freight value="<TMPL_VAR name="freight">">
-<input type=hidden name=invoice value="<TMPL_VAR name="invoice">">
-
-<b>Search ISBN or Title:</b> <INPUT TYPE="text"  SIZE="25"   NAME="recieve">
-</form>
-<p>
-<FORM ACTION="" method=get name=orderform>
-
-<table border=0 cellspacing=0 cellpadding=5>
-	<tr valign=top bgcolor="#ffdf61">
-		<td><b>BASKET</b></td>
-		<td><b>ISBN</b></td>
-		<td><b>TITLE</b></td>
-		<td><b>AUTHOR</b></td>
-		<td><b>ACTUAL</b></td>
-		<td><b>P&P</b></td>
-		<td><b>QTY</b></td>
-		<td><b>TOTAL</b></td>
-	</tr>
-	<TMPL_VAR name="count">
-	<TMPL_LOOP name="loop_orders">
-		<tr valign=top bgcolor="<TMPL_VAR name="color">">
-			<td><TMPL_VAR name="basketno"></td>
-			<td><TMPL_VAR name="isbn"></td>
-			<td><a href="acquire.pl?recieve=<TMPL_VAR name="ordernumber">&biblio=<TMPL_VAR name="biblionumber">&invoice=<TMPL_VAR name="invoice">&gst=<TMPL_VAR name="gst">&freight=<TMPL_VAR name="freight">&id=<TMPL_VAR name="id">"><TMPL_VAR name="title"></a></td>
-			<td><TMPL_VAR name="author"></td>
-			<td>$<TMPL_VAR name="unitprice"></td>
-			<td></td>
-			<td><TMPL_VAR name="quantityrecieved"></td>
-			<td>$<TMPL_VAR name="total"></td>
-		</tr>
-	</TMPL_LOOP>
-	<tr valign=top bgcolor=white>
-		<td colspan=8><hr>
-		</td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td></td>
-		<td></td>
+	<div id="bloc25">
+		<p><label>Factura</label><!-- TMPL_VAR NAME="invoice" --></p>
+        <p><label>Fecha</label> <!-- TMPL_VAR name="formatteddatereceived"--></p>
+	</div>
+	
+	<div id="bloc25">
+	<h2 class="acquisition"> Ejemplares en el paquete</h2>
+	<p>
+	<!-- TMPL_VAR NAME="countreceived" --> art&iacute;culo recibido
+	</p>
+	<table>
+		<tr>
+			<th class="acquisition">CANASTA</th>
+			<th class="acquisition">T&iacute;tulo</th>
+			<th class="acquisition">Coste estimado</th>
+			<th class="acquisition">Cantidad pedida</th>
+			<th class="acquisition">P&amp;P</th>
+			<th class="acquisition">Real</th>
+			<th class="acquisition">Cant</th>
+			<th class="acquisition">Total</th>
+		</tr>
+		<!-- TMPL_LOOP NAME="loop_received" -->
+			<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
+				<td class="number"><!-- TMPL_VAR NAME="basketno" --></td>
+				<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->&catview=yes&datereceived=<!-- TMPL_VAR name="datereceived" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+				<td class="number"><!-- TMPL_VAR NAME="ecost" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
 		<td></td>
-		<td><b>SUBTOTALS</b></td>
-		<td>$<TMPL_VAR name="totalprice"></td>
-		<td><TMPL_VAR name="totalfreight"></td>
-		<td><TMPL_VAR name="totalquantity"></td>
-		<td>$<TMPL_VAR name="tototal"></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td colspan=5 rowspan=2  bgcolor="#ffdf61">
-		<b>HELP</b>
-		<br>
-		The total at the bottom of the page should be within a few cents of the total for the invoice.<p>
-		When you have finished this invoice save the changes.
+				<td class="number"><!-- TMPL_VAR NAME="unitprice" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="quantityrecieved" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="total" --></td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+		<tr>
+			<td colspan="5" rowspan=3  bgcolor="#ffdf61">
+			<b>AYUDA</b>
+				<p>El total al final de la p&aacute;gina deber&iacute;a ser de unos cuantos centavos del total de la factura. </p>
 		</td>
-		<td colspan=2 align=right><b>GST</b></td>
-		<td>$<TMPL_VAR name="gst"></td>
+			<td colspan="2"  class="acquisition number"><b>GST</b></td>
+			<td class="acquisition number"><!-- TMPL_VAR NAME="gst" --></td>
 	</tr>
-	<tr valign=top bgcolor=white>
-		<td colspan=2 align=right ><b>TOTAL</b></td>
-		<td>$<TMPL_VAR name="grandtot"></td>
+		<tr>
+			<td colspan="2" class="acquisition number"><b>Carga</b></td>
+			<td class="acquisition number"><!-- TMPL_VAR NAME="freight" --></td>
+		</tr>
+		<tr>
+			<td colspan="2" class="acquisition number"><b>TOTAL</b></td>
+			<td class="acquisition number"><!-- TMPL_VAR NAME="grandtot" --></td>
 	</tr>
-</table>
-</CENTER>
+	</table>
+	</div>
+	
+	<div id="bloc25">
+	<h2 class="acquisition"> Pedidos pendientes </h2>
+		<form action="/cgi-bin/koha/acqui/acquire.pl">
+			<input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->">
+			<input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->">
+			<input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->">
+			<input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->">
+			
+			<b>Buscar ISBN o T&iacute;tulo:</b> <input type="text" size="25" name="recieve">
+		</form>
+	<p>
+	<form action="" method="get" name="orderform">
+	
+	<table class="small">
+		<tr>
+			<th class="acquisition">CANASTA</th>
+			<th class="acquisition">T&iacute;tulo</th>
+			<th class="acquisition">Pedido</th>
+			<th class="acquisition">Recibido</th>
+			<th class="acquisition"></th>
+		</tr>
+		<!-- TMPL_VAR NAME="countpending" --> l&iacute;neas
+		<!-- TMPL_LOOP NAME="loop_orders" -->
+			<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
+				<td class="number"><!-- TMPL_VAR NAME="basketno" --></td>
+				<td><!-- TMPL_VAR NAME="title" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="quantityrecieved" --></td>
+                <td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;datereceived=<!-- TMPL_VAR name="datereceived"-->&catview=yes" class="button acquisition">Recibir</td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+	</table>
+	</div>
+</div>
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: es/acqui/recieveorder.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui/Attic/recieveorder.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/acqui/recieveorder.tmpl	3 Jun 2003 21:49:32 -0000	1.1
+++ es/acqui/recieveorder.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,33 +1,125 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
+<div id="mainbloc">
+	<h1 class="acquisition">Recibir pedidos del proveedor <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
 
-<FONT SIZE=6><em>Receive Orders From Supplier <a href=whitcoulls.html><TMPL_VAR name="name"></a></em></FONT>
-<p>
-<CENTER>
-<form method=get action="receive.pl">
-<input type=hidden name=id value=<TMPL_VAR name="id">>
-<p>
-<table border=1 cellspacing=0 cellpadding=5>
-<tr valign=top bgcolor="#ffdf61"><td  colspan=2><B>SUPPLIER INVOICE INFORMATION</B></td></tr>
-<TR VALIGN=TOP >
-<TD>Supplier Invoice Number</td>
-<td><input type=text size=20 name=invoice>
-</td>
-</tr>
-<TR VALIGN=TOP bgcolor="#ffffcc">
-<TD>GST</td>
-<td><input type=text size=20 name=gst>
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Freight</td>
-<td><input type=text size=20 name=freight>
-</td>
-</tr>
-<TR VALIGN=TOP>
-<td colspan=2 align="center"><input type=image  name=submit src="/<TMPL_VAR name="theme">/images/2rightarrow.png" border=0 title="continue" alt="save" border=0>
-</td>
-</tr>
-</table>
-</CENTER>
+<!-- TMPL_IF NAME="count" --><p> <!-- TMPL_VAR NAME="count" --> paquetes encontrados</p><!--/TMPL_IF-->
+<div id="resultnumber">
+<!-- Row of numbers corresponding to search result pages -->
+<!-- TMPL_IF NAME="displayprev" -->
+	<a href="recieveorder.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0"></a>
+<!-- TMPL_ELSE -->
+	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
+<!-- /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="recieveorder.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
+	<!-- /TMPL_IF -->
+<!-- /TMPL_LOOP -->
+<!-- TMPL_IF NAME="displaynext" -->
+	<a href="recieveorder.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
+<!-- TMPL_ELSE -->
+	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
+<!-- /TMPL_IF -->
+</div>
 
-<TMPL_INCLUDE name="acquisitions-bottom.inc">
+<div id="resultlist">
+<!-- Search Results Table -->
+<!-- TMPL_IF NAME="count" -->
+<form method="post" action="recieveorder.pl">
+	<table class="small">
+		<tr>
+			<th class="acquisition">L&iacute;nea</th>
+			<th class="acquisition">C&oacute;digo</th>
+			<th class="acquisition">Fecha de recepci&oacute;n</th>
+			<th class="acquisition">Cantidad de Ejemplares</th>
+			<th class="acquisition">Cuenta de art&iacute;culos</th>
+			<th class="acquisition">Ejemplares esperando</th>
+		</tr>
+		<tr>
+			<th class="acquisition">
+				&nbsp;
+				<input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
+			</th>
+			<th class="acquisition">
+				<input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->">
+			</th>
+			<th class="acquisition">
+				Desde :<input type="text" size="9" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->"> 
+				<p>A :<input type="text" size="9" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->">
+			</th>
+			<th class="acquisition">
+				&nbsp;
+			</th>
+			<th class="acquisition">
+				Ordenar por :<select name="orderby" size="1">
+				<option value="aqorders.booksellerinvoicenumber"> C&oacute;digo</option>
+				<option value="datereceived"> Fecha de recepci&oacute;n</option>
+				<option value="datereceived desc"> Fecha de recepci&oacute;n inversa</option>
+				<option value="aqorders.booksellerinvoicenumber desc"> C&oaacute;digo invertido</option>
+				</select><br />
+				Resultados por p&aacute;gina :<select name="resultsperpage" value ="<!--TMPL_VAR Name="resultsperpage"-->" size="1">
+				<option value="20">20</option>
+				<option value="30">30</option>
+				<option value="50">50</option>
+				<option value="100">100</option>
+				</select>
+			</th>
+			<th class="acquisition">
+				<input type="submit" class="button acquisition" value="Filtro">
+			</th>
+		</tr>
+<!-- Actual Search Results -->
+<!-- TMPL_LOOP NAME="searchresults" -->
+	<tr>
+		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+			<!-- TMPL_VAR NAME="number" -->
+		</td>
+		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+			<!--TMPL_IF Name="code"--><!--TMPL_VAR Name="code" --><!--/TMPL_IF-->
+		</td>
+		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
+		<!-- /TMPL_IF -->
+			<a href="/cgi-bin/koha/acqui/receive.pl?type=intra&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&amp;datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&amp;code=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
+				<!-- TMPL_VAR NAME="datereceived" -->
+			</a>
+		</td>
+		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
+		<!-- /TMPL_IF -->
+			<!-- TMPL_VAR NAME="reccount" --> 
+		</td>
+		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+			<!-- TMPL_VAR NAME="bibcount" -->
+		</td>
+		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+			<!-- TMPL_VAR NAME="itemcount" -->
+		</td>
+	</tr>
+<!-- /TMPL_LOOP -->
+</table>
+</form>
+<!--/TMPL_IF-->
+	<div id="bloc25">
+	<h2 class="acquisition"> Recibir un paquete nuevo </h2>
+		<form method="get" action="receive.pl">
+		<p>
+			<input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
+			<label>C&oacute;digo de paquete</label>
+			<input type="text" size="20" name="invoice">
+		</p>
+<!-- TMPL_IF NAME="GST" -->		<p>
+			<label>GST</label>
+			<input type="text" size="20" name="gst">
+		</p><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0"><!-- /TMPL_IF -->
+		<p>
+			<label>Freight</label>
+			<input type="text" size="20" name="freight">
+		</p>
+		<p>
+			<input type="submit" class="button acquisition" value="Guardar">
+		</p>
+		</form>
+	</div>
+</div>
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: es/acqui/supplier.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui/Attic/supplier.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/acqui/supplier.tmpl	3 Jun 2003 21:49:32 -0000	1.1
+++ es/acqui/supplier.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,159 +1,234 @@
-<TMPL_INCLUDE name="acquisitions-top.inc">
+<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<form action=updatesupplier.pl method=post>
-
-<input type=hidden name=id value=<TMPL_VAR name="id">>
-<FONT SIZE=6><em>Update: <TMPL_VAR name="name"></em></FONT>
-<P>
-<CENTER>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
-	<tr valign=top bgcolor="#ffdf61">
-		<td colspan=2><B>COMPANY DETAILS</B></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD><b>Company Name</b></td>
-		<td><input type=text size=20 name=company value="<TMPL_VAR name="name">">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Postal Address</td>
-		<td>
-			<textarea name=company_postal cols=20 rows=3><TMPL_VAR name="postal">
-			</textarea>
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Physical Address</td>
-		<td><textarea name=physical cols=20 rows=4><TMPL_VAR name="address1">
-			<TMPL_VAR name="address2">
-			<TMPL_VAR name="address3">
-			<TMPL_VAR name="address4">
-			</textarea>
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Phone</td>
-		<td><input type=text size=20 name=company_phone value="<TMPL_VAR name="phone">">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Fax</td>
-		<td><input type=text size=20 name=company_fax value="<TMPL_VAR name="fax">">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Website</td>
-		<td><input type=text size=20 name=website value="<TMPL_VAR name="url">">
-		</td>
-	</tr>
-	<tr valign=top bgcolor="#ffdf61">
-		<td colspan=2><B>CONTACT DETAILS</B></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Contact Name</td>
-		<td><input type=text size=20 name=company_contact_name value="<TMPL_VAR name="contact">"></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Position</td>
-		<td><input type=text size=20 name=company_contact_position value="<TMPL_VAR name="contpos">">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Phone</td>
-		<td><input type=text size=20 name=contact_phone value="<TMPL_VAR name="contphone">">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Alternative Phone</td>
-		<td><input type=text size=20 name=contact_phone_2 value="<TMPL_VAR name="contaltphone">">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Fax</td>
-		<td><input type=text size=20 name=contact_fax value="<TMPL_VAR name="contfax">">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>E-mail</td>
-		<td><input type=text size=20 name=company_email value="<TMPL_VAR name="contemail">">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Notes</td>
-		<td><textarea name=notes cols=20 rows=4><TMPL_VAR name="contnotes"></textarea>
-		</td>
-	</tr>
-	<tr>
-		<td colspan=2 align="center"><input type=image  name=submit src="/<TMPL_VAR name="theme">/images/filesave.png" border=0 title="save" alt="save"></td>
-	</tr>
-</table>
-
-<table border=1 cellspacing=0 cellpadding=5 width="40%">
-	<tr valign=top bgcolor="#ffdf61">
-		<td colspan=2><B>CURRENT STATUS</B></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Supplier is</td>
-		<td><input type="radio" name="status" value="1" <TMPL_IF name="active">checked</TMPL_IF>>Active
-			<input type="radio" name="status" value="0" <TMPL_UNLESS name="active">checked</TMPL_UNLESS>>Inactive</td>
-	</tr>
-	<tr valign=top bgcolor="#ffdf61">
-		<td colspan=2><B>ORDERING INFORMATION</B></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Publishers and Imprints</td>
-		<td><textarea name="publishers_imprints" cols=20 rows=4><TMPL_VAR name="specialty"></textarea>
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>List Prices are</td>
-		<td>
-			<select name=list_currency size=1>
-			<TMPL_LOOP name="loop_pricescurrency">
-				<TMPL_VAR name="currency">
-			</TMPL_LOOP>
+<div id="mainbloc">
+<!--TMPL_IF Name="enter"-->
+	<form action=updatesupplier.pl method="post">
+	
+	<input type="hidden" name="id" value=<!-- TMPL_VAR NAME="id" -->>
+	
+	<!-- TMPL_IF name="id" -->
+		<h1 class="acquisition">Actualizar: <!-- TMPL_VAR NAME="name" --></h1>
+	<!-- TMPL_ELSE -->
+		<h1 class="acquisition">A&ntilde;adir proveedor</h1>
+	<!-- /TMPL_IF -->
+	<div id="bloc25">
+		<h2 class="acquisition">DETALLES DE LA COMPA&Ntilde;IA</h2>
+		<p>
+			<label>NOMBRE DE LA COMPA&Ntilde;IA</label>
+			<input type="text" size="40" name="company" value="<!-- TMPL_VAR NAME="name" -->">
+		</p>
+		<p>
+			<label>Direcci&oacute;n Postal</label>
+				<textarea name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
+		</p>
+		<p>
+			<label>Direcci&oacute;n F&iacute;sica</label>
+			<textarea name="physical" cols="40" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
+		</p>
+		<p>
+			<label>Tel&eacute;fono</label>
+			<input type="text" size="20" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->">
+		</p>
+		<p>
+			<label>Fax</label>
+			<input type="text" size="20" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->">
+		</p>
+		<p>
+			<label>Sitio web</label>
+			<input type="text" size="40" name="website" value="<!-- TMPL_VAR NAME="url" -->">
+		</p>
+		<h2 class="acquisition">DETALLES DE CONTACTO</h2>
+		<p>
+			<label>Nombre del Contacto</label>
+			<input type="text" size="40" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->">
+		</p>
+		<p>
+			<label>Posici&oacute;n</label>
+			<input type="text" size="40" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->">
+		</p>
+		<p>
+			<label>Tel&eacute;fono</label>
+			<input type="text" size="20" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->">
+		</p>
+		<p>
+			<label>tel&eacute;fono alternativo</label>
+			<input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->">
+		</p>
+		<p>
+			<label>Fax</label>
+			<input type="text" size="20" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->">
+		</p>
+		<p>
+			<label>Correo</label>
+			<input type="text" size="40" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->">
+		</p>
+		<p>
+			<label>Notas</label>
+			<textarea name="contact_notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
+		</p>
+	</div>
+	<div id="bloc25">
+		<h2 class="acquisition">ESTADO ACTUAL</h2>
+		<p>
+			<label>El proveedor es</label>
+				<!-- TMPL_IF name="active" -->
+					<input type="radio" name="status" value="1" checked>Activo <input type="radio" name="status" value="0">Inactivo</td>
+				<!-- TMPL_ELSE -->
+					<input type="radio" name="status" value="1">Activo <input type="radio" name="status" value="0" checked>Inactivo</td>
+				<!-- /TMPL_IF -->
+		</p>
+		<h2 class="acquisition">INFORMACION DE PEDIDOS</h2>
+		</p>
+		<p>
+			<label>Editores y Editoriales</label>
+			<textarea name="publishers_imprints" cols="20" rows="4"><!-- TMPL_VAR NAME="specialty" --></textarea>
+		</p>
+		<p>
+			<label class="label100">Los precios de lista son</label>
+				<select name="list_currency" size="1">
+				<!-- TMPL_LOOP NAME="loop_pricescurrency" -->
+					<!-- TMPL_VAR NAME="currency" -->
+				<!-- /TMPL_LOOP -->
 			</select>
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Invoice Prices are</td>
-		<td>
-			<select name=invoice_currency size=1>
-			<TMPL_LOOP name="loop_invoicecurrency">
-				<TMPL_VAR name="currency">
-			</TMPL_LOOP>
+		</p>
+		<p>
+			<label class="label100">Precios de la Factura son</label>
+				<select name="invoice_currency" size="1">
+				<!-- TMPL_LOOP NAME="loop_invoicecurrency" -->
+					<!-- TMPL_VAR NAME="currency" -->
+				<!-- /TMPL_LOOP -->
 			</select>
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>GST Registered</td>
-		<td>
-			<input type=radio name=gst value=1 <TMPL_IF name="gstreg">checked</TMPL_IF>>Yes
-			<input type=radio name=gst value=0 <TMPL_UNLESS name="gstreg">checked</TMPL_UNLESS>>No
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>List Item Price Includes GST</td>
-		<td>
-			<input type=radio name=list_gst <TMPL_IF name="listincgst">checked</TMPL_IF>>Yes
-			<input type=radio name=list_gst value=0 <TMPL_UNLESS name="listincgst">checked</TMPL_UNLESS>>No
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Invoice Item Price Includes GST</td>
-		<td>
-			<input type=radio name=invoice_gst value=1 <TMPL_IF name= "invoiceincgst">checked</TMPL_IF>>Yes
-			<input type=radio name=invoice_gst value=0 <TMPL_UNLESS name="invoiceincgst">checked</TMPL_UNLESS>>No
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Discount</td>
-		<td><input type=text size=3 name=discount value=<TMPL_VAR name="discount">> %
-	</tr>
-</table>
-
-</form>
-</center>
-
-
-<TMPL_INCLUDE name="acquisitions-bottom.inc">
+		</p>
+		<!-- TMPL_IF NAME="GST" --><p>
+			<label class="label100">GST Registrado</label>
+				<input type="radio" name="gst" value="1" <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Si <input type="radio" name="gst" value="0" <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>No
+		</p><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0"><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="GST" --><p>
+			<label class="label100">Precio unitario de lista incluye GST</label>
+				<input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Si <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>No
+		</p><!-- TMPL_ELSE --><input type="hidden" name="list_gst" value="0"><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="GST" --><p>
+			<label class="label100">Precio unitario de la factura incluye GST</label>
+				<input type="radio" name="invoice_gst" value="1" <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>Si <input type="radio" name="invoice_gst" value="0" <!-- TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>No
+		</p><!-- TMPL_ELSE --><input type="hidden" name="invoice_gst" value="0"><!-- /TMPL_IF -->
+		<p>
+			<label class="label100">Descuento</label>
+			<input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->"> %
+		</p>
+		<p>
+			<label class="label100">Notas</label>
+			<textarea cols="40" rows="4" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea>
+		</p>
+	<br/>
+	<br/><input type="image" name="submit" src="/<!-- TMPL_VAR NAME="theme" -->/images/filesave.png" border="0" title="Guardar" alt="Guardar" class="button acquisition">
+	</form>
+	</div>
+</div>
+<!--TMPL_ELSE-->
+	<h1 class="acquisition">Informaci&oacute;n para :<!-- TMPL_VAR NAME="name" --></h1>
+	<a href="supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->" class="button acquisition"> Editar Suministrador </a> <a href="order.pl?supplier=<!--TMPL_VAR Name="name"-->" class="button acquisition"> Administrar Pedidos </a> <a href="recieveorder.pl?supplierid=<!--TMPL_VAR Name="id"-->" class="button acquisition"> Recibir paquetes </a>
+	<div id="bloc25">
+		<h2 class="acquisition">DETALLES DE LA COMPA&Ntilde;IA</h2>
+		<p>
+			<label>NOMBRE DE LA COMPA&Ntilde;IA</label>
+			<!-- TMPL_VAR NAME="name" -->
+		</p>
+		<p>
+			<label class="label100">Direcci&oacute;n Postal</label>
+				<!-- TMPL_VAR NAME="postal" -->
+		</p>
+		<p>
+			<label class="label100">Direcci&oacute;n F&iacute;sica</label>
+			<!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" -->
+		</p>
+		<p>
+			<label>Tel&eacute;fono</label>
+			<!-- TMPL_VAR NAME="phone" -->
+		</p>
+		<p>
+			<label>Fax</label>
+			<!-- TMPL_VAR NAME="fax" -->
+		</p>
+		<p>
+			<label>Sitio web</label>
+			<!-- TMPL_VAR NAME="url" -->
+		</p>
+		
+		<h2 class="acquisition">DETALLES DE CONTACTO</h2>
+		<p>
+			<label>Nombre del Contacto</label>
+			<!-- TMPL_VAR NAME="contact" -->
+		</p>
+		<p>
+			<label>Posici&oacute;n</label>
+			<!-- TMPL_VAR NAME="contpos" -->
+		</p>
+		<p>
+			<label>Tel&eacute;fono</label>
+			<!-- TMPL_VAR NAME="contphone" -->
+		</p>
+		<p>
+			<label>tel&eacute;fono alternativo</label>
+			<!-- TMPL_VAR NAME="contaltphone" -->
+		</p>
+		<p>
+			<label>Fax</label>
+			<!-- TMPL_VAR NAME="contfax" -->
+		</p>
+		<p>
+			<label>Correo</label>
+			<!-- TMPL_VAR NAME="contemail" -->
+		</p>
+		<p>
+			<label>Notas</label>
+			<!-- TMPL_VAR NAME="contnotes" -->
+		</p>
+	</div>
+	<div id="bloc25">
+		<h2 class="acquisition">ESTADO ACTUAL</h2>
+		<p>
+			<label>El proveedor es</label>
+				<!-- TMPL_IF name="active" -->
+					Activo
+				<!-- TMPL_ELSE -->
+					Inactivo
+				<!-- /TMPL_IF -->
+		</p>
+		<h2 class="acquisition">INFORMACION DE PEDIDOS</h2>
+		</p>
+		<p>
+			<label>Editores y Editoriales</label>
+			<!-- TMPL_VAR NAME="specialty" -->
+		</p>
+		<p>
+			<label class="label100">Los precios de lista son</label><!--TMPL_VAR Name="listprice"-->
+		</p>
+		<p>
+			<label class="label100">Precios de la Factura son</label><!--TMPL_VAR Name="invoiceprice"-->
+		</p>
+		<p>
+			<label class="label100">GST Registrado</label>
+				<!-- TMPL_IF name="gstreg" -->Si<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Precio unitario de lista incluye GST</label>
+				<!-- TMPL_IF name="listincgst" -->Si<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Precio unitario de la factura incluye GST</label>
+				<!-- TMPL_IF name= "invoiceincgst" -->Si<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Descuento</label>
+			<!-- TMPL_VAR NAME="discount" --> %
+		</p>
+		<p>
+			<label class="label100">Notas</label>
+			<!-- TMPL_VAR NAME="notes" -->
+		</p>
+	<br/>
+	<br/>
+	</div>
+</div>
+<!--/TMPL_IF-->
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: es/acqui.simple/addbiblio.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui.simple/Attic/addbiblio.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.12.1
diff -u -b -r1.4 -r1.4.12.1
--- es/acqui.simple/addbiblio.tmpl	3 Jun 2003 21:41:13 -0000	1.4
+++ es/acqui.simple/addbiblio.tmpl	7 May 2007 13:55:50 -0000	1.4.12.1
@@ -1,310 +1,167 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
-
-<STYLE TYPE="text/css" MEDIA=screen>
-	table {	font-family:Arial;
-	font-weight:normal;
-	text-decoration:none;
-	font-size:10pt;}
-</STYLE>
-
-<form method="post" name="f">
-<table width=100% cellspacing=0 cellpadding=5 border=1>
-<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-	<th>MARC biblio : <TMPL_VAR name="bibid"></th>
-</tr>
-<tr>
-	<td>
-	<table width=100% border=0 colspacing=0 cellpadding=0>
-	<tr>
-		<td width=9% align="center"><a href="javascript:active(0)"><div id="link0">0</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(1)"><div id="link1">1</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(2)"><div id="link2">2</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(3)"><div id="link3">3</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(4)"><div id="link4">4</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(5)"><div id="link5">5</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(6)"><div id="link6">6</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(7)"><div id="link7">7</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(8)"><div id="link8">8</div></a></td>
-		<td width=9% align="center"><a href="javascript:active(9)"><div id="link9">9</div></a></td>
-		<td width=10% align="center"><input type="hidden" name="op" value="addbiblio">
-												<input type="hidden" name="oldbiblionumber" value="<TMPL_VAR name="oldbiblionumber">">
-												<input type="button" value="items" onClick='Check(this.form)' accesskey="w">
-		</td>
-	</tr>
-	</table>
-	</td>
-</tr>
-</table>
-   <DIV name="0XX" id="0XX" style="position:absolute;visibility:visible;width:90%">
-    <table width=100%  cellspacing=0 cellpadding=2 border=0>
-	<TMPL_LOOP name="0XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"></td></tr>
-	<TMPL_LOOP name="subfield_loop">
-	<tr>
-		<td width="3%">&nbsp;</td>
-		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
-		<td width="40%">
-			<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">">
-			<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
-		</td>
-	</tr>
-	</tmpl_loop>
-	</tmpl_loop>
-		</table>
-		</DIV>
-
-	<DIV name="1XX" id="1XX" style="position:absolute;visibility:hidden;width:90%">
-	<table width=100%  cellspacing=0 cellpadding=1 border=0>
-	<TMPL_LOOP name="1XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"></td></tr>
-	<TMPL_LOOP name="subfield_loop">
-	<tr>
-		<td width="3%">&nbsp;</td>
-		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
-		<td width="40%">
-			<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">">
-			<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
-		</td>
-	</tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-     </table>
-     </DIV>
-
-	<DIV name="2XX" id="2XX" style="position:absolute;visibility:hidden;width:90%">
-	<table width=100% cellspacing=0 cellpadding=2  border=0>
-	<TMPL_LOOP name="2XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"></td></tr>
-	<TMPL_LOOP name="subfield_loop">
-	<tr>
-		<td width="3%">&nbsp;</td>
-		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
-		<td width="40%">
-			<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">">
-			<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
-		</td>
-       </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-	</table>
-	</DIV>
-
-	<DIV name="3XX" id="3XX" style="position:absolute;visibility:hidden;width:90%">
-	<table width=100% cellspacing=0 cellpadding=2  border=0>
-	<TMPL_LOOP name="3XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"></td></tr>
-	<TMPL_LOOP name="subfield_loop">
-	<tr>
-		<td width="3%">&nbsp;</td>
-		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><<TMPL_IF name="mandatory"> *</b></TMPL_IF>/td>
-		<td width="40%">
-			<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">">
-			<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
-		</td>
-		</tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-	</table>
-	</DIV>
-
-	<DIV name="4XX" id="4XX" style="position:absolute;visibility:hidden;width:90%">
-	<table width=100%  cellspacing=0 cellpadding=2 border=0>
-	<TMPL_LOOP name="4XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"></td></tr>
-	<TMPL_LOOP name="subfield_loop">
-	<tr>
-		<td width="3%">&nbsp;</td>
-		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
-		<td width="40%">
-			<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">">
-			<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
-		</td>
-	</tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-	</table>
-	</DIV>
-
-	<DIV name="5XX" id="5XX" style="position:absolute;visibility:hidden;width:90%">
-	<table width=100% cellspacing=0 cellpadding=2  border=0>
-	<TMPL_LOOP name="5XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"></td></tr>
-	<TMPL_LOOP name="subfield_loop">
-	<tr>
-		<td width="3%">&nbsp;</td>
-		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
-		<td width="40%">
-			<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">">
-			<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
-		</td>
-	</tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-	</table>
-	</DIV>
-
-	<DIV name="6XX" id="6XX" style="position:absolute;visibility:hidden;width:90%">
-	<table width=90% cellspacing=0 cellpadding=2  border=0>
-	<TMPL_LOOP name="6XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"></td></tr>
-	<TMPL_LOOP name="subfield_loop">
-	<tr>
-		<td width="3%">&nbsp;</td>
-		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
-		<td width="40%">
-			<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">">
-			<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
-		</td>
-	</tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-	</table>
-	</DIV>
-
-	<DIV name="7XX" id="7XX" style="position:absolute;visibility:hidden;width:90%">
-	<table width=100%  cellspacing=0 cellpadding=2 border=0>
-	<TMPL_LOOP name="7XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"></td></tr>
-	<TMPL_LOOP name="subfield_loop">
-	<tr>
-		<td width="3%">&nbsp;</td>
-		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
-		<td width="40%">
-			<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">">
-			<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
-		</td>
-	</tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-	</table>
-	</DIV>
-
-	<DIV name="8XX" id="8XX" style="position:absolute;visibility:hidden;width:90%">
-	<table width=100% cellspacing=0 cellpadding=2  border=0>
-	<TMPL_LOOP name="8XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"></td></tr>
-	<TMPL_LOOP name="subfield_loop">
-	<tr>
-		<td width="3%">&nbsp;</td>
-		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
-		<td width="40%">
-			<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">">
-			<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
-		</td>
-	</tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-	</table>
-	</DIV>
-
-	<DIV name="9XX" id="9XX" style="position:absolute;visibility:hidden;width:90%">
-	<table width=90% cellspacing=0 cellpadding=2  border=0>
-	<TMPL_LOOP name="9XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><TMPL_VAR name="tag">  <input type="hidden" name="ind_tag" value="<TMPL_VAR name="tag">"><input type="text" name="indicator" size=3 maxlength=2 value="<TMPL_VAR name="indicator">"> - <tmpl_var name="tag_lib"></td></tr>
-	<TMPL_LOOP name="subfield_loop">
-	<tr>
-		<td width="3%">&nbsp;</td>
-		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
-		<td width="40%">
-			<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">">
-			<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
-		</td>
-	</tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-	</table>
-	</DIV>
-
-	<DIV name="hidden" id="hidden" style="position:absolute;visibility:hidden;width:90%">
-	<table width=90% cellspacing=0 cellpadding=2  border=0>
-	<TMPL_LOOP name="hidden_loop">
-	<tr>
-		<td width="3%">&nbsp;</td>
-		<td width="2%"><b><TMPL_VAR name="subfield"></b></td>
-		<td width="55%" align="right"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
-		<td width="40%">
-			<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">">
-			<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
-		</td>
-	</tr>
-	</TMPL_LOOP>
-	</table>
-	</DIV>
-	<TMPL_IF name="oldbiblionumtagfield">
-		<input type="hidden" name="tag" value="<TMPL_VAR name="oldbiblionumtagfield">">
-		<input type="hidden" name="subfield" value="<TMPL_VAR name="oldbiblionumtagsubfield">">
-		<input type="hidden" name="field_value" value="<TMPL_VAR name="oldbiblionumber">">
+<!-- TMPL_INCLUDE NAME="marc-top.inc" -->
+	<form method="post" name="f" id="f" action="addbiblio.pl">
+<h1 class="catalogue"><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Editar MARC con n&uacute;mero de registro <!-- TMPL_VAR name="oldbiblionumber" --><!-- TMPL_ELSE -->A&ntilde;adir registros MARC<!-- /TMPL_IF --> Con el formato : <!--TMPL_VAR Name="framework" --></h1>
+
+<div class="tabbed">
+		<input type="hidden" name="op" value="addbiblio" />
+		<input type="hidden" name="addfield_field" />
+		<input type="hidden" name="repeat_field" />
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->" />
+		<!-- TMPL_IF name="bibid" -->
+			<input type="button" value="Guardar Registro e ir a Ejemplares" onclick="Check(this.form);" accesskey="w" class="button catalogue">
+		<!-- TMPL_ELSE -->
+			<input type="button" value="A&ntilde;adir el Art&iacute;culo bibliogr&aacute;fico e ir a los Ejemplares" onclick="Check(this.form);" accesskey="w" class="button catalogue">
+		<!-- /TMPL_IF -->
+	<input type="button" value="B&uacute;squeda Z39.50" class="button catalogue" onclick="PopupZ3950(); return false;" =/></div>
+
+
+	<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">
+<!-- TMPL_ELSE -->
+    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:visible">
+<!-- /TMPL_IF -->
+<!-- TMPL_UNLESS name="number" -->
+    <!-- show duplicate warning on tab 0 only -->
+        <!-- TMPL_IF name="duplicatebiblionumber" -->
+                    <div class="error">
+                        <p>&iquest;Es este un duplicado de <a href="../MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicatebiblionumber" -->" onclick="openWindow('../MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicatebiblionumber" -->&popup=1', 'Duplicate biblio'; return false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
+                        <p>Debes o bien:</p>
+                        <ul>
+                            <li>Si <em>es</em> un duplicado, <a href="additem.pl?bibid=<!-- TMPL_VAR name="duplicatebibid" -->">Edita los Ejemplares</a>del registro existente.</li>
+                            <li>Si no, pincha a <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" /> <a href="#" onclick="confirmnotdup(); return false;">Confirme que esto no es un duplicado</a></li>
+                        </ul>
+                    </div>
+        <!-- /TMPL_IF -->
+    <!-- /TMPL_UNLESS -->
+    <!-- TMPL_LOOP NAME="innerloop" -->
+		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
+        <!-- TMPL_IF name="tag" -->
+        <p class="MARCtag">
+            <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
+            <!-- TMPL_UNLESS name="hide_marc" -->
+                <a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>  <input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffff00;'" type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> -
+            <!-- TMPL_ELSE -->
+                <input tabindex="1" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
+            <!-- /TMPL_UNLESS -->
+            <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
+            <!-- TMPL_VAR NAME="tag_lib" -->
+            <!-- /TMPL_UNLESS -->
+            <!-- TMPL_IF name="repeatable" --><a href="#<!-- TMPL_VAR NAME="tag" -->" onclick="javascript:this.nextSibling.type='text';this.nextSibling.focus()">+</a><input type="hidden"  value="" size="2" onchange="AddField('<!-- TMPL_VAR NAME="tag" -->',this.value)" ><!-- /TMPL_IF -->
+        </p>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_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" -->')" title="<!-- TMPL_VAR name="marc_lib_plain" -->">
+                    <!-- 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" 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" -->"/>
+                </p>
+            </div>
+        <!-- /TMPL_LOOP -->
+        </div>
+    <!-- /TMPL_LOOP -->
+    </div>
+<!-- /TMPL_LOOP -->
+		<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" 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" value="<!-- TMPL_VAR NAME="oldbiblionumtagsubfield" -->">
+			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->">
 		<input type="hidden" name="mandatory" value="0">
-		<input type="hidden" name="tag" value="<TMPL_VAR name="oldbiblioitemnumtagfield">">
-		<input type="hidden" name="subfield" value="<TMPL_VAR name="oldbiblioitemnumtagsubfield">">
-		<input type="hidden" name="field_value" value="<TMPL_VAR name="oldbiblioitemnumber">">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldbiblioitemnumtagfield" -->">
+			<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldbiblioitemnumtagsubfield" -->">
+			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="oldbiblioitemnumber" -->">
 		<input type="hidden" name="mandatory" value="0">
-			<input type="hidden" name="tag_mandatory" value="<TMPL_VAR name="tag_mandatory">">
-	</TMPL_IF>
-</form>
-
-
-<script LANGUAGE="JavaScript">
+			<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">
+function loading(){
+	document.getElementById("loading").style.display = "none";
+}
+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 < 10 ; i++ ) {
+	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";
-			document.getElementById(link).style.backgroundColor="#11AA11";
-			document.getElementById(link).style.backgroundImage="url(<TMPL_VAR name="themelang">/images/background-mem.gif)";
+			}
+			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";
-			document.getElementById(link).style.backgroundColor="#FFFFFF";
-			document.getElementById(link).style.backgroundImage="";
+			}
+			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++) {
@@ -318,51 +175,196 @@
 
 	// 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]) {
-			document.getElementById("error"+i).style.backgroundColor="#FF0000";
+				f.field_value[i].style.backgroundColor="#FF0000";
 			total_missing_mandatory_subfields++;
+			if (f.field_value[i].parentNode.tagName == "B")
+			{
+				missing_mandatory_subfields.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+			}
+			else
+			{
+				missing_mandatory_subfields.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+			}
+
 		    }
 		} else {
-			document.getElementById("error"+i).style.backgroundColor="#FFFFFF";
+			f.field_value[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) + ")");
 		}
-		document.getElementById("error"+i).style.backgroundColor="#ffff00";
+		}
+		f.field_value[i].style.backgroundColor="#FFFF00";
 	    }
 	}
 
 	var total_errors = total_missing_mandatory_tags + total_missing_mandatory_subfields;
 	var alertString2;
 	if (total_errors!=0) {
-		alertString2 = "Form not submitted because of the following problem(s)\n";
-		alertString2 += "------------------------------------------------------------------------------------\n\n";
-		alertString2 += "- "+ total_missing_mandatory_tags +" mandatory tags empty\n";
-		alertString2 += "- "+ total_missing_mandatory_subfields +" mandatory fields empty (see bold subfields)";
+		alertString2  = _("El Formulario no fue procesado debido a los siguientes problemas");
+		alertString2 += "\n------------------------------------------------------------------------------------\n";
+		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" campos obligatorios vac&iacute;os ");
+		for (i=0; i<missing_mandatory_tags.length; i++)
+		{
+			alertString2 += "\n--->"+ missing_mandatory_tags[i];
+		}
+  		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" campos obligatorios vac&iacute;os (ver subcampos en negrita)");
+		for (i=0; i<missing_mandatory_subfields.length; i++)
+		{
+			alertString2 += "\n--->"+ missing_mandatory_subfields[i];
+		}
 		alert(alertString2);
 	} else {
-		document.f.submit();
+		document.forms['f'].submit();
 	}
 }
 function Dopop(link,i) {
-	defaultvalue=document.forms[0].field_value[i].value;
-	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes');
+	defaultvalue=document.forms['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'].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'].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'].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'].kohafield[i].value == "biblioitems.issn"){
+			if(document.forms['f'].field_value[i].value.length>0) {
+		    strQuery += "&issn="+document.forms['f'].field_value[i].value;
+		} else {
+			error++;
+		}
+		}
+	}
+	if(error < 4){
+	newin=window.open("../z3950/search.pl?oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->"+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;
+}
+
+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,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); //original <div>
+    var clone = original.cloneNode(true);
+
+    // set the attribute for the new 'div' subfields
+    clone.setAttribute('id',index + index);//set another id.
+    var NumTabIndex;
+    NumTabIndex = parseInt(original.getAttribute('tabindex'));
+    if(isNaN(NumTabIndex)) NumTabIndex = 0;
+    clone.setAttribute('tabindex',NumTabIndex+1);
+    
+    var CloneButtonPlus;
+    try{
+        CloneButtonPlus = clone.getElementsByTagName('a')[0];
+        CloneButtonPlus.setAttribute('onclick',"cloneSubfield('" + index + index + "')");
+    }
+    catch(e){
+        // do nothig if ButtonPlus & CloneButtonPlus don't exist.
+    }
+
+    // insert this line on the page
+    original.parentNode.insertBefore(clone,original.nextSibling);
+}
+
+function upSubfield(index) {
+	try{
+		var line = document.getElementById(index); // get the line where the user has clicked.
+	} catch(e) {
+		return;
+	}
+	var tag = line.parentNode; // get the dad of this line. (should be "<div tag=XXX>")
+	
+	// getting all subfields for this tag
+	var subfields = tag.getElementsByTagName('div');
+	var subfieldsLength = subfields.length;
+	if(subfieldsLength<=1) return; // nothing to do if there is just one subfield.
+	// among all subfields 
+	for(var i=0;i<subfieldsLength;i++){ 
+		if(subfields[i].getAttribute('id') == index){ //looking for the subfield which is clicked :
+			if(i==0){ // if the clicked subfield is on the top
+				tag.appendChild(subfields[0]);
+				return;
+			}else{
+				var lineAbove = subfields[i-1];
+				tag.insertBefore(line,lineAbove);
+				return;
+			}
+		}
+	}
+}
+
+function unHideSubfield(index,labelindex) {
+	subfield = document.getElementById(index);
+	subfield.style.display = 'block';
+	label = document.getElementById(labelindex);
+	label.style.display='none';	
+}
 </script>
 </body>
 </html>

Index: es/acqui.simple/addbooks.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui.simple/Attic/addbooks.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/acqui.simple/addbooks.tmpl	3 Jun 2003 21:41:13 -0000	1.2
+++ es/acqui.simple/addbooks.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,85 +1,57 @@
-<TMPL_INCLUDE NAME="acquisitions-top.inc">
-
-
-<font size="5"><em>MARC import and BIBLIO management</em></font>
-<TMPL_IF name="noitemsfound">
-	<p />
-	<font color="red" size="4">No items found</font>
-</TMPL_IF>
-<TMPL_IF name="websiteadded">
-	<p />
-	<font color="red" size="4">Website Biblioitem Added</font>
-</TMPL_IF>
-
-<p />
-<table bgcolor="#ffcc00" width="80%" cellpadding="3">
-	<tr valign="center">
-	<td><font size="4">To add a new biblio/item, scan or type the ISBN/ISSN number:</font></td>
-	</tr>
-</table>
-<form action="isbnsearch.pl">
-	<table cellpadding="3" border=0 width="100%">
-		<tr valign="top">
-			<td width="5%">ISBN:</td>
-			<td width="20%"><input type="text" name="isbn" /></td>
-			<td width="10%" rowspan=2 valign="middle"><input type="submit" value="Go" /></td>
-			<td rowspan=2>If the ISBN is found into the biblio table, it will be retrieved and can be modified.<br/>
-					If the ISBN is found into the breeding farm, it will be retrieved. and a biblio added.<br/>
-					Otherwise, a biblio can be added from scratch.</td>
-		</tr>
-			<td width="5%">Title</td>
-			<td width="20%"><input type="text" name="title" /></td>
-		</tr>
-		<tr><td>&nbsp;</td>
-			<td colspan=2><a href=addbiblio.pl>Add biblio without ISBN/ISSN</a></td></tr>
-	</table>
-</form>
-
-<p />
-<p />
-<table bgcolor="#ffcc00" width="80%" cellpadding="3">
-	<tr valign="center">
-		<td><font size="4">Tools for importing MARC records into breeding farm</font></td>
-	</tr>
-</table>
-<table cellpadding="3" border=0 width="100%">
-	<tr valign="top">
-		<td width="5%">&nbsp;</td>
-		<td width="20%"><li><a href=marcimport.pl>Upload MARC records</a></li></td>
-		<td width="10%">&nbsp;</td>
-		<td>The breeding farm is a table where are stored imported MARC records.<br/>
-			A MARC record is stored in the breeding farm as long as you've no item. When you type the ISBN of a biblio, it's searched in the breeding farm.
-			If found, the biblio is added to koha active table, and removed from breeding farm.
-		</td>
-
-
-<table bgcolor="#ffcc00" width="80%" cellpadding"5">
-	<tr>
-		<td><font size="4">Tools for importing MARC from a z3950 server</font></td>
-	</tr>
-</table>
-<table cellpadding="3" border=0 width="100%">
-	<tr valign="top">
-		<td width="5%">&nbsp;</td>
-		<td width="20%"><li><a href=marcimport.pl?menu=z3950>Z39.50 Search Tool</a></li></td>
-		<td width="10%">&nbsp;</td>
-		<td>does not work</td>
-	</tr>
-</table>
-
-<table bgcolor="#ffcc00" width="80%" cellpadding="3">
-	<tr valign="center">
-		<td><FONT SIZE=4>Add New Website</font></td>
-	</tr>
-</table>
-<form action="websitesearch.pl" method="post">
-	<table>
-	<tr>
-		<td>Keyword:</td>
-		<td><input type="text" name="keyword" /></td>
-		<td><input type="submit" value="Go" /></td>
-	</tr>
-	</table>
-</FORM>
-<p />
-<TMPL_INCLUDE NAME="acquisitions-bottom.inc">
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<div id="mainbloc">
+	<h1 class="catalogue">Administraci&oacute;n de registros MARC</h1>
+	<!-- TMPL_IF name="noitemsfound" -->
+		<font color="red" size="4">No se encontraron ejemplares</font>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="websiteadded" -->
+		<font color="red" size="4">Website Biblioitem a&ntilde;adido</font>
+	<!-- /TMPL_IF -->
+	
+	<div id="bloc25">
+		<form action="isbnsearch.pl">
+			<h2 class="catalogue">Para a&ntilde;adir un nuevo Art&iacute;culo, escanee o escriba el ISBN/ISSN</h2>
+			<p>
+				<label class="label100" for="title">T&iacute;tulo</label>
+				<input type="hidden" name="marclist" value="biblio.title">
+	
+				<input type="hidden" name="and_or" value="and">
+				<input type="hidden" name="excluding" value="">
+				<input type="hidden" name="operator" value="contains">
+				<input type="text" name="value" id="title" size="35">
+			</p>
+			<p>
+				<label class="label100" for="title">ISBN</label>
+				<input type="hidden" name="marclist" value="biblioitems.isbn">
+	
+				<input type="hidden" name="and_or" value="and">
+				<input type="hidden" name="excluding" value="">
+				<input type="hidden" name="operator" value="start">
+				<input type="text" name="value" id="title" size="35">
+			</p>
+			<p><input type="submit" value="Iniciar" class="button catalogue"></p>
+		</form>
+		<!-- TMPL_IF NAME="NOTMARC" -->
+			<p><a href="addbiblio-nomarc.pl" class="button catalogue">Crear Registro</a></p>
+		<!-- TMPL_ELSE -->
+			<p>
+				<form action="addbiblio.pl" method="post">
+					<select name="frameworkcode">
+						<option value="">Predeterminado</option>
+						<!-- TMPL_LOOP NAME="frameworkcodeloop" -->
+							<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
+						<!-- /TMPL_LOOP -->
+					</select>
+					<input type="submit" value="Crear Registro" class="button catalogue">
+				</form>
+			</p>
+		<!-- /TMPL_IF -->
+	</div>
+	<div id="bloc25">
+		<h2 class="catalogue">Consejo</h2>
+		<p>Si el ISBN o el t&iacute;tulo son encontrados en la tabla, ser&aacute;n recuperados y podr&aacute;n ser modificados.<br/>
+				Si el ISBN o el t&iacute;tulo son encontrados en el dep&oacute;sito, ser&aacute;n recuperados y se a&ntilde;adir&aacute; un registro.<br/>
+				Por otro lado, un registro puede ser agregado desde el principio.</p>
+	</div>
+</div>
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: es/acqui.simple/additem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui.simple/Attic/additem.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/acqui.simple/additem.tmpl	3 Jun 2003 21:41:13 -0000	1.2
+++ es/acqui.simple/additem.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,79 +1,75 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
-<STYLE TYPE="text/css" MEDIA=screen>
-	table {	font-family:Arial;
-	font-weight:normal;
-	text-decoration:none;
-	font-size:10pt;}
-</STYLE>
-<br /><br />
-<form method="post" action="additem.pl" name="f">
-<input type="hidden" name="op" value="<TMPL_VAR name="op">">
-<input type="hidden" name="bibid" value="<TMPL_VAR name="bibid">">
-<table width="80%" align="center" cellspacing=0 cellpadding=5 border=1>
-<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-	<td>
-	<table width="100%" border=0 cellpadding=0 cellspacing=0>
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<div id="mainbloc">
+	<form method="post" action="additem.pl" name="f">
+	<input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->">
+	<input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->">
+	<div class="tabbed">
+		<h1 class="catalogue"><!-- TMPL_VAR name="title" --> (<!-- TMPL_VAR name="author" --> n&uacute;mero de libro #<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
+		<a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> Editar art&iacute;culo </a> <a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> MARC </a> <a href="../detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> Normal </a> <a href="../ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> ISBD </a>
+	</div>
+	<!-- TMPL_IF name="item_loop" -->
+		<div id="bloc25">
+			<div name="10XX" id="10XX">
+			<h2 class="catalogue">Ejemplares existentes</h2>
+			<table>
 		<tr>
-			<td width=8%><a href="addbiblio.pl?oldbiblionumber=<TMPL_VAR name="biblionumber">"><img border="0" src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png"></td>
-			<td width=8%><a href="../detail.pl?bib=<TMPL_VAR name="biblionumber">">Normal</a></td>
-			<td align="center"><b>MARC biblio : <TMPL_VAR name="bibid"></b></td>
+					<!-- TMPL_LOOP NAME="item_header_loop" -->
+						<th class="catalogue">
+							<TMPL_VAR NAME="header_value">
+						</th>
+					<!-- /TMPL_LOOP -->
+					<th colspan="2" class="catalogue">&nbsp;</th>
 		</tr>
-	</table>
-	</td>
-</tr>
-</table>
-<br />
-<center>
-<DIV name="10XX" id="10XX">
-<table border=1 cellspacing=0 cellpadding=5 width=80%>
-	<tr  background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<th>Existing items</th>
-	</tr>
-</table>
-<table border=1 cellspacing=0 cellpadding=0 width=80%>
-	<tr  background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<TMPL_LOOP name="item_header_loop"><th><tmpl_var name="header_value"></th></TMPL_LOOP><th colspan=2>&nbsp;</th>
-	</tr>
-		<TMPL_LOOP name="item_loop">
+					<!-- TMPL_LOOP NAME="item_loop" -->
 		<tr>
-			<TMPL_VAR name="item_value">
-			<td><a href="additem.pl?op=edititem&bibid=<TMPL_VAR name="bibid">&itemnum=<TMPL_VAR name="itemnum">">Edit</a></td>
+						<!-- TMPL_VAR NAME="item_value" -->
+						<!-- TMPL_IF Name="nomod" -->
+							<td>&nbsp;</td>
+							<td>&nbsp;</td>
+						<!-- TMPL_ELSE -->
+							<td><a href="additem.pl?op=edititem&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->&amp;itemnum=<!-- TMPL_VAR NAME="itemnum" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" border="0"></a></td>
+							<td><a href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="bibid" -->,<!-- TMPL_VAR NAME="itemnum" -->)"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" border="0"></a></td>
+						<!-- /TMPL_IF -->
 		</tr>
-		</TMPL_LOOP>
-</table>
-</DIV>
-<br /><br />
-<table border=1 cellspacing=0 cellpadding=5 width=80%>
-	<tr  background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<th>New Item</th>
-	</tr>
-</table><table width=80%  cellspacing=0 cellpadding=1 border=0>
-	<TMPL_LOOP name="item">
-	<tr>
-		<td width="3%">&nbsp;</td>
-		<td width="2%"><TMPL_VAR name="subfield"></td>
-		<td width="55%"><TMPL_IF name="mandatory"><b></TMPL_IF><TMPL_VAR name="marc_lib"><TMPL_IF name="mandatory"> *</b></TMPL_IF></td>
-		<td width="40%">
-			<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="itemnum" value="<TMPL_VAR name="itemnum">">
-<TMPL_IF name="opisadd">
-<input type="button" value="Add item" onClick='Check(this.form)' accesskey="w">
-<TMPL_ELSE>
-<input type="hidden" name="tag" value="<TMPL_VAR name="itemtagfield">">
-<input type="hidden" name="subfield" value="<TMPL_VAR name="itemtagsubfield">">
-<input type="hidden" name="field_value" value="<TMPL_VAR name="itemnum">">
-<input type="button" value="Modify item" onClick='Check(this.form)' accesskey="w">
-</TMPL_IF>
-</center>
-</form>
+					<!-- /TMPL_LOOP -->
+			</table>
+			</div>
+		</div>
+	<!-- /TMPL_IF -->
+	<div id="bloc25">
+	<!-- TMPL_IF name="opisadd" -->
+		<h2 class="catalogue">Nuevo Ejemplar</h2>
+	<!-- TMPL_ELSE -->
+		<h2 class="catalogue">Modificar Ejemplar</h2>
+	<!-- /TMPL_IF -->	
+		<!-- TMPL_LOOP NAME="item" -->
+			<p>
+					<label><!-- TMPL_VAR NAME="subfield" --> - <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label>
+					<!-- TMPL_VAR NAME="marc_value" -->
+					<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
+					<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
+					<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
+			</p>
+		<!-- /tmpl_loop -->
+	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
+	<!-- TMPL_IF name="barcode_not_unique" -->
+		<div id="problem"><b>ERROR : Ya existe el C&oacute;digo de Barras !<b></div>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="book_on_loan" -->
+		<div id="problem"><b>ERROR : Item prestado : !no puede borrarse !<b></div>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="opisadd" -->
+	<input type="button" value="A&ntilde;adir art&iacute;culo" onclick="Check(this.form)" accesskey="w" class="button catalogue">
+	<!-- 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="itemnum" -->">
+	<input type="button" value="Modificar ejemplar" onclick="Check(this.form)" accesskey="w" class="button catalogue">
+	<!-- /TMPL_IF -->
+	</form>
+</div>
 <script LANGUAGE="JavaScript">
+function _(s) { return s } // dummy function for gettext
 function active(numlayer)
 {
 	for (i=10; i < 11 ; i++ ) {
@@ -82,7 +78,7 @@
 		if (numlayer==i) {
 			document.getElementById(ong).style.visibility="visible";
 			document.getElementById(link).style.backgroundColor="#11AA11";
-			document.getElementById(link).style.backgroundImage="url(<TMPL_VAR name="themelang">/images/background-mem.gif)";
+			document.getElementById(link).style.backgroundImage="url(<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif)";
 		} else {
 			document.getElementById(ong).style.visibility="hidden";
 			document.getElementById(link).style.backgroundColor="#FFFFFF";
@@ -106,16 +102,22 @@
 	if (total_errors==0) {
 		document.f.submit();
 	} else {
-		alertString2 = "Form not submitted because of the following problem(s)\n";
-		alertString2 += "------------------------------------------------------------------------------------\n\n";
-		alertString2 += "- "+ total_errors+" mandatory fields empty (see bold subfields)";
+		alertString2  = _("El Formulario no fue procesado debido a los siguientes problemas");
+		alertString2 += "\n------------------------------------------------------------------------------------\n";
+		alertString2 += "\n- "+ total_errors+_(" campos obligatorios vac&iacute;os (ver subcampos en negrita)");
 		alert(alertString2);
 	}
 }
 function Dopop(link,i) {
-	defaultvalue=document.forms[0].field_value[i].value;
+	defaultvalue=document.forms['f'].field_value[i].value;
 	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes');
 }
+function confirm_deletion(bibid,itemnum) {
+	var is_confirmed = confirm(_('Confirma el borrado del art&iacute;culo?'));
+	if (is_confirmed) {
+	window.location = "additem.pl?op=delitem&bibid="+bibid+"&itemnum="+itemnum;
+	}
+}
 </script>
 </body>
 </html>

Index: es/acqui.simple/isbnsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui.simple/Attic/isbnsearch.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.12.1
diff -u -b -r1.4 -r1.4.12.1
--- es/acqui.simple/isbnsearch.tmpl	3 Jun 2003 21:41:13 -0000	1.4
+++ es/acqui.simple/isbnsearch.tmpl	7 May 2007 13:55:50 -0000	1.4.12.1
@@ -1,93 +1,162 @@
-<TMPL_INCLUDE NAME="acquisitions-top.inc">
-
-<font size="6"><em>Biblio Search Results</em></font><br />
-<CENTER>
-You searched on <b><TMPL_IF name="isbn">ISBN <TMPL_VAR name="isbn"></TMPL_IF><TMPL_IF name="title">title <TMPL_VAR name="title"></TMPL_IF></b><br />
-<TMPL_IF name="total">
-<TMPL_VAR NAME=total> results found<br />
-Results <TMPL_VAR name="showoffset"> to <TMPL_VAR name="total"> displayed
-</TMPL_IF>
-<p />
-<!-- Row of numbers corresponding to search result pages -->
-<TMPL_IF NAME=displayprev>
-	<a href=isbnsearch.pl?offset=<TMPL_VAR NAME="prevstartfrom">&<TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>><img src=<TMPL_VAR name="themelang">/images/numbers/prev.gif border=0></a>
-<TMPL_ELSE>
-	<img src=<TMPL_VAR name="themelang">/images/numbers/placeholder.gif border=0>
-</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=isbnsearch.pl?offset=<TMPL_VAR NAME=startfrom>&<TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>><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=isbnsearch.pl?offset=<TMPL_VAR NAME="nextstartfrom">&<TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>><img src=<TMPL_VAR name="themelang">/images/numbers/next.gif border=0></a>
-<TMPL_ELSE>
-	<img src=<TMPL_VAR name="themelang">/images/numbers/placeholder.gif border=0>
-</TMPL_IF>
-
-<table width="80%" cellpadding="3">
-	<tr valign="center">
-	<td><font size="4">Biblios in koha</font></td>
-	</tr>
-</table>
-<table border="0" cellspacing="0" cellpadding="5" width="80%">
-	<tr valign=top bgcolor=#ffcc00>
-		<td><b>Title</b></td>
-		<td><b>Author</b></td>
-		<td><b>&copy;</b></td>
-		<td>&nbsp;</td>
-	</tr>
-	<TMPL_IF name="loop">
-	<TMPL_LOOP name="loop">
-		<tr valign="top" bgcolor="<TMPL_VAR name="toggle">">
-			<td><TMPL_VAR name="title"></a>
-			<td><TMPL_VAR name="author"></td>
-			<td><TMPL_VAR name="copyrightdate"></td>
-			<td><a href="addbiblio.pl?oldbiblionumber=<TMPL_VAR name="biblionumber">">Edit...</a></td>
-		</tr>
-	</TMPL_LOOP>
-	<TMPL_ELSE>
-	<tr><td colspan=4>Nothing found</td></tr>
-	</TMPL_IF>
-</table>
-<br />
-<table width="80%" cellpadding="3">
-	<tr valign="center">
-	<td><font size="4">Biblios in breeding farm</font></td>
-	</tr>
-</table>
-<table border="0" cellspacing="0" cellpadding="5" width="80%">
-	<tr valign=top bgcolor=#ffcc00>
-		<td><b>Title</b></td>
-		<td><b>Author</b></td>
-		<td><b>ISBN</b></td>
-		<td><b>coming from</b></td>
-		<td><b>&nbsp;</b></td>
-		<td>&nbsp;</td>
-	</tr>
-	<TMPL_IF name="breeding_loop">
-	<TMPL_LOOP name="breeding_loop">
-		<tr valign="top" bgcolor="<TMPL_VAR name="toggle">">
-			<td><TMPL_VAR name="title"></a>
-			<td><TMPL_VAR name="author"></td>
-			<td><TMPL_VAR name="isbn"></td>
-			<td><TMPL_VAR name="file"></td>
-			<td><a href="addbiblio.pl?breedingid=<TMPL_VAR name="id">">Add biblio</a></td>
-		</tr>
-	</TMPL_LOOP>
-	<TMPL_ELSE>
-	<tr><td colspan=6>Nothing found</td></tr>
-	</TMPL_IF>
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<div id="mainbloc">
+	<h1 class="catalogue">Resultados de la B&uacute;squeda</h1>
+	<div id="bloc25">
+		<h2 class="catalogue">Usted busc&oacute; </h2>
+		<!-- TMPL_IF name="isbn" -->
+			<p>ISBN <!-- TMPL_VAR NAME="isbn" --></p>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="title" -->
+			<p>t&iacute;tulo <!-- TMPL_VAR NAME="title" --></p>
+		<!-- /TMPL_IF -->
+	</div>
+	<div id="bloc25">
+		<h2 class="catalogue">Registros en Koha</h2>
+		<!-- TMPL_IF name="loop" -->
+			<div id="resultnumber">
+				<p>
+					<!-- TMPL_IF NAME="displayprev" --> 
+						<a class="resultnumber" href="isbnsearch.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+							&lt;&lt; Anterior
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_LOOP NAME="numbers" -->
+						<!-- TMPL_IF NAME="highlight" -->
+							<span class="highlight"><!-- TMPL_VAR NAME="number" --></span>
+						<!-- TMPL_ELSE -->
+							<a class="resultnumber" href="isbnsearch.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+								<!-- TMPL_VAR NAME="number" -->
+							</a>
+						<!-- /TMPL_IF -->
+					<!-- /TMPL_LOOP -->
+					<!-- TMPL_IF NAME="displaynext" -->
+						<a class="resultnumber" href="isbnsearch.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+							Siguiente&gt;&gt;
+						</a>
+					<!-- /TMPL_IF -->
+			</p>
+			<p class="resultcount">
+				<!-- TMPL_IF NAME="total" -->
+					Resultados <!-- TMPL_VAR NAME="from" --> a <!-- TMPL_VAR NAME="to" --> de <!-- TMPL_VAR NAME="total" -->
+				<!-- TMPL_ELSE -->
+					No se encontraron resultados
+				<!-- /TMPL_IF -->
+			</p>
+		</div>
+			<table>
 	<tr>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td><a href="addbiblio.pl?isbn=<TMPL_VAR name="isbn">">Add New Biblio</a></td>
-	</tr>
-</table>
+					<th class="catalogue">T&iacute;tulo</th>
+					<th class="catalogue">Autor</th>
+					<th class="catalogue">&copy;</th>
+					<th class="catalogue">&nbsp;</th>
+					<!-- TMPL_UNLESS NAME="NOTMARC" -->
+						<th class="catalogue">&nbsp;</th>
+					<!-- /TMPL_UNLESS -->
+				</tr>
+				<!-- TMPL_LOOP NAME="loop" -->
+					<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
+						<td><!-- TMPL_VAR NAME="title" --></a>
+						<td><!-- TMPL_VAR NAME="author" --></td>
+						<td><!-- TMPL_VAR NAME="copyrightdate" --></td>
+						<!-- TMPL_IF NAME="NOTMARC" -->
+						<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">A&ntilde;adir art&iacute;culos</a></td>
+						<!-- TMPL_ELSE -->
+						<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Editar...</a></td>
+						<!-- /TMPL_IF -->
+						<!-- TMPL_UNLESS NAME="NOTMARC" -->
+						<td>
+							<a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
+								Duplicado
+							</a>
+						</td>
+						<!-- /TMPL_UNLESS -->
+					</tr>
+				<!-- /TMPL_LOOP -->
+			</table>
+			<div id="resultnumber">
+				<p>
+					<!-- TMPL_IF NAME="displayprev" --> 
+						<a class="resultnumber" href="isbnsearch.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+							&lt;&lt; Anterior
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_LOOP NAME="numbers" -->
+						<!-- TMPL_IF NAME="highlight" -->
+							<span class="highlight"><!-- TMPL_VAR NAME="number" --></span>
+						<!-- TMPL_ELSE -->
+							<a class="resultnumber" href="isbnsearch.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+								<!-- TMPL_VAR NAME="number" -->
+							</a>
+						<!-- /TMPL_IF -->
+					<!-- /TMPL_LOOP -->
+					<!-- TMPL_IF NAME="displaynext" -->
+						<a class="resultnumber" href="isbnsearch.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+							Siguiente&gt;&gt;
+						</a>
+					<!-- /TMPL_IF -->
+			</p>
+			<p class="resultcount">
+				<!-- TMPL_IF NAME="total" -->
+					Resultados <!-- TMPL_VAR NAME="from" --> a <!-- TMPL_VAR NAME="to" --> de <!-- TMPL_VAR NAME="total" -->
+				<!-- TMPL_ELSE -->
+					No se encontraron resultados
+				<!-- /TMPL_IF -->
+			</p>
+		</div>
+		<!-- TMPL_ELSE -->
+			<p>Ninguno</p>
+		<!-- /TMPL_IF -->
+	</div>
+	<div id="bloc25">
+		<h2 class="catalogue">Art&iacute;culos en repositorio</h2>
+		<!-- TMPL_IF name="breeding_loop" -->
+			<table>
+				<tr>
+					<th class="catalogue">T&iacute;tulo</th>
+					<th class="catalogue">Autor</th>
+					<th class="catalogue">ISBN</th>
+					<th class="catalogue">viene de</th>
+					<th class="catalogue">&nbsp;</th>
+					<th class="catalogue">&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" -->" class="button catalogue">A&ntilde;adir art&iacute;culo</a></td>
+							<!-- /TMPL_IF -->
+						</tr>
+					<!-- /TMPL_LOOP -->
+			</table>
+		<!-- TMPL_ELSE -->
+			<p>Ninguno</p>
+		<!-- /TMPL_IF -->
+	</div>
+	<div id="bloc25">
+		<h2 class="catalogue">A&ntilde;adir art&iacute;culo</h2>
+		<p class="center">
+		<!-- TMPL_IF NAME="NOTMARC" -->
+			<a href="addbiblio-nomarc.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button catalogue">A&ntilde;adir Nuevo Art&iacute;culo</a>
+		<!-- TMPL_ELSE -->
+		<p>
+		<form action="addbiblio.pl" method="post">
+			<select name="frameworkcode">
+				<option value="">Predeterminado</option>
+				<!-- TMPL_LOOP NAME="frameworkcodeloop" -->
+					<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
+				<!-- /TMPL_LOOP -->
+			</select>
+			<input type="submit" value="Crear Registro" class="button catalogue">
+		</form>
+		</p>
+		<!-- /TMPL_IF -->
+		</p>
+	</div>
 
-<br />
-<TMPL_INCLUDE NAME="acquisitions-bottom.inc">
+</div>
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: es/acqui.simple/marcimport.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/acqui.simple/Attic/marcimport.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/acqui.simple/marcimport.tmpl	3 Jun 2003 21:41:13 -0000	1.2
+++ es/acqui.simple/marcimport.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,52 +1,60 @@
-<TMPL_INCLUDE NAME="acquisitions-top.inc">
-<h1>MARC acquisition system</h1>
+<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+<h1>Sistema de adquisiones MARC</h1>
 
 <table bgcolor="#ffcc00" width="80%" cellpadding="3">
 	<tr valign="center">
-	<td><font size="4">Import into breeding farm</font></td>
+	<td><font size="4">Importar al dep&oacute;sito</font></td>
 	</tr>
 </table>
 
-<TMPL_IF name="uploadmarc">
-<p>Import results :</p>
+<!-- TMPL_IF name="uploadmarc" -->
+<p>Resultados de la importaci&oacute;n ></p>
 <ul>
-	<p><TMPL_VAR name="imported"> imported records</p>
-	<p><TMPL_VAR name="alreadyindb"> not imported because already in DB</p>
-	<p><TMPL_VAR name="alreadyinfarm"> not imported because already in farm</p>
-	<p><TMPL_VAR name="notmarcrecord"> not imported because they seems not to be MARC format (or ISBN/ISSN missing) !</p>
-	<p><TMPL_VAR name="total">  records parsed</p>
-	<p><a href="addbooks.pl">Back to acquisition</a>
+	<p><!-- TMPL_VAR NAME="imported" --> registros importados</p>
+	<p><!-- TMPL_VAR NAME="alreadyindb" --> no importado porque ya se encuentra en la BD</p>
+	<p><!-- TMPL_VAR NAME="alreadyinfarm" --> no importado porque ya se encuentra en el repositorio</p>
+	<p><!-- TMPL_VAR NAME="notmarcrecord" --> &iexcl;no importado porque parece no estar en formato MARC (o falta ISBN/ISSN) !</p>
+	<p><!-- TMPL_VAR NAME="total" --> registros procesados</p>
+	<p><a href="addbooks.pl">Volver a Adquisiciones</a>
 </ul>
-<TMPL_ELSE>
-<ul>Select a file to import into breeding farm. It will be parsed, and for each ISBN found, a new baby will be created in breeding farm.
-If an ISBN already exists in the breeding farm, you can choose wether to ignore the new one, or overwrite the old one.<br/>
-You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested marc data comes !<br/>
-Of course, if the ISBN already exists in active DB, the biblio will be ignored.<br/></ul>
-<form method="post" action="<TMPL_VAR name="SCRIPT_NAME">" enctype="multipart/form-data">
-<table cellpadding="3" border=0>
+<!-- TMPL_ELSE -->
+<ul>
+	<li>Seleccione un archivo para importarlo en el dep&oacute;sito. Ser&aacute; procesado y, por cada ISBN encontrado, se crear&aacute; un nuevo registro en el dep&oacute;sito. </li>
+	<li>Si un ISBN ya existe en el dep&oacute;sito, puede elegir entre ignorar el nuevo o sobreescribir el antiguo.</li>
+	<li>Puede introducir un nombre para esta importaci&oacute;n. Puede ser &uacute;til, cuando se crea un libro, para recordar d&oacute;nde vienen sugeridos los datos de MARC!</li>
+	<li>Por supuesto, si el ISBN ya existe en la BD activa, el registro ser&aacute; ignorado.</li>
+</ul>
+<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" enctype="multipart/form-data">
+<table cellpadding="3" border="0">
+	<tr valign="top">
+		<td>Seleccione el archivo a importar:</td>
+		<td>
+			<input type="file" name="uploadmarc" /><br/>
+		</td>
+	</tr>
 	<tr valign="top">
-		<td>Select the file to import :</td>
+		<td>Nombre de esta importaci&oacute;n</td>
 		<td>
-			<input type="file" name="uploadmarc"/><br/>
+			<input type="text" name="filename" /><br/>
 		</td>
 	</tr>
 	<tr valign="top">
-		<td>Name of this import :</td>
+		<td>Codificaci&oacute;n de car&aacute;cteres (MARC21 o UNIMARC)</td>
 		<td>
-			<input type="text" name="filename"/><br/>
+			<select name="syntax" /><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select><br/>
 		</td>
 	</tr>
 	<tr valign="top">
-		<td>If ISBN already in breeding farm : </td>
-		<td><input type="radio" name="overwrite_biblio" value="0" checked>Ignore this one, keep the existing one<br/>
-			<input type="radio" name="overwrite_biblio" value="1">Overwrite the existing one with this</td>
+		<td>Si el ISBN ya se encuentra en el dep&oacute;sito: </td>
+		<td><input type="radio" name="overwrite_biblio" value="0" checked>Ignorar este, mantener el existente<br/>
+			<input type="radio" name="overwrite_biblio" value="1">Sobreescribir el existente con este</td>
 	</tr>
 	<tr valign="top">
 		<td>&nbsp; </td>
-		<td><input type="submit" value="import"></td>
+		<td><input type="submit" value="Importar"></td>
 	</tr>
 
 </table>
 </form>
-</TMPL_IF>
-<TMPL_INCLUDE NAME="acquisitions-bottom.inc">
+<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->

Index: es/catalogue/MARCdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/Attic/MARCdetail.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -u -b -r1.3 -r1.3.12.1
--- es/catalogue/MARCdetail.tmpl	3 Jun 2003 21:41:14 -0000	1.3
+++ es/catalogue/MARCdetail.tmpl	7 May 2007 13:55:50 -0000	1.3.12.1
@@ -1,248 +1,394 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
+<!-- TMPL_INCLUDE NAME="marc-top.inc" -->
 
-<STYLE TYPE="text/css" MEDIA=screen>
-	table {	font-family:Arial;
-	font-weight:normal;
-	text-decoration:none;
-	font-size:10pt;}
-</STYLE>
-
-<table width="100%" cellspacing=0 cellpadding=5>
-<tr>
-	<td width="80%">
-		<table width=100% cellspacing=0 cellpadding=5 border=1>
-		<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-			<td>
-			<table width="100%" border=0 cellpadding=0 cellspacing=0>
-				<tr>
-					<td width=8%><a href="acqui.simple/addbiblio.pl?oldbiblionumber=<TMPL_VAR name="biblionumber">"><img border="0" src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png"></a></td>
-					<td width=8%><a href="detail.pl?bib=<TMPL_VAR name="biblionumber">">Normal</a></td>
-					
-                <td align="center"><b>registro MARC : <TMPL_VAR name="bibid"></b></td>
-				</tr>
-			</table>
-			</td>
-		</tr>
-		<tr>
-			<td colspan=3>
-			<table width=100% border=0 colspacing=0 cellpadding=0>
-			<tr>
-				<td width=9% align="center"><a href="javascript:active(0)"><div id="link0">0</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(1)" ><div id="link1">1</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(2)"><div  id="link2">2</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(3)"><div  id="link3">3</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(4)"><div  id="link4">4</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(5)"><div  id="link5">5</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(6)"><div  id="link6">6</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(7)"><div  id="link7">7</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(8)"><div  id="link8">8</div></a></td>
-				<td width=9% align="center"><a href="javascript:active(9)"><div  id="link9">9</div></a></td>
-				<td width=10% align="center"><a href="javascript:active(10)"><div  id="link10">Item</div></a></td>
-			</tr>
-			</table>
-			</td>
-		</tr>
-		</table>
-	</td>
-	<td>
-		<TMPL_IF NAME="norequests">
-		<TMPL_ELSE>
-			<a href=request.pl?bib=<TMPL_VAR NAME="biblionumber">><img height=42  WIDTH=120 BORDER="0"
-			src="<TMPL_VAR name="themelang">/images/requests.gif" align="right" border="0"></a>
-		</TMPL_IF>
-	</td>
-</tr>
-</table>
-
-   <DIV name="0XX" id="0XX" style="position:absolute;visibility:visible;width:90%">
-    <table width=100%  cellspacing=0 cellpadding=5 border=0>
-	<TMPL_LOOP name="0XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><tmpl_var name="tag"></b></td></tr>
-	<TMPL_LOOP name="subfield">
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_tag"></b></td>
-		<td width="55%" align="right"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-	</tr>
-	</tmpl_loop>
-	</tmpl_loop>
-     </table>
-     </DIV>
-
-    <DIV name="1XX" id="1XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=100%  cellspacing=0 cellpadding=5 border=0>
-	<TMPL_LOOP name="1XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><tmpl_var name="tag"></b></td></tr>
-	<TMPL_LOOP name="subfield">
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_tag"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-       </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-     </table>
-     </DIV>
-
-    <DIV name="2XX" id="2XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=100% cellspacing=0 cellpadding=5  border=0>
-	<TMPL_LOOP name="2XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><tmpl_var name="tag"></b></td></tr>
-	<TMPL_LOOP name="subfield">
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_tag"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-       </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-     </table>
-     </DIV>
-
-    <DIV name="3XX" id="3XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=100% cellspacing=0 cellpadding=5  border=0>
-	<TMPL_LOOP name="3XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><tmpl_var name="tag"></b></td></tr>
-	<TMPL_LOOP name="subfield">
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_tag"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-       </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-     </table>
-     </DIV>
-
-    <DIV name="4XX" id="4XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=100%  cellspacing=0 cellpadding=5 border=0>
-	<TMPL_LOOP name="4XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><tmpl_var name="tag"></b></td></tr>
-	<TMPL_LOOP name="subfield">
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_tag"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-       </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-     </table>
-     </DIV>
-
-    <DIV name="5XX" id="5XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=100% cellspacing=0 cellpadding=5  border=0>
-	<TMPL_LOOP name="5XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><tmpl_var name="tag"></b></td></tr>
-	<TMPL_LOOP name="subfield">
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_tag"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-       </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-     </table>
-     </DIV>
 
-	<DIV name="6XX" id="6XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=90% cellspacing=0 cellpadding=5  border=0>
-	<TMPL_LOOP name="6XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><tmpl_var name="tag"></b></td></tr>
-	<TMPL_LOOP name="subfield">
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_tag"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
+<!-- TMPL_UNLESS name="popup" -->
+	<div class="tabbed">
+	<form Name="f">
+		<h1 class="catalogue">N&uacute;mero de libro : <!-- TMPL_VAR NAME="biblionumber" --> <b>Con formato :<!--TMPL_VAR Name="framework" --></b>
+</h1>
+	</form>
+		<a href="javascript:Addbiblio('')" class="button catalogue"> Editar art&iacute;culo </a> <a href="javascript:Addbiblio('duplicate')" class="button catalogue"> Duplicar </a> <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue"> Editar ejemplar </a>
+	
+		<!--TMPL_IF Name="candelete" --><a href="javascript:confirm_deletion()" class="button catalogue">
+			borrar
+		</a>
+		<!--/TMPL_IF -->
+        <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> Completo </a> <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> Normal </a> <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> ISBD </a> <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue"> A&ntilde;adir a estante </a> <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue"> Imprimir </a>
+		<!-- TMPL_IF name="subscriptionsnumber" -->
+		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
+			Suscripci&oacute;n(es)
+		</a>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="norequests" -->
+		<!-- TMPL_ELSE -->
+			<a href="request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Reserva</a>
+		<!-- /TMPL_IF -->
+		
+
+	</div>
+<!-- /TMPL_UNLESS -->
+	<div class="tabs">
+		<!-- TMPL_IF NAME="0XX" -->
+			<div id="link0"><a href="javascript:active(0)">0</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="1XX" -->
+			<div id="link1"><a href="javascript:active(1)">1</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="2XX" -->
+			<div id="link2"><a href="javascript:active(2)">2</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="3XX" -->
+			<div id="link3"><a href="javascript:active(3)">3</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="4XX" -->
+			<div id="link4"><a href="javascript:active(4)">4</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="5XX" -->
+			<div id="link5"><a href="javascript:active(5)">5</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="6XX" -->
+			<div id="link6"><a href="javascript:active(6)">6</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="7XX" -->
+			<div id="link7"><a href="javascript:active(7)">7</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="8XX" -->
+			<div id="link8"><a href="javascript:active(8)">8</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="9XX" -->
+			<div id="link9"><a href="javascript:active(9)">9</a></div>
+		<!-- /TMPL_IF -->
+		<a href="javascript:active(10)">I<br>t<br>e<br>m<br>s</a>
+	</div>
+
+	<div name="0XX" id="0XX" class="tab" style="visibility:visible">
+		<!-- TMPL_LOOP NAME="0XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='N&uacute;mero de Autoridad <!-- TMPL_VAR NAME="authid" -->'>
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Autor</a>
+					<!-- /TMPL_IF -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div id="1XX" class="tab">
+		<!-- TMPL_LOOP NAME="1XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='N&uacute;mero de Autoridad <!-- TMPL_VAR NAME="authid" -->'>
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Autor</a>
+					<!-- /TMPL_IF -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div id="2XX" class="tab">
+		<!-- TMPL_LOOP NAME="2XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='N&uacute;mero de Autoridad <!-- TMPL_VAR NAME="authid" -->'>
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Autor</a>
+					<!-- /TMPL_IF -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div id="3XX" class="tab">
+		<!-- TMPL_LOOP NAME="3XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='N&uacute;mero de Autoridad <!-- TMPL_VAR NAME="authid" -->'>
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Autor</a>
+					<!-- /TMPL_IF -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div id="4XX" class="tab">
+		<!-- TMPL_LOOP NAME="4XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='N&uacute;mero de Autoridad <!-- TMPL_VAR NAME="authid" -->'>
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Autor</a>
+					<!-- /TMPL_IF -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div  id="5XX" class="tab">
+		<!-- TMPL_LOOP NAME="5XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='N&uacute;mero de Autoridad <!-- TMPL_VAR NAME="authid" -->'>
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Autor</a>
+					<!-- /TMPL_IF -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div id="6XX" class="tab">
+		<!-- TMPL_LOOP NAME="6XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='N&uacute;mero de Autoridad <!-- TMPL_VAR NAME="authid" -->'>
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Autor</a>
+					<!-- /TMPL_IF -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div  id="7XX" class="tab">
+		<!-- TMPL_LOOP NAME="7XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='N&uacute;mero de Autoridad <!-- TMPL_VAR NAME="authid" -->'>
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Autor</a>
+					<!-- /TMPL_IF -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div id="8XX" class="tab">
+		<!-- TMPL_LOOP NAME="8XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='N&uacute;mero de Autoridad <!-- TMPL_VAR NAME="authid" -->'>
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Autor</a>
+					<!-- /TMPL_IF -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div id="9XX" class="tab">
+		<!-- TMPL_LOOP NAME="9XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title='N&uacute;mero de Autoridad <!-- TMPL_VAR NAME="authid" -->'>
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Autor</a>
+					<!-- /TMPL_IF -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	
+	<div id="10XX" class="tab">
+		<p class="MARCtag">Ejemplares</p>
+		<br/>
+		<table class="noborder">
+				<tr>
+					<!-- TMPL_LOOP NAME="item_header_loop" -->
+						<th class="noborder">
+							<!-- TMPL_VAR NAME="header_value" -->
+						</th>
+					<!-- /TMPL_LOOP -->
        </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-     </table>
-     </DIV>
-
-    <DIV name="7XX" id="7XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=100%  cellspacing=0 cellpadding=5 border=0>
-	<TMPL_LOOP name="7XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><tmpl_var name="tag"></b></td></tr>
-	<TMPL_LOOP name="subfield">
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_tag"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-       </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-     </table>
-     </DIV>
-
-    <DIV name="8XX" id="8XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=100% cellspacing=0 cellpadding=5  border=0>
-	<TMPL_LOOP name="8XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><tmpl_var name="tag"></b></td></tr>
-	<TMPL_LOOP name="subfield">
+				<!-- TMPL_LOOP NAME="item_loop" -->
 	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_tag"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
+						<!-- TMPL_VAR NAME="item_value" -->
        </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
+				<!-- /TMPL_LOOP -->
      </table>
-     </DIV>
-
-    <DIV name="9XX" id="9XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width=90% cellspacing=0 cellpadding=5  border=0>
-	<TMPL_LOOP name="9XX">
-	<tr background="<TMPL_VAR name="themelang">/images/background-mem.gif"><td colspan=4><b><tmpl_var name="tag"></b></td></tr>
-	<TMPL_LOOP name="subfield">
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><TMPL_VAR name="marc_tag"></b></td>
-		<td width="55%"><TMPL_VAR name="marc_lib"></td>
-		<td width="40%"><TMPL_VAR name="marc_value"></td>
-       </tr>
-	</TMPL_LOOP>
-	</TMPL_LOOP>
-     </table>
-     </DIV>
-
-    <DIV name="10XX" id="10XX" style="position:absolute;visibility:hidden;width:90%">
-    <table border=1 cellspacing=0 cellpadding=5>
-		<tr  background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-			<TMPL_LOOP name="item_header_loop"><th><tmpl_var name="header_value"></th></TMPL_LOOP>
-		</tr>
-		<TMPL_LOOP name="item_loop">
-			<tr>
-					<TMPL_VAR name="item_value">
-			</tr>
-		</TMPL_LOOP>
-     </table>
-     </DIV>
-
-<script LANGUAGE="JavaScript">
+	</div>
+<script language="JavaScript" type="text/javascript">
 function active(numlayer)
 {
-for (i=0; i <= 10 ; i++ ) {
+	for (i=0; i <= 10 ; i++ ) {
     ong = i+"XX";
 	link = "link"+i;
     if (numlayer==i) {
 	document.getElementById(ong).style.visibility="visible";
-	document.getElementById(link).style.backgroundColor="#11AA11";
-	document.getElementById(link).style.backgroundImage="url(<TMPL_VAR name="themelang">/images/background-mem.gif)";
-} else {
+		} else {
 	document.getElementById(ong).style.visibility="hidden";
-	document.getElementById(link).style.backgroundColor="#FFFFFF";
-	document.getElementById(link).style.backgroundImage="";
+		}
+	}
+}
+
+function confirm_deletion() {
+	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
+	if (is_confirmed) {
+		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
+	}
+}
+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?bib=<!--TMPL_VAR Name="biblionumber"-->&frameworkcode="+fwk;
 }
+function Addbiblio(op) {
+  var fwk = document.forms['f'].Frameworks.options[document.forms['f'].Frameworks.selectedIndex].value;
+  window.location = "acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
 }
 </script>
 </body>

Index: es/catalogue/catalogue-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/Attic/catalogue-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/catalogue/catalogue-home.tmpl	3 Jun 2003 21:41:14 -0000	1.2
+++ es/catalogue/catalogue-home.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,115 +1,50 @@
-<TMPL_IF name="opac">
-	<TMPL_INCLUDE NAME="opac-top.inc">
-<TMPL_ELSE>
-	<TMPL_INCLUDE NAME="cat-top.inc">
-</TMPL_IF>
-
-<!-- ----------------------- MAIN BODY OF PAGE ------------------------ -->
-<FORM ACTION="/cgi-bin/koha/search.pl" method=post>
-  <FONT SIZE=6><em>B&uacute;squeda en Cat&aacute;logo</em></FONT> 
-  <CENTER>
-
-<TABLE align="left" width="40%" cellspacing=0 cellpadding=5 border=0 >
-	<TR VALIGN=TOP>
-		<TD>C&oacute;digo</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="itemnumber"></td>
-		<td><b> &nbsp; &nbsp; O</b></TD>
-      </TR>
-	<!-- <TR VALIGN=TOP>
-	<TD>ISBN</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="isbn"></TD></TR>
-	-->
-	<TR VALIGN=TOP>
-		<TD colspan=2 >&nbsp; </td>
-	</TR>
-	<TR VALIGN=TOP>
-		<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2> 
-          <b>AYUDA</b><br>
-          <b>Buscando:</b>Al usar m&aacute;s campos para su b&uacute;squeda(ej 
-          Keyword + author + class) la har&aacute; m&aacute;s lenta. 
-          <p> <b><a href=/cgi-bin/koha/maint/catmaintain.pl target=window0>Mantenimiento 
-            del Cat&aacute;logo:</a></b> Para agregar un <b>nuevo</b> libro o 
-            &iacute;tem ir a<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions"> 
-            adquisiciones</a>.
-          <p> Para<b> solicitar, modificar o eliminar</b> un libro o &iacute;tem 
-            primero b&uacute;squelo aqu&iacute;. 
-        </td>
-	</TR>
-</table>
-
-
-
-<TABLE border=0>
-	<TR VALIGN=TOP>
-		<TD>Palabras Claves</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="keyword"></TD>
-	</TR>
-	<TR VALIGN=TOP>
-		<TD>T&iacute;tulo</TD>
-		<TD><INPUT TYPE="text"  SIZE="25" NAME="title"></TD>
-		<td rowspan=2>
-			<input type=radio name=ttype value=normal checked>Normal<br/>
-			<input type=radio name=ttype value=exact>
-          Exacta </td>
-	</TR>
-	<TR VALIGN=TOP>
-		<TD>Autor</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="author"></TD>
-	</TR>
-	<TR VALIGN=TOP>
-		<TD>Ilustrador</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="illustrator"></TD>
-	</TR>
-		<TR VALIGN=TOP>
-		<TD>Dewey</TD><TD><INPUT TYPE="text"  SIZE="25"   NAME="dewey"></TD>
-	</TR>
-
-	<TR VALIGN=TOP>
-	    <TD>Clase</TD>
-		<td>
-			<select name="class" size="1">
-			<option value="">Any
-			<TMPL_VAR name="classlist">
-			</select>
-		</td>
-	</tr>
-	<!-- <TR VALIGN=TOP>
-	<td>Branch</td><td><select name=branch>
-	<option value="F">Foxton
-	</select>
-	</td></tr> -->
-
-	<!-- <TD>Pub Date (before)</TD> <TD><INPUT TYPE="text"  SIZE="8"   NAME="date-before"> &nbsp; &nbsp; (after) <INPUT TYPE="text"  SIZE="8"   NAME="date-after"></TD></TR>
-	-->
-	<TR VALIGN=TOP>
-	    <TD><b>O</b></TD>
-	</TR>
-
-	<TR VALIGN=TOP>
-		<TD>Tema</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="subject"></TD>
-	</TR>
-	<tr>
-		<TD colspan=3>
-			<table width="100%" cellpadding=0 cellspacing=0>
-				<tr align="center">
-					<td>
-						<input type="hidden" name="type" value="intra">
-						<INPUT TYPE="image"  alt="Start Search" src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png" BORDER=0 >
-					</td>
-					<td>
-						
-                <INPUT TYPE="reset"  VALUE= "Borrar">
-					</td>
-					
-              <td> <a href=/cgi-bin/koha/shelves.pl>Estanter&iacute;as Virtuales 
-                </a> </td>
-				</tr>
-			</table>
-		</TD>
-	</TR>
-</TABLE>
-	</center></FORM><CENTER>
+<!-- TMPL_IF NAME="opac" -->
+	<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<!-- TMPL_ELSE -->
+	<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<!-- /TMPL_IF -->
+
+<div id="mainbloc">
+<form action="/cgi-bin/koha/search.pl" method="post">
+
+<h1 class="catalogue">B&uacute;squeda en el Cat&aacute;logo</h1>
+
+
+<div id="bloc25">
+<h2 class="catalogue">Buscar</h2>
+		<p><label class="label100" for="keyword">Palabras Clave:</label><input type="text"  size="25" id="keyword"  name="keyword"></p>
+
+		<p><label class="label100" for="title">T&iacute;tulo:</label><input type="text" id="title"  size="25" name="title"></p>
+
+		<p><label class="label100" for="author">Autor:</label><input type="text"  size="25" id="author"  name="author"></p>
+
+		<p><label class="label100" for="illustrator">Ilustrador:</label><input type="text"  size="25" id="illustrator"  name="illustrator"></p>
+		
+		<p><label class="label100" for="dewey">Dewey:</label></td><td><input type="text"  size="25" id="dewey"  name="dewey"></p>
+
+<p>		<label class="label100" for="class">Clase:</label><select name="class" id="class" size="1">
+			<option value=""> Cualquier <!-- TMPL_VAR NAME="classlist" -->
+			</select></p>
+			
+					<p><label class="label100">Estilo de b&uacute;squeda:</label><input type="radio" name="ttype" id=" ttype" value="normal" checked>Normal <input type="radio" name="ttype" value="exact">Exacta</p>
+			</div>
+			
+	<div id="bloc25">
+		<h2 class="catalogue">B&uacute;squeda de C&oacute;digo de barras</h2>
 	<p>
-	</CENTER>
-<!--#include virtual="/includes/cat-bottom.inc" -->
+		<label class="label100" for="itemnumber">C&oacute;digo de barras</label><input type="text"  size="25" id="itemnumber" name="itemnumber"></p>
+</div>
+
+<div id="bloc25">
+<h2 class="catalogue">B&uacute;squeda de Tema</h2>
+<p><label class="label100" for="subject">Tema:</label><input type="text"  size="25"  id="subject" name="subject"><input type="hidden" name="type" value="intra"></p></div>
+
+<div id="block25"><p><input type="submit" class="button catalogue" value="Iniciar b&uacute;squeda">
+						<input type="reset" value="Limpiar" class="button catalogue">
+						<a href="/cgi-bin/koha/shelves.pl" class="button catalogue">Estantes Virtuales</a></p></div>
+
+	</form>
+
+	</div>
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
 

Index: es/catalogue/cmsdsearchresults.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/Attic/cmsdsearchresults.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/catalogue/cmsdsearchresults.tmpl	3 Jun 2003 21:41:14 -0000	1.2
+++ es/catalogue/cmsdsearchresults.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -2,33 +2,28 @@
 <head><title>Resultados de la B&uacute;squeda</title>
 </head>
 <body>
-<TMPL_INCLUDE NAME="searchheader.tmpl">
-<table border=0 cellspacing=0 cellpadding=0>
-<tr bgcolor=#ccccff>
-    <th>T&iacute;tulo</th>
-    <th>Autor</th>
-    <th>Dewey</th></tr>
-<TMPL_LOOP NAME=SEARCH_RESULTS>
+<!-- TMPL_INCLUDE NAME="searchheader.tmpl" -->
+<table border="0" cellspacing="0" cellpadding="0">
+<tr bgcolor="#ccccff"><th>T&iacute;tulo</th><th>Autor</th><th>Dewey</th></tr>
+<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
   <tr>
-  <td><TMPL_VAR NAME=title></td>
-  <td><TMPL_VAR NAME=author></td>
-  <td align=right><TMPL_VAR NAME=dewey></td>
-  </tr>
-</TMPL_LOOP>
-<tr><td colspan=3 bgcolor=#ccccff>
-    <table border=0 cellpadding=0 cellspacing=0 width=100%>
-    <tr>
-          <td align=left> <a href=search.pl?template=<TMPL_VAR NAME="template">&startfrom=<TMPL_VAR NAME="prevstartfrom">>Registros
-            Anteriores </a> </td>
-          <td align=right> <a href=search.pl?template=<TMPL_VAR NAME="template">&startfrom=<TMPL_VAR NAME="nextstartfrom">>Registros 
-            Siguientes </a> </td>
+  <td><!-- TMPL_VAR NAME="title" --></td>
+  <td><!-- TMPL_VAR NAME="author" --></td>
+  <td align="right"><!-- TMPL_VAR NAME="dewey" --></td>
         </tr>
+<!-- /TMPL_LOOP -->
+<tr><td colspan="3" bgcolor="#ccccff">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr><td align="left">
+    <a href="search.pl?template=<!-- TMPL_VAR NAME="template" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Registros Anteriores</a>
+    </td><td align="right">
+    <a href="search.pl?template=<!-- TMPL_VAR NAME="template" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Pr&oacute;ximos Registros</a>
+    </td></tr>
     </table>
 </td></tr>
 </table>
 <br>
-Resultados<TMPL_VAR NAME="startfrom"> hasta<TMPL_VAR NAME="endat"> de<TMPL_VAR NAME="numrecords"> 
-registros. 
+Resultados <i><!-- TMPL_VAR NAME="startfrom" --></i> hasta <i><!-- TMPL_VAR NAME="endat" --></i> de <i><!-- TMPL_VAR NAME="numrecords" --></i> registros.
 <hr>
 </body>
 </html>

Index: es/catalogue/detail-opac.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/Attic/detail-opac.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/catalogue/detail-opac.tmpl	3 Jun 2003 21:41:14 -0000	1.2
+++ es/catalogue/detail-opac.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,70 +1,71 @@
-<TMPL_INCLUDE NAME="opac-top.inc">
+<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 
 
-<TMPL_LOOP NAME="BIBLIO_RESULTS">
-<font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
-<TMPL_VAR NAME="class"></em></font><p>
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+<font size="6"><em><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></em></font><p>
 <!-- FIXME - "callpadding" should be "cellpadding", right? -->
 <table cellspacing="0" callpadding="5" border="1" align="left" width="220">
-<!-----------------BIBLIO RECORD TABLE--------->
+<!-- ---------------BIBLIO RECORD TABLE------- -->
 <tr valign="top">
 
-    <td bgcolor="#99cccc"> <b>REGISTRO DEL LIBRO</b><TMPL_VAR NAME="biblionumber"> 
-    </td>
+<td bgcolor="#99cccc">
+<b>REGISTRO DE LIBRO</b> <!-- TMPL_VAR NAME="biblionumber" -->
+</td>
 </tr>
 <tr valign="top">
 <td>
 <br>
-      <FONT SIZE=2  face="arial, helvetica"> <b>Subt&iacute;tulo:</b> <TMPL_VAR NAME="subtitle"><br>
-      <b>Autor:</b> <TMPL_VAR NAME="author"><br>
-      <b>Autor Adicional:</b> <TMPL_VAR NAME="additional"><br>
-      <b>T&iacute;tulo de Serie:</b> <TMPL_VAR NAME="seriestitle"><br>
-      <b>Tema:</b> <TMPL_VAR NAME="subject"><br>
-      <b>Copyright:</b> <TMPL_VAR NAME="copyrightdate"><br>
-      <b>Notas:</b> <TMPL_VAR NAME="notes"><br>
-      <b>T&iacute;tulo Unificado:</b> <TMPL_VAR NAME="unititle"><br>
-      <b>Serie:</b> <TMPL_VAR NAME="serial"><br>
-      <b>N&uacute;mero Total de Items:</b> <TMPL_VAR NAME="count"> 
-      <p> 
-      </font></td>
+<font size="2"  face="arial, helvetica">
+<b>Subt&iacute;tulo:</b> <!-- TMPL_VAR NAME="subtitle" --><br>
+<b>Autor:</b> <!-- TMPL_VAR NAME="author" --><br>
+<b>Autor Adicional:</b> <!-- TMPL_VAR NAME="additional" --><br>
+<b>T&iacute;tulo de Serie:</b> <!-- TMPL_VAR NAME="seriestitle" --><br>
+<b>Tema:</b> <!-- TMPL_VAR NAME="subject" --><br>
+<b>Copyright:</b> <!-- TMPL_VAR NAME="copyrightdate" --><br>
+<b>Notas:</b> <!-- TMPL_VAR NAME="notes" --><br>
+<b>T&iacute;tulo Uniforme:</b> <!-- TMPL_VAR NAME="unititle" --><br>
+<b>Serie:</b> <!-- TMPL_VAR NAME="serial" --><br>
+<b>N&uacute;mero de ejemplares:</b> <!-- TMPL_VAR NAME="count" -->
+<p>
+</font></td>
 </tr>
 </table>
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 <center>
-<table border=0 cellspacing=0 cellpadding=2>
+<table border="0" cellspacing="0" cellpadding="2">
 <tr bgcolor="#99cccc">
-      <td>Tipo de Item</td>
-      <td>Clase</td>
-      <td>Ubicaci&oacute;n</td>
-<td>Date Due</td>
-      <td>Visto por &uacute;ltima vez</td>
+<td>Tipo de art&iacute;culo</td>
+<td>Clase</td>
+<td>Ubicaci&oacute;n</td>
+<td>Fecha de Devoluci&oacute;n</td>
+<td>Visto por &uacute;ltima vez</td>
 </tr>
-<TMPL_LOOP NAME="ITEM_RESULTS">
+<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 <tr>
-<td><TMPL_VAR NAME="itemtype"></td>
-<td><TMPL_VAR NAME="class"></td>
-<td><TMPL_VAR NAME="branchname"></td>
-<td><TMPL_VAR NAME="datedue"></td>
-<td><TMPL_VAR NAME="datelastseen"></td>
+<td><!-- TMPL_VAR NAME="itemtype" --></td>
+<td><!-- TMPL_VAR NAME="class" --></td>
+<td><!-- TMPL_VAR NAME="branchname" --></td>
+<td><!-- TMPL_VAR NAME="datedue" --></td>
+<td><!-- TMPL_VAR NAME="datelastseen" --></td>
 </tr>
-</TMPL_LOOP>
-<TMPL_LOOP NAME="WEB_RESULTS">
+<!-- /TMPL_LOOP -->
+<!-- TMPL_LOOP NAME="WEB_RESULTS" -->
 <tr>
-<td><TMPL_VAR NAME="itemtype"></td>
-<td>Website</td>
-<td>Online</td>
-      <td>Disponible</td>
+<td><!-- TMPL_VAR NAME="itemtype" --></td>
+<td>Sitio web</td>
+<td>En l&iacute;nea</td>
+<td>Disponible</td>
 <td></td>
 <td><a href="/cgi-bin/koha/moredetail.pl?item=<TMPL_VAR
-NAME="itemnumber>&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR
-NAME="biblioitemnumber">">http://<TMPL_VAR NAME="url"></a></td>
+name="itemnumber">&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<TMPL_VAR
+name="biblioitemnumber">">http://<!-- TMPL_VAR NAME="url" --></a></td>
 </tr>
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 </table>
-</center><p><center>
+<p>
 </center>
-<br clear=all>
+<br clear="all">
 <p />
 <p />
 
-<TMPL_INCLUDE NAME="opac-bottom.inc">
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: es/catalogue/detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/Attic/detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/catalogue/detail.tmpl	3 Jun 2003 21:41:14 -0000	1.2
+++ es/catalogue/detail.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,161 +1,163 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 
-<TMPL_LOOP NAME="BIBLIO_RESULTS">
-	<TMPL_IF NAME="norequests">
-	<TMPL_ELSE>
-		<a href=request.pl?bib=<TMPL_VAR NAME="biblionumber">><img height=42  WIDTH=120 BORDER="0"
-		src="<TMPL_VAR name="themelang">/images/requests.gif" align="right" border="0"></a>
-	</TMPL_IF>
-
-	<font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
-	<TMPL_VAR NAME="class"></em></font><p>
-	<table cellspacing="0" cellpadding="5" border="1" align="left" width="220">
-	<!-----------------BIBLIO RECORD TABLE--------->
-	<tr valign="top">
-		
-    <td bgcolor="#cccc99" background="/images/background-mem.gif"> <b>REGISTRO 
-      DEL LIBRO<TMPL_VAR NAME="biblionumber"></b> </td>
-	</tr>
-	<tr valign="top">
-		<td>
-			<form action="/cgi-bin/koha/modbib.pl" method="post">
-			<table width="100%" border=0 cellspacing=0 cellpadding=0>
+<div id="mainbloc">
+<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+	<h1 class="catalogue"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></h1>
+	<div class="bibliomenu">
+		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> Editar art&iacute;culo </a> <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue"> Duplicar </a> <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue"> Editar ejemplar </a>
+	
+		<!--TMPL_IF Name="candelete" --><a href="javascript:confirm_deletion()" class="button catalogue">
+			borrar
+		</a>
+		<!--/TMPL_IF -->
+		<a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> Completo </a> <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> Normal </a> <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue"> ISBD </a> <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue"> A&ntilde;adir a estante </a> <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue"> Imprimir </a>
+		<!-- TMPL_IF name="subscriptionsnumber" -->
+		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
+			Suscripci&oacute;n(es)
+		</a>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="norequests" -->
+		<!-- TMPL_ELSE -->
+			<a href="request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Reserva</a>
+		<!-- /TMPL_IF -->
+	</div>
+	<div id="bloc25">
+	<table class="small">
+		<!-- BIBLIO RECORD TABLE -->
 				<tr>
-					<td width="33%">
-						<input type="hidden" name="bibnum" value="<TMPL_VAR NAME="biblionumber">">
-						<input type="image" name="submit" value="modify" border="0" src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0>
-					</td>
-					<td width="33%"><input type="image" name="delete" value="delete" border="0" src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0"></td>
-					<td width="33%"><a href="MARCdetail.pl?bib=<TMPL_VAR name="biblionumber">">MARC</a></td>
+			<th class="catalogue">
+				<!-- TMPL_VAR NAME="title" --> (registro <!-- TMPL_VAR NAME="biblionumber" -->)
+			</th>
 				</tr>
-			</table>
-			</form>
-			<br>
-      <FONT SIZE=2  face="arial, helvetica"> <b>Subt&iacute;tulo:</b> <TMPL_VAR NAME="subtitle"><br>
-      <b>Autor:</b> <a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR
-			NAME="author" ESCAPE=URL>><TMPL_VAR NAME="author"></a><br>
-      <b>Autor Adicional:</b> <TMPL_VAR NAME="additional"><br>
-      <b>T&iacute;tulo de Serie:</b> <TMPL_VAR NAME="seriestitle"><br>
-      <b>Tema:</b> <TMPL_VAR NAME="subject"><br>
-			<b>Copyright:</b> <TMPL_VAR NAME="copyrightdate"><br>
-      <b>Notas:</b> <TMPL_VAR NAME="notes"><br>
-      <b>T&iacute;tulo Unificado:</b> <TMPL_VAR NAME="unititle"><br>
-      <b>Serie:</b> <TMPL_VAR NAME="serial"><br>
-      <b>N&uacute;mero Total de Items:</b> <TMPL_VAR NAME="count"> 
+		<tr>
+			<td>
+				<!-- TMPL_IF name="subtitles" -->
+					<p><label class="label100"><b>Subt&iacute;tulo(s):</b> </label>
+					<!-- TMPL_LOOP name="subtitles" -->
+						<!-- TMPL_VAR NAME="subtitle" --> ; 
+					<!-- /TMPL_LOOP -->
+					</p>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="author" --><p><label class="label100"><b>Autor:</b> </label><!-- TMPL_VAR NAME="author" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="additional" --><p><label class="label100"><b>Autor Adicional:</b></label><!-- TMPL_VAR NAME="additional" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="illus" --><p><label class="label100"><b>Ilustrador:</b></label><!-- TMPL_VAR name="illus" --></p><!-- /TMPL_IF -->
+				<p>
+					<!-- TMPL_IF name="publishercode" --><label class="label100"><b>publicado por:</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
+				</p>
+				<!-- TMPL_IF name="publicationyear" --><p><label class="label100"><b>en </b></label><!-- TMPL_VAR NAME="publicationyear" --></p><!-- /TMPL_IF -->
+				<p>
+					<label class="label100">&nbsp;</label><!-- TMPL_IF name="pages" --> <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+					<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" -->
+				</p>
+				<!-- TMPL_IF name="isbn" --><p><label class="label100"><b>ISBN:</b> </label><!-- TMPL_VAR NAME="isbn" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="issn" --><p><label class="label100"><b>ISSN:</b> </label><!-- TMPL_VAR NAME="issn" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="seriestitle" --><p><label class="label100"><b>Colecci&oacute;n:</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" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="MARCSUBJCTS" -->
+					<p><label class="label100"><b>Temas:</b></label></p>
+					<p>
+						<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
+							<label class="label100">-</label><a href="/cgi-bin/koha/search.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">
+								<!-- TMPL_VAR NAME="marcsubjct" -->
+							</a><br>
+						<!-- /TMPL_LOOP -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<!-- TMPL_IF name="subjects" --><p><label class="label100"><b>Tema(s):</b> </label></p>
+						<!-- TMPL_LOOP name="subjects" -->
+							<p><a href="/cgi-bin/koha/search.marc/search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->&type=intranet"><!-- TMPL_VAR NAME="subject" --></a>, </p> <!-- /TMPL_LOOP -->
+					<!-- /TMPL_IF -->
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="copyrightdate" --><p><label class="label100"><b>A&ntilde;o :</b> </label><!-- TMPL_VAR NAME="copyrightdate" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="MARCNOTES" -->
+					<p><label class="label100"><b>Notas:</b> </label></p>
       <p>
-			</font>
+						<!-- TMPL_LOOP NAME="MARCNOTES" -->
+							<p>- <!-- TMPL_VAR NAME="marcnote" --></p>
+						<!-- /TMPL_LOOP -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<!-- TMPL_IF name="notes" --><p><label class="label100"><b>Notas:</b> </label><!-- TMPL_VAR NAME="notes" --></p><!-- /TMPL_IF -->
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="unititle" --><p><label class="label100"><b>T&iacaute;tulo alternativo:</b> </label><!-- TMPL_VAR NAME="unititle" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="classification" --><p><label class="label100"><b>Clasificaci&oacute;n:</b></label><!-- TMPL_VAR name="subclass" --><!-- TMPL_VAR name="classification" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="dewey" --><p><label class="label100"><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="URLS" -->
+					<p><label class="label100"><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 class="label100"><b>Tipo de art&iacute;culo : </b></label>
+					<!-- TMPL_IF name="description" -->
+						<!-- TMPL_VAR name="description" -->
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_VAR NAME="itemtype" -->
+					<!-- /TMPL_IF -->
+				</p>
+				<!-- TMPL_IF name="count" -->
+					<p><b>N&uacute;mero de ejemplares:</b> <!-- TMPL_VAR NAME="count" --></p>
+				<!-- /TMPL_IF -->
 		</td>
 	</tr>
 	</table>
-</TMPL_LOOP>
-<!-- FIXME - The help box overflows on the right. I think this is
-     because it is specified as "width=70%", which the browser
-     interprets as 70% of the width of the browser window. However,
-     leaving out the "width=70%" makes the help box abut the "biblio
-     record" box. I think the fix is to put all three boxes in a
-     table, for layout, and make the help box as wide as it wants to
-     be. -->
-
-<center>
-<table border=0 cellspacing=0 cellpadding=2>
-	<tr bgcolor="#cccc99" background="/images/background-mem.gif">
-		
-      <td>Tipo de Item </td>
-		
-      <td>Clase</td>
-		
-      <td>Ubicaci&oacute;n</td>
-		<td>Date Due</td>
-		
-      <td>Visto por &uacute;ltima vez</td>
-		
-      <td>C&oacute;digo</td>
-		
-      <td>Volumen</td>
-	</tr>
-	<TMPL_LOOP NAME="ITEM_RESULTS">
+	</div>
+<!-- /TMPL_LOOP -->
+<div id="bloc25">
+	<h2 class="catalogue">Ejemplares</h2>
+	<table>
 		<tr>
-			<td><TMPL_VAR NAME="itemtype"></td>
-			<td><a href=/cgi-bin/koha/search.pl?dewey=<TMPL_VAR NAME="dewey" ESCAPE=URL>><TMPL_VAR NAME="class"></a></td>
-			<td><TMPL_VAR NAME="branchname"></td>
-			<td><TMPL_VAR NAME="datedue"></td>
-			<td><TMPL_VAR NAME="datelastseen"></td>
-			<td><a href="/cgi-bin/koha/moredetail.pl?type=<TMPL_VAR NAME="type">&item=<TMPL_VAR NAME="itemnumber>&bib=<TMPL_VAR NAME="biblionumber">&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&bi=<TMPL_VAR NAME="biblioitemnumber">&item=<TMPL_VAR NAME="itemtype">>Fix Itemtype</a>
-				</td>
-			</TMPL_IF>
+			<th class="catalogue">Tipo de art&iacute;culo</th>
+			<th class="catalogue">Ubicaci&oacute;n</th>
+			<th class="catalogue">Estado</th>
+			<th class="catalogue">Fecha de Devoluci&oacute;n</th>
+			<th class="catalogue">Visto por &uacute;ltima vez</th>
+			<th class="catalogue">C&oacute;digo de barras</th>
+			<th class="catalogue">Volumen</th>
 		</tr>
-	</TMPL_LOOP>
-	<TMPL_LOOP NAME="WEB_RESULTS">
+		<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 		<tr>
-			<td><TMPL_VAR NAME="itemtype"></td>
-			<td>Website</td>
-			<td>Online</td>
-			
-      <td>Disponible</td>
-			<td></td>
+				<td><!-- TMPL_VAR NAME="description" --></td>
+				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --></td>
 			<td>
-				<a href="/cgi-bin/koha/moredetail.pl?item=<TMPL_VAR NAME="itemnumber>&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR NAME="biblioitemnumber">">http://<TMPL_VAR NAME="url"></a>
+					<!-- TMPL_IF name="borrowernumber" -->
+						E-mail: <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_IF name="notforloantext" -->
+							<!-- TMPL_VAR name="notforloantext" -->
+						<!-- TMPL_ELSE -->
+						    <!-- TMPL_IF name="itemlost"-->
+						        Ejemplar perdido
+						    <!-- TMPL_ELSE -->
+							<!-- TMPL_IF NAME="wthdrawn" -->Ejemplar Cancelado<!-- TMPL_ELSE -->Disponible<!-- /TMPL_IF -->
+						    <!-- /TMPL_IF -->
+						<!-- /TMPL_IF -->
+					<!-- /TMPL_IF -->
 			</td>
-		</tr>
-	</TMPL_LOOP>
-</table>
-<p>
-<table border="0" cellspacing="0" cellpadding="5" width=70%>
-	<tr valign="top">
-		<td bgcolor="99cc33" background="/images/background-mem.gif" colspan="2">
-			
-        <p><b>AYUDA</b><br>
-          <b>Actualizar Biblioteca para todos los Items:</b> Haga click en el 
-          bot&oacute;n <b>Modificar</b> [izquierda] para amend la biblioteca. 
-          Cualquier cambio que haga actualiar&aacute; el registro para todos los 
-          &iacute;tems listados arriba. 
-        <p> <b>Actualizando la Biblioteca s&oacute;lo para UNO o ALGUNOS Items:</b> 
-          Si alguno de los &iacute;tems listados arriba necesitan una biblioteca 
-          diferente, o est&aacute;n en una biblioteca incorrecta, debe usar el 
-          proceso de <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">adquisiciones</a> 
-          para arreglar esto. Necesitar&aacute; "re-ordenar" los &iacute;tems, 
-          y borrarlos de esta biblioteca.
-        <p />
+				<td><!-- TMPL_VAR NAME="datedue" -->
+				<!-- TMPL_IF name="reservestatus" -->Reserva <!-- TMPL_VAR name="reservestatus" --><!-- /TMPL_IF --></td>
+				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
+				<td><a href="/cgi-bin/koha/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+				<td><!-- TMPL_VAR NAME="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" -->">Arreglar tipo de art&iacute;culo</a>
 		</td>
+				<!-- /TMPL_IF -->
 	</tr>
-</table>
-</center>
-<br clear=all>
-<p />
-
-<!--
-<table border="1" cellspacing="0" cellpadding="5" width="90%">
-<tr valign="top">
-<td bgcolor="$main"
-background="/images/background-mem.gif"><b>Abstract</b></td>
-</tr>
-<tr valign="top">
-<TMPL_LOOP NAME="BIBLIO_RESULTS">
-<td><TMPL_VAR NAME="abstract"></td>
-</TMPL_LOOP>
-</tr>
-</table>
-<p />
-<table border="1" cellspacing="0" cellpadding="5" width="90%">
-<tr valign="top">
-<td bgcolor="$main" background="/images/background-mem.gif"><b>Links to
-Associated Websites<b></td>
-</tr>
-<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_LOOP -->
+	</table>
+</div>
+<script language="javascript" type="text/javascript">
+function Dopop(link) {
+	newin=window.open(link,'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="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
+	}
+}
+</script>
 
-<TMPL_INCLUDE NAME="cat-bottom.inc">
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: es/catalogue/moredetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/Attic/moredetail.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/catalogue/moredetail.tmpl	3 Jun 2003 21:41:14 -0000	1.2
+++ es/catalogue/moredetail.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,98 +1,76 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 
-<center>
-<br>
-<TMPL_LOOP NAME="BIBITEM_DATA">
-<a href=/cgi-bin/koha/request.pl?bib=<TMPL_VAR NAME="biblionumber">
-<img src=<TMPL_VAR name="themelang">/images/requests.gif width=120 height=42 border=0 align=right border=0></a>
-<FONT SIZE=6><em><a
-href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR NAME="biblionumber">&type=intra><TMPL_VAR NAME="title">
-(<TMPL_VAR NAME="author">)</a></em></FONT><P>
-<p>
-<form action=/cgi-bin/koha/modbibitem.pl>
-<input type=hidden name=bibitem value=<TMPL_VAR NAME="biblioitemnumber">>
-<input type=hidden name=biblio value=<TMPL_VAR NAME="biblionumber">>
-<!-------------------BIBLIO ITEM------------>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left>
-<TR VALIGN=TOP>
-        <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" 
-          ><B><TMPL_VAR NAME="biblioitemnumber"> GRUPO - <TMPL_VAR NAME="description"> 
-          </b> </TD>
-</TR>
-<tr VALIGN=TOP  >
-<TD width=210 >
-<INPUT TYPE="image" name="submit"  VALUE="modify" BORDER=0 src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png">
-<INPUT TYPE="image" name="delete"  VALUE="delete"border=0 src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png">
-<br>
-<FONT SIZE=2  face="arial, helvetica">
-<b>Biblionumber:</b> <TMPL_VAR NAME="biblionumber"><br>
-          <b>Tipo de Item:</b> <TMPL_VAR NAME="itemtype"><br>
-<b>URL:</b> <TMPL_VAR NAME="url"><br>
-          <b>Plazo de Pr&eacute;stamo:</b> <TMPL_VAR NAME="loanlength"><br>
-          <b>Costo de renta:</b> <TMPL_VAR NAME="rentalcharge"><br>
-          <b>Clasificaci&oacute;n:</b> <TMPL_VAR NAME="classification"><TMPL_VAR NAME="dewey"><TMPL_VAR NAME="subclass"><br>
-<b>ISBN:</b> <TMPL_VAR NAME="isbn"><br>
-          <b>Editor:</b> <TMPL_VAR NAME="publishercode"> <br>
-          <b>Lugar:</b> <TMPL_VAR NAME="place"><br>
-          <b>Fecha:</b> <TMPL_VAR NAME="publicationyear"><br>
-          <b>Volumen:</b> <TMPL_VAR NAME="volumeddesc"><br>
-          <b>P&aacute;ginas:</b> <TMPL_VAR NAME="pages"><br>
-          <b>Ilustrado:</b> <TMPL_VAR NAME="illus"><br>
-          <b>Tama&ntilde;o:</b> <TMPL_VAR NAME="size"><br>
-          <b>Notas:</b> <TMPL_VAR NAME="bnotes"><br>
-          <b>N&uacute;mero de Items:</b> <TMPL_VAR NAME="count"> </font> </TD>
-</tr>
-</table>
-</form>
-</TMPL_LOOP>
-<TMPL_LOOP NAME="ITEM_DATA">
-<img src="<TMPL_VAR name="themelang">/images/holder.gif" width=16 height=300 align=left>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width=220 >
-<TR VALIGN=TOP>
-      <td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>CODIGO<TMPL_VAR NAME="barcode"></b></TD>
-</TR>
-<tr VALIGN=TOP>
-<TD width=220>
-<form action=/cgi-bin/koha/moditem.pl method=post>
-<input type=hidden name=bibitem value=<TMPL_VAR NAME="biblioitemnumber">>
-<input type=hidden name=item value=<TMPL_VAR NAME="itemnumber">>
-<input type=hidden name=type value=<TMPL_VAR NAME="type">>
-<INPUT TYPE="image" name="submit"  VALUE="modify" BORDER=0 src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png">
-<INPUT TYPE="image" name="delete"  VALUE="delete" BORDER=0 src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png">
-<br>
-          <FONT SIZE=2  face="arial, helvetica"> <b>Biblioteca Depositaria:</b> 
-          <TMPL_VAR NAME="homebranch"><br>
-          <b>Visto por &uacute;ltima vez:</b> <TMPL_VAR NAME="datelastseen"><br>
-          <b>Prestado por &uacute;ltima vez:</b> <TMPL_VAR NAME="timestamp0"><br>
-          <!-- on issue bit -->
-          <b>Ultimo Usuario 1:</b> <TMPL_VAR NAME="card0"><br>
-          <b>Ultimo Usuario 2:</b> <TMPL_VAR NAME="card1"><br>
-          <b>Biblioteca Actual:</b> <TMPL_VAR NAME="holdingbranch"><br>
-          <b>Precio de Reposici&oacute;n:</b> <TMPL_VAR NAME="replacementprice"><br>
-          <b>Item perdido:</b> <TMPL_VAR NAME="itemlost"><br>
-          <b>Adquirido por:</b> <TMPL_VAR NAME="paidfor"><br>
-          <b>Notas:</b> <TMPL_VAR NAME="itemnotes"><br>
-          <b>Renovaciones:</b> <TMPL_VAR NAME="renewals"><br>
-          <b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<TMPL_VAR NAME="ordernumber">&biblio=<TMPL_VAR NAME="biblionumber">&invoice=<TMPL_VAR NAME="booksellerinvoicenumber">&catview=yes"> 
-          Fecha de Acceso</a>:<TMPL_VAR NAME="dateaccessioned"><br>
-          <b>Cancelado: <TMPL_VAR NAME="wthdrawn"><br>
+<div id="mainbloc">
+	<div id="bloc25">
+	<!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
+		<h2 class="catalogue">
+			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra">
+				<!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)
+			</a>
+		</h2>
+		<p>
+		<form action="/cgi-bin/koha/modbibitem.pl" method="post">
+			<input type="hidden" name="bibitem" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+			<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+			<p><!-- TMPL_VAR NAME="biblioitemnumber" --> GRUPO - <!-- TMPL_VAR NAME="description" --> </p>
+			<p><b>Biblionumber:</b> <!-- TMPL_VAR NAME="biblionumber" --></p>
+			<p><b>Tipo de art&iacute;culo:</b> <!-- TMPL_VAR NAME="itemtype" --></p>
+			<p><b>URL:</b> <!-- TMPL_VAR NAME="url" --></p>
+			<p><b>Per&iacute;odo de pr&eacute;stamo:</b> <!-- TMPL_VAR NAME="loanlength" --></p>
+			<p><b>Costo por pr&eacute;stamo:</b> <!-- TMPL_VAR NAME="rentalcharge" --></p>
+			<p><b>Clasificaci&oacute;n:</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>Editor:</b> <!-- TMPL_VAR NAME="publishercode" --> </p>
+			<p><b>Lugar:</b> <!-- TMPL_VAR NAME="place" --></p>
+			<p><b>Fecha:</b> <!-- TMPL_VAR NAME="publicationyear" --></p>
+			<p><b>Volumen:</b> <!-- TMPL_VAR NAME="volumeddesc" --></p>
+			<p><b>P&aacute;ginas:</b> <!-- TMPL_VAR NAME="pages" --></p>
+			<p><b>Ilus:</b> <!-- TMPL_VAR NAME="illus" --></p>
+			<p><b>Tama&ntilde;o:</b> <!-- TMPL_VAR NAME="size" --></p>
+			<p><b>Notas:</b> <!-- TMPL_VAR NAME="bnotes" --></p>
+			<p><b>Nro. de Art&iacute;culos:</b> <!-- TMPL_VAR NAME="count" --></p>
+		</form>
+		<input type="image" name="submit" value="Modificar" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
+		<input type="image" name="delete" value="borrar" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
+		<a class="button" href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Reservas</a>
+	<!-- /TMPL_LOOP -->
+	</div>
+<!-- TMPL_LOOP NAME="ITEM_DATA" -->
+<div id="bloc25">
+	<h2 class="catalogue">CODIGO DE BARRAS <!-- TMPL_VAR NAME="barcode" --></h2>
+	<form action="/cgi-bin/koha/moditem.pl" method="post">
+	<input type="hidden" name="bibitem" value=<!-- TMPL_VAR NAME="biblioitemnumber" -->>
+	<input type="hidden" name="item" value=<!-- TMPL_VAR NAME="itemnumber" -->>
+	<input type="hidden" name="type" value=<!-- TMPL_VAR NAME="type" -->>
+	<input type="image" name="submit" value="Modificar" border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
+	<input type="image" name="delete" value="borrar" border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
+	<br>
+	<b>Sede Propietaria:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
+	<b>Sede Actual:</b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
+	<b>Visto por &uacute;ltima vez:</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
+	<b>&Uacute;ltimo prestado:</b> <!-- TMPL_VAR NAME="datelastborrowed" --><br>
+	<b>Estado del Ejemplar:</b> <!-- TMPL_IF NAME="issue" -->E-mail: <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a><!-- TMPL_ELSE -->Disponible <!-- /TMPL_IF --><br>
+	<!-- TMPL_IF NAME="issue" --><b>Fecha Devoluci&oacute;n:</b> <!-- TMPL_VAR NAME="date_due" --><br><!-- /TMPL_IF -->
+	<b>&Uacute;ltimo Usuario 1:</b> <!-- TMPL_VAR NAME="card0" --><br>
+	<b>&Uacute;ltimo Usuario 2:</b> <!-- TMPL_VAR NAME="card1" --><br>
+	<b>Precio de reemplazo:</b> <!-- TMPL_VAR NAME="replacementprice" --><br>
+	<b>Ejemplar perdido:</b> <!-- TMPL_IF NAME="itemlost" -->Si<!-- TMPL_ELSE -->No<!-- /TMPL_IF --><br>
+	<b>Pagado por:</b> <!-- TMPL_VAR NAME="paidfor" --><br>
+	<b>Notas:</b> <!-- TMPL_VAR NAME="itemnotes" --><br>
+	<b>Renovaciones:</b> <!-- TMPL_VAR NAME="renewals" --><br>
+	<b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&catview=yes"> Fecha de Acceso:</a></b> <!-- TMPL_VAR NAME="dateaccessioned" --><br>
+	<b>Cancelado:</b> <!-- TMPL_IF NAME="wthdrawn" -->Si<!-- TMPL_ELSE -->No<!-- /TMPL_IF --><br>
           <b><a
-href=/cgi-bin/koha/bookcount.pl?&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR NAME="biblioitemnumber">&itm=<TMPL_VAR NAME="itemnumber">>Total 
-          Pr&eacute;stamos :</a></b> <TMPL_VAR NAME="issues"><br>
-          <b>N&uacute;mero de Grupo:</b> <TMPL_VAR NAME="biblioitemnumber"> <br>
-          <b>N&uacute;mero de Biblioteca:</b> <TMPL_VAR NAME="biblionumber"> <br>
-
-
-
-</b></b></font>
-</form></TD>
-</tr>
-</table>
-
-</TMPL_LOOP>
-
-</center><p><center>
+	href="/cgi-bin/koha/bookcount.pl?&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;itm=<!-- TMPL_VAR NAME="itemnumber" -->">Total de pr&eacute;stamos:</a></b> <!-- TMPL_VAR NAME="issues" --><br>
+	<b>N&uacute;mero de Grupo:</b> <!-- TMPL_VAR NAME="biblioitemnumber" --> <br>
+	<b>N&uacute;mero de libro:</b> <!-- TMPL_VAR NAME="biblionumber" --> <br>
+	</h2>
+</div>
+</form>
+<!-- /TMPL_LOOP -->
 
+<p>
+</form>
 </center>
 
-<TMPL_INCLUDE NAME="cat-bottom.inc">
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: es/catalogue/searchresults.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/Attic/searchresults.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/catalogue/searchresults.tmpl	3 Jun 2003 21:41:14 -0000	1.2
+++ es/catalogue/searchresults.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,83 +1,106 @@
-<TMPL_IF NAME="opac">
-	<TMPL_INCLUDE NAME="opac-top.inc">
-<TMPL_ELSE>
-	<TMPL_INCLUDE NAME="cat-top.inc">
-</TMPL_IF>
-<center>
-  <TMPL_IF NAME=searchdesc> Usted Busc&oacute; <b></b> <TMPL_ELSE> Usted no especific&oacute; 
-  ning&uacute;n criterio de b&uacute;squeda<br>
-  </TMPL_IF> <TMPL_VAR NAME=numrecords> resultados encontrados 
-  <p>
+<!-- TMPL_IF NAME="opac" -->
+	<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<!-- TMPL_ELSE -->
+	<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<!-- /TMPL_IF -->
+<div id="mainbloc">
+
+<h1 class="catalogue">Resultados de la B&uacute;squeda</h1>
+<p><!-- TMPL_IF NAME="searchdesc" -->
+	Usted busc&oacute; <b><!-- TMPL_VAR NAME="searchdesc" --></b>
+<!-- TMPL_ELSE -->
+	No especific&oacute; ning&uacute;n criterio de b&uacute;squeda<br>
+<!-- /TMPL_IF --></p>
+
+<p><!-- TMPL_VAR NAME="numrecords" --> resultados encontrados</p>
+<div id="resultnumber">
 <!-- Row of numbers corresponding to search result pages -->
-<TMPL_IF NAME=displayprev>
-	<a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=<TMPL_VAR name="themelang">/images/numbers/prev.gif border=0></a>
-<TMPL_ELSE>
-	<img src=<TMPL_VAR name="themelang">/images/numbers/placeholder.gif border=0>
-</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=search.pl?startfrom=<TMPL_VAR NAME=startfrom>&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>&</TMPL_LOOP>type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><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=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>><img src=<TMPL_VAR name="themelang">/images/numbers/next.gif border=0></a>
-<TMPL_ELSE>
-	<img src=<TMPL_VAR name="themelang">/images/numbers/placeholder.gif border=0>
-</TMPL_IF>
+<!-- TMPL_IF NAME="displayprev" -->
+	<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0"></a>
+<!-- TMPL_ELSE -->
+	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
+<!-- /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="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->"><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="search.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
+<!-- TMPL_ELSE -->
+	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
+<!-- /TMPL_IF -->
+</div>
 
-<p>
+<div id="resultlist">
 <!-- Search Results Table -->
-<TMPL_IF NAME=numrecords>
-<table border=0 cellspacing=0 cellpadding=2 width=90%>
-<tr <TMPL_IF NAME="opac">bgcolor=#99cccc background=<TMPL_VAR name="themelang">/images/background-opac.gif<TMPL_ELSE> background="<TMPL_VAR name="themelang">/images/background-mem.gif"</TMPL_IF>>
-	  <th align=left>T&iacute;tulo</th>
-      <th align=left>Autor</th>
-      <th>&copy;</th>
-      <th>Cantidad de Items</th>
-      <th>Ubicaci&oacute;n</th>
-	<TMPL_IF NAME="opac">
-	<TMPL_ELSE>
-	<th>&nbsp;</th>
-	</TMPL_IF>
+<!-- TMPL_IF NAME="numrecords" -->
+<table>
+		<tr>
+	<th class="catalogue">T&iacute;tulo</th><th class="catalogue">Autor</th><th class="catalogue">&copy;</th><th class="catalogue">Cantidad de Ejemplares</th><th class="catalogue">Ubicaci&oacute;n</th><th class="catalogue">&nbsp;</th>
+	<!-- /TMPL_IF -->
 </tr>
 <!-- Actual Search Results -->
-<TMPL_LOOP NAME=SEARCH_RESULTS>
+<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
 	<tr>
-		<td><a href=/cgi-bin/koha/<TMPL_VAR name="script">?type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>&bib=<TMPL_VAR NAME=biblionumber ESCAPE=URL>><TMPL_VAR NAME=title></a></td>
-		<td><a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR NAME=authorhtmlescaped>&type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>><TMPL_VAR NAME=author></a></td>
-		<td align=center> <TMPL_VAR NAME=copyrightdate> </td>
-		<td align=center> <TMPL_VAR NAME=itemcount> </td>
-		<td> <TMPL_VAR NAME=location> </td>
-		<TMPL_IF NAME="opac">
-		<TMPL_ELSE>
-			
-      <td> <a href=/cgi-bin/koha/request.pl?bib=<TMPL_VAR NAME="biblionumber">>Solicitar</a></td>
-		</TMPL_IF>
-	</tr>
-</TMPL_LOOP>
-
-<tr <TMPL_IF NAME="opac">bgcolor=#99cccc background=<TMPL_VAR name="themelang">/images/background-opac.gif<TMPL_ELSE>bgcolor=#ccccff background="<TMPL_VAR name="themelang">/images/background-mem.gif"</TMPL_IF>>
-	<td colspan=6>
-		<table border=0 cellpadding=0 cellspacing=0 width=100%">
-			<tr <TMPL_IF NAME="opac">bgcolor=#99cccc background=<TMPL_VAR name="themelang">/images/background-opac.gif<TMPL_ELSE>bgcolor=#ccccff background="<TMPL_VAR name="themelang">/images/background-mem.gif"</TMPL_IF>>
-			<td align=left> <TMPL_IF NAME=displayprev> <a href=search.pl?startfrom=<TMPL_VAR NAME="prevstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>>Registros
-              anteriores </a> <TMPL_ELSE> &nbsp; </TMPL_IF> </td>
-			<td align=right> <TMPL_IF NAME=displaynext> <a href=search.pl?startfrom=<TMPL_VAR NAME="nextstartfrom">&<TMPL_LOOP NAME=FORMINPUTS><TMPL_VAR NAME=term>=<TMPL_VAR name="value" ESCAPE=URL>&</TMPL_LOOP>type=<TMPL_IF NAME="opac">opac<TMPL_ELSE>intra</TMPL_IF>>Registros
-              siguientes </a> <TMPL_ELSE> &nbsp; </TMPL_IF> </td>
-			</tr>
-		</table>
+			<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
+				<a href="/cgi-bin/koha/<!-- TMPL_VAR NAME="script" -->?type=intra&amp;bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
+					<!-- TMPL_VAR NAME="title" -->
+				</a>
 	</td>
-</tr>
+			<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
+				<a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME="authorhtmlescaped" -->&amp;type=intra">
+					<!-- TMPL_VAR NAME="author" -->
+				</a>
+			</td>
+		<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->> <!-- TMPL_VAR NAME="copyrightdate" --> </td>
+		<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->> <!-- TMPL_VAR NAME="itemcount" --> </td>
+		<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
+		<!-- TMPL_IF NAME=use-location-flags-p -->
+		<!-- TMPL_IF NAME=location-only --><!-- TMPL_VAR NAME=location-only --><br><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME=not-available-p -->No Disponible<!-- TMPL_IF NAME=not-available-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME=lost-p -->Ejemplar perdido<!-- TMPL_IF NAME=lost-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME=withdrawn-p -->Retirado<!-- TMPL_IF NAME=withdrawn-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME=on-loan-p -->Prestado<!-- TMPL_IF NAME=on-loan-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
+		<!-- TMPL_ELSE -->
+		<!-- TMPL_VAR NAME="location" -->
+		<!-- /TMPL_IF -->
+		</td>
+		<!-- TMPL_IF NAME="opac" -->
+		<!-- TMPL_ELSE -->
+			<!-- TMPL_UNLESS name="norequests" -->
+				<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->> <a class="button catalogue" href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Reserva</a></td>
+			<!-- TMPL_ELSE -->
+				<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>No Reservable</td>
+			<!-- /TMPL_UNLESS -->
+		<!-- /TMPL_IF -->
+	</tr>
+<!-- /TMPL_LOOP -->
 </table>
 
-<br>
-  Resultados <TMPL_VAR NAME="startfrom"> hasta<TMPL_VAR NAME="endat"> de<TMPL_VAR NAME="numrecords"> 
-  registros. 
-  <hr>
-  Intente otra <a href=/cgi-bin/koha/catalogue-home.pl>b&uacute;squeda</a> <TMPL_ELSE> 
-  Intente otra <a href=/cgi-bin/koha/catalogue-home.pl>b&uacute;squeda</a> </TMPL_IF> 
-  <TMPL_IF NAME="opac"> <TMPL_INCLUDE NAME="opac-bottom.inc"> <TMPL_ELSE> <TMPL_INCLUDE NAME="cat-bottom.inc"> 
-  </TMPL_IF> 
-</center>
+
+<p>				<!-- TMPL_IF NAME="displayprev" -->
+				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->">Registros Anteriores</a>
+				<!-- TMPL_ELSE -->
+				&nbsp;
+				<!-- /TMPL_IF -->
+
+				<!-- TMPL_IF NAME="displaynext" -->
+				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->">Pr&oacute;ximos Registros</a>
+				<!-- TMPL_ELSE -->
+				&nbsp;
+				<!-- /TMPL_IF --></p>
+
+
+
+<p>Resultados <b><!-- TMPL_VAR NAME="startfrom" --></b> hasta <b><!-- TMPL_VAR NAME="endat" --></b> de <b><!-- TMPL_VAR NAME="numrecords" --></b> registros.</p>
+
+
+<p>Pruebe otra <a href="/cgi-bin/koha/catalogue-home.pl">b&uacute;squeda</a></p>
+
+
+</div>
+
+    <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: es/catalogue/subject.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/catalogue/Attic/subject.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/catalogue/subject.tmpl	3 Jun 2003 21:41:14 -0000	1.2
+++ es/catalogue/subject.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,39 +1,25 @@
-<TMPL_IF NAME="opac">
-    <TMPL_INCLUDE NAME="opac-top.inc">
-<TMPL_ELSE>
-    <TMPL_INCLUDE NAME="cat-top.inc">
-</TMPL_IF>
-
-<center>
-
-<table border=0 cellspacing=0 cellpadding=2>
-<tr ><TMPL_IF NAME="opac">bgcolor=#99cccc background=/images/background-opac.gif<TMPL_ELSE> background="/images/background-mem.gif"</TMPL_IF>>
-      <th>Tema</th>
-    </tr>
-<TMPL_LOOP NAME=SEARCH_RESULTS>
-  <tr>
-  <td><a href=/cgi-bin/koha/search.pl?type=<TMPL_IF NAME=opac>opac<TMPL_ELSE>intra</TMPL_IF>&subjectitems=<TMPL_VAR NAME=subject2 ESCAPE=HTML>><TMPL_VAR NAME=subject></a></td>
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+
+<div id="mainbloc">
+
+<h1 class="catalogue">Resultados de b&uacute;squeda de serie</h1>
+
+<div id="resultnumber"><p>Resultados <b><!-- TMPL_VAR NAME="startfrom" --></b> hasta <b><!-- TMPL_VAR NAME="endat" --> de <!-- TMPL_VAR NAME="numrecords" --></b> registros.<br></p></div>
+
+<table>
+<tr>
+		<th class="catalogue">Encabezados de Tema</th>
   </tr>
-</TMPL_LOOP>
-<tr ><TMPL_IF NAME="opac">bgcolor=#99cccc background=/images/background-opac.gif<TMPL_ELSE> background="/images/background-mem.gif"</TMPL_IF>><td colspan=4>
-    <table border=0 cellpadding=0 cellspacing=0 width=100%>
+<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
     <tr>
-            <td align=left> <a href=search.pl?><TMPL_LOOP name=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>startfrom=<TMPL_VAR NAME="prevstartfrom">>Registros 
-              Anteriores </a> </td>
-            <td align=right> <a href=search.pl?><TMPL_LOOP name=FORMINPUTS><TMPL_VAR NAME=line>&</TMPL_LOOP>startfrom=<TMPL_VAR NAME="nextstartfrom">>Registros 
-              Siguientes </a> </td>
+		<td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
+			<a href="/cgi-bin/koha/search.pl?type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&amp;subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=HTML -->"><!-- TMPL_VAR NAME="subject" --></a>
+		</td>
           </tr>
-    </table>
-</td></tr>
+<!-- /TMPL_LOOP -->
 </table>
-<br>
-  Resultados<TMPL_VAR NAME="startfrom"> hasta<TMPL_VAR NAME="endat"> de<TMPL_VAR NAME="numrecords"> 
-  registros. 
-  <hr>
-
-<TMPL_IF NAME="opac">
-    <TMPL_INCLUDE NAME="opac-bottom.inc">
-<TMPL_ELSE>
-    <TMPL_INCLUDE NAME="cat-bottom.inc">
-</TMPL_IF>
-</center>
+<p><a  class="button catalogue" href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Registros A$nteriorres</a> <a class="button catalogue" href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Registros Siguientes</a></p>
+
+</div>
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
+

Index: es/circ/branchtransfers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/circ/Attic/branchtransfers.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/circ/branchtransfers.tmpl	3 Jun 2003 22:04:40 -0000	1.1
+++ es/circ/branchtransfers.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,165 +1,139 @@
-<TMPL_INCLUDE NAME="circulation-top.inc">
+<!-- TMPL_INCLUDE Name="circulation-top.inc" -->
+<div id="mainbloc">
+
+<h1 class="circulation">Circulaci&oacute;n: Transferencias</h1>
+<b>Sede:</b> <!-- TMPL_VAR NAME="genbrname" -->, <b>Impresora:</b> <!-- TMPL_VAR NAME="genprname" --> <a href="selectbranchprinter.pl" class="button circulation">Cambiar configuraci&oacute;n</a>
+<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
+<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
+
+<!-- TMPL_IF Name="found" -->
+	<table>
+	<tr><th class="circulation">Reserva encontrada</th></tr>
+	<tr><td>
+	<!-- TMPL_IF Name="reserved" -->
+			Reservado: Reserva encontrada para <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow(this,'Member', 480, 640); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF Name="waiting" --> Ejemplar marcado como Esperando:<br>
+    Est&aacute; marcado como esperando en <!-- TMPL_VAR NAME="branchname" --> por <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow(this,'Member', 480, 640); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).<br><!-- /TMPL_IF -->
 
-<table align=right><tr><td>
-<a href=circulation.pl>
-<img src="<TMPL_VAR name="themelang">/images/button-issues.gif" width="99" height="42" border="0" alt="Pr&oacute;ximo Usuario"></a> &nbsp
-<a href=returns.pl>
-<img src="<TMPL_VAR name="themelang">/images/button-returns.gif" width="110" height="42" border="0" alt="Devoluciones"></a>
-</td></tr></table>
-
-<FONT SIZE=6><em>Circulaci&oacute;n: Transferencias</em></FONT><br>
-<b>Branch:</b> <TMPL_VAR Name="genbrname"> &nbsp
-<b>Printer:</b> <TMPL_VAR Name="genprname"><br>
-<a href=selectbranchprinter.pl>Cambiar Configuraci&oacute;n</a>
-<input type=hidden name=branch value=<TMPL_VAR Name="branch">>
-<input type=hidden name=printer value=<TMPL_VAR Name="printer">>
 <p>
 
-<TMPL_IF Name="found">
-	<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-	<tr><th background="<TMPL_VAR name="themelang">/images/background-mem.gif"><font>Reserva Encontrada</font></th></tr>
-	<tr><td> <font color='red' size='+2'>
-		<TMPL_IF Name="reserved">Reservado:</font> reserva encontrada para <TMPL_VAR Name="name"> (<a href=/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum"> onClick="openWindow(this,'Member', 480, 640)"><TMPL_VAR Name="borcnum"></a>).</TMPL_IF>
-		<TMPL_IF Name="waiting"> Item marked Waiting:<br>
-    El Item esta esperando en <TMPL_VAR Name="branchname"> por <TMPL_VAR Name="name"> (<a href=/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum"> onClick="openWindow(this,'Member', 480, 640)"><TMPL_VAR Name="borcnum"></a>).<br></TMPL_IF>
-		<table border=1 cellpadding=5 cellspacing=0>
-		<tr><td>
-			<TMPL_IF Name="reserved">Marcar reserva como esperando y tranferir el libro a <b><TMPL_VAR Name="branchname"> </b>: </TMPL_IF>
-			<TMPL_IF Name="waiting">Cancelar reserva e intentar transferencia: </TMPL_IF>
-		</td>
-		<td>
-			<form method=post action='branchtransfers.pl'>
-				<TMPL_LOOP Name="trsfitemloop">
-					<input type=hidden name=bc-><TMPL_VAR Name="counter"> value=<TMPL_VAR Name="barcode">>
-					<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=hidden name=itemnumber value=<TMPL_VAR Name="itemnumber">>
-				<input type=hidden name=borrowernumber value=<TMPL_VAR Name="bornum">>
-				<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="Cancelar">
-				</TMPL_IF>
-				<TMPL_IF Name="reserved"><input type=hidden name=request value='SetWaiting'>
-					<input type=submit value="Esperando"></TMPL_IF>
-			</form>
-		</td></tr>
-		<TMPL_IF Name="reserved"><tr><td>Cancelar reserva e intentar transferencia: </td>
-			<td>
-			<form method=post action='branchtransfers.pl'>
-
-			<TMPL_LOOP Name="trsfitemloop">
-				<input type=hidden name=bc-><TMPL_VAR Name="counter"> value=<TMPL_VAR Name="barcode">>
-				<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=hidden name=biblionumber value=<TMPL_VAR Name="biblionumber">>
-			<input type=hidden name=borrowernumber value=<TMPL_VAR Name="bornum">>
-			<input type=hidden name=tobranchcd value=<TMPL_VAR Name="tobranchcd">>
-			<input type=hidden name=barcode value=<TMPL_VAR Name="barcode">>
-			<input type=hidden name=request value='KillReserved'>
-			<input type=submit value="Cancelar">
-			</form>
-		</TMPL_IF>
-		</table></td></tr>
-		<tr><td>Ignorar y volver a transferencias: </td>
-			<td>
-			<form method=post action='branchtransfers.pl'>
-			<input type=hidden name=tobranchcd value=<TMPL_VAR Name="tobranchcd">>
-			<input type=hidden name=barcode value=0>
-			<TMPL_LOOP Name="trsfitemloop">
-				<input type=hidden name=bc-><TMPL_VAR Name="counter"> value=<TMPL_VAR Name="barcode">>
-				<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="Ignorar">
-			</form>
-			</td>
-		</tr></table>
+			<form method="post" action="branchtransfers.pl"><!-- TMPL_IF Name="reserved" -->Establecer la reserva como esperando y transferir el art&iacute;culo a <b><!-- TMPL_VAR NAME="branchname" --> </b>: <!-- /TMPL_IF -->
+			<!-- TMPL_IF Name="waiting" --><strong>Cancelar reserva e intentar transferencia:</strong> <!-- /TMPL_IF -->
+				<!-- TMPL_LOOP Name="trsfitemloop" -->
+					<input type="hidden" name="bc-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+					<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="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
+				<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->">
+				<!-- 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="Cancelar" class="button circulation">
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting">
+					<input type="submit" value="Esperando" class="button circulation"><!-- /TMPL_IF -->
+			</form></p>
+
+		<!-- TMPL_IF Name="reserved" --><p>
+			<form method="post" action="branchtransfers.pl">
+<strong>Cancelar reserva e intentar transferencia:</strong>
+			<!-- TMPL_LOOP Name="trsfitemloop" -->
+				<input type="hidden" name="bc-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+				<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="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->">
+			<input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR NAME="tobranchcd" -->">
+			<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
+			<input type="hidden" name="request" value="KillReserved">
+			<input type="submit" value="Cancelar" class="button circulation">
+			</form></p>
+		<!-- /TMPL_IF -->
+<p>
+			<form method="post" action="branchtransfers.pl"><strong>Ignorar y volver a Transferencias:</strong> 
+			<input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR NAME="tobranchcd" -->">
+			<input type="hidden" name="barcode" value="0">
+			<!-- TMPL_LOOP Name="trsfitemloop" -->
+				<input type="hidden" name="bc-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+				<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="Ignorar" class="button circulation">
+			</form></p>
 
+	</td></tr></table>
 
-<TMPL_ELSE>
-	<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-	<tr>
-    <th background="<TMPL_VAR name="themelang">/images/background-mem.gif"><font>Mensajes</font></th>
-  </tr>
+<!-- TMPL_ELSE -->
+		<!-- TMPL_IF NAME="allmessages" -->
+	<table>
+	<tr><th class="circulation">Mensajes</th></tr>
 	<tr><td>
-	<TMPL_IF Name="reqmessage">
-		<TMPL_IF Name="cancelled">
+	<!-- TMPL_IF Name="reqmessage" -->
+		<!-- TMPL_IF Name="cancelled" -->
 			Reserva Cancelada<br>
-		</TMPL_IF>
-		<TMPL_IF Name="setwaiting">
-			El Item deber&iacute;a estar ahora esperando en la Biblioteca: <TMPL_VAR Name="reqbrchname"><br>
-		</TMPL_IF>
-	</TMPL_IF>
-	<TMPL_LOOP Name="errmsgloop">
-		<font color='red' size='+2'>
-		<TMPL_IF Name="errbadcode">
-			No hay un Item con c&oacute;digo: <TMPL_VAR Name="msg">
-		</TMPL_IF>
-		<TMPL_IF Name="errispermanent">
-			Por favor regrese el item a la biblioteca de origen: <TMPL_VAR Name="msg">
-		</TMPL_IF>
-		<TMPL_IF Name="errdesteqholding">
-			El Item ya se encuentran en la biblioteca de destino.
-		</TMPL_IF>
-		<TMPL_IF Name="errwasreturned">
-			El Item estaba prestado a <a href=/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum">
-onClick="openWindow(this,'Member', 480, 640)"><TMPL_VAR Name="borcnum"></a>
-<TMPL_VAR Name="name"> y ha sido devuelto.
-		</TMPL_IF>
-		</font>
-		<BR>
-	</TMPL_LOOP>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF Name="setwaiting" -->
+			El ejemplar deber&iacute;a estar ahora esperando en la sede: <!-- TMPL_VAR NAME="reqbrchname" --><br>
+		<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
+	<!-- TMPL_LOOP Name="errmsgloop" -->
+				<!-- TMPL_IF Name="errbadcode" -->
+			No hay un Ejemplar con c&oacute;digo de barras: <!-- TMPL_VAR NAME="msg" -->
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF Name="errispermanent" -->
+			Por favor, devuelva el art&iacute;culo a la sede propietaria: <!-- TMPL_VAR NAME="msg" -->
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF Name="errdesteqholding" -->
+			El ejemplar ya se encuentra en la sede de destino.
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF Name="errwasreturned" -->
+			El ejemplar estaba prestado a <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"
+onclick="openWindow(this,'Member', 480, 640); return false;"><!-- TMPL_VAR NAME="borcnum" --></a> <!-- TMPL_VAR NAME="name" --> y ha sido devuelto.
+		<!-- /TMPL_IF -->
+	<!-- /TMPL_LOOP -->&nbsp;
 	</td></tr></table>
-	<img src="<TMPL_VAR name="themelang">/images/holder.gif" width=24 height=24>
-	<form method=post action=/cgi-bin/koha/circ/branchtransfers.pl>
-	<table border=1 cellpadding=5 cellspacing=0 align=left>
-	<tr><td colspan=2 align=center background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-	<font color=black><b>Seleccione una Biblioteca</b></font></td></tr>
-	<tr><td>Biblioteca de Destino:</td>
-		<td><select name=tobranchcd>
-			<TMPL_LOOP Name="branchoptionloop">
-				<option value=<TMPL_VAR Name="code"> <TMPL_VAR Name="selected">><TMPL_VAR Name="name"> <br>
-			</TMPL_LOOP>
-		</select></td></tr></table>
-
-	<img src="<TMPL_VAR name="themelang">/images/holder.gif" width=24 height=50 align=left>
-
-	<table border=1 cellpadding=5 cellspacing=0 ><tr>
-	<td colspan=2 align=center background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-	<font color=black><b>Ingrese c&oacute;digo del Libro</b></font></td></tr>
-	<tr><td>C&oacute;digo del Item:</td><td><input name=barcode size=10></td></tr>
-	</table>
-	<input type=hidden name=tobranchcd value=<TMPL_VAR Name="tobrancd">>
-
-	<TMPL_LOOP Name="trsfitemloop">
-		<input type=hidden name=bc-><TMPL_VAR Name="counter"> value=<TMPL_VAR Name="barcode">>
-		<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>
+<!-- /TMPL_IF -->
+	<form method="post" action="/cgi-bin/koha/circ/branchtransfers.pl">
+	<p><b>Seleccionar Sede de Destino: </b><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></p>
+
+	<p><b>Introduzca C&oacute;digo de barras del ejemplar:</b> C&oacute;digo de barras del ejemplar: <input name="barcode" size="10">
+	<input type="hidden" name="tobranchcd" value=<!-- TMPL_VAR NAME="tobrancd" -->>
+
+	<!-- TMPL_LOOP Name="trsfitemloop" -->
+		<input type="hidden" name="bc-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+		<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 --></p>
 
 	</form>
-	<TMPL_IF Name="transferred">
+	<!-- TMPL_IF Name="trsfitemloop" -->
 		<p>
-		<table border=1 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-		<tr><th colspan=6  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><font color=black>Transfered Items</font></th></tr>
-		<tr><th>C&oacute;digo</th><th>T&iacute;tulo</th><th>Autor</th><th>Type</th><th>Desde</th><th>Hasta</th></tr>
-		<TMPL_LOOP Name="trsfitemloop">
-			<tr><td bgcolor=<TMPL_VAR Name="color"> align=center>
-			<a href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionumber">
-			&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\"><TMPL_VAR Name="barcode"></a></td>
-			<td bgcolor=<TMPL_VAR Name="color">><TMPL_VAR Name="title"></td>
-			<td bgcolor=<TMPL_VAR Name="color">><TMPL_VAR Name="author"></td>
-			<td bgcolor=<TMPL_VAR Name="color"> align=center><TMPL_VAR Name="itemtype"></td>
-			<td bgcolor=<TMPL_VAR Name="color"> align=center><TMPL_VAR Name="frbrname"></td>
-			<td bgcolor=<TMPL_VAR Name="color"> align=center><TMPL_VAR Name="tobrname"></td>
+		<table border="1" cellpadding="5" cellspacing="0">
+		<tr><th colspan="6" class="circulation">Art&iacaute;culos transferidos</th></tr>
+		<tr><th class="circulation">C&oacute;digo de barras</th><th class="circulation">T&iacute;tulo</th><th class="circulation">Autor</th><th class="circulation">Tipo</th><th class="circulation">Desde</th><th class="circulation">A</th></tr>
+		<!-- TMPL_LOOP Name="trsfitemloop" -->
+			<!-- TMPL_IF NAME="color" --><tr class="hilighted"><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --><td align="center">
+			<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></td>
+			<td><!-- TMPL_VAR NAME="title" --></td>
+			<td><!-- TMPL_VAR NAME="author" --></td>
+			<td align="center"><!-- TMPL_VAR NAME="itemtype" --></td>
+			<td align="center"><!-- TMPL_VAR NAME="frbrname" --></td>
+			<td align="center"><!-- TMPL_VAR NAME="tobrname" --></td>
 			</tr>
-		</TMPL_LOOP>
+		<!-- /TMPL_LOOP -->
 		</table>
-	</TMPL_IF>
-</TMPL_IF>
-
+	<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+<div class="bloc25">
+<a class="button circulation" href="circulation.pl"> Pr&eacute;stamos</a> <a class="button circulation" href="returns.pl"> Devoluciones</a>
+</div>
 
-<TMPL_INCLUDE Name="circulation-bottom.inc">
+</div>
+<!-- TMPL_INCLUDE Name="circulation-bottom.inc" -->

Index: es/circ/circulation.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/circ/Attic/circulation.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/circ/circulation.tmpl	3 Jun 2003 22:04:40 -0000	1.1
+++ es/circ/circulation.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,250 +1,320 @@
-<TMPL_INCLUDE NAME="circulation-top.inc">
+<!-- TMPL_INCLUDE NAME="circulation-top.inc" -->
+ <div id="mainbloc">
+	<h1 class="circulation">Circulaci&oacute;n: Pr&eacute;stamos</h1>
 
-<TMPL_IF name="borrowernumber">
-	<table align="right">
-		<tr>
-			<td>
-				<a href=circulation.pl?borrnumber=<TMPL_VAR name="borrowernumber">&branch=<TMPL_VAR name="branch">&printer=<TMPL_VAR name="printer">&print=yes>
-				<img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png" border="0" alt="Pr&oacute;ximo Usuario"></a> &nbsp;
-				<a href=returns.pl>
-				<img src="<TMPL_VAR name="themelang">/images/button-returns.gif" width="110" height="42" border="0" alt="Devoluciones"></a>
-				&nbsp;<a href=branchtransfers.pl><img src="<TMPL_VAR name="themelang">/images/button-transfers.gif" width="127" height="42" border="0" alt="Transferencias"></a>
-			</td>
-		</tr>
-	</table>
-	<FONT SIZE=6><em>Circulaci&oacute;n: Pr&eacute;stamos</em></FONT><br>
-	<b>Biblioteca:</b> <TMPL_VAR name="branchname">&nbsp;
-	<b>Impresora:</b> <TMPL_VAR name="printername"><br>
-	<a href=selectbranchprinter.pl>Cambiar Configuraci&oacute;n</a>
-	<input type=hidden name=branch value=<TMPL_VAR name="branch">>
-	<input type=hidden name=printer value=<TMPL_VAR name="printer">>
-	<p>
-<TMPL_ELSE>
-	<table align="right">
-		<tr>
-			<td>
-				<a href=returns.pl>
-				<img src="<TMPL_VAR name="themelang">/images/button-returns.gif" width="110" height="42" border="0" alt="Devoluciones"></a>
-				&nbsp<a href=branchtransfers.pl><img src="<TMPL_VAR name="themelang">/images/button-transfers.gif" width="127" height="42" border="0" alt="Transferencias"></a>
-			</td>
-		</tr>
-	</table>
+<!--
 	
-<FONT SIZE=6><em>Circulaci&oacute;n: Pr&eacute;stamos</em></FONT><br>
-	<b>Biblioteca:</b> <TMPL_VAR name="branchname"> &nbsp;
-	<b>Impresora:</b> <TMPL_VAR name="printername"><br>
-	<a href=selectbranchprinter.pl>Cambiar Configuraci&oacute;n</a>
-	<input type=hidden name=branch value=<TMPL_VAR name="branch">>
-	<input type=hidden name=printer value=<TMPL_VAR name="printer">>
-	<p>
-</TMPL_IF>
-
-<TMPL_IF name="question">
-	<table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
-		<tr>
+ INITIAL BLOC : PARAMETERS & BORROWER INFO
 			
-    <th background="<TMPL_VAR name="themelang">/images/background-mem.gif"> <font size=+2 color=red><b>Consulta 
-      de Pr&eacute;stamo</b></font> </th>
-		</tr>
-		<tr>
-			<td>
-				<table border=0 cellpadding=10>
-					<tr>
+-->
+	<div id="bloc25">
+		<h2 class="circulation">Par&aacute;metros</h2>
+		<p>
+			<b>Sede:</b> <!-- TMPL_VAR NAME="branchname" -->, <b>Impresora:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Cambiar configuraci&oacute;n</a>
+		</p>
 						
-          <td> Intentando prestar<TMPL_VAR name="title"> por <TMPL_VAR name="author"> 
-            a <TMPL_VAR name="firstname"> <TMPL_VAR name="surname">. 
-            <p><TMPL_VAR name="question">
-						</td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-		<tr>
-			<td align=center>
-				<table border=0>
-					<tr>
-						<td>
-							<form method=get>
-							<input type=hidden name=borrnumber value=<TMPL_VAR name="borrowernumber">>
-							<input type=hidden name=barcode value=<TMPL_VAR name="barcode">>
-							<input type=hidden name=questionnumber value=<TMPL_VAR name="questionnumber">>
-							<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=stickyduedate value=<TMPL_VAR name="stickyduedate">>
-							<input type=hidden name=branch value=<TMPL_VAR name="branch">>
-							<input type=hidden name=printer value=<TMPL_VAR name="printer">>
-							<TMPL_VAR name="responsesform">
-							<input type=hidden name=answer value=Y>
-							<input type=submit value=Si>
+	<!-- TMPL_IF NAME="message" -->
+		<h2 class="circulation">Mensajes</h2>
+			<p>No hay usuario que corresponda a <!-- TMPL_VAR NAME="message" --></p>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="CGIselectborrower" -->
+		<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
+		<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
+		<h2 class="circulation">Seleccionar un usuario</h2>
+		<!-- TMPL_VAR NAME="CGIselectborrower" -->
+		<input type="submit" value="ACEPTAR" class="button circulation">
+	<!-- TMPL_ELSE -->
+		<!-- TMPL_IF NAME="borrowernumber" -->
+			<h2 class="circulation">Informaci&oacute;n de usuario</h2>
+			<!--TMPL_IF Name="warndeparture"--><p class="problem"><!--TMPL_ELSE--><p><!--/TMPL_IF--><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR name="cardnumber" -->) <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" --> " class="button circulation"> detalle </a> <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ" class="button circulation">editar</a>
+			<!--TMPL_IF Name="warndeparture"--><br /> El usuario caducar&aacute; pronto<br /><!--/TMPL_IF-->
+			<!-- TMPL_IF NAME="patronimages" -->
+				<div class="bloc25">
+					<img src="/patronimages/<!-- TMPL_VAR NAME="cardnumber" -->.<!-- TMPL_VAR NAME="patronimages" -->" alt="SIN IMAGEN" border="0">
+				</div>
+			<!-- /TMPL_IF -->
+			</p>
+			<p>
+				<!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" -->
+			</p>
+			<p>
+				<!-- TMPL_VAR NAME="phone" -->
+			</p>
+			<p>Categor&iacute;a: <!-- TMPL_VAR NAME="categorycode" --></p>
+			<p><!-- TMPL_VAR NAME="issuecount" --> Pr&eacute;stamos<!-- TMPL_IF NAME="overduecount" -->, <!-- TMPL_VAR NAME="overduecount" --> Retraso<!-- /TMPL_IF --></p>
+			<p><b><!-- TMPL_VAR NAME="borrowernotes" --></b></p>
+  			<!-- TMPL_IF NAME="dbarred" -->
+				<span class="error">Excluido:</span> El patr&oacute;n esta excluido 
+				<form 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="button circulation" value="Levantar la exclusi&oacute;n">
 							</form>
-						</td>
-						<td>
-							<form method=get>
-							<input type=hidden name=borrnumber value=<TMPL_VAR name="borrowernumber">>
-							<input type=hidden name=barcode value=<TMPL_VAR name="barcode">>
-							<input type=hidden name=questionnumber value=<TMPL_VAR name="questionnumber">>
-							<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=stickyduedate value=<TMPL_VAR name="stickyduedate">>
-							<input type=hidden name=branch value=<TMPL_VAR name="branch">>
-							<input type=hidden name=printer value=<TMPL_VAR name="printer">>
-							<TMPL_VAR name="responsesform">
-							<input type=hidden name=answer value=N>
-							<input type=submit value=No>
+			<!-- /TMPL_IF -->
+		<!-- TMPL_ELSE -->
+				<h2 class="circulation">
+					Inserte N&uacute;mero de carnet del usuario o parte de su apellidos
+				</h2>
+				<form method="post" name="f" action="/cgi-bin/koha/circ/circulation.pl">
+					<input name="findborrower">
+					<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
+					<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
+					<input type="submit" value="ACEPTAR" class="button circulation">
 							</form>
-						</td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-	</table>
+		<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
+	</div>
+
+<!--
+	BARCODE ENTRY
+-->
+
+<!-- TMPL_IF NAME="borrowernumber" -->
+	<div id="bloc25">
+	<form method="post" name="f" action="/cgi-bin/koha/circ/circulation.pl">
+		<h2 class="circulation">Inserte el C&oacute;digo de Barras del ejemplar</h2>
+		<p>C&oacute;digo de barras del ejemplar:<input name="barcode" size="10"> <input type="submit" value="Pr&eacute;stamo" class="button circulation"></p>
+		<p>
+			<select name="day">
+				<option value="0">D&iacute;a</option>
+				<option value="01"<!-- TMPL_IF NAME="day1" --> selected="selected"<!-- /TMPL_IF -->>1</option>
+				<option value="02"<!-- TMPL_IF NAME="day2" --> selected="selected"<!-- /TMPL_IF -->>2</option>
+				<option value="03"<!-- TMPL_IF NAME="day3" --> selected="selected"<!-- /TMPL_IF -->>3</option>
+				<option value="04"<!-- TMPL_IF NAME="day4" --> selected="selected"<!-- /TMPL_IF -->>4</option>
+				<option value="05"<!-- TMPL_IF NAME="day5" --> selected="selected"<!-- /TMPL_IF -->>5</option>
+				<option value="06"<!-- TMPL_IF NAME="day6" --> selected="selected"<!-- /TMPL_IF -->>6</option>
+				<option value="07"<!-- TMPL_IF NAME="day7" --> selected="selected"<!-- /TMPL_IF -->>7</option>
+				<option value="08"<!-- TMPL_IF NAME="day8" --> selected="selected"<!-- /TMPL_IF -->>8</option>
+				<option value="09"<!-- TMPL_IF NAME="day9" --> selected="selected"<!-- /TMPL_IF -->>9</option>
+				<option value="10"<!-- TMPL_IF NAME="day10" --> selected="selected"<!-- /TMPL_IF -->>10</option>
+				<option value="11"<!-- TMPL_IF NAME="day11" --> selected="selected"<!-- /TMPL_IF -->>11</option>
+				<option value="12"<!-- TMPL_IF NAME="day12" --> selected="selected"<!-- /TMPL_IF -->>12</option>
+				<option value="13"<!-- TMPL_IF NAME="day13" --> selected="selected"<!-- /TMPL_IF -->>13</option>
+				<option value="14"<!-- TMPL_IF NAME="day14" --> selected="selected"<!-- /TMPL_IF -->>14</option>
+				<option value="15"<!-- TMPL_IF NAME="day15" --> selected="selected"<!-- /TMPL_IF -->>15</option>
+				<option value="16"<!-- TMPL_IF NAME="day16" --> selected="selected"<!-- /TMPL_IF -->>16</option>
+				<option value="17"<!-- TMPL_IF NAME="day17" --> selected="selected"<!-- /TMPL_IF -->>17</option>
+				<option value="18"<!-- TMPL_IF NAME="day18" --> selected="selected"<!-- /TMPL_IF -->>18</option>
+				<option value="19"<!-- TMPL_IF NAME="day19" --> selected="selected"<!-- /TMPL_IF -->>19</option>
+				<option value="20"<!-- TMPL_IF NAME="day20" --> selected="selected"<!-- /TMPL_IF -->>20</option>
+				<option value="21"<!-- TMPL_IF NAME="day21" --> selected="selected"<!-- /TMPL_IF -->>21</option>
+				<option value="22"<!-- TMPL_IF NAME="day22" --> selected="selected"<!-- /TMPL_IF -->>22</option>
+				<option value="23"<!-- TMPL_IF NAME="day23" --> selected="selected"<!-- /TMPL_IF -->>23</option>
+				<option value="24"<!-- TMPL_IF NAME="day24" --> selected="selected"<!-- /TMPL_IF -->>24</option>
+				<option value="25"<!-- TMPL_IF NAME="day25" --> selected="selected"<!-- /TMPL_IF -->>25</option>
+				<option value="26"<!-- TMPL_IF NAME="day26" --> selected="selected"<!-- /TMPL_IF -->>26</option>
+				<option value="27"<!-- TMPL_IF NAME="day27" --> selected="selected"<!-- /TMPL_IF -->>27</option>
+				<option value="28"<!-- TMPL_IF NAME="day28" --> selected="selected"<!-- /TMPL_IF -->>28</option>
+				<option value="29"<!-- TMPL_IF NAME="day29" --> selected="selected"<!-- /TMPL_IF -->>29</option>
+				<option value="30"<!-- TMPL_IF NAME="day30" --> selected="selected"<!-- /TMPL_IF -->>30</option>
+				<option value="31"<!-- TMPL_IF NAME="day31" --> selected="selected"<!-- /TMPL_IF -->>31</option>
+			</select>
+			<select name="month">
+				<option value="0">Mes</option>
+				<option value="01"<!-- TMPL_IF NAME="month1" --> selected="selected"<!-- /TMPL_IF -->>Ene</option>
+				<option value="02"<!-- TMPL_IF NAME="month2" --> selected="selected"<!-- /TMPL_IF -->>Feb</option>
+				<option value="03"<!-- TMPL_IF NAME="month3" --> selected="selected"<!-- /TMPL_IF -->>Mar</option>
+				<option value="04"<!-- TMPL_IF NAME="month4" --> selected="selected"<!-- /TMPL_IF -->>Abr</option>
+				<option value="05"<!-- TMPL_IF NAME="month5" --> selected="selected"<!-- /TMPL_IF -->>May</option>
+				<option value="06"<!-- TMPL_IF NAME="month6" --> selected="selected"<!-- /TMPL_IF -->>Jun</option>
+				<option value="07"<!-- TMPL_IF NAME="month7" --> selected="selected"<!-- /TMPL_IF -->>Jul</option>
+				<option value="08"<!-- TMPL_IF NAME="month8" --> selected="selected"<!-- /TMPL_IF -->>Ago</option>
+				<option value="09"<!-- TMPL_IF NAME="month9" --> selected="selected"<!-- /TMPL_IF -->>Sep</option>
+				<option value="10"<!-- TMPL_IF NAME="month10" --> selected="selected"<!-- /TMPL_IF -->>Oct</option>
+				<option value="11"<!-- TMPL_IF NAME="month11" --> selected="selected"<!-- /TMPL_IF -->>Nov</option>
+				<option value="12"<!-- TMPL_IF NAME="month12" --> selected="selected"<!-- /TMPL_IF -->>Dic</option>
+			</select>
+			<select name="year">
+				<option value="0">A&ntilde;o</option>
+				<option value="2004"<!-- TMPL_IF NAME="year2004" --> selected="selected"<!-- /TMPL_IF -->>2004</option>
+				<option value="2005"<!-- TMPL_IF NAME="year2005" --> selected="selected"<!-- /TMPL_IF -->>2005</option>
+				<option value="2006"<!-- TMPL_IF NAME="year2006" --> selected="selected"<!-- /TMPL_IF -->>2006</option>
+				<option value="2007"<!-- TMPL_IF NAME="year2007" --> selected="selected"<!-- /TMPL_IF -->>2007</option>
+				<option value="2008"<!-- TMPL_IF NAME="year2008" --> selected="selected"<!-- /TMPL_IF -->>2008</option>
+			</select>
+		</p>
+		<p>
+		<input type="checkbox" name="stickyduedate" <!-- TMPL_VAR NAME="selected" -->> Mantener Fecha de Devoluci&oacute;n
+		<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
+		<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
+		<input type="hidden" name="print" value="maybe">
+		<!-- TMPL_IF NAME="CHARGES" -->
+			<input type="hidden" name="charges" value="yes">
+			<input type="hidden" name="oldamount" value="<!-- TMPL_VAR NAME="amountold" -->">
+		<!-- /TMPL_IF -->
+		</p>
+	</form>
+	</div>
 	
-</TMPL_IF>
 
-<TMPL_IF name="rejected">
-	<table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
-		<tr>
-    <th><font color=black size=5>Error Prestando Libro</font></th>
-  </tr>
-		<tr><td><font color=red size=5><TMPL_VAR name="rejected"></font></td></tr>
-	</table>
-	<br>
-</TMPL_IF>
 
-<TMPL_IF name="message">
-	<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-		<tr><th background="<TMPL_VAR name="themelang">/images/background-mem.gif">Mensajes</th></tr>
-		<tr><td><TMPL_VAR name="message"></td></tr>
-	</table>
-</TMPL_IF>
+<!--
+	RESULT OF ISSUING REQUEST
+-->
+	<div id="bloc25">
+		<!-- TMPL_IF NAME="IMPOSSIBLE" -->
+		<h2 class="problem">Imposible prestar</h2>
+			<!-- TMPL_IF NAME="NOTSAMEBRANCH" -->
+				<p class="problem">Est&aacute; intentando prestar un libro que no est&aacute; en tu sede.</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="INVALID_DATE" -->
+				<p class="problem">La fecha de devoluci&oacute;n es inv&aacute;lida</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
+				<p class="problem">El c&oacute;digo de barras es desconocido</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
+				<p class="problem">El ejemplar no puede prestarse</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="WTHDRAWN" -->
+				<p class="problem">Ejemplar retirado </p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="GNA" -->
+				<p class="problem">El usuario se ha ido sin direcci&oacute;n</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="CARD_LOST" -->
+				<p class="problem">El carnet del usuario se ha perdido</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="DEBARRED" -->
+				<p class="problem">El usuario esta exluido</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="NO_MORE_RENEWALS" -->
+				<p class="problem">No es posible una nueva renovaci&oacute;n</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="EXPIRED" -->
+				<p class="problem">Tarjeta de usuario caducada</p>
+			<!-- /TMPL_IF -->
+			<br/>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
+		<h2 class="problem">Necesito confirmaci&oacute;n antes de prestar</h2>
+			<!-- TMPL_IF NAME="DEBT" -->
+				<p>El usuario teiene una deuda de <!-- TMPL_VAR name="DEBT" --></p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="RENEW_ISSUE" -->
+				<p>No es un pr&eacute;stamo, sino una renovaci&oacute;n</p>
+			<!-- /TMPL_IF -->	
+			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
+				<p>Esperando reserva para <!-- TMPL_VAR NAME="RESERVE_WAITING" --></p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="RESERVED" -->
+				<p>Recibido por <!-- TMPL_VAR NAME="RESERVED" --></p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
+				<p>El ejemplar est&aacute; prestado a <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. &iquest;Devolver &amp; Prestar?</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="TOO_MANY" -->
+				<p class="problem">Demasiados pr&eacute;stamos (ya prestado / max : <!-- TMPL_VAR name="TOO_MANY" -->)</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
+			<form method="post">
+				<!-- TMPL_IF NAME="RESERVED" -->
+					<p><input type="checkbox" checked name="cancelreserve" value="1">Cancele Reserva</p>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="RESERVE_WAITING" -->
+					<p><input type="checkbox" checked name="cancelreserve" value="1">Cancele Reserva</p>
+				<!-- /TMPL_IF -->
+				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
+				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber">">
+				<input type="hidden" name="issueconfirmed" value="1">
+				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->">
+				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->">
+				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->">
+				<input type="submit" value="Confirmar pr&eacute;stamo" class="button circulation">
+				<a href="circulation.pl?borrnumber=<!-- TMPL_VAR NAME="borrowernumber" -->" class="button circulation">Confirmar pr&eacute;stamo</a>
+			</form>
+			<!-- /TMPL_UNLESS -->
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="issued" -->
+			<p>El ejemplar est&aacute; prestado</p>
+		<!-- /TMPL_IF -->
+	</div>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="CGIselectborrower">
-	<form method=post action=/cgi-bin/koha/circ/circulation.pl>
-	<input type=hidden name=branch value=<TMPL_VAR name="branch">>
-	<input type=hidden name=printer value=<TMPL_VAR name="printer">>
-	<table border=1 cellspacing=0 cellpadding=5 bgcolor="#dddddd">
-		<tr>
-			<th background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-				<font color=black><b>Seleccionar usuario</b></font>
-			</th>
-		</tr>
-		<tr>
-			<td align=center>
-				<TMPL_VAR name="CGIselectborrower">
-				<br>
 				
-        <input type=submit value="Seleccionar">
-			</td>
-		</tr>
-	</table>
-<TMPL_ELSE>
-	</form><form method=post action=/cgi-bin/koha/circ/circulation.pl>
-	<table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
-		<tr>
-			<th background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-				<font color=black><b>Ingresar Identificaci&oacute;n de Usuario<br> o parte del apellido</b></font>
-			</th>
-		</tr>
-		<tr>
+
+<!--
+SUMMARY : TODAY & PREVIOUS ISSUES
+-->
+
+<div id="bloc25">
+	<h2 class="circulation">Pr&eacute;stamos</h2>
+	<form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post">
+	<input type="hidden" value="circ" name="destination" />
+	<input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
+	<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+	<table>
+		<tr>
+			<th class="circulation">Fecha de Devoluci&oacute;n</th>
+			<th class="circulation">C&oacute;digo de barras</th>
+			<th class="circulation">T&iacute;tulo</th>
+			<th class="circulation">&iquest;Renovar?</th>
+			<th class="circulation">&iquest;Devolver?</th>
+		</tr>
+		<!-- TMPL_LOOP NAME="todayissues" -->
+		<!-- TMPL_IF NAME="togglecolor" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+			<td><!-- TMPL_VAR NAME="dd" --></td>
 			<td>
-				<input name=findborrower>
-				<input type=hidden name=branch value=<TMPL_VAR name="branch">>
-				<input type=hidden name=printer value=<TMPL_VAR name="printer">>
+				<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>
 			</td>
-		</tr>
-	</table>
-	</form>
-</TMPL_IF>
-<TMPL_IF name="borrowernumber">
-	<TMPL_VAR name="patrontable">
-	<TMPL_VAR name="flaginfotable">
-</TMPL_IF>
-
-<TMPL_IF name="borrowernumber">
-<form method=post action=/cgi-bin/koha/circ/circulation.pl>
-<table border=1 cellpadding=5>
-	<tr>
-	<td align=center valign=top>
-		<table border=0 cellspacing=0 cellpadding=5>
-			<tr>
-				<th background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-					<font color=black><b>Ingresar C&oacute;digo del Libro</b></font>
-				</th>
-			</tr>
-			<tr>
-				<td align=center>
-					<table border=0>
-						<tr>
-							<td>C&oacute;digo del Item:</td>
-							<td><input name=barcode size=10></td>
 							<td>
-                    <input type=submit value=Prestar>
-                  </td>
-						</tr>
-						<tr>
-							<td colspan=3 align=center>
-								<table border=0 cellpadding=0 cellspacing=0>
-									<tr>
+				<p><!-- TMPL_VAR NAME="title" --></p>
+				<p><!-- TMPL_VAR NAME="author" -->, <!-- TMPL_VAR NAME="itemcallnumber" --></p>
+				<p><i><!-- TMPL_VAR name="itemnotes" --></i></p>
+			</td>
+			<td><input type="checkbox" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> checked="checked"<!-- /TMPL_IF --> /></td>
+			<td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR name="barcode" -->">Devoluci&oacute;n</a></td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	
+        <!-- TMPL_LOOP NAME="previssues" -->
+		<!-- TMPL_IF NAME="togglecolor" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="od" -->
+					<td class="problem">
+						<!-- TMPL_VAR NAME="dd" -->
+					</td>
+					<td class="problem">
+						<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>
+					</td>
+					<td class="problem">
+					   <p><!-- TMPL_VAR NAME="title" --></p>
+					   <p><!-- TMPL_VAR NAME="author" -->, <!-- TMPL_VAR NAME="itemcallnumber" --></p>
+					</td>
+                    <td><input type="checkbox" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> checked="checked"<!-- /TMPL_IF --> /></td>
+                    <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR name="barcode" -->" class="button circulation">Devoluci&oacute;n</a></td>
+				<!-- TMPL_ELSE -->
 										<td>
-											<select name=day><option value=0>D&iacute;a<TMPL_VAR name="dayoptions"></select>
+						<!-- TMPL_VAR NAME="dd" -->
 										</td>
 										<td>
-											<select name=month><option value=0>Mes<TMPL_VAR name="monthoptions"></select>
+						<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>
 										</td>
 										<td>
-											<select name=year><option value=0>A&ntilde;o<TMPL_VAR name="yearoptions"></select>
-										</td>
-									</tr>
-								</table>
-								<input type=checkbox name=stickyduedate ><TMPL_VAR name="selected">> Sticky Due Date
-							</td>
-						</tr>
-					</table>
-					<input type=hidden name=borrnumber value=<TMPL_VAR name="borrowernumber">>
-					<input type=hidden name=branch value=<TMPL_VAR name="branch">>
-					<input type=hidden name=printer value=<TMPL_VAR name="printer">>
-					<input type=hidden name=print value=maybe>
-					<TMPL_IF name="CHARGES">
-						<input type=hidden name=charges value=yes>
-						<input type=hidden name=oldamount value=<TMPL_VAR name="amountold">>
-					</TMPL_IF>
-				</td>
-			</tr>
-		</table>
+					   <p><!-- TMPL_VAR NAME="title" --></p>
+					   <p><!-- TMPL_VAR NAME="author" -->, <!-- TMPL_VAR NAME="itemcallnumber" --></p>
 	</td>
+                    <td><input type="checkbox" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> checked="checked"<!-- /TMPL_IF --> /></td>
+                    <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR name="barcode" -->" class="button circulation">Devoluci&oacute;n</a></td>
+				<!-- /TMPL_IF -->
 	</tr>
-</table>
-</form>
-</TMPL_IF>
-<p clear=all><br><br>
-<TMPL_IF name="todayissues">
-<table border=1 cellpadding=5 cellspacing=0 width=80%>
-	<tr>
-		
-    <th colspan=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif"> 
-      <font color=black> <b>Pr&eacute;stamos de Hoy</b></font> </th>
-	</tr>
-	<tr>
-		<th>Due Date</th><th>C&oacute;digo</th><th>T&iacute;tulo</th><th>Autor</th><th>Clase</th>
-	</tr>
-	<TMPL_VAR name="todayissues">
-</table>
-</TMPL_IF>
+		<!-- /TMPL_LOOP -->
 
-<TMPL_IF name="previssues">
-	<table border=1 cellpadding=5 cellspacing=0 width=80%>
 		<tr>
-			
-    <th colspan=5  background="<TMPL_VAR name="themelang">/images/background-mem.gif"> 
-      <font color=black> <b>Pr&eacute;stamos Anteriores</b></font> </th>
-		</tr>
-		<tr>
-			<th>Due Date</th><th>C&oacute;digo</th><th>T&iacute;tulo</th><th>Autor</th><th>Clase</th>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td><input type="submit" value="Renovar" class="button circulation"></td>
+        <td>
 		</tr>
-		<TMPL_VAR name="previssues">
 	</table>
-</TMPL_IF>
+    </form>
+</div>
 
+</div>
+<!-- TMPL_INCLUDE NAME="circulation-bottom.inc" -->
 

Index: es/circ/returns.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/circ/Attic/returns.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/circ/returns.tmpl	3 Jun 2003 22:04:40 -0000	1.1
+++ es/circ/returns.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,237 +1,216 @@
-<TMPL_INCLUDE Name="circulation-top.inc">
+<!-- TMPL_INCLUDE Name="circulation-top.inc" -->
 
-<table align="right"><tr>
-    <td> <a href=circulation.pl> <img src="<TMPL_VAR name="themelang">/images/button-issues.gif" 
-      width="99" height="42" border="0" alt="Pr&eacute;stamos"></a> &nbsp<a href=branchtransfers.pl><img src="<TMPL_VAR name="themelang">/images/button-transfers.gif" 
-      width="127" height="42" border="0" alt="Transferencias"></a> </td>
-  </tr></table>
-<FONT SIZE=6><em>Circulaci&oacute;n: Devoluciones</em></FONT><br>
-<b>Biblioteca:</b> <TMPL_VAR Name="genbrname"> &nbsp; <b>Impresora:</b> <TMPL_VAR Name="genprname"><br>
-<a href=selectbranchprinter.pl>Cambiar Configuraci&oacute;n</a>
-<input type=hidden name=branch value=<TMPL_VAR Name="branch">>
-<input type=hidden name=printer value=<TMPL_VAR Name="printer">>
-<p>
-
-<table cellpadding=5 cellspacing=0 width=100%>
-
-<TMPL_IF Name="found">
-	<tr>
-	<td colspan=2>
-		<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-		<tr><th background="<TMPL_VAR name="themelang">/images/background-mem.gif"><font>Reserva Encontrada</font></th></tr>
-		<tr><td>
-		<TMPL_IF Name="waiting">
-			<font color='red' size='+2'>Item marcado como Esperando:</font><br>
-		Item <TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">) <br>
-	est&aacute; marcado como Esperando en <b><TMPL_VAR Name="branchname"></b> por <TMPL_VAR Name="name"> (<a href=/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum"> onClick='openWindow(this,'Member', 480, 640)'><TMPL_VAR Name="borcnum"></a>).
-			<center><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="bornum">>
-			</TMPL_LOOP>
-			<input type=hidden name=barcode value=0>
-			<input type=submit value="OK">
-			</form></center>
-		    </TMPL_IF> <TMPL_IF Name="diffbranch"> <font color='red' size='+2'>Item 
-            marcado como Esperando:</font><br>
-    Item: <TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">)<br>
- necesita ser transferido a <b><TMPL_VAR Name="branchname"></b> <br>
-para ser retirado por <TMPL_VAR Name="name"> (<a href=/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum"> onClick='openWindow(this,'Member', 480, 640)'><TMPL_VAR Name="borcnum"></a>).
-			<center><form method=post action='returns.pl'>
-			<TMPL_LOOP Name="inputloop">
-				<TMPL_UNLESS Name="first">
-					<input type=hidden name=ri-><TMPL_VAR Name="counter"> value=<TMPL_VAR Name="barcode">>
-					<input type=hidden name=dd-><TMPL_VAR Name="counter"> value=<TMPL_VAR Name="duedate">>
-					<input type=hidden name=bn-><TMPL_VAR Name="counter"> value=<TMPL_VAR Name="bornum">>
-				</TMPL_UNLESS>
-			</TMPL_LOOP>
-			<input type=hidden name=barcode value=0>
-			<input type=submit value="OK">
-			</form></center>
-		</TMPL_IF>
-		<TMPL_IF Name="reserved">
-			<font color='red' size='+2'>Reserva encontrada:</font> Item: <TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">) <a href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="itembiblionumber">&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\"><TMPL_VAR Name="itembarcode"></a> <br>
-            para<TMPL_VAR Name="name"> (<a href=/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum"> 
-            onClick='openWindow(this,'Member', 480, 640)'><TMPL_VAR Name="borcnum"></a>) 
-            para ser retirado en <b><TMPL_VAR Name="branchname"></b>. 
-            <table cellpadding=5 cellspacing=0>
-			<tr>
-                <td valign="top">Cambiar estado a Esperando e imprimir <a href="" onClick='alert(document.forms[0].resslip.value); return false'>slip</a>?: 
-                </td>
-			<td valign="top">
-			<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="bornum">>
-			</TMPL_LOOP>
-			<input type=hidden name=itemnumber value=<TMPL_VAR Name="itemnumber">>
-			<input type=hidden name=borrowernumber value=<TMPL_VAR Name="borrowernumber">>
-			<input type=hidden name=resbarcode value=<TMPL_VAR Name="barcode">>
-			<input type=hidden name=resslip value="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Date: <TMPL_VAR Name="today">
-
-ITEM RESERVADO:<TMPL_VAR Name="itemtitle"> (<TMPL_VAR Name="itemauthor">)
-c&oacute;digo: <TMPL_VAR Name="itembarcode">
-tipo: <TMPL_VAR Name="itemtype">
-RETIRAR EN: <TMPL_VAR Name="branchname">
-
-USUARIO:
-<TMPL_VAR Name="bortitle"> <TMPL_VAR Name="borfirstname"> <TMPL_VAR Name="borsurname">
-Identificaci&oacute;n: <TMPL_VAR Name="borcnum">
-Tel&eacute;fono: <TMPL_VAR Name="borphone">
-<TMPL_VAR Name="borstraddress">
-<TMPL_VAR Name="borsub">
-<TMPL_VAR Name="bortown">
-<TMPL_VAR Name="boremail">
+<div id="mainbloc">
+	<h1 class="circulation">Circulaci&oacute;n: Devoluciones</h1>
+	<p>
+		<b>Sede:</b> <!-- TMPL_VAR NAME="genbrname" -->, <b>Impresora:</b> <!-- TMPL_VAR NAME="genprname" --> <a href="selectbranchprinter.pl" class="button circulation">Cambiar configuraci&oacute;n</a>
+	</p>
+	
+	<!-- TMPL_IF Name="found" -->
+		<div id="bloc25">
+			<!-- TMPL_IF Name="waiting" -->
+				<h2 class="circulation">Ejemplar marcado como Esperando:</h2>
+			<p>El Ejemplar <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) est&aacute; marcado como esperando en <b><!-- TMPL_VAR NAME="tobranchname" --></b> por <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
+					<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="bornum" -->">
+					<!-- /TMPL_LOOP -->
+					<input type="hidden" name="barcode" value="0">
+					<input type="submit" value="ACEPTAR" class="button circulation">
+					</form>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF Name="diffbranch" -->
+				<h2 class="circulation">Ejemplar marcado como Esperando:</h2>
+				<p>
+					El Ejemplar: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) necesita ser transferido a <b><!-- TMPL_VAR NAME="tobranchname" --></b> para ser retirado por <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
+				</p>
+				<center>
+				<form name="f" method="post" action="returns.pl">
+				<!-- TMPL_LOOP Name="inputloop" -->
+					<!-- TMPL_UNLESS Name="first" -->
+						<input type="hidden" name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+						<input type="hidden" name="dd-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="duedate" -->">
+						<input type="hidden" name="bn-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
+					<!-- /TMPL_UNLESS -->
+				<!-- /TMPL_LOOP -->
+				<input type="hidden" name="barcode" value="0">
+				<input type="submit" value="ACEPTAR" class="button circulation">
+				</form>
+				</center>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF Name="reserved" -->
+				<h2 class="circulation">Reserva encontrada</h2>
+				<p>Ejemplar: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra', 'Item'); return false;"> <!-- TMPL_VAR NAME="itembarcode" --> </a> de <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false"><!-- TMPL_VAR NAME="borcnum" --></a>) para ser recogidos en <b><!-- TMPL_VAR NAME="tobranchname" --></b>.
+				</p>
+				<p>
+				Cambiar estado a en espera e imprimir<a href="" class="circulation" onclick="alert(document.forms['f'].resslip.value); return false">slip</a>?: </p>
+				<p>
+				<form method="post" action="returns.pl" name="f">
+				<!-- TMPL_LOOP Name="inputloop" -->
+					<input type="hidden" name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+					<input type="hidden" name="dd-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="duedate" -->">
+					<input type="hidden" name="bn-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
+				<!-- /TMPL_LOOP -->
+				<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
+				<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->">
+				<input type="hidden" name="resbarcode" value="<!-- TMPL_VAR NAME="barcode" -->">
+				<input type="hidden" name="resslip" value="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Date: <!-- TMPL_VAR NAME="today" -->
+	
+	ITEM RESERVED:<!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->)
+	barcode: <!-- TMPL_VAR NAME="itembarcode" -->
+	itemtype: <!-- TMPL_VAR NAME="itemtype" -->
+	COLLECT AT: <!-- TMPL_VAR NAME="tobranchname" -->
+	
+	BORROWER:
+	<!-- TMPL_VAR NAME="bortitle" --> <!-- TMPL_VAR NAME="borfirstname" --> <!-- TMPL_VAR NAME="borsurname" -->
+	card number: <!-- TMPL_VAR NAME="borcnum" -->
+	Phone: <!-- TMPL_VAR NAME="borphone" -->
+	<!-- TMPL_VAR NAME="borstraddress" -->
+	<!-- TMPL_VAR NAME="borsub" -->
+	<!-- TMPL_VAR NAME="bortown" -->
+	<!-- TMPL_VAR NAME="boremail" -->
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-">
-			<input type=submit value="Imprimir">
+	">
+				<input type="submit" value="Si" class="button circulation">
 			</form>
-			</td></tr>
-			</table>
-		</TMPL_IF>
-		</td></tr></table>
-	</td>
-	</tr>
-	<tr>
-	<td colspan=2>
-<TMPL_ELSE>
-	<tr>
-	<td valign=top align=left>
-		<form method=post action=/cgi-bin/koha/circ/returns.pl>
-			<table border=1 cellpadding=5 cellspacing=0>
-			<tr><td colspan=2 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-			<font color=black><b>Ingresar C&oacute;digo del Libro</b></font></td></tr>
-			<tr><td>C&oacute;digo del Item:</td><td><input name=barcode size=10></td></tr>
+			<!-- /TMPL_IF -->
+		</div>
+	<!-- TMPL_ELSE -->
+		<div id="bloc25">
+			<form name="f" method="post" action="/cgi-bin/koha/circ/returns.pl">
+				<h2 class="circulation">Inserte el C&oacute;digo de Barras del ejemplar</h2>
+				<label class="label20">C&oacute;digo de barras del ejemplar:</label><input name="barcode" size="10">
 			</table>
-			<TMPL_LOOP Name="inputloop">
-				<input type=hidden name="ri-><TMPL_VAR Name="counter">" value=<TMPL_VAR Name="barcode">>
-				<input type=hidden name="dd-><TMPL_VAR Name="counter">" value=<TMPL_VAR Name="duedate">>
-				<input type=hidden name="bn-><TMPL_VAR Name="counter">" value=<TMPL_VAR Name="bornum">>
-			</TMPL_LOOP>
+				<!-- TMPL_LOOP Name="inputloop" -->
+					<input type="hidden" name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+					<input type="hidden" name="dd-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="duedate" -->">
+					<input type="hidden" name="bn-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
+				<!-- /TMPL_LOOP -->
 		</form>
-	</td>
-	<td valign=top align=left>
-</TMPL_IF>
-		<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-		<tr><th  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><font>Mensajes</font></th></tr>
-		<tr><td>
-			<TMPL_LOOP Name="errmsgloop">
-				<font color='red' size='+2'>
-				<TMPL_IF Name="badbarcode">
-					No hay un Item con c&oacute;digo: <TMPL_VAR Name="msg">
-				</TMPL_IF>
-				<TMPL_IF Name="ispermanent">
-					Por favor vuelva a  <TMPL_VAR Name="msg">
-				</TMPL_IF>
-				<TMPL_IF Name="notissued">
-					Ese Item no se halla en pr&eacute;stamo.
-				</TMPL_IF>
-				<TMPL_IF Name="waslost">
-					El Item estaba perdido, ahora se ha encontrado.
-				</TMPL_IF>
-				<TMPL_IF Name="withdrawn">
-					Item Cancelado
-				</TMPL_IF>
+		</div>
+	<!-- /TMPL_IF -->
+		<div id="bloc25">
+			<h2 class="circulation">Mensajes</h2>
+				<!-- TMPL_LOOP Name="errmsgloop" -->
+					<span id="problem">
+					<!-- TMPL_IF Name="badbarcode" -->
+						No hay un Ejemplar con c&oacute;digo de barras: <!-- TMPL_VAR NAME="msg" -->
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF Name="ispermanent" -->
+						Por favor, devolver a <!-- TMPL_VAR NAME="msg" -->
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF Name="notissued" -->
+						No Est&aacute; Prestado
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF Name="waslost" -->
+						El ejemplar estaba perdido, se ha encontrado.
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF Name="withdrawn" -->
+						Ejemplar Cancelado
+					<!-- /TMPL_IF -->
+					</span>
+				<!-- /TMPL_LOOP -->
+		</div>
+	<!-- TMPL_IF Name="returned" -->
+		<div id="bloc25">
+			<h2 class="circulation">Informaci&oacute;n del Item Devuelto</h2>
+			<p>T&iacute;tulo: <!-- TMPL_VAR NAME="itemtitle" --></p>
+			<h2 class="circulation">Informaci&oacute;n de Usuario</h2>
+			<p>
+			<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="ribornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="ribornum" -->','Member'); return false;">
+				<!-- TMPL_VAR NAME="riborcnum" -->
+			</a> 
+			<!-- TMPL_IF NAME="boremail" -->(<a href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!-- TMPL_VAR Name="boremail" --></a>)<!-- /TMPL_IF -->
+			<!-- TMPL_VAR NAME="riborsurname" -->, <!-- TMPL_VAR NAME="ribortitle" --> <!-- TMPL_VAR NAME="riborfirstname" --></p>
+			<!-- TMPL_IF Name="flagset" -->
+				<h2 class="circulation">Permisos</h2>
+				<!-- TMPL_LOOP Name="flagloop" -->
+					<p>
+						<!-- TMPL_IF Name="redfont" --><div class="problem"><!-- /TMPL_IF -->
+						<!-- TMPL_VAR NAME="flag" --><!-- TMPL_IF Name="redfont" --></div><!-- /TMPL_IF -->
+					</p>
+					<!-- TMPL_IF Name="charges" -->
+					<p>
+						<a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Payment'); return false;">Pago</a>
+					</p>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF Name="waiting" -->
+						<!-- TMPL_LOOP Name="itemloop" -->
+							<p>
+								<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionum" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionum" -->&amp;type=intra','Item'); return false;">  <!-- TMPL_VAR NAME="barcode" -->  </a> <!-- TMPL_VAR NAME="title" -->(<!-- TMPL_VAR NAME="brname" -->)
+							</p>
+						<!-- /TMPL_LOOP -->
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF Name="overdue" -->
+						<!-- TMPL_LOOP Name="itemloop" -->
+						<p><!-- TMPL_VAR NAME="duedate" -->
+							<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionum" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionum" -->&amp;type=intra', 'Item'); return false;">
+								<!-- TMPL_VAR NAME="barcode" -->
+							</a>
+							<!-- TMPL_VAR NAME="title" -->
+						</p>
+						<!-- /TMPL_LOOP -->
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF Name="other" -->
+						<p><b><!-- TMPL_VAR NAME="msg" --></b></p>
+					<!-- /TMPL_IF -->
+				<!-- /TMPL_LOOP -->
+			<!-- /TMPL_IF -->
+		</div>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF Name="riloop" -->
+		<div id="bloc25">
+			<h2 class="circulation">Items Devueltos</h2>
+			<table>
+			<tr>
+				<th class="circulation">Fecha de Devoluci&oacute;n</th>
+				<th class="circulation">C&oacute;digo de barras</th>
+				<th class="circulation">T&iacute;tulo</th>
+				<th class="circulation">Autor</th>
+				<th class="circulation">Tipo</th>
+				<th class="circulation">Usuario</th>
+			</tr>
+			<!-- TMPL_LOOP Name="riloop" -->
+				<!-- TMPL_IF NAME="color" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
+					<td >
+						<!-- TMPL_IF Name="duedate" -->
+							<!-- TMPL_IF Name="early" -->
+								<font color="red">
+							<!-- /TMPL_IF -->
+								<!-- TMPL_VAR NAME="duedate" -->
+							<!-- TMPL_IF Name="early" -->
 				</font>
-				<BR>
-			</TMPL_LOOP>
-		</td></tr></table>
-	
-	
-<TMPL_IF Name="returned">
-	<tr>
-	<td valign=top align=left>
-		<table border=1 cellpadding=5 cellspacing=0>
-		<tr><th background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<font color=black>Informaci&oacute;n del Item Devuelto</font></th></tr>
-		<tr>
-          <td> T&iacute;tulo: <TMPL_VAR Name="itemtitle"><br>
-		</td></tr>
-		</table>
+							<!-- /TMPL_IF -->
+						<!-- TMPL_ELSE -->
+							No Est&aacute; Prestado
+						<!-- /TMPL_IF -->
 	</td>
-	<td valign=top align=left>
-		<table border=1 cellpadding=5 cellspacing=0>
-		<tr><td colspan=2 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<font color=black><b>Informacion del Usuario</b></font></td></tr>
-		<tr><td colspan=2>
-		<a href=/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="ribornum"> onClick="openWindow(this,'Member', 480, 640)"><TMPL_VAR Name="riborcnum"></a>
-		<TMPL_VAR Name="riborsurname">, <TMPL_VAR Name="ribortitle"> <TMPL_VAR Name="riborfirstname"><br>
-		</td></tr>
-		<TMPL_IF Name="flagset">
-			<tr>
-          <td  background="<TMPL_VAR name="themelang">/images/background-mem.gif" 
-            colspan=2> <b>Permisos</b></td>
-        </tr>
-			<TMPL_LOOP Name="flagloop">
-				<tr><td valign=top><TMPL_IF Name="redfont"><font color="red"></TMPL_IF><TMPL_VAR Name="flag"><TMPL_IF Name="redfont"></font></TMPL_IF></td>
-				<TMPL_IF Name="charges">
-					
-          <td bgcolor=<TMPL_VAR Name="color">><b><TMPL_VAR Name="msg"></b><a href=/cgi-bin/koha/pay.pl?bornum=<TMPL_VAR Name="borrowernumber"> 
-            onClick="openWindow(this, 'Payment', 480,640)">Pago</a></td>
-        </tr>
-				</TMPL_IF>
-				<TMPL_IF Name="waiting">
-					<td bgcolor=<TMPL_VAR Name="color">>
-					<TMPL_LOOP Name="itemloop">
-						<a href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionum">&type=intraonClick="openWindow(this, 'Item', 480, 640)"><TMPL_VAR Name="barcode"></a><TMPL_VAR Name="title">(<TMPL_VAR Name="brname">)<br>
-					</TMPL_LOOP>
-					</td></tr>
-				</TMPL_IF>
-				<TMPL_IF Name="overdue">
-					<td bgcolor=<TMPL_VAR Name="color">>
-					<TMPL_LOOP Name="itemloop">
-					<font color=red><TMPL_VAR Name="duedate"></font>
-						<a href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="biblionum">&type='intra' onClick="openWindow(this, 'Item', 480, 640)">
-							<TMPL_VAR Name="barcode">
+					<td>
+						<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra', 'Item'); return false;">
+							<!-- TMPL_VAR NAME="barcode" -->
 						</a>
-						<TMPL_VAR Name="title">
-						<br>
-					</TMPL_LOOP>
-					</td></tr>
-				</TMPL_IF>
-				<TMPL_IF Name="other">
-					<td bgcolor=<TMPL_VAR Name="color">><b><TMPL_VAR Name="msg"></b></td></tr>
-				</TMPL_IF>
-			</TMPL_LOOP>
-		</TMPL_IF>
-	</table></td>
-	<tr>
-</TMPL_IF>
-<TMPL_IF Name="returneditems">
-    <tr><td colspan=2>
-		<table border=1 cellpadding=5 cellspacing=0>
-		<tr><th colspan=6 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<font color=black>Items Devueltos</font></th></tr>
-		<tr><th>Due Date</th><th>C&oacute;digo</th><th>T&iacutetulo</th><th>Autor</th><th>Tipo</th><th>Usuario</th></tr>
-		<TMPL_LOOP Name="returneditemloop">
-			<tr>
-          <td bgcolor=<TMPL_VAR Name="color">> <TMPL_IF Name="duedate"> <TMPL_IF Name="early"> 
-            <font color=red> </TMPL_IF> <TMPL_VAR Name="year">/<TMPL_VAR Name="month">/<TMPL_VAR Name="day"> <TMPL_IF Name="early"> 
-            </font> </TMPL_IF> <TMPL_ELSE> No Prestado. </TMPL_IF> </td>
-			<td bgcolor=<TMPL_VAR Name="color">> align=center>
-			<a href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR Name="itembiblionumber">&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\"><TMPL_VAR Name="barcode"></a></td>
-			<td bgcolor=<TMPL_VAR Name="color">><TMPL_VAR Name="itemtitle"></td>
-			<td bgcolor=<TMPL_VAR Name="color">><TMPL_VAR Name="itemauthor"></td>
-			<td bgcolor=<TMPL_VAR Name="color"> align=center><TMPL_VAR Name="itemtype"></td>
-			<td bgcolor=<TMPL_VAR Name="color">>
-			<TMPL_IF Name="duedate">
-				<a href=/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR Name="bornum"> onClick=\"openWindow(this,'Member', 480, 640)\">
-					<TMPL_VAR Name="borcnum">
-				</a> <TMPL_VAR Name="borfirstname"> <TMPL_VAR Name="borsurname">
-			<TMPL_ELSE>
-				<TMPL_VAR Name="bornum">
-			</TMPL_IF>
-			</td></tr>
-		</TMPL_LOOP>
+					</td>
+					<td><!-- TMPL_VAR NAME="itemtitle" --></td>
+					<td><!-- TMPL_VAR NAME="itemauthor" --></td>
+					<td><!-- TMPL_VAR NAME="itemtype" --></td>
+					<td>
+					<!-- TMPL_IF Name="duedate" -->
+						<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->','Member'); return false;">
+							<!-- TMPL_VAR NAME="borcnum" -->
+						</a> <!-- TMPL_VAR NAME="borfirstname" --> <!-- TMPL_VAR NAME="borsurname" -->
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_VAR NAME="bornum" -->
+					<!-- /TMPL_IF -->
+					</td>
+				</tr>
+			<!-- /TMPL_LOOP -->
 		</table>
-	</td></tr>
-</TMPL_IF>
-
-</table>
-
-<TMPL_INCLUDE Name="circulation-bottom.inc">
+		</div>
+	<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE Name="circulation-bottom.inc" -->

Index: es/circ/selectbranchprinter.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/circ/Attic/selectbranchprinter.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/circ/selectbranchprinter.tmpl	3 Jun 2003 22:04:40 -0000	1.1
+++ es/circ/selectbranchprinter.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,42 +1,37 @@
-<TMPL_INCLUDE Name="circulation-top.inc">
+<!-- TMPL_INCLUDE Name="circulation-top.inc" -->
 
-<FONT SIZE=6><em>Circulaci&oacute;n: Seleccionar Impresora y Configuraci&oacute;n de Biblioteca</em></FONT><br>
+<div id="mainbloc">
+<h1 class="circulation">Circulaci&oacute;n: Configurar Impresora y Sede</h1>
 
-<center>
-<form method=post action=/cgi-bin/koha/circ/circulation.pl>
-<table border=1 cellpadding=5 cellspacing=0>
-<tr><td colspan=2 bgcolor=<TMPL_VAR Name="headerbackgroundcolor"> align=center background=<TMPL_VAR Name="backgroundimage">>
-<font color=black><b>Por favor seleccione Biblioteca e Impresora</b></font></td></tr>
-<tr><td>
+<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+<p>
 <!--branchselection-->
-<TMPL_IF Name="onebranch">
-Biblioteca: <TMPL_VAR Name="branchname"><br>
-<TMPL_ELSE>
-	<select name=branch>
-	<TMPL_LOOP Name="branchloop">
-		<option value=<TMPL_VAR Name="value"><TMPL_IF Name="selected"> selected</TMPL_IF>><TMPL_VAR Name="name">
-	</TMPL_LOOP>
+<!-- TMPL_IF Name="onebranch" -->
+<b>Sede:</b> <!-- TMPL_VAR NAME="branchname" -->
+<!-- TMPL_ELSE -->
+<b>Por favor, establezca su Sede:</b>
+	<select name="branch">
+	<!-- TMPL_LOOP Name="branchloop" -->
+		<option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="name" --></option>
+	<!-- /TMPL_LOOP -->
 	</select>
-</TMPL_IF>
-</td>
-<td>
-<!--printerselection-->
-<TMPL_IF Name="oneprinter">
-Impresora: <TMPL_VAR Name="printername"><br>
-<TMPL_ELSE>
-	<select name=printer>
-	<TMPL_LOOP Name="printerloop">
-		<option value=<TMPL_VAR Name="value"><TMPL_IF Name="selected"> selected</TMPL_IF>><TMPL_VAR Name="name">
-	</TMPL_LOOP>
+<!-- /TMPL_IF --></p>
+
+<p><!-- printerselection -->
+<!-- TMPL_IF Name="oneprinter" -->
+<b>Impresora:</b> <!-- TMPL_VAR NAME="printername" -->
+<!-- TMPL_ELSE -->
+<b>Por favor, establezca su Impresora:</b>
+	<select name="printer">
+	<!-- TMPL_LOOP Name="printerloop" -->
+		<option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="name" --></option>
+	<!-- /TMPL_LOOP -->
 	</select>
-</TMPL_IF>
-</td></tr>
-</table>
-<input type="hidden" name="setcookies" value=1>
-<input type="submit" value="Grabar">
+<!-- /TMPL_IF --></p>
+<p><input type="hidden" name="setcookies" value="1">
+<input type="submit" value="Enviar" class="button circulation"></p>
 </form>
-</center>
-
 
-<TMPL_INCLUDE Name="circulation-bottom.inc">
+</div>
+<!-- TMPL_INCLUDE Name="circulation-bottom.inc" -->
 

Index: es/export/marc.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/export/Attic/marc.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/export/marc.tmpl	3 Jun 2003 22:04:41 -0000	1.1
+++ es/export/marc.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,15 +1,26 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<center>
-<FONT SIZE=6><em>Koha admin page</em></FONT><br /><br /><br />
-Export in MARC format the following biblios :
-<form method="post">
-<p>from biblio number : <input type="text" name="start_bib">
-to biblio number : <input type="text" name="end_bib"></p>
-<input type="hidden" name="op" value="export">
-<input type="submit" value="Export">
-</form>
-
-<p>(leave blank to export every biblio)</p>
-<p>Note : the items are NOT exported by this tool</p>
-<TMPL_INCLUDE NAME="cat-bottom.inc">
+<div id="mainbloc">
+<h1>Exportaci&oacute;n de registro MARC</h1>
+	<div id="bloc25">
+		<h2 class="parameters">Seleccione el archivo a importar:</h2>
+		<form method="post">
+			<p>de n&uacute;mero de biblio : <input type="text" name="start_bib"> a n&uacute;mero de biblio : <input type="text" name="end_bib"></p>
+			<p>Tipo de Documento : <!--TMPL_VAR Name="CGIitemtype"--></p>
+			<p>Sede:  <select name="branch">
+			<option value="">Predeterminado</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>de n&uacute;mero de art&iacute;culo : <input type="text" name="start_callnumber"> a n&uacute;mero de art&iacute;culo : <input type="text" name="end_callnumber"></p>
+			<p>Limitar a <input type="text" name="limit"> primeros art&iacute;culos</p>
+			<p>Nota : los art&iacute;culos son exportados por esta herramienta</p>
+			<input type="hidden" name="op" value="export">
+			<input type="submit" value="Exportar" class="button">
+		</form>
+	</div>
+</div>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/images/koha-front-koha.gif
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/images/Attic/koha-front-koha.gif,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
Binary files /tmp/cvscFJerz and /tmp/cvskoKjhX differ

Index: es/includes/acquisitions-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/acquisitions-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/includes/acquisitions-bottom.inc	3 Jun 2003 21:41:14 -0000	1.2
+++ es/includes/acquisitions-bottom.inc	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,26 +1,17 @@
-<!-- saas at users.sf.net 21-APR-2002 renamed "aquisitions" to "acquisitions" -->
-
-<br clear=all>
+<br clear="all">
 <p> &nbsp; </p>
 
-</BLOCKQUOTE>
-
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR></TABLE>
-
-<CENTER>
-<FONT SIZE=2  face="arial, helvetica">
-<A HREF="/cgi-bin/koha/mainpage.pl">Home</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Cat&aacute;logo</a> ||
-<A HREF="/cgi-bin/koha/members-home.pl">Usuarios</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adcquisiciones</a> ||
-<A HREF="/reports/">Informes</a> ||
-<A HREF="/cgi-bin/koha/admin-home.pl">Par&aacute;metros del Sistema</a> ||
-<A HREF="/help/">Ayuda</a>
-</FONT>
-</CENTER>
-</BODY>
-
-</HTML>
+<div class="center">
+<a href="/cgi-bin/koha/mainpage.pl">Inicio</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Cat&aacute;logo</a> ||
+<a href="/cgi-bin/koha/members/members-home.pl">Usuarios</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a> ||
+<a href="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a> ||
+<a href="/cgi-bin/koha/reports-home.pl">Informes</a> ||
+<a href="/cgi-bin/koha/admin-home.pl">Par&aacute;metros</a> ||
+<a href="/cgi-bin/koha/about.pl">Acerca de</a> || 
+Ayuda
+</div>
 
+</body>
+</html>

Index: es/includes/acquisitions-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/acquisitions-top.inc,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/includes/acquisitions-top.inc	3 Jun 2003 21:41:14 -0000	1.2
+++ es/includes/acquisitions-top.inc	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,178 +1,47 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html>
 <head>
 <title>KOHA: INTRANET: Adquisiciones</title>
-</head>
-<body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300"
-marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
-
-<style>
-#menubar {
-	border-top:1px solid #666;
+<link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/includes/common-print.css">
+<link rel="stylesheet" type="text/css" media="screen" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+<!-- Additions for Calendar-system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js">
+</script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js">
+</script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js">
+</script>
+<!-- /Additions for Calendar-system -->
+
+<!-- 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 -->
+<script language="JavaScript" type="text/javascript">
+function Help() {
+	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
 }
-.koha {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	text-align:center;
-	background-image:url("<TMPL_VAR name="themelang">/images/background-mem.gif");
-	}
+</script>
 
-a.home {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.home:hover {
-	background-color: #339933;
-	color: #000000;
-	text-decoration: none;
-	font-weight: normal;
-	font-weight: bold;
-	}
-a.catalogue {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	margin:0;
-	}
-a.catalogue:hover {
-	background-color: #ad11ad;
-	color: #000000;
-	text-decoration: none;
-	font-weight: normal;
-	font-weight: bold;
-	margin:0;
-	}
-a.members {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.members:hover {
-	background-color: #86c268;
-	color: #000000;
-	text-decoration: none;
-	font-weight: bold;
-	}
-
-a.acquisition {
-	font-weight: normal;
-	text-decoration: none;
+<style type="text/css">
+.acquisition {
 	background-color: #ffdf61;
-	cursor: hand;
 	color:#000000;
-	padding:4px;
-	font-weight: bold;
+	background-image:none;
+	text-decoration: none;
 	}
 a.acquisition:hover {
 	background-color: #ffdf61;
 	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.reports {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.reports:hover {
-	background-color: #6b7cbe;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.circulation {
-	font-weight: normal;
 	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.circulation:hover {
-	background-color: #be6170;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.parameters {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.parameters:hover {
-	background-color: #86c268;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
 	}
 </style>
+</head>
+<body>
 
-<!------------------------MENUS-------------------------------->
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<tr height="45">
-	<td valign="bottom" align="left">
-		<table bgcolor="dddddd" width="100%" cellpadding=0 cellspacing=0>
-		<tr>
-			<td>
-			<div id="menubar">
-			<table cellpadding=0 cellspacing=0  border=0 height=29 width=85%>
-				<tr>
-					<td class="koha"><b>KOHA</b></td>
-					<td>
-						<a class="home" href="/cgi-bin/koha/mainpage.pl">Home</a>
-					</td>
-
-                  <td> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Cat&aacute;logo</a>	</td>
-
-                  <td> <a class="members" href="/cgi-bin/koha/members-home.pl">Usuarios</a></td>
-					
-                  <td> <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a> 
-                  </td>
-					<td>
-						<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=MARC">Marc</a>
-					</td>
-					
-                  <td> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a> 
-                  </td>
-					
-                  <td> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Informes</a> 
-                  </td>
-					
-                  <td> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Par&aacute;metros</a></td>
-					
-                  <td> <a class="parameters" href="/cgi-bin/koha/about.pl">Acerca</a> </td>
-				</TR>
-			</TABLE>
-			</div>
-		</td></tr></table>
-	</TD>
-</tr>
-</table>
-<TMPL_IF NAME="loggedinuser">
-    
-<p align=left>Registrado como: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Salir</a>]</p>
-<TMPL_ELSE>
     
-<p align=left><a href=/cgi-bin/koha/opac-user.pl>Ingresar</a> a Koha</p>
-</TMPL_IF>
+<!-- TMPL_INCLUDE name="menus.inc" -->
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p class="user">Registrado como: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Salir</a>]</p>
+<!-- TMPL_ELSE -->
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Entrar</a> a Koha</p>
+<!-- /TMPL_IF -->

Index: es/includes/cat-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/cat-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/includes/cat-bottom.inc	3 Jun 2003 21:41:14 -0000	1.2
+++ es/includes/cat-bottom.inc	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,20 +1,17 @@
-<br clear=all>
-<p>&nbsp;  </p>
+<br clear="all">
+<p> &nbsp; </p>
 
+<div class="center">
+<a href="/cgi-bin/koha/mainpage.pl">Inicio</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Cat&aacute;logo</a> ||
+<a href="/cgi-bin/koha/members/members-home.pl">Usuarios</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a> ||
+<a href="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a> ||
+<a href="/cgi-bin/koha/reports-home.pl">Informes</a> ||
+<a href="/cgi-bin/koha/admin-home.pl">Par&aacute;metros</a> ||
+<a href="/cgi-bin/koha/about.pl">Acerca de</a> || 
+Ayuda
+</div>
 
-
-
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR></TABLE>
-
-
-<CENTER>
-  <FONT SIZE=2  face="arial, helvetica"> <A HREF="/cgi-bin/koha/mainpage.pl">Home</a> 
-  || <A HREF="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a> || <A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Cat&aacute;logo</a> 
-  || <A HREF="/cgi-bin/koha/members-home.pl">Usuarios</a> || <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a> 
-  || <A HREF="/cgi-bin/koha/reports-home.pl">Informes</a> || <A HREF="/cgi-bin/koha/admin-home.pl">Par&aacute;metros 
-  del Sistema</a> || <A HREF="/help/">Ayuda</a> </FONT> 
-</CENTER>
-</BODY>
-
-</HTML>
+</body>
+</html>

Index: es/includes/cat-class-list.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/cat-class-list.inc,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/includes/cat-class-list.inc	3 Jun 2003 21:41:14 -0000	1.2
+++ es/includes/cat-class-list.inc	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -2,10 +2,15 @@
  list of Classes to be included in /catalogue/index.html and cat/index.html
  This is a qick-fix - These should really be fetched from the database
 -->
-<option value="E">
-F&aacute;cil / Libros con Dibujos<option value="ER">Lectua F&aacute;cil<option value="JNF">No-Ficci&oacute;n 
-para J&oacute;venes<option value="JF"> Ficci&oacute;n para J&oacute;venes<option value="TREF">Referencia 
-para Maestros<option value="FYA"> Ficci&oacute;n para Adultos j&oacute;venes<option value="REF">Libros 
-de Referencia<option value="F"> Ficci&oacute;n<option value="NF"> No-Ficci&oacute;n <option value="CD"> 
-Compact Disc 
+<option value="E">F&aacute;cil / Libros Ilustrados
+<option value="ER">Lector F&aacute;cil	
+<option value="JNF">Junior Non-Fiction
+<option value="JF">Junior Fiction
+<option value="TREF">Teacher Reference
+<option value="FYA">J&oacute;ven Adulto Ficci&oacute;n	
+<option value="REF">Libros de Referencia
+<option value="F">Ficci&oacute;n
+<option value="NF">Non-Fiction
+<option value="CD">Disco Compacto
 <!--	<option value="E|ER">Easy Books-->
+

Index: es/includes/cat-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/cat-top.inc,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/includes/cat-top.inc	3 Jun 2003 21:41:14 -0000	1.2
+++ es/includes/cat-top.inc	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,176 +1,43 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <title>KOHA: INTRANET: Cat&aacute;logo</title>
-</head>
-<body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300"
-marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
+<!-- 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 -->
 
-<style>
-#menubar {
-	border-top:1px solid #666;
+<script language="JavaScript" type="text/javascript">
+<!-- Hide from old browsers
+function openWindow(targeturl, windowname) {
+	newwin =
+window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
 }
-.koha {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	text-align:center;
-	}
+function Help() {
+	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
+}
+// end hiding -->
+</script>
 
-a.home {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.home:hover {
-	background-color: #339933;
-	color: #000000;
-	text-decoration: none;
-	font-weight: normal;
-	font-weight: bold;
-	}
-a.catalogue {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+<style type="text/css">
+.catalogue {
 	background-color:#ad11ad;
 	color:#FFFFFF;
-	padding:4px;
-	font-weight: bold;
-	margin:0;
+	background-image:none;
+	text-decoration: normal;
 	}
 a.catalogue:hover {
 	background-color: #ad11ad;
 	color: #FFFFFF;
 	text-decoration: none;
-	font-weight: normal;
-	font-weight: bold;
-	margin:0;
-	}
-a.members {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.members:hover {
-	background-color: #86c268;
-	color: #000000;
-	text-decoration: none;
-	font-weight: bold;
-	}
-
-a.acquisition:hover {
-	background-color: #ffdf61;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.acquisition {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.reports {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.reports:hover {
-	background-color: #6b7cbe;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.circulation {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.circulation:hover {
-	background-color: #be6170;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.parameters {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.parameters:hover {
-	background-color: #86c268;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
 	}
 </style>
+</head>
 
-<!------------------------MENUS-------------------------------->
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<tr height="45">
-	<td valign="bottom" align="left">
-		<table bgcolor="dddddd" width="100%" cellpadding=0 cellspacing=0>
-		<tr>
-			<td>
-			<div id="menubar">
-			<table cellpadding=0 cellspacing=0  border=0 height=29 width=85%>
-				<tr>
-					<td class="koha"><b>KOHA</b></td>
-					<td>
-						<a class="home" href="/cgi-bin/koha/mainpage.pl">Home</a>
-					</td>
-
-                  <td> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Cat&aacute;logo</a></td>
-
-                  <td> <a class="members" href="/cgi-bin/koha/members-home.pl">Usuarios</a></td>
-					
-                  <td> <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a></td>
-					<td>
-						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=MARC">Marc</a>
-					</td>
-					
-                  <td> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a></td>
-					
-                  <td> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Informes</a></td>
-					
-                  <td> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Par&aacute;metros</a></td>
-					
-                  <td> <a class="parameters" href="/cgi-bin/koha/about.pl">Acerca</a></td>
-				</TR>
-			</TABLE>
-			</div>
-		</td></tr></table>
-	</TD>
-</tr>
-</table>
-<BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
+<body>
     
-  <p align=left>Registrado como: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Salir</a>]</p>
-<TMPL_ELSE>
+<!-- TMPL_INCLUDE name="menus.inc" -->
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p class="user">Registrado como: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Salir</a>]</p>
+<!-- TMPL_ELSE -->
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Entrar</a> a Koha</p>
+<!-- /TMPL_IF -->
     
-  <p align=left><a href=/cgi-bin/koha/opac-user.pl>Ingresar</a> a Koha</p>
-</TMPL_IF>
-</blockquote>

Index: es/includes/circulation-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/circulation-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/includes/circulation-bottom.inc	3 Jun 2003 21:41:14 -0000	1.2
+++ es/includes/circulation-bottom.inc	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,23 +1,17 @@
-<br clear=all>
-<p>&nbsp;  </p>
+<br clear="all">
+<p> &nbsp; </p>
 
+<div class="center">
+<a href="/cgi-bin/koha/mainpage.pl">Inicio</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Cat&aacute;logo</a> ||
+<a href="/cgi-bin/koha/members/members-home.pl">Usuarios</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a> ||
+<a href="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a> ||
+<a href="/cgi-bin/koha/reports-home.pl">Informes</a> ||
+<a href="/cgi-bin/koha/admin-home.pl">Par&aacute;metros</a> ||
+<a href="/cgi-bin/koha/about.pl">Acerca de</a> || 
+Ayuda
+</div>
 
-
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR></TABLE>
-
-<CENTER>
-<FONT SIZE=2  face="arial, helvetica">
-<A HREF="/cgi-bin/koha/mainpage.pl">Home</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Cat&aacute;logo</a> ||
-<A HREF="/cgi-bin/koha/members-home.pl">Usuarios</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Informes</a> ||
-<A HREF="/cgi-bin/koha/admin-home.pl">Par&aacute;metros del Sitema</a> ||
-<A HREF="/help/">Ayuda</a>
-</FONT>
-</CENTER>
-</BODY>
-
-</HTML>
+</body>
+</html>

Index: es/includes/circulation-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/circulation-top.inc,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/includes/circulation-top.inc	3 Jun 2003 21:41:14 -0000	1.2
+++ es/includes/circulation-top.inc	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,182 +1,50 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html>
 <head>
 <title>KOHA: INTRANET: Circulaci&oacute;n</title>
-</head>
-<body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300"
-marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
+<!-- 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 -->
 
-<style>
-#menubar {
-	border-top:1px solid #666;
+<script language="JavaScript">
+<!-- Hide from old browsers
+function openWindow(targeturl, windowname) {
+newwin =
+window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
 }
-.koha {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	text-align:center;
-	background-image:url("<TMPL_VAR NAME="themelang">/images/background-mem.gif");
-	}
+function focusOnFirst (){
+document.forms['f'].elements[0].focus();
+}
+// end hiding -->
+</script>
 
-a.home {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.home:hover {
-	background-color: #339933;
-	color: #000000;
-	text-decoration: none;
-	font-weight: normal;
-	font-weight: bold;
-	}
-a.catalogue {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	margin:0;
-	}
-a.catalogue:hover {
-	background-color: #ad11ad;
-	color: #000000;
-	text-decoration: none;
-	font-weight: normal;
-	font-weight: bold;
-	margin:0;
-	}
-a.members {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.members:hover {
-	background-color: #86c268;
-	color: #000000;
-	text-decoration: none;
-	font-weight: bold;
-	}
+<script language="JavaScript" type="text/javascript">
+function Help() {
+	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
+}
+</script>
 
-a.acquisition {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.acquisition:hover {
-	background-color: #ffdf61;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.reports {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.reports:hover {
-	background-color: #6b7cbe;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.circulation {
-	font-weight: normal;
-	text-decoration: none;
+
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+<style type="text/css">
+.circulation {
 	background-color: #be6170;
-	cursor: hand;
 	color:#FFFFFF;
-	padding:4px;
-	font-weight: bold;
+	background-image:none;
+	text-decoration: normal;
 	}
 a.circulation:hover {
 	background-color: #be6170;
 	color: #FFFFFF;
 	text-decoration: normal;
-	font-weight: bold;
-	}
-a.parameters {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.parameters:hover {
-	background-color: #86c268;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
 	}
 </style>
+</head>
+
+<body onload="focusOnFirst()">
 
-<!------------------------MENUS-------------------------------->
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<tr height="45">
-	<td valign="bottom" align="left">
-		<table bgcolor="dddddd" width="100%" cellpadding=0 cellspacing=0>
-		<tr>
-			<td>
-			<div id="menubar">
-			<table cellpadding=0 cellspacing=0  border=0 height=29 width=85%>
-				<tr>
-					<td class="koha"><b>KOHA</b></td>
-					<td>
-						<a class="home" href="/cgi-bin/koha/mainpage.pl">Home</a>
-					</td>
-					<td>
-						<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Cat&aacute;logo</a>
-					</td>
-					<td>
-						<a class="members" href="/cgi-bin/koha/members-home.pl">Usuarios</a>
-					</td>
-					<td>
-						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a>
-					</td>
-					<td>
-						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=MARC">Marc</a>
-					</td>
-					<td>
-						<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a>
-					</td>
-					<td>
-						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Informes</a>
-					</td>
-					<td>
-						<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Par&aacute;metros</a>
-					</td>
-					<td>
-						<a class="parameters" href="/cgi-bin/koha/about.pl">Acerca</a>
-					</td>
-				</TR>
-			</TABLE>
-			</div>
-		</td></tr></table>
-	</TD>
-</tr>
-</table>
-<BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Registrado como: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Salir</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Ingresar</a> a Koha</p>
-</TMPL_IF>
-</blockquote>
+<!-- TMPL_INCLUDE name="menus.inc" -->
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p class="user">Registrado como: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Salir</a>]</p>
+<!-- TMPL_ELSE -->
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Entrar</a> a Koha</p>
+<!-- /TMPL_IF -->

Index: es/includes/issues-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/issues-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/includes/issues-bottom.inc	3 Jun 2003 21:41:14 -0000	1.2
+++ es/includes/issues-bottom.inc	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,20 +1,17 @@
-<br clear=all>
-<p>&nbsp;  </p>
+<br clear="all">
+<p> &nbsp; </p>
 
+<div class="center">
+<a href="/cgi-bin/koha/mainpage.pl">Inicio</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Cat&aacute;logo</a> ||
+<a href="/cgi-bin/koha/members/members-home.pl">Usuarios</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a> ||
+<a href="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a> ||
+<a href="/cgi-bin/koha/reports-home.pl">Informes</a> ||
+<a href="/cgi-bin/koha/admin-home.pl">Par&aacute;metros</a> ||
+<a href="/cgi-bin/koha/about.pl">Acerca de</a> || 
+Ayuda
+</div>
 
-
-
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR></TABLE>
-
-
-<CENTER>
-  <FONT SIZE=2  face="arial, helvetica"> <A HREF="/cgi-bin/koha/mainpage.pl">Home</a> 
-  || <A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Cat&aacute;logo</a> 
-  || <A HREF="/cgi-bin/koha/members-home.pl">Usuarios</a> || <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a> 
-  || <A HREF="/cgi-bin/koha/reports-home.pl">Informes</a> || <A HREF="/cgi-bin/koha/admin-home.pl">Par&aacute;metros 
-  del Sistema</a> || <A HREF="/help/">Ayuda</a> </FONT> 
-</CENTER>
-</BODY>
-
-</HTML>
+</body>
+</html>

Index: es/includes/members-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/members-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/includes/members-bottom.inc	3 Jun 2003 21:41:15 -0000	1.2
+++ es/includes/members-bottom.inc	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,16 +1,17 @@
-<br clear=all>
-<p>&nbsp;  </p>
+<br clear="all">
+<p> &nbsp; </p>
 
+<div class="center">
+<a href="/cgi-bin/koha/mainpage.pl">Inicio</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Cat&aacute;logo</a> ||
+<a href="/cgi-bin/koha/members/members-home.pl">Usuarios</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a> ||
+<a href="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a> ||
+<a href="/cgi-bin/koha/reports-home.pl">Informes</a> ||
+<a href="/cgi-bin/koha/admin-home.pl">Par&aacute;metros</a> ||
+<a href="/cgi-bin/koha/about.pl">Acerca de</a> || 
+Ayuda
+</div>
 
-
-
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR></TABLE>
-
-<CENTER>
-<FONT SIZE=2  face="arial, helvetica"> <A HREF="/cgi-bin/koha/mainpage.pl">Home</a> 
-|| <A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Cat&aacute;logo</a> 
-|| <A HREF="/cgi-bin/koha/members-home.pl">Usuarios</a> || <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a> 
-|| <A HREF="/cgi-bin/koha/reports-home.pl">Informes</a> || <A HREF="/cgi-bin/koha/admin-home.pl">Par&aacute;metros 
-del Sistema</a> || <A HREF="/help/">Ayuda</a> </FONT> </CENTER> 
-</BODY></HTML>
+</body>
+</html>

Index: es/includes/members-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/members-top.inc,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/includes/members-top.inc	3 Jun 2003 21:41:15 -0000	1.2
+++ es/includes/members-top.inc	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,181 +1,36 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html>
 <head>
-<title>KOHA: INTRANET: Members</title>
-</head>
-<body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300"
-marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
-
-<style>
-#menubar {
-	border-top:1px solid #666;
+<title>KOHA: INTRANET: Usuarios</title>
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+<!-- 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 -->
+<script language="JavaScript" type="text/javascript">
+function Help() {
+	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
 }
-.koha {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	text-align:center;
-	background-image:url("<TMPL_VAR name="themelang">/images/background-mem.gif");
-	}
+</script>
 
-a.home {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.home:hover {
-	background-color: #339933;
-	color: #000000;
-	text-decoration: none;
-	font-weight: normal;
-	font-weight: bold;
-	}
-a.catalogue {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	margin:0;
-	}
-a.catalogue:hover {
-	background-color: #ad11ad;
-	color: #000000;
-	text-decoration: none;
-	font-weight: normal;
-	font-weight: bold;
-	margin:0;
-	}
-a.members {
-	font-weight: normal;
-	text-decoration: none;
+<style type="text/css">
+.members {
 	background-color: #86c268;
-	cursor: hand;
 	color:#FFFFFF;
-	padding:4px;
-	font-weight: bold;
+	text-decoration: normal;
 	}
 a.members:hover {
 	background-color: #86c268;
 	color: #FFFFFF;
-	text-decoration: none;
-	font-weight: bold;
-	}
-
-a.acquisition {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.acquisition:hover {
-	background-color: #ffdf61;
-	color: #000000;
 	text-decoration: normal;
-	font-weight: bold;
-	}
-a.reports {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.reports:hover {
-	background-color: #6b7cbe;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.circulation {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.circulation:hover {
-	background-color: #be6170;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.parameters {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.parameters:hover {
-	background-color: #86c268;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
 	}
 </style>
+</head>
+
+<body>
 
-<!------------------------MENUS-------------------------------->
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<tr height="45">
-	<td valign="bottom" align="left">
-		<table bgcolor="dddddd" width="100%" cellpadding=0 cellspacing=0>
-		<tr>
-			<td>
-			<div id="menubar">
-			<table cellpadding=0 cellspacing=0  border=0 height=29 width=85%>
-				<tr>
-					<td class="koha"><b>KOHA</b></td>
-					<td>
-						<a class="home" href="/cgi-bin/koha/mainpage.pl">Home</a>
-					</td>
-					<td>
-						<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Cat&aacute;logo</a>
-					</td>
-					<td>
-						<a class="members" href="/cgi-bin/koha/members-home.pl">Usuarios</a>
-					</td>
-					<td>
-						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a>
-					</td>
-					<td>
-						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=MARC">Marc</a>
-					</td>
-					<td>
-						<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a>
-					</td>
-					<td>
-						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Informes</a>
-					</td>
-					<td>
-						<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Par&aacute;metros</a>
-					</td>
-					<td>
-						<a class="parameters" href="/cgi-bin/koha/about.pl">Acerca</a>
-					</td>
-				</TR>
-			</TABLE>
-			</div>
-		</td></tr></table>
-	</TD>
-</tr>
-</table>
-<BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Registrado como: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Salir</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Ingresar</a> a Koha</p>
-</TMPL_IF>
+<!-- MENUS -->
+<!-- TMPL_INCLUDE name="menus.inc" -->
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p class="user">Registrado como: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Salir</a>]</p>
+<!-- TMPL_ELSE -->
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Entrar</a> a Koha</p>
+<!-- /TMPL_IF -->

Index: es/includes/opac-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/opac-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/includes/opac-bottom.inc	3 Jun 2003 21:41:15 -0000	1.2
+++ es/includes/opac-bottom.inc	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -6,10 +6,10 @@
 
 <font size=2  face="arial, helvetica">
 
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">B&uacute;squeda en Cat&aacute;logo</a> ||
+<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">B&uacute;squeda en el Cat&aacute;logo</a> ||
 <!--<A HREF="/cgi-bin/koha/members-home.pl">Members Area</a> || -->
-<A HREF="/join.html">As&oacute;ciese</a> ||
-<A HREF="/cgi-bin/koha/mainpage.pl">P&aacute;gina Principal</a>
+<A HREF="/join.html">Reg&iacute;strese</a> ||
+<A HREF="/cgi-bin/koha/mainpage.pl">Inicio</a>
 
 </font>
 </center>

Index: es/includes/opac-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/opac-top.inc,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/includes/opac-top.inc	3 Jun 2003 21:41:15 -0000	1.2
+++ es/includes/opac-top.inc	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -3,7 +3,8 @@
 
 <html>
 <head>
-<title>KOHA: OPAC B&uacute;squeda en el Cat&aacute;logo</title>
+<title>KOHA: OPAC B&uacute;squeda en Cat&aacute;logo</title>
+<!-- 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 -->
 
 </head>
 <body text="black" bgcolor="white" link="#0000ff" vlink="#3366cc" Alink="#cc3300"
@@ -22,48 +23,41 @@
 
 -->
 
-<!------------------------MENUS-------------------------------->
+<!--------------------------MENUS---------------------------------->
 
 <table cellpadding=0 cellspacing=0 width="100%" border=0>
 <tr BGCOLOR="#339999" >
 
-        <td valign=bottom><img src="<TMPL_VAR name="themelang">/images/inside-top-search.gif" 
-	width=349 height=50 alt="KOHA: B&uacute;squeda en el Cat&aacute;logo" hspace=0 vspace=0 border=0></td>
+        <td valign=bottom><img src="<!-- TMPL_VAR name="themelang" -->/images/inside-top-search.gif" width=349 height=50 alt="KOHA: B&uacute;squeda en Cat&aacute;logo" hspace=0 vspace=0 border=0></td>
 
 
-        <td align=right><a href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet" 		onMouseOver="document.mouseover.src='<TMPL_VAR name="themelang">/images/mouseover-search.gif'" 		onMouseOut="document.mouseover.src='/images/holder.gif'"><img 
-	src="<TMPL_VAR name="themelang">/images/menu-search.gif" 
-	width=71 height=30 alt="Buscar" hspace=0 vspace=0 border=0 name="menu-search"></a>
+        <td align=right><a href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet" 		onMouseOver="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/mouseover-search.gif'" 		onMouseOut="document.mouseover.src='/images/holder.gif'"><img src="<!-- TMPL_VAR name="themelang" -->/images/menu-search.gif" width=71 height=30 alt="Buscar" hspace=0 vspace=0 border=0 name="menu-search"></a>
 
 <!--	<a href="/member/"
 	onMouseOver="document.mouseover.src='/images/mouseover-member.gif'" 			onMouseOut="document.mouseover.src='/images/holder.gif'"><img src="/images/menu-login.gif"
 	width=111 height=30 alt="Member Login" hspace=0 vspace=0 border=0 name="menu-login"></a>
 -->
-	<TMPL_IF NAME=loggedinuser>
+	<!-- TMPL_IF NAME="loggedinusername" -->
 	    <a href="/cgi-bin/koha/userpage.pl"
-	    onMouseOver="document.mouseover.src='<TMPL_VAR name="themelang">/images/mouseover-mysettings.gif'" 		onMouseOut="document.mouseover.src='<TMPL_VAR name="themelang">/images/holder.gif'">
-	    <img src="<TMPL_VAR name="themelang">/images/menu-mysettings.gif"
-	    width=90 height=30 alt="Mi Configuraci&oacute;n" hspace=0 vspace=0 border=0 name="menu-mysettings"></a>
-	<TMPL_ELSE>
+	    onMouseOver="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/mouseover-mysettings.gif'" 		onMouseOut="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/holder.gif'">
+	    <img src="<!-- TMPL_VAR name="themelang" -->/images/menu-mysettings.gif" width=90 height=30 alt="Mis Preferencias" hspace=0 vspace=0 border=0 name="menu-mysettings"></a>
+	<!-- TMPL_ELSE -->
 	    <a href="/join.html"
-	    onMouseOver="document.mouseover.src='<TMPL_VAR name="themelang">/images/mouseover-join.gif'" 		onMouseOut="document.mouseover.src='<TMPL_VAR name="themelang">/images/holder.gif'">
-	    <img src="<TMPL_VAR name="themelang">/images/menu-join.gif"
-	    width=54 height=30 alt="Asociarse" hspace=0 vspace=0 border=0 name="menu-join"></a>
-	</TMPL_IF>
-
+	    onMouseOver="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/mouseover-join.gif'" 		onMouseOut="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/holder.gif'">
+	    <img src="<!-- TMPL_VAR name="themelang" -->/images/menu-join.gif" width=54 height=30 alt="Registrarse" hspace=0 vspace=0 border=0 name="menu-join"></a>
+	<!-- /TMPL_IF -->
 	<a href="/cgi-bin/koha/mainpage.pl"
-	onMouseOver="document.mouseover.src='<TMPL_VAR name="themelang">/images/mouseover-home.gif'" 		onMouseOut="document.mouseover.src='<TMPL_VAR name="themelang">/images/holder.gif'"><img src="<TMPL_VAR name="themelang">/images/menu-home.gif"
-	width=60 height=30 alt="P&aacute;gina Principal" hspace=0 vspace=0 border=0 name="menu-home"></a></td>
+	onMouseOver="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/mouseover-home.gif'" 		onMouseOut="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/holder.gif'"><img src="<!-- TMPL_VAR name="themelang" -->/images/menu-home.gif" width=60 height=30 alt="Inicio" hspace=0 vspace=0 border=0 name="menu-home"></a></td>
 
         </TR>
 
 
 <tr valign=top>
 
-        <td><img src="<TMPL_VAR name="themelang">/images/inside-koha-bottom.gif"
+        <td><img src="<!-- TMPL_VAR name="themelang" -->/images/inside-koha-bottom.gif"
 	width=69 height=44 alt="KOHA" hspace=0 vspace=0 border=0 ></td>
 
-        <td align=right><img src="<TMPL_VAR name="themelang">/images/holder.gif"
+        <td align=right><img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif"
 	width=300 height=48 alt="" hspace=0 vspace=0 name="mouseover" ></a></td>
 
         </TR>
@@ -74,5 +68,5 @@
 
 
 
-<!-------------------------MAIN BODY OF PAGE-------------------------->
+<!--------------------------MAIN BODY OF PAGE-------------------------->
 <BLOCKQUOTE>

Index: es/includes/parameters-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/parameters-bottom.inc,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/includes/parameters-bottom.inc	3 Jun 2003 21:49:33 -0000	1.1
+++ es/includes/parameters-bottom.inc	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,20 +1,17 @@
-<br clear=all>
-<p>&nbsp;  </p>
+<br clear="all">
+<p> &nbsp; </p>
 
+<div class="center">
+<a href="/cgi-bin/koha/mainpage.pl">Inicio</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Cat&aacute;logo</a> ||
+<a href="/cgi-bin/koha/members/members-home.pl">Usuarios</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a> ||
+<a href="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a> ||
+<a href="/cgi-bin/koha/reports-home.pl">Informes</a> ||
+<a href="/cgi-bin/koha/admin-home.pl">Par&aacute;metros</a> ||
+<a href="/cgi-bin/koha/about.pl">Acerca de</a> || 
+Ayuda
+</div>
 
-
-
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR></TABLE>
-
-
-<CENTER>
-  <FONT SIZE=2  face="arial, helvetica"> <A HREF="/cgi-bin/koha/mainpage.pl">Home</a> 
-  || <A HREF="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a> || <A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Cat&aacute;logo</a> 
-  || <A HREF="/cgi-bin/koha/members-home.pl">Usuarios</a> || <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a> 
-  || <A HREF="/cgi-bin/koha/reports-home.pl">Informes</a> || <A HREF="/cgi-bin/koha/admin-home.pl">Par&aacute;metros 
-  del Sistema</a> || <A HREF="/help/">Ayuda</a> </FONT> 
-</CENTER>
-</BODY>
-
-</HTML>
+</body>
+</html>

Index: es/includes/parameters-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/parameters-top.inc,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -u -b -r1.3 -r1.3.12.1
--- es/includes/parameters-top.inc	16 Jul 2003 04:55:43 -0000	1.3
+++ es/includes/parameters-top.inc	7 May 2007 13:55:50 -0000	1.3.12.1
@@ -1,178 +1,46 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html>
 <head>
 <title>KOHA: INTRANET: Par&aacute;metros</title>
-</head>
-<body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300"
-marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
-
-<style>
-#menubar {
-	border-top:1px solid #666;
-}
-.koha {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	text-align:center;
-	background-image:url("<TMPL_VAR name="themelang">/images/background-mem.gif");
-	}
+<!-- Additions to enable Calendar system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+<!-- End of additions -->
+
+<!-- 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 -->
+<!-- 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 -->
 
-a.home {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.home:hover {
-	background-color: #339933;
-	color: #000000;
-	text-decoration: none;
-	font-weight: normal;
-	font-weight: bold;
-	}
-a.catalogue {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	margin:0;
-	}
-a.catalogue:hover {
-	background-color: #ad11ad;
-	color: #000000;
-	text-decoration: none;
-	font-weight: normal;
-	font-weight: bold;
-	margin:0;
-	}
-a.members {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.members:hover {
-	background-color: #86c268;
-	color: #000000;
-	text-decoration: none;
-	font-weight: bold;
-	}
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
 
-a.acquisition:hover {
-	background-color: #ffdf61;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.acquisition {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.reports {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color: #777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.reports:hover {
-	background-color: #6b7cbe;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.circulation {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color: #777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.circulation:hover {
-	background-color: #be6170;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-a.parameters {
+<style type="text/css">
+.parameters {
 	background-color: #86c268;
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
 	color: #FFFFFF;
-	padding:4px;
-	font-weight: bold;
+	text-decoration: normal;
+	background-image:none;
 	}
 a.parameters:hover {
 	background-color: #86c268;
 	color: #FFFFFF;
 	text-decoration: normal;
-	font-weight: bold;
 	}
 </style>
+</head>
+<body>
+
+<script language="JavaScript" type="text/javascript">
+function Help() {
+	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
+}
+</script>
 
-<!------------------------MENUS-------------------------------->
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<tr height="45">
-	<td valign="bottom" align="left">
-		<table bgcolor="dddddd" width="100%" cellpadding=0 cellspacing=0>
-		<tr>
-			<td>
-			<div id="menubar">
-			<table cellpadding=0 cellspacing=0  border=0 height=29 width=85%>
-				<tr>
-					<td class="koha"><b>KOHA</b></td>
-					<td>
-						<a class="home" href="/cgi-bin/koha/mainpage.pl">Home</a>
-					</td>
-
-                  <td> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Cat&aacute;logo</a>
-                  </td>
-
-                  <td> <a class="members" href="/cgi-bin/koha/members-home.pl">Usuarios</a></td>
-					
-                  <td> <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adqusiciones</a></td>
-					<td>
-						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=MARC">Marc</a>
-					</td>
-					
-                  <td> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a></td>
-					
-                  <td> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Informes</a></td>
-					
-                  <td> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Par&aacute;metros</a></td>
-					
-                  <td> <a class="parameters" href="/cgi-bin/koha/about.pl">Acerca</a></td>
-				</TR>
-			</TABLE>
-			</div>
-		</td></tr></table>
-	</TD>
-</tr>
-</table>
-<BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-    
-  <p align=left>Registrado como: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Salir</a>]</p>
-<TMPL_ELSE>
-    
-  <p align=left><a href=/cgi-bin/koha/opac-user.pl>Ingresar</a> a Koha</p>
-</TMPL_IF>
-</blockquote>
+<!-- TMPL_INCLUDE name="menus.inc" -->
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p class="user">Registrado como: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Salir</a>]</p>
+<!-- TMPL_ELSE -->
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Entrar</a> a Koha</p>
+<!-- /TMPL_IF -->

Index: es/includes/reports-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/reports-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/includes/reports-bottom.inc	3 Jun 2003 21:41:15 -0000	1.2
+++ es/includes/reports-bottom.inc	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,20 +1,17 @@
-<br clear=all>
-<p>&nbsp;  </p>
+<br clear="all">
+<p> &nbsp; </p>
 
+<div class="center">
+<a href="/cgi-bin/koha/mainpage.pl">Inicio</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Cat&aacute;logo</a> ||
+<a href="/cgi-bin/koha/members/members-home.pl">Usuarios</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a> ||
+<a href="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a> ||
+<a href="/cgi-bin/koha/reports-home.pl">Informes</a> ||
+<a href="/cgi-bin/koha/admin-home.pl">Par&aacute;metros</a> ||
+<a href="/cgi-bin/koha/about.pl">Acerca de</a> || 
+Ayuda
+</div>
 
-
-
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<TR VALIGN=TOP BGCOLOR="000000"><TD  COLSPAN=6><img src="/images/blackdot.gif"  WIDTH=1  HEIGHT=2  HSPACE=0 vspace=0></TD></TR></TABLE>
-
-
-<CENTER>
-  <FONT SIZE=2  face="arial, helvetica"> <A HREF="/cgi-bin/koha/mainpage.pl">Home</a> 
-  || <A HREF="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a> || <A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Cat&aacute;logo</a> 
-  || <A HREF="/cgi-bin/koha/members-home.pl">Usuarios</a> || <A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a> 
-  || <A HREF="/cgi-bin/koha/reports-home.pl">Informes</a> || <A HREF="/cgi-bin/koha/admin-home.pl">Par&aacute;metros 
-  del Sistema</a> || <A HREF="/help/">Ayuda</a> </FONT> 
-</CENTER>
-</BODY>
-
-</HTML>
+</body>
+</html>

Index: es/includes/reports-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/includes/Attic/reports-top.inc,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/includes/reports-top.inc	3 Jun 2003 21:41:15 -0000	1.2
+++ es/includes/reports-top.inc	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,181 +1,35 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html>
 <head>
 <title>KOHA: INTRANET: Informes</title>
-</head>
-<body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300"
-marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
-
-<style>
-#menubar {
-	border-top:1px solid #666;
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+<!-- 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 -->
+<script language="JavaScript" type="text/javascript">
+function Help() {
+	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
 }
-.koha {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	text-align:center;
-	background-image:url("<TMPL_VAR name="themelang">/images/background-mem.gif");
-	}
-
-a.home {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.home:hover {
-	background-color: #339933;
-	color: #000000;
-	text-decoration: none;
-	font-weight: normal;
-	font-weight: bold;
-	}
-a.catalogue {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	margin:0;
-	}
-a.catalogue:hover {
-	background-color: #ad11ad;
-	color: #000000;
-	text-decoration: none;
-	font-weight: normal;
-	font-weight: bold;
-	margin:0;
-	}
-a.members {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.members:hover {
-	background-color: #86c268;
-	color: #000000;
-	text-decoration: none;
-	font-weight: bold;
-	}
-
-a.acquisition {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.acquisition:hover {
-	background-color: #ffdf61;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
-	}
+</script>
 
-a.reports {
-	font-weight: normal;
+<style type="text/css">
+.reports {
 	background-color: #6b7cbe;
-	text-decoration: none;
-	cursor: hand;
 	color:#FFFFFF;
-	padding:4px;
-	font-weight: bold;
+	text-decoration: normal;
+	background-image:none;
 	}
 a.reports:hover {
 	background-color: #6b7cbe;
 	color: #FFFFFF;
 	text-decoration: normal;
-	font-weight: bold;
-	}
-a.circulation {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.circulation:hover {
-	background-color: #be6170;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
-	}
-
-a.parameters {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	}
-a.parameters:hover {
-	background-color: #86c268;
-	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
 	}
 </style>
+</head>
+<body>
 
-<!------------------------MENUS-------------------------------->
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<tr height="45">
-	<td valign="bottom" align="left">
-		<table bgcolor="dddddd" width="100%" cellpadding=0 cellspacing=0>
-		<tr>
-			<td>
-			<div id="menubar">
-			<table cellpadding=0 cellspacing=0  border=0 height=29 width=85%>
-				<tr>
-					<td class="koha"><b>KOHA</b></td>
-					<td>
-						<a class="home" href="/cgi-bin/koha/mainpage.pl">Home</a>
-					</td>
-
-                  <td> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Cat&aacute;logo</a>
-                  </td>
-					
-                  <td> <a class="members" href="/cgi-bin/koha/members-home.pl">Usuarios</a></td>
-					
-                  <td> <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Adquisiciones</a></td>
-					<td>
-						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=MARC">Marc</a>
-					</td>
-					
-                  <td> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulaci&oacute;n</a></td>
-					
-                  <td> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Informes</a></td>
-					
-                  <td> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Par&aacute;metros</a></td>
-					
-                  <td> <a class="parameters" href="/cgi-bin/koha/about.pl">Acerca 
-                    de </a></td>
-				</TR>
-			</TABLE>
-			</div>
-		</td></tr></table>
-	</TD>
-</tr>
-</table>
-<BLOCKQUOTE>
-<TMPL_IF NAME="loggedinuser">
-    
-  <p align=left>Registrado como: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Salir</a>]</p>
-<TMPL_ELSE>
-    
-  <p align=left><a href=/cgi-bin/koha/opac-user.pl>Ingresar</a> a Koha</p>
-</TMPL_IF>
-</blockquote>
+<!-- TMPL_INCLUDE name="menus.inc" -->
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <p class="user">Registrado como: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Salir</a>]</p>
+<!-- TMPL_ELSE -->
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Entrar</a> a Koha</p>
+<!-- /TMPL_IF -->

Index: es/marcimport/AcceptBiblioitem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/marcimport/Attic/AcceptBiblioitem.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/marcimport/AcceptBiblioitem.tmpl	3 Jun 2003 21:41:15 -0000	1.2
+++ es/marcimport/AcceptBiblioitem.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,59 +1,57 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <center>
 <!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
      was in Perl.
   -->
-<a href=$ENV{'SCRIPT_NAME'}?file=$file>New Record</a> | <a href=marcimport.pl>New File</a><br>
-<TMPL_IF name="BIBLIO_EXISTS">
-	<table border=0 width=50% cellpadding=10 cellspacing=0>
+<a href="$ENV{'SCRIPT_NAME'}?file=$file">Nuevo Registro</a> | <a href="marcimport.pl">Nuevo Archivo</a><br>
+<!-- TMPL_IF NAME="BIBLIO_EXISTS" -->
+	<table border="0" width="50%" cellpadding="10" cellspacing="0">
 		<tr>
-			<th background=/images/background-acq.gif>Record already in database
+			<th background="/images/background-acq.gif">El registro ya se encuentra en la base de datos
 			</th>
 		</tr>
 		<tr>
 			<td bgcolor="#dddddd">
-				<TMPL_VAR name="title"> is already in the database with 
-				biblionumber <TMPL_VAR name="biblionumber"> and biblioitemnumber <TMPL_VAR name="biblioitemnumber">
+				<!-- TMPL_VAR NAME="title" --> ya est&aacute; en la base de datos con el n&uacute;mero de libro <!-- TMPL_VAR NAME="biblionumber" --> y de art&iacute;culo <!-- TMPL_VAR NAME="biblioitemnumber" -->
 			  </td>
 		</tr>
 	</table>
 	<p>
-</TMPL_IF>
-<TMPL_IF name="BIBLIO_CREATE">
-    <table cellpadding=10 cellspacing=0 border=0 width=50%>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="BIBLIO_CREATE" -->
+    <table cellpadding="10" cellspacing="0" border="0" width="50%">
 		<tr>
-			<th background=/images/background-acq.gif>Record entered into database</th>
+			<th background="/images/background-acq.gif">Registro almacenado en la base de datos</th>
 		</tr>
 		<tr>
-			<td bgcolor=#dddddd>
-				<TMPL_VAR name="title">has been entered into the database with biblionumber
-				<TMPL_VAR name="biblionumber"> and biblioitemnumber <TMPL_VAR name="biblioitemnumber"></td>
+			<td bgcolor="#dddddd">
+				<!-- TMPL_VAR NAME="title" -->ha sido incorporado a la base de datos con n&uacute;mero de art&iacute;culo <!-- TMPL_VAR NAME="biblionumber" --> y n&uacute;mero de art&iacute;culo <!-- TMPL_VAR NAME="biblioitemnumber" --></td>
 		</tr>
 	  </table>
-</TMPL_IF>
-    <table border=0 cellpadding=10 cellspacing=0>
-      <tr><th background=/images/background-acq.gif>
-	Add a New Item for <TMPL_VAR name="title">
+<!-- /TMPL_IF -->
+    <table border="0" cellpadding="10" cellspacing="0">
+      <tr><th background="/images/background-acq.gif">
+	A&ntilde;adir un nuevo Art&iacute;culo para <!-- TMPL_VAR NAME="title" -->
       </th></tr>
-      <tr><td bgcolor=#dddddd>
+      <tr><td bgcolor="#dddddd">
       <form>
-        <input type=hidden name=newitem value=1>
-        <input type=hidden name=biblionumber value="<TMPL_VAR name="biblionumber">">
-        <input type=hidden name=biblioitemnumber value="<TMPL_VAR name="biblioitemnumber">">
-        <input type=hidden name=file value="<TMPL_VAR name="file">">
-        <table border=0>
-          <tr><td>BARCODE</td><td><input name=barcode size=10 value="<TMPL_VAR name="barcode">">
-          Home Branch: <select name=homebranch><TMPL_VAR name="branchselect"></select>
+        <input type="hidden" name="newitem" value="1">
+        <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+        <input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+        <input type="hidden" name="file" value="<!-- TMPL_VAR NAME="file" -->">
+        <table border="0">
+          <tr><td>CODIGO DE BARRAS</td><td><input name="barcode" size="10" value="<!-- TMPL_VAR NAME="barcode" -->">
+          Sede Propietaria: <select name="homebranch"><!-- TMPL_VAR NAME="branchselect" --></select>
 	  </td></tr>
-          <tr><td>Replacement Price:</td>
-	  <td><input name=replacementprice size=10></td></tr>
-          <tr><td>Notes</td>
-	  <td><textarea name=notes rows=4 cols=40 wrap=physical></textarea>
+          <tr><td>Costo de Restituci&oacute;n:</td>
+	  <td><input name="replacementprice" size="10"></td></tr>
+          <tr><td>Notas</td>
+	  <td><textarea name="notes" rows="4" cols="40" wrap="physical"></textarea>
 	  </td></tr>
         </table>
         <p>
-        <input type=submit value="Add Item">
+        <input type="submit" value="A&ntilde;adir Ejemplar">
       </form>
       </td></tr>
     </table>
-<TMPL_INCLUDE NAME="cat-bottom.inc">
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: es/marcimport/AcceptItemCopy.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/marcimport/Attic/AcceptItemCopy.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/marcimport/AcceptItemCopy.tmpl	3 Jun 2003 21:41:15 -0000	1.2
+++ es/marcimport/AcceptItemCopy.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,27 +1,27 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <center>
-<TMPL_IF name="BARCODE_EXISTS">
-	<font color=red>Barcode '<TMPL_VAR name="barcode">' has already been assigned.</font><p>
-</TMPL_IF>
-<TMPL_IF name="ITEM_ERROR">
-	<font color=red>Error : <TMPL_VAR name="error"></font><p>
-</TMPL_IF>
-<TMPL_IF name="ITEM_CREATED">
-	<table border=1 align=center cellpadding=10>
-		<tr><td bgcolor=yellow>
-			Item added with barcode <TMPL_VAR name="barcode">
+<!-- TMPL_IF NAME="BARCODE_EXISTS" -->
+	<font color="red">C&oacute;digo de barras <b><!-- TMPL_VAR NAME="barcode" --></b> ya ha sido asignado.</font><p>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="ITEM_ERROR" -->
+	<font color="red">Error : <!-- TMPL_VAR NAME="error" --></font><p>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="ITEM_CREATED" -->
+	<table border="1" align="center" cellpadding="10">
+		<tr><td bgcolor="yellow">
+			Ejemplar agregado con c&oacute;digo de barras <!-- TMPL_VAR NAME="barcode" -->
 		</td></tr>
 	</table>
-</TMPL_IF>
-<h1>Main Menu</h1>
+<!-- /TMPL_IF -->
+<h1>Menu Principal</h1>
 <ul>
 <!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
      was in Perl.
   -->
-<li><a href=$ENV{'SCRIPT_NAME'}?menu=z3950>Z39.50 Search</a>
+<li><a href="$ENV{'SCRIPT_NAME'}?menu=z3950">B&uacute;squeda Z39.50</a>
 <!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
      was in Perl.
   -->
-<li><a href=$ENV{'SCRIPT_NAME'}?menu=uploadmarc>Upload MARC Records</a>
+<li><a href="$ENV{'SCRIPT_NAME'}?menu=uploadmarc">Subir registros MARC</a>
 </ul>
-<TMPL_INCLUDE NAME="cat-bottom.inc">
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: es/marcimport/AcceptMarcUpload.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/marcimport/Attic/AcceptMarcUpload.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/marcimport/AcceptMarcUpload.tmpl	3 Jun 2003 21:41:15 -0000	1.2
+++ es/marcimport/AcceptMarcUpload.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,41 +1,42 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
-<h1><a href=<TMPL_VAR name="SCRIPT_NAME">>Main Menu</a></h1>
-<h2>Select a set of MARC records</h2>\n<ul>
-<TMPL_LOOP name="marc">
-	<li><a href=<TMPL_VAR name="SCRIPT_NAME">?file=<TMPL_VAR name="id">&menu=<TMPL_VAR name="menu">><TMPL_VAR name="name"></a></li>
-</TMPL_LOOP>
-<li><a href=<TMPL_VAR name="SCRIPT_NAME">?menu=z3950>Z39.50 Search</a>
-<li><a href=<TMPL_VAR name="SCRIPT_NAME">?menu=uploadmarc>Upload MARC Records</a>
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<h1><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->">Menu Principal</a></h1>
+<h2>Seleccionar un conjunto de registros MARC</h2>
+<ul>
+<!-- TMPL_LOOP NAME="marc" -->
+	<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?file=<!-- TMPL_VAR NAME="id" -->&amp;menu=<!-- TMPL_VAR NAME="menu" -->"><!-- TMPL_VAR NAME="name" --></a></li>
+<!-- /TMPL_LOOP -->
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=z3950">B&uacute;squeda Z39.50</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=uploadmarc">Subir registros MARC</a>
 </ul>
 </ul>
 <p>
-<table border=1 bgcolor=#dddddd>
-	<tr><th bgcolor=#bbbbbb colspan=2>
-		Upload a set of MARC records</th>
+<table border="1" bgcolor="#dddddd">
+	<tr><th bgcolor="#bbbbbb" colspan="2">
+		Subir un conjunto de registros MARC</th>
 	</tr>
 	<tr>
-		<td>Upload a set of MARC records:</td>
+		<td>Subir un conjunto de registros MARC:</td>
 		<td>
-			<form method="post" action="<TMPL_VAR name="SCRIPT_NAME">?menu=<TMPL_VAR name="menu">" enctype="multipart/form-data">
-			<input type="file" name="uploadmarc"/>
+			<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=<!-- TMPL_VAR NAME="menu" -->" enctype="multipart/form-data">
+			<input type="file" name="uploadmarc" />
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<input type=hidden name=menu value=<TMPL_VAR name="menu">
-			Name this set of MARC records:
+			<input type="hidden" name="menu" value="<!-- TMPL_VAR NAME="menu" -->">
+			Nombre de este conjunto de registros MARC
 		</td>
 		<td>
-			<input type=text name=name>
+			<input type="text" name="name">
 		</td>
 	</tr>
 	<tr>
-		<td colspan=2 align=center>
-			<input type=submit>
+		<td colspan="2" align="center">
+			<input type="submit">
 		</td>
 	</tr>
 </table>
 </form>
 
-<TMPL_INCLUDE NAME="cat-bottom.inc">
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
 

Index: es/marcimport/ListFileRecords.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/marcimport/Attic/ListFileRecords.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/marcimport/ListFileRecords.tmpl	3 Jun 2003 21:41:15 -0000	1.2
+++ es/marcimport/ListFileRecords.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,53 +1,53 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
-<h1>Main Menu</h1>
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<h1>Menu Principal</h1>
 <ul>
-<li><a href=<TMPL_VAR name="SCRIPT_NAME">?menu=z3950>Z39.50 Search</a>
-<li><a href=<TMPL_VAR name="SCRIPT_NAME">?menu=uploadmarc>Upload MARC Records</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=z3950">B&uacute;squeda Z39.50</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=uploadmarc">Subir registros MARC</a>
 </ul>
 <center>
 <p>
 <!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
      was in Perl.
   -->
-<a href=$ENV{'SCRIPT_NAME'}?menu=$menu>Select a New File</a>
+<a href="$ENV{'SCRIPT_NAME'}?menu=$menu">Seleccionar un Nuevo Archivo</a>
 <p>
-<TMPL_IF name="IS_MARC">
-	<table border=0 cellpadding=10 cellspacing=0>
+<!-- TMPL_IF NAME="IS_MARC" -->
+	<table border="0" cellpadding="10" cellspacing="0">
 	<tr>
-		<th background=/images/background-acq.gif>
-		 	Select a Record to Import from <TMPL_VAR name="recordsource">
+		<th background="/images/background-acq.gif">
+		 	Seleccionar un Registro del cual Importar <!-- TMPL_VAR NAME="recordsource" -->
 		</th>
 	</tr>
 	<tr>
-		<td bgcolor=#dddddd>
-</TMPL_IF>
-<TMPL_IF name="IS_Z3950">
-<table border=0 cellpadding=10 cellspacing=0>
+		<td bgcolor="#dddddd">
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="IS_Z3950" -->
+<table border="0" cellpadding="10" cellspacing="0">
 <tr>
-		<td bgcolor=#dddddd>
-		<TMPL_IF name="HAS_NUMRECORDS">
-	            <a name=SERVER-<TMPL_VAR name="srvid">></a> " <TMPL_VAR name="srvname">
-		<font size=-1>[Viewing <TMPL_VAR name="startrecord"> to <TMPL_VAR name="highest"> of <TMPL_VAR name="numrecords"> records]  <TMPL_VAR name="previous"> | <TMPL_VAR name="next"> </font><br>
-		</TMPL_IF>
-		<TMPL_IF name="PENDING">
-			<font color=red>Search still pending...</font>
-		<TMPL_ELSE>
-			<font color=red>processing... <TMPL_VAR name="elapsedtime"></font>
-		</TMPL_IF>
-		<TMPL_IF name="NO_RECORDS">
-			<b>No results found for query <TMPL_VAR name="id"></b>
-		</TMPL_IF>
-</TMPL_IF>
-	<TMPL_LOOP name="LINES">
-<!--		<a href=<TMPL_VAR name="SCRIPT_NAME">?file=<TMPL_VAR name="file">&resultsid=<TMPL_VAR name="resultsid">&<TMPL_VAR name="searchfield">=<TMPL_VAR name="searchvalue">&searchfield=<TMPL_VAR name="searchfield">&searchvalue=<TMPL_VAR name="searchvalue">> -->
-		<a href=<TMPL_VAR name="SCRIPT_NAME">?file=<TMPL_VAR name="file">&numrecord=<TMPL_VAR name="numrecord">>
-				<TMPL_VAR name="title">
-				<TMPL_VAR name="author">
+		<td bgcolor="#dddddd">
+		<!-- TMPL_IF NAME="HAS_NUMRECORDS" -->
+	            <a name="SERVER-<!-- TMPL_VAR NAME="srvid" -->"></a> " <!-- TMPL_VAR NAME="srvname" -->
+		<font size="-1">[Viendo <!-- TMPL_VAR NAME="startrecord" --> a <!-- TMPL_VAR NAME="highest" --> de <!-- TMPL_VAR NAME="numrecords" --> registros] <!-- TMPL_VAR NAME="previous" --> | <!-- TMPL_VAR NAME="next" --> </font><br>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="PENDING" -->
+			<font color="red">B&uacute;squeda pendiente...</font>
+		<!-- TMPL_ELSE -->
+			<font color="red">procesando... <!-- TMPL_VAR NAME="elapsedtime" --></font>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="NO_RECORDS" -->
+			<b>No hubo resultados para la consulta <!-- TMPL_VAR NAME="id" --></b>
+		<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+	<!-- TMPL_LOOP NAME="LINES" -->
+<!--		<a href=<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?file=<!-- TMPL_VAR NAME="file" -->&amp;resultsid=<!-- TMPL_VAR NAME="resultsid" -->&amp;<!-- TMPL_VAR NAME="searchfield" -->=<!-- TMPL_VAR NAME="searchvalue" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;searchvalue=<!-- TMPL_VAR NAME="searchvalue" -->> -->
+		<a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?file=<!-- TMPL_VAR NAME="file" -->&amp;numrecord=<!-- TMPL_VAR NAME="numrecord" -->">
+				<!-- TMPL_VAR NAME="title" -->
+				<!-- TMPL_VAR NAME="author" -->
 		</a>
-		<TMPL_VAR name="donetext"><br>
-	</TMPL_LOOP>
+		<!-- TMPL_VAR NAME="donetext" --><br>
+	<!-- /TMPL_LOOP -->
 </td>
 </tr>
 </table>
 
-<TMPL_INCLUDE NAME="cat-bottom.inc">
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: es/marcimport/mainmenu.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/marcimport/Attic/mainmenu.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/marcimport/mainmenu.tmpl	3 Jun 2003 21:41:15 -0000	1.2
+++ es/marcimport/mainmenu.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,7 +1,7 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
-<h1>Main Menu</h1>
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<h1>Menu Principal</h1>
 <ul>
-<li><a href=<TMPL_VAR name="SCRIPT_NAME">?menu=z3950>Z39.50 Search</a>
-<li><a href=<TMPL_VAR name="SCRIPT_NAME">?menu=uploadmarc>Upload MARC Records</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=z3950">B&uacute;squeda Z39.50</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=uploadmarc">Subir registros MARC</a>
 </ul>
-<TMPL_INCLUDE NAME="cat-bottom.inc">
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: es/marcimport/marcimportdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/marcimport/Attic/marcimportdetail.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/marcimport/marcimportdetail.tmpl	3 Jun 2003 21:41:15 -0000	1.2
+++ es/marcimport/marcimportdetail.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,61 +1,60 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
-<a href=request.pl?bib=<TMPL_VAR NAME="biblionumber">>
-<img height=42  WIDTH=120 BORDER="0" src="/images/requests.gif" align="right" border="0"></a>
-<font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
-<TMPL_VAR NAME="class"></em></font><p>
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<a href="request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">
+<img height="42"  width="120" border="0" src="/images/requests.gif" align="right" border="0"></a>
+<font size="6"><em><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></em></font><p>
 <!-- FIXME - "callpadding" should be "cellpadding", right? -->
 <table cellspacing="0" callpadding="5" border="1" align="left" width="220">
-<!-----------------old style RECORD TABLE--------->
+<!-- ---------------old style RECORD TABLE------- -->
 <center>
-<h1>New Record</h1>
-Full MARC Record available at bottom
-<form method=post>
-<table border=1>
-	<tr bgcolor="#dddddd"><td>Title</td><td><input type="text" name="title" value="<TMPL_VAR NAME="title">" size=40 maxlenght=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Subtitle</td><td><input type="text" name="subtitle" value="<TMPL_VAR NAME="subtitle">" size=40 maxlenght=255></td></tr>
-	<tr bgcolor="#dddddd"><td>Author</td><td><input type="text" name="author" value="<TMPL_VAR NAME="author">" size=40 maxlenght=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Additional authors</td><td><textarea name="additionalauthors" rows=4 cols=20><TMPL_VAR NAME="additionalauthors"></textarea></td></tr>
-	<tr bgcolor="#dddddd"><td>Illustrator</td><td><input type="text" name="illustrator" value="<TMPL_VAR NAME="illustrator">" size=40 maxlenght=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Copyright</td><td><input type="text" name="copyrightdate" value="<TMPL_VAR NAME="copyrightdate">" size=20 maxlenght=80></td></tr>
-	<tr bgcolor="#dddddd"><td>Series Title</td><td><input type="text" name="seriestitle" value="<TMPL_VAR NAME="seriestitle">" size=40 maxlenght=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Volume</td><td><input type="text" name="volume" value="<TMPL_VAR NAME="volume">" size=40 maxlenght=255></td></tr>
-	<tr bgcolor="#dddddd"><td>Number</td><td><input type="text" name="number" value="<TMPL_VAR NAME="number">" size=40 maxlenght=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Volume Date</td><td><input type="text" name="volumedate" value="<TMPL_VAR NAME="volumedate">" size=40 maxlenght=255></td></tr>
-	<tr bgcolor="#dddddd"><td>Volume Description</td><td><input type="text" name="volumedesc" value="<TMPL_VAR NAME="volumeddesc">" size=40 maxlenght=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Subject</td><td><input type="text" name="subject" value="<TMPL_VAR NAME="subject">" size=40 maxlenght=255></td></tr>
-	<tr bgcolor="#dddddd"><td>Notes</td><td><input type="text" name="notes" value="<TMPL_VAR NAME="notes">" size=40 maxlenght=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Item Type</td><td><select name=itemtype>$itemtypeselect</select></td></tr>
-	<tr bgcolor="#dddddd"><td>ISBN</td><td><input type="text" name="isbn" value="<TMPL_VAR NAME="isbn">" size=40 maxlenght=40></td></tr>
-	<tr bgcolor="#ddaaaa"><td>ISSN</td><td><input type="text" name="issn" value="<TMPL_VAR NAME="issn">" size=40 maxlenght=40></td></tr>
-	<tr bgcolor="#dddddd"><td>LCCN</td><td><input type="text" name="lccn" value="<TMPL_VAR NAME="lccn">" size=40 maxlenght=40></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Dewey</td><td><input type="text" name="dewey" value="<TMPL_VAR NAME="dewey">" size=8 maxlenght=10></td></tr>
-	<tr bgcolor="#dddddd"><td>Subclass</td><td><input type="text" name="subclass" value="<TMPL_VAR NAME="subclass">" size=40 maxlenght=40></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Publication Year</td><td><input type="text" name="pubyear" value="<TMPL_VAR NAME="publicationyear">" size=5 maxlenght=10></td></tr>
-	<tr bgcolor="#dddddd"><td>Publisher</td><td><input type="text" name="publisher" value="<TMPL_VAR NAME="publishercode">" size=40 maxlenght=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Place</td><td><input type="text" name="place" value="<TMPL_VAR NAME="place">" size=40 maxlenght=255></td></tr>
-	<tr bgcolor="#dddddd"><td>Pages</td><td><input type="text" name="pages" value="<TMPL_VAR NAME="pages">" size=5 maxlenght=10></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Size</td><td><input type="text" name="size" value="<TMPL_VAR NAME="size">" size=40 maxlenght=40></td></tr>
+<h1>Nuevo Registro</h1>
+Registro MARC completo disponible m&aacute;s abajo
+<form method="post">
+<table border="1">
+	<tr bgcolor="#dddddd"><td>T&iacute;tulo</td><td><input type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Subt&iacute;tulo</td><td><input type="text" name="subtitle" value="<!-- TMPL_VAR NAME="subtitle" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#dddddd"><td>Autor</td><td><input type="text" name="author" value="<!-- TMPL_VAR NAME="author" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Autores Adicionales</td><td><textarea name="additionalauthors" rows="4" cols="20"><!-- TMPL_VAR NAME="additionalauthors" --></textarea></td></tr>
+	<tr bgcolor="#dddddd"><td>Ilustrador</td><td><input type="text" name="illustrator" value="<!-- TMPL_VAR NAME="illustrator" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Copyright</td><td><input type="text" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" size="20" maxlength="80"></td></tr>
+	<tr bgcolor="#dddddd"><td>T&iacute;tulo de Serie</td><td><input type="text" name="seriestitle" value="<!-- TMPL_VAR NAME="seriestitle" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Volumen</td><td><input type="text" name="volume" value="<!-- TMPL_VAR NAME="volume" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#dddddd"><td>N&uacute;mero</td><td><input type="text" name="number" value="<!-- TMPL_VAR NAME="number" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Fecha del Volumen</td><td><input type="text" name="volumedate" value="<!-- TMPL_VAR NAME="volumedate" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#dddddd"><td>Descripci&oacute;n del Volumen</td><td><input type="text" name="volumedesc" value="<!-- TMPL_VAR NAME="volumeddesc" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Tema</td><td><input type="text" name="subject" value="<!-- TMPL_VAR NAME="subject" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#dddddd"><td>Notas</td><td><input type="text" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Tipo de art&iacute;culo</td><td><select name="itemtype">$itemtypeselect</select></td></tr>
+	<tr bgcolor="#dddddd"><td>ISBN</td><td><input type="text" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" size="40" maxlength="40"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>ISSN</td><td><input type="text" name="issn" value="<!-- TMPL_VAR NAME="issn" -->" size="40" maxlength="40"></td></tr>
+	<tr bgcolor="#dddddd"><td>LCCN</td><td><input type="text" name="lccn" value="<!-- TMPL_VAR NAME="lccn" -->" size="40" maxlength="40"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Dewey</td><td><input type="text" name="dewey" value="<!-- TMPL_VAR NAME="dewey" -->" size="8" maxlength="10"></td></tr>
+	<tr bgcolor="#dddddd"><td>Subclase</td><td><input type="text" name="subclass" value="<!-- TMPL_VAR NAME="subclass" -->" size="40" maxlength="40"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>A&ntilde;o de Publicaci&oacute;n</td><td><input type="text" name="pubyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" size="5" maxlength="10"></td></tr>
+	<tr bgcolor="#dddddd"><td>Editor</td><td><input type="text" name="publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Lugar</td><td><input type="text" name="place" value="<!-- TMPL_VAR NAME="place" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#dddddd"><td>P&aacute;ginas</td><td><input type="text" name="pages" value="<!-- TMPL_VAR NAME="pages" -->" size="5" maxlength="10"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Tama&ntilde;o</td><td><input type="text" name="size" value="<!-- TMPL_VAR NAME="size" -->" size="40" maxlength="40"></td></tr>
 </table>
-<input type=submit>
-<input type="hidden" name="insertnewrecord" value=1>
-<!-- <input type="hidden" name="origisbn" value="<TMPL_VAR name="qisbn">">
-<input type="hidden" name="origissn" value="<TMPL_VAR name="qissn">">
-<input type="hidden" name="origlccn" value="<TMPL_VAR name="qlccn">">
-<input type="hidden" name="origcontrolnumber" value="<TMPL_VAR name="qcontrolnumber">"> -->
-<input type="hidden" name="file" value="<TMPL_VAR name="file">">
-<input type="hidden" name="numrecord" value="<TMPL_VAR name="numrecord">">
+<input type="submit">
+<input type="hidden" name="insertnewrecord" value="1">
+<!-- <input type="hidden" name="origisbn" value="<!-- TMPL_VAR NAME="qisbn" -->">
+<input type="hidden" name="origissn" value="<!-- TMPL_VAR NAME="qissn" -->">
+<input type="hidden" name="origlccn" value="<!-- TMPL_VAR NAME="qlccn" -->">
+<input type="hidden" name="origcontrolnumber" value="<!-- TMPL_VAR NAME="qcontrolnumber" -->"> -->
+<input type="hidden" name="file" value="<!-- TMPL_VAR NAME="file" -->">
+<input type="hidden" name="numrecord" value="<!-- TMPL_VAR NAME="numrecord" -->">
 </form>
 
 <!-- MARC RECORD -->
-<table width=100% cellspacing=1 cellpading=1>
-<th colspan=4 background="/images/background-acq.gif">MARC RECORD</th>
-<TMPL_LOOP name="MARC">
-<tr bgcolor="<TMPL_VAR name="color">">
-	<td width=5% align="right"><b><TMPL_VAR name="tagid"></b>&nbsp;</td>
-	<td width=3% align="right"><b><TMPL_VAR name="subfield"></b>&nbsp;</td>
-	<td width=48%><TMPL_VAR name="tagmean">&nbsp;</td>
-	<td width=45% bgcolor="<TMPL_VAR name="color">"><TMPL_VAR name="tagvalue">&nbsp;</td>
+<table width="100%" cellspacing="1" cellpadding="1">
+<th colspan="4" background="/images/background-acq.gif">REGISTRO MARC</th>
+<!-- TMPL_LOOP NAME="MARC" -->
+<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
+	<td width="5%" align="right"><b><!-- TMPL_VAR NAME="tagid" --></b>&nbsp;</td>
+	<td width="3%" align="right"><b><!-- TMPL_VAR NAME="subfield" --></b>&nbsp;</td>
+	<td width="48%"><!-- TMPL_VAR NAME="tagmean" -->&nbsp;</td>
+	<td width="45%" bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="tagvalue" -->&nbsp;</td>
 <tr>
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 </table>
-<TMPL_INCLUDE NAME="cat-bottom.inc">
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: es/marcimport/uploadmarc.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/marcimport/Attic/uploadmarc.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/marcimport/uploadmarc.tmpl	3 Jun 2003 21:41:16 -0000	1.2
+++ es/marcimport/uploadmarc.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,42 +1,42 @@
-<TMPL_INCLUDE NAME="cat-top.inc">
-<h1><a href=<TMPL_VAR name="SCRIPT_NAME">>Main Menu</a></h1>
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<h1><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->">Menu Principal</a></h1>
 <ul>
-	<li><a href=<TMPL_VAR name="SCRIPT_NAME">?menu=z3950>Z39.50 Search</a>
-	<li><a href=<TMPL_VAR name="SCRIPT_NAME">?menu=uploadmarc>Upload MARC Records</a>
+	<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=z3950">B&uacute;squeda Z39.50</a>
+	<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=uploadmarc">Subir registros MARC</a>
 </ul>
-<h2>Select a set of MARC records</h2><ul>
-<TMPL_LOOP name="marc">
-	<li><a href=<TMPL_VAR name="SCRIPT_NAME">?file=<TMPL_VAR name="id">&menu=<TMPL_VAR name="menu">><TMPL_VAR name="name"></a></li>
-</TMPL_LOOP>
+<h2>Seleccionar un conjunto de registros MARC</h2><ul>
+<!-- TMPL_LOOP NAME="marc" -->
+	<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?file=<!-- TMPL_VAR NAME="id" -->&amp;menu=<!-- TMPL_VAR NAME="menu" -->"><!-- TMPL_VAR NAME="name" --></a></li>
+<!-- /TMPL_LOOP -->
 </ul>
 <p>
-<table border=1 bgcolor=#dddddd>
-	<tr><th bgcolor=#bbbbbb colspan=2>
-		Upload a set of MARC records</th>
+<table border="1" bgcolor="#dddddd">
+	<tr><th bgcolor="#bbbbbb" colspan="2">
+		Subir un conjunto de registros MARC</th>
 	</tr>
 	<tr>
-		<td>Upload a set of MARC records:</td>
+		<td>Subir un conjunto de registros MARC:</td>
 		<td>
-			<form method="post" action="<TMPL_VAR name="SCRIPT_NAME">?menu=<TMPL_VAR name="menu">" enctype="multipart/form-data">
-			<input type="file" name="uploadmarc"/>
+			<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=<!-- TMPL_VAR NAME="menu" -->" enctype="multipart/form-data">
+			<input type="file" name="uploadmarc" />
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<input type=hidden name=menu value=<TMPL_VAR name="menu">>
-			Name this set of MARC records:
+			<input type="hidden" name="menu" value=<!-- TMPL_VAR NAME="menu" -->>
+			Nombre de este conjunto de registros MARC
 		</td>
 		<td>
-			<input type=text name=name>
+			<input type="text" name="name">
 		</td>
 	</tr>
 	<tr>
-		<td colspan=2 align=center>
-			<input type=submit>
+		<td colspan="2" align="center">
+			<input type="submit">
 		</td>
 	</tr>
 </table>
 </form>
 
-<TMPL_INCLUDE NAME="cat-bottom.inc">
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
 

Index: es/members/imemberentry.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/members/Attic/imemberentry.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/members/imemberentry.tmpl	3 Jun 2003 21:41:16 -0000	1.2
+++ es/members/imemberentry.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,128 +1,115 @@
-<TMPL_INCLUDE name="members-top.inc">
-<BLOCKQUOTE>
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
+<div id="mainbloc">
+<!-- TMPL_IF NAME="surname" -->
+	<h1>Editar Instituci&oacute;n</h1>
+<!-- TMPL_ELSE -->
+	<h1>A&ntilde;adir nueva Instituci&oacute;n</h1>
+<!-- /TMPL_IF -->
+<form action="/cgi-bin/koha/members/newimember.pl" method="post">
+  <input type="hidden" name="joining" value="">
+  <input type="hidden" name="expiry" value="">
+  <input type="hidden" name="type" value="borrowers">
+  <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
+  <input type="hidden" name="updtype" value="I">
 
-<FONT SIZE=6><em>Agregar Instituci&oacute;n</em></FONT><br>
-<form action=/cgi-bin/koha/newimember.pl method=post>
-  <input type=hidden name=joining value="">
-  <input type=hidden name=expiry value="">
-  <input type=hidden name=type value="borrowers">
-  <input type=hidden name=borrowernumber value="<TMPL_VAR NAME=member>">
-  <input type=hidden name=updtype value=I>
+  <table border="0" cellspacing="0" cellpadding="5">
 
-  <table border=0 cellspacing=0 cellpadding=5>
-
-    <tr valign=top>
-      <td ><input type=reset value="Borrar Todo"></td>
+    <tr valign="top">
+      <td colspan="3"><input type="reset" value="Limpiar Todos los Campos"></td>
     </tr>
 
-    <tr align=right>
-      <td COLSPAN=2 ALIGN=RIGHT><font size=3 face='arial,helvetica'>
-        <STRONG>Usuario# <TMPL_VAR NAME="member">, Identificaci&oacute;n*</STRONG>
-      </TD>
-      <TD align=right><input type=text name=cardnumber_institution size=20 value=" "><br></td>
-    </TR>
-
-    <tr><td>&nbsp;</TD></TR>
-
-    <tr valign=top bgcolor="99cc33" >
-      <td  COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-        <B>DETALLES DE LA INSTITUCION</b>
+    <tr align="right">
+      <td colspan="2" align="right">
+        <strong>Usuario# <!-- TMPL_VAR NAME="member" -->, N&uacute;mero de carnet*</strong>
       </td>
-      <td  COLSPAN=2  ALIGN=RIGHT background="<TMPL_VAR name="themelang">/images/background-mem.gif">
+      <td align="right"><input type="text" name="cardnumber_institution" size="20" value="<!-- TMPL_VAR NAME="cardnumber_institution" -->"></td>
+    </tr>
+
+    <tr valign="top" bgcolor="#99cc33">
+      <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+        <b>DETALLES DE LA INSTITUCION</b>
       </td>
+      <td colspan="2" align="right" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">&nbsp;</td>
     </tr>
 
-    <tr valign=top bgcolor=white>
-      <td><FONT SIZE=2>Nombre de la Instituci&oacute;n</FONT></td>
+    <tr>
+      <td colspan="3">Nombre de la Instituci&oacute;n</td>
     </tr>
-    <tr valign=top bgcolor=white>
-      <td colspan=3><input type=text name=institution_name size=50 value=""></td>
+    <tr>
+      <td colspan="3"><input type="text" name="institution_name" size="50" value="<!-- TMPL_VAR NAME="surname" -->"></td>
     </tr>
-    <tr><td>&nbsp;</TD></TR>
 
-    <tr valign=top bgcolor="99cc33" >
-      <td  COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-	  <B>DIRECCION DE LA INSTITUCION</b>
+    <tr valign="top" bgcolor="#99cc33" >
+      <td  colspan="3" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+	  <b>DIRECCION DE LA INSTITUCION</b>
       </td>
     </tr>
 
-    <tr valign=top bgcolor=white>
-	<td ><FONT SIZE=2>Direcci&oacute;Postal*</FONT></td>
-	<td><FONT SIZE=2>Ciudad*</FONT></td>
-	<td><FONT SIZE=2>Area</FONT></td>
+    <tr>
+	<td >Direcci&oacute;n Postal*</td>
+	<td>Cod. Postal / Ciudad</td>
+	<td>Area</td>
     </tr>
-    <tr valign=top bgcolor=white>
-	<td><input type=text name=address size=40 value=""></td>
-	<td><input type=text name=city size=20 value=""></td>
+    <tr>
+	<td><input type="text" name="address" size="40" value="<!-- TMPL_VAR NAME="streetaddress" -->"></td>
+	<td><input type="text" name="zipcode" size="20" value="<!-- TMPL_VAR NAME="zipcode" -->"> <br> <input type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"></td>
 	<td>
-      	<TMPL_VAR name="CGIbranch">
+      	<!-- TMPL_VAR NAME="CGIbranch" -->
 	 </td>
     </tr>
-    <tr><td>&nbsp;</TD></TR>
 
-    <tr valign=top bgcolor="99cc33">
-      <td COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-	  <B>DETALLES DEL CONTACTO</b>
+    <tr valign="top" bgcolor="#99cc33">
+      <td colspan="3" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+	  <b>DETALLES DE CONTACTO</b>
       </td>
     </tr>
 
-    <tr valign=top bgcolor=white>
-	<td COLSPAN=3><FONT SIZE=2>Nombre del Contacto*</td>
+    <tr>
+	<td colspan="3">Nombre del Contacto*</td>
     </tr>
-    <tr valign=top bgcolor=white>
-	<td COLSPAN=3><input type=text name=contactname size=40 value=""></td>
+    <tr>
+	<td colspan="3"><input type="text" name="contactname" size="40" value="<!-- TMPL_VAR NAME="contactname" -->"></td>
     </tr>
 
 
-    <tr valign=top bgcolor=white>
-	<td><FONT SIZE=2>Tel&eacute;fono (d&iacute;a)</td>
-	<td><FONT SIZE=2>Fax</td>
-	<td><FONT SIZE=2>Email</td>
+    <tr>
+	<td>Tel&eacute;fono (d&iacute;a)</td>
+	<td>Fax</td>
+	<td>Correo electr&oacute;nico</td>
     </tr>
-    <tr valign=top bgcolor=white>
-	<td ><input type=text name=phoneday size=20 value=""></td>
-	<td><input type=text name=faxnumber size=20 value=""></td>
-	<td ><input type=text name=emailaddress size=20 value=""></td>
+    <tr>
+	<td ><input type="text" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->"></td>
+	<td><input type="text" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->"></td>
+	<td ><input type="text" name="emailaddress" size="20" value="<!-- TMPL_VAR NAME="emailaddress" -->"></td>
     </tr>
 
-    <tr><td>&nbsp;</TD></TR>
-
-    <tr valign=top bgcolor=white>
-	<td><FONT SIZE=2>Notas</font></td>
+    <tr>
+	<td>Notas</td>
     </tr>
-    <tr valign=top bgcolor=white>
-	<td COLSPAN=4><textarea name=altnotes wrap=physical cols=70 rows=3></textarea></td>
+    <tr>
+	<td colspan="3"><textarea name="altnotes" cols="70" rows="3"><!-- TMPL_VAR NAME="altnotes" --></textarea></td>
     </tr>
 
-    <tr><td>&nbsp;</TD></TR>
-
-    <tr valign=top bgcolor="99cc33"  >
-	<td  COLSPAN=5  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>LIBRARY USE</B></td>
+    <tr valign="top" bgcolor="#99cc33"  >
+	<td  colspan="3"  background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>USO INTERNO</b></td>
     </tr>
 
-    <tr valign=top bgcolor=white>
-	<td ><FONT SIZE=2>Notas</font></td>
+    <tr>
+	<td colspan="3">Notas</td>
     </tr>
-    <tr valign=top >
-	<td  COLSPAN=5><textarea name=borrowernotes wrap=physical cols=70 rows=3></textarea></td>
+    <tr valign="top" >
+	<td colspan="3"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td>
     </tr>
 
-    <tr><td>&nbsp;</TD></TR>
-
-    <tr valign=top bgcolor=white>
-	<td  COLSPAN=5 align=right >
-	  <input type=image src="<TMPL_VAR name="themelang">/images/save-changes.gif" WIDTH=188 HEIGHT=44 ALT="Add New Member" border=0 >
+    <tr>
+	<td  colspan="3" align="right" >
+	  <input type="submit" class="button" value="Guardar Cambios">
       </td>
     </tr>
-  </TABLE>
+  </table>
 </form>
-
-</BLOCKQUOTE>
-
-<br clear=all>
-<p> &nbsp; </p>
-
-<TMPL_VAR NAME=endmenumember>
+</div>
+<!-- TMPL_VAR NAME="endmenumember" -->
 
 </body>
-</HTML>
+</html>

Index: es/members/jmemberentry.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/members/Attic/jmemberentry.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/members/jmemberentry.tmpl	3 Jun 2003 21:41:17 -0000	1.2
+++ es/members/jmemberentry.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,111 +1,116 @@
-<HTML>
-
-<!-- startmenu (member)
-     this  includes the head-container and <body>
-     including this via var contradicts the separation of code and design
-     a solution via tmpl_include would be better -->
-
-<TMPL_VAR NAME=startmenumember>
-
-<!-- here comes the junior stuff -->
-
-<BLOCKQUOTE>
-
-<FONT SIZE=6><em>Agregar usuario menor</em></font><br>
-<form action=/cgi-bin/koha/newjmember.pl method=post>
-	<!--<input type=hidden name=joining value="">
-	<input type=hidden name=expiry value="">
-	<input type=hidden name=type value="borrowers">-->
-	<input type=hidden name=borrowernumber value="<TMPL_VAR NAME=member>">
-	<input type=hidden name=updtype value=I>
-	<input type=hidden name=area value="<TMPL_VAR NAME=area>">
-	<input type=hidden name=city value="<TMPL_VAR NAME=city>">
-	<input type=hidden name=street value="<TMPL_VAR NAME=address>">
-	<input type=hidden name=streetaddress value="<TMPL_VAR NAME=streetaddress>">
-	<input type=hidden name=streetcity value="<TMPL_VAR NAME=streetcity>">
-	<input type=hidden name=phone value="<TMPL_VAR NAME=phone>">
-	<input type=hidden name=phoneday value="<TMPL_VAR NAME=phoneday>">
-	<input type=hidden name=faxnumber value="<TMPL_VAR NAME=faxnumber>">
-	<input type=hidden name=emailaddress value="<TMPL_VAR NAME=emailaddress>">
-	<input type=hidden name=contactname value="<TMPL_VAR NAME=contactname>">
-	<input type=hidden name=altphone value"<TMPL_VAR NAME=altphone>">
-
-	<table border=0 cellspacing=0 cellpadding=5 >
-	<tr valign=top bgcolor="99cc33" >
-		<td  COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-			<B>PADRE O TUTOR </b>
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
+<div id="mainbloc">
+	<h1>A&ntilde;adir Nuevo Usuario Junior </h1><br>
+	<form action="/cgi-bin/koha/members/newjmember.pl" method="post">
+		<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->">
+		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
+		<input type="hidden" name="zipcode" value="<!-- TMPL_VAR NAME="zipcode" -->">
+		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
+		<input type="hidden" name="updtype" value="I">
+		<input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->">
+		<input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city" -->">
+		<input type="hidden" name="physstreet" value="<!-- TMPL_VAR NAME="physstreet" -->">
+		<input type="hidden" name="streetaddress" value="<!-- TMPL_VAR NAME="streetaddress" -->">
+		<input type="hidden" name="streetcity" value="<!-- TMPL_VAR NAME="streetcity" -->">
+		<input type="hidden" name="phone" value="<!-- TMPL_VAR NAME="phone" -->">
+		<input type="hidden" name="phoneday" value="<!-- TMPL_VAR NAME="phoneday" -->">
+		<input type="hidden" name="faxnumber" value="<!-- TMPL_VAR NAME="faxnumber" -->">
+		<input type="hidden" name="emailaddress" value="<!-- TMPL_VAR NAME="emailaddress" -->">
+		<input type="hidden" name="contactname" value="<!-- TMPL_VAR NAME="contactname" -->">
+		<input type="hidden" name="altphone" value"<!-- TMPL_VAR NAME="altphone" -->">
+	
+		<table border="0" cellspacing="0" cellpadding="5" >
+		<tr>
+			<th  colspan="5">
+				PADRE O TUTOR 
+			</th>
+		</tr>
+		<tr valign="top" bgcolor="white">
+			<td>Saludo</td>
+			<td>Nombre*</td>
+			<td colspan="2">Apellidos*</td>
+			<td>Nro de Membres&iacute;a.</td>
+		</tr>
+		<tr>
+			<td>
+				<select name="title" size="1">
+					<option value=" ">Sin T&iacute;tulo
+					<!-- TMPL_LOOP NAME="titleloop" -->
+					<option value="<!-- TMPL_VAR NAME="title" -->" <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="title" -->
+					<!-- /TMPL_LOOP -->
+				</select>
+			</td>
+			<td><input type="text" name="firstname_guardian" size="20" value="<!-- TMPL_VAR NAME="firstname" -->"></td>
+			<td colspan="2"><input type="text" name="surname_guardian" size="20" value="<!-- TMPL_VAR NAME="surname" -->"></td>
+			<td><input type="text" name="guardian_number" size="20" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
+		</tr>
+		<!-- TMPL_LOOP NAME="cmemloop" -->
+		<tr>
+			<tH colspan="5">
+				NI&Ntilde;O <!-- TMPL_VAR NAME="count" -->
+			</tH>
+		</tr>
+		<tr>
+			<td colspan="5">
+				Usuario# <!-- TMPL_VAR NAME="cmember" -->, N&uacute;mero de carnet* <input type="text" name="cardnumber_child_<!-- TMPL_VAR NAME="i" -->" size="20" value="<!-- TMPL_VAR NAME="jcardnumber" -->"><br>
+				<input type="hidden" name="bornumber_child_<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="cmember" -->">
+			</td>
+		</tr>
+		<tr>
+			<td>Nombre</td>
+			<td>Apellidos*</td>
+			<td>Fecha de Nacimiento (<!-- TMPL_VAR NAME="dateformat" -->)*</td>
+			<td>&nbsp;</td>
+			<td>Escuela</td>
+		</tr>
+		<tr>
+			<td><input type="text" name="firstname_child_<!-- TMPL_VAR NAME="i" -->" size="20" value=""></td>
+			<td><input type="text" name="surname_child_<!-- TMPL_VAR NAME="i" -->" size="20" value=""></td>
+			<td><input type="text" name="dateofbirth_child_<!-- TMPL_VAR NAME="i" -->" size="10" value=""></td>
+			<td>
+				<input type="radio" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="F"><b>F</b> <input type="radio" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="M"><b>M*</b>
 		</td>
+			<td><input type="text" name="school_child_<!-- TMPL_VAR NAME="i" -->" size="20" value=""></td>
+		</tr>
+                <tr>
+                        <th colspan="5" >USO INTERNO</th>
 	</tr>
-	<tr valign=top bgcolor=white>
+                <tr>
+                    <td>Fecha de alta (dejar en blanco para hoy)</td>
+                    <td><input type="text" name="joining_child_<!-- TMPL_VAR NAME="i" -->" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->"></td>
+                    <td>Fecha de Vencimiento (dejar en blanco para autocalcular)</td>
+                    <td><input type="text" name="expiry_child_<!-- TMPL_VAR NAME="i" -->" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->"></td>
+                </tr>
+		<tr>
+			<td colspan="5">Los siguientes 2 campos est&aacute;n disponibles para su uso interno. Pueden ser &uacute;tiles para prop&oacute;sitos estad&iacute;sticos</td>
+		<tr>
+			<td>Campo de control 1</td>
+			<td colspan="4">
+				<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
+			</td>
+		</tr>
+		<tr>
+			<td>Campo de control 2</td>
+			<td colspan="4">
+				<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
+			</td>
+		</tr>
+		<tr>
+			<td>Notas</td>
+		</tr>
+		<tr>
+			<td colspan="5"><textarea name="altnotes_child_<!-- TMPL_VAR NAME="i" -->" wrap="physical" cols="70" rows="3"></textarea></td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+		<tr>
 		<td>
-		<SELECT NAME="title" SIZE="1">
-			<OPTION value=" ">Sin T&iacute;tulo
-			<TMPL_LOOP NAME=titleloop>
-			<OPTION value="<TMPL_VAR NAME=title>"<TMPL_VAR NAME=selected>><TMPL_VAR NAME=title>
-			</TMPL_LOOP>
-		</SELECT>
-		</td>
-		<td><input type=text name=firstname_guardian size=20 value="<TMPL_VAR NAME=firstname>"></td>
-		<td colspan=2><input type=text name=surname_guardian size=20 value="<TMPL_VAR NAME=surname>"></td>
-		<td><input type=text name=guardian_number size=20 value="<TMPL_VAR NAME=cardnumber>"></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td><FONT SIZE=2>T&iacute;tulo</FONT></td>
-		<td><FONT SIZE=2>Nombres*</FONT></td>
-		<td colspan=2><FONT SIZE=2>Apellido*</FONT></td>
-		<td><FONT SIZE=2>Membres&iacute;a Nro.</FONT></td>
-	</tr>
-	<TMPL_LOOP NAME=cmemloop>
-	<tr valign=top bgcolor="99cc33">
-		<td COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-			<B>NI&Ntilde;O <TMPL_VAR NAME=count></b>
-		</td>
-	</TR>
-	<TR>
-		<td  COLSPAN=4   ALIGN=RIGHT ><font size=3 face='arial,helvetica'>
-			<STRONG>Usuario# <TMPL_VAR NAME=cmember>, Identificaci&oacute;n*</STRONG>
-		</TD>
-		<TD>
-			<input type=text name=cardnumber_child_<TMPL_VAR NAME=i> size=20 value=""><br>
-			<input type=hidden name=bornumber_child_<TMPL_VAR NAME=i> value="<TMPL_VAR NAME=cmember>">
-		</td>
-	</TR>
-	<tr bgcolor=white>
-		<td><input type=text name=firstname_child_<TMPL_VAR NAME=i> size=20 value=""></td>
-		<td><input type=text name=surname_child_<TMPL_VAR NAME=i> size=20 value=""></td>
-		<td><input type=text name=dateofbirth_child_<TMPL_VAR NAME=i> size=10 value=""></TD>
-		<TD>
-			<input type="radio" name="sex_child_<TMPL_VAR NAME=i>" value="F">F
-			<input type="radio" name="sex_child_<TMPL_VAR NAME=i>" value="M">M*
-		</td>
-		<TD align=right><input type=text name=school_child_<TMPL_VAR NAME=i> size=20 value=""></TD>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td><FONT SIZE=2>Nombres*</FONT></td>
-		<td><FONT SIZE=2>Apellido*</FONT></td>
-		<td><FONT SIZE=2>Fecha de Nacimiento<BR> (dd/mm/aa)*</FONT></td>
-		<td><FONT SIZE=2>&nbsp;</FONT></td>
-		<td><FONT SIZE=2>Escuela</FONT></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td  COLSPAN=5><textarea name=altnotes_child_<TMPL_VAR NAME=i> wrap=physical cols=70 rows=3></textarea></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td><FONT SIZE=2>Notas</font></td>
-	</tr>
-	</TMPL_LOOP>
-	<tr valign=top bgcolor=white>
-		<td colspan=2 align="center"><input type=reset value="Borrar Todo"></td>
-		<td  COLSPAN=3 align="center">
-			<input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png" ALT="Agregar Usuario" border=0>
+				<input type="submit" class="button members" value="ACEPTAR">
 		</td>
+			<td><input type="reset" class="button members" value="Limpiar Todos los Campos"></td>
 	</tr>
 
-	</TABLE>
-</form>
-
-
-<TMPL_VAR NAME=endmenumember>
+		</table>
+	</form>
+</div>
 
-</body>
-</HTML>
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: es/members/member-password.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/members/Attic/member-password.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/members/member-password.tmpl	3 Jun 2003 21:49:33 -0000	1.1
+++ es/members/member-password.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,20 +1,20 @@
-<HTML>
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
-<TMPL_INCLUDE NAME="members-top.inc">
-
-<TMPL_IF NAME=newpassword>
-Haga click <a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME=member>">aqu&iacute;</a> Para ver mayor informaci&oacute;n.
-
-<TMPL_ELSE>
-	<h2><TMPL_VAR NAME="title"> <TMPL_VAR NAME="othernames"> <TMPL_VAR NAME="surname">, <TMPL_VAR NAME="firstname"></h2>
-	<form method=post>
-	<input type=hidden name=member value=<TMPL_VAR NAME=member>>
-	Nueva Identificaci&oacute;n: <input name=newuserid size=20 value=<TMPL_VAR NAME=userid>> <br>
-	Nueva Clave de Acceso: <input name=newpassword size=20 value=<TMPL_VAR NAME=defaultnewpassword>>
-	<p>
-	<input type=submit value="Confirmar Clave de Acceso">
+<div id="mainbloc">
+		<div id="bloc25">
+		<div id="bloctitle"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></div>
+		<form method="post" action="/cgi-bin/koha/members/member-password.pl">
+			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->">
+			<!-- TMPL_IF NAME="warn" -->
+				Introdujo un c&oacute;digo de usuario que ya existe, Por favor elija otro.<br>
+			<!-- /TMPL_IF -->
+		    <!-- TMPL_IF NAME= "ShortPass" -->
+	           Su nueva contrase&ntilde;a debe tener por lo menos <!-- TMPL_VAR NAME="MinPasswordLength" --> car&aacute;cteres.<br>
+	        <!-- /TMPL_IF -->
+			Nuevo Id de Usuario: <input name="newuserid" size="20" value="<!-- TMPL_VAR NAME="userid" -->"> <br>
+			Nueva Clave <input name="newpassword" size="20" value="<!-- TMPL_VAR NAME="defaultnewpassword" -->"><br>
+			<input type="submit" value="Confirmar Password" class="button">
 	</form>
-</TMPL_IF>
-
-
-<TMPL_INCLUDE NAME="members-bottom.inc">
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: es/members/member.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/members/Attic/member.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -u -b -r1.3 -r1.3.12.1
--- es/members/member.tmpl	3 Jun 2003 21:41:17 -0000	1.3
+++ es/members/member.tmpl	7 May 2007 13:55:50 -0000	1.3.12.1
@@ -1,48 +1,62 @@
-<HTML>
-
-<TMPL_INCLUDE NAME="members-top.inc">
-
-<FONT SIZE=6><em>B&uacute;squeda de Usuarios</em></FONT><br>
-
-<form action="/cgi-bin/koha/member.pl" method=post>
-  <input type=text name="member" value="<TMPL_VAR NAME=member>">
-  <input type=reset name="reset" value="clr">
-</form>
-
-Usted busc&oacute; <TMPL_VAR NAME=member><p>
-<table>
-  <tr bgcolor="#99cc33">
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Id</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Apellido</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Nombre</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Categor&iacute;a</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Direcci&oacute;n</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>OD/Pr&eacute;stamos</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Deudas</b></td>
-    <td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Notas</b></td>
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
+<div id="mainbloc">
+<h1>B&uacute;squeda de Usuarios</h1>
+
+<div class="bloc100">
+	<div class="bloctitle">Buscar</div>
+	<form action="/cgi-bin/koha/members/member.pl" method="post">
+		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->"> ordenado por 
+		<select name="orderby">
+			<option value="surname,firstname">Apellidos</option>
+			<option value="cardnumber">N&uacute;mero de Carnet</option>
+		</select>
+		<input type="submit" class="button" value="ACEPTAR">
+	</form>
+</div>
+
+<div class="bloc100">
+	<div class="bloctitle">Usted busc&oacute; <!-- TMPL_VAR NAME="member" --></div>
+	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> usuarios encontrados.
+	 </p>
+	<table>
+		<tr>
+			<th>&nbsp;</th>
+			<th>Carnet</th>
+			<th>Nombre</th>
+			<th>Sede</th>
+			<th>Categor&iacute;a</th>
+			<th>Atrasados/Pr&eacute;stamos</th>
+			<th>Costos</th>
+			<th>Control1</th>
+			<th>Control2</th>
   </tr>
-
-  <TMPL_LOOP NAME=resultsloop>
-    <TMPL_IF NAME="__ODD__">
-    <TR bgcolor="#ffffcc">
-    <TMPL_ELSE>
-    <TR bgcolor=white>
-    </TMPL_IF>
-      <td><TMPL_VAR NAME=cardnumber></td>
-      <td><a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME=borrowernumber>"><TMPL_VAR NAME=surname></td>
-      <td><TMPL_VAR NAME=firstname></a></td>
-      <td><TMPL_VAR NAME=categorycode></td>
-      <td><TMPL_VAR NAME=streetaddress> <TMPL_VAR NAME=city></td>
-      <td><TMPL_VAR NAME=odissue></td>
-      <td><TMPL_VAR NAME=fines></td>
-      <td><TMPL_VAR NAME=borrowernotes></td>
+		<!-- TMPL_LOOP NAME="resultsloop" -->
+			<!-- TMPL_IF NAME="background" -->
+				<tr bgcolor="#ffffcc">
+			<!-- TMPL_ELSE -->
+				<tr bgcolor="white">
+			<!-- /TMPL_IF -->
+				<td><!-- TMPL_VAR NAME="count" --></td>
+				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
+				<td>
+					<p><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <b><!-- TMPL_VAR NAME="firstname" --></b></a></p>
+					<p><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" --></p>
+					<p><i><!-- TMPL_VAR NAME="borrowernotes" --></i></p>
+				</td>
+				<td><!-- TMPL_VAR name="branchcode" --></td>
+				<td><!-- TMPL_VAR NAME="categorycode" --></td>
+				<td><!-- TMPL_VAR NAME="odissue" --></td>
+				<td><!-- TMPL_VAR NAME="fines" --></td>
+				<td><!-- TMPL_VAR NAME="sort1" --></td>
+				<td><!-- TMPL_VAR NAME="sort2" --></td>
     </tr>
-  </TMPL_LOOP>
-</table>
-
-<form action=/cgi-bin/koha/simpleredirect.pl method=post>
-<input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png"  ALT="Agregar Usuario" BORDER=0 ></a>
-<INPUT TYPE="radio" name="chooseform" value="adult" checked>Adulto
-<INPUT TYPE="radio" name="chooseform" value="organisation" >Organizaci&oacute;n
-</form>
-<TMPL_INCLUDE NAME="members-bottom.inc">
+		<!-- /TMPL_LOOP -->
+	</table>
+	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
+	<input type="submit" class="button" value="A&ntilde;adir usuario" title="A&ntilde;adir usuario" alt="A&ntilde;adir usuario">
+	<input type="radio" name="categorycode" value="" checked>Adulto <input type="radio" name="categorycode" value="I" >Instituci&oacute;n
+	<input type="hidden" name="actionType" value="Add">
+	</form>
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: es/members/memberentry.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/members/Attic/memberentry.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -u -b -r1.3 -r1.3.12.1
--- es/members/memberentry.tmpl	3 Jun 2003 21:41:17 -0000	1.3
+++ es/members/memberentry.tmpl	7 May 2007 13:55:50 -0000	1.3.12.1
@@ -1,203 +1,307 @@
-<HTML>
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
-<TMPL_INCLUDE NAME="members-top.inc">
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="addAction" -->
+	<h1>
+		A&ntilde;adir <!-- TMPL_IF NAME="institution" -->Institucional <!-- /TMPL_IF -->Usuario
+	</h1>
+	<!-- TMPL_ELSE -->
+	<h1>
+		Actualizar Detalles del Usuario
+	</h1>
+	<!-- /TMPL_IF -->
+
+	<!-- TMPL_IF Name="NOK" -->
+		<h1>ERROR</h1>
+		<div id="problem">
+			<p>Los siguientes campos tienen un valor prohibido. Corr&iacute;jalos y presione ACEPTAR otra vez :</p>
+			<!-- TMPL_IF NAME="ERROR_cardnumber" -->
+				N&uacute;mero de Carnet<br>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_invalid_cardnumber" -->
+				N&uacute;mero de carnet inv&aacute;lido<br>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_gender" -->
+				Sexo<br>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_firstname" -->
+				Nombre<br>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_surname" -->
+				Apellidos<br>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_address" -->
+				Calle<br>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_city" -->
+				Ciudad<br>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_branch" -->
+				Sede: el ususario tiene que ser de la misma sede que usted<br>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_date" -->
+				Fecha de vencimiento ANTERIOR de la fecha de la inscripci$oacute;n <br>
+			<!-- /TMPL_IF -->
+		</div>
+	<!-- /TMPL_IF -->
+	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
+		<input type="hidden" name="type" value="borrowers">
+		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
+		<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
+		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
+		<!-- TMPL_IF NAME="addAction" -->
+			<input type="hidden" name="op" value="add">
+		<!-- TMPL_ELSE -->
+			<input type="hidden" name="op" value="modify">
+		<!-- /TMPL_IF -->
+		<table>
+			<tr>
+				<td colspan="5"><b>Member# <!-- TMPL_VAR NAME="member" -->, N&uacute;mero de carnet*</b> <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
+			</tr>
+			<tr>
+				<th colspan="5">USUARIO <!-- TMPL_UNLESS name="institution" -->PERSONAL<!-- /TMPL_UNLESS --> DETALLES</th>
+			</tr>
+			<tr>
+				<td><!-- TMPL_UNLESS name="institution" -->Saludo<!-- /TMPL_UNLESS --></td>
+				<td><!-- TMPL_UNLESS name="institution" -->Iniciales<!-- /TMPL_UNLESS --></td>
+				<td><!-- TMPL_UNLESS name="institution" --><b> Nombre*</b><!-- /TMPL_UNLESS --></td>
+				<td><!-- TMPL_IF NAME="institution" --><b>Nombre de la Instituci&oacute;n*</b><!-- TMPL_ELSE --><b> Apellidos*</b><!-- /TMPL_IF --></td>
+				<td><!-- TMPL_UNLESS name="institution" -->Nombre preferido<!-- /TMPL_UNLESS --></td>
+			</tr>
+			<tr>
+				<td>
+				<!-- TMPL_UNLESS name="institution" -->
+				<!-- TMPL_VAR NAME="Mr" -->
+				<select name="title">
+					<option <!-- TMPL_VAR NAME="title_selected_ " --> value=" ">Sin T&iacute;tulo</option>
+					<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Srta</option>
+					<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Sra</option>
+					<option value="Ms" <!-- TMPL_VAR NAME="title_Ms" -->>Srta</option>
+					<option <!-- TMPL_VAR NAME="title_Mr" --> value="Mr" >Sr</option>
+					<option value="Dr" <!-- TMPL_VAR NAME="title_Dr" -->>Dr</option>
+					<option value="Sir" <!-- TMPL_VAR NAME="title_Sir" -->>Sir</option>
+				</select>
+				<!-- /TMPL_UNLESS -->
+				</td>
+				<td>
+					<!-- TMPL_UNLESS name="institution" -->
+						<input type="text" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->">
+					<!-- /TMPL_UNLESS -->
+				</td>
+				<td>
+				<!-- TMPL_UNLESS name="institution" -->
+					<input type="text" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
+					<!-- /TMPL_UNLESS -->
+				</td>
+				<td><input type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->"></td>
+				<td>
+					<!-- TMPL_UNLESS name="institution" -->
+						<input type="text" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->">
+					<!-- /TMPL_UNLESS -->
+				</td>
+			</tr>
 
-<FONT SIZE=6><em><TMPL_VAR NAME=header></em></FONT><br>
+			<tr>
+				<td colspan="2">
+				<!-- TMPL_UNLESS name="institution" -->
+                                    <!-- TMPL_IF NAME="female" -->
+					<input type="radio" name="sex" value="F" checked>Female  <input type="radio" name="sex" value="M" > Male
+                                    <!-- TMPL_ELSE -->
+					<input type="radio" name="sex" value="F">Female  <input type="radio" name="sex" value="M" checked> Male
+                                    <!-- /TMPL_IF -->
+				<!-- /TMPL_UNLESS -->
 
-<form action=/cgi-bin/koha/newmember.pl method=post>
-	<input type=hidden name=joining value="<TMPL_VAR NAME=dateenrolled>">
-	<input type=hidden name=expiry value="<TMPL_VAR NAME=expiry>">
-	<input type=hidden name=type value="borrowers">
-	<input type=hidden name=borrowernumber value="<TMPL_VAR NAME=member>">
-	<input type=hidden name=updtype value="<TMPL_VAR NAME=updtype>">
-
-	<table border=0 cellspacing=0 cellpadding=5 >
-
-	<tr valign=top>
-		<td COLSPAN=2><input type=reset value="Borrar Todo"></td>
-		<td COLSPAN=3 ALIGN=RIGHT><font size=4 face='arial,helvetica'>Usuario# <TMPL_VAR NAME=member>, Id de Usuario* <input type=text name=cardnumber size=10 value="<TMPL_VAR NAME=cardnumber>"><br></td>
-	</tr>
-
-	<tr valign=top>
-		<td COLSPAN=3 background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>INFORMACION PERSONAL DEL USUARIO</b></td>
-		<td COLSPAN=2 ALIGN=RIGHT background="<TMPL_VAR name="themelang">/images/background-mem.gif">*
-		<input type="radio" name="sex" value="F"<TMPL_IF NAME=female> checked</TMPL_IF>>F
-		<input type="radio" name="sex" value="M"<TMPL_UNLESS NAME=female> checked</TMPL_UNLESS>> M
-		&nbsp; &nbsp;  <B>Fecha de Nac.</B> (<TMPL_VAR NAME=dateformat>)
-		<input type=text name=dateofbirth size=10 value="<TMPL_VAR NAME=dateofbirth>">
-		</td>
-	</tr>
-
-	<tr valign=top bgcolor=white>
-		<td><FONT SIZE=2>T&iacute;tulo</FONT></td>
-		<td><FONT SIZE=2>Iniciales</FONT></td>
-		<td><FONT SIZE=2><b>Nombres*</b></FONT></td>
-		<td><FONT SIZE=2><b>Apellido*</b></FONT></td>
-		<td><FONT SIZE=2>Nombre Preferido</FONT></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td><TMPL_VAR name="Mr">
-		<SELECT NAME="title">
-			<option value=" "<TMPL_VAR name="title_selected_">>Sin t&iacute;tulo</option>
-			<option value="Miss"<TMPL_VAR name="title_Miss">>Srta</option>
-			<option value="Mrs"<TMPL_VAR name="title_Mrs">>Sra</option>
-			<option value="Ms"<TMPL_VAR name="title_Ms">>Ms</option>
-			<option value="Mr" <TMPL_VAR name="title_Mr">>Sr</option>
-			<option value="Dr" <TMPL_VAR name="title_Dr">>Dr</option>
-			<option value="Sir" <TMPL_VAR name="title_Sir">>Sir</option>
-		</SELECT>
-		</td>
-		<td><input type=text name=initials size=5 value="<TMPL_VAR NAME=initials>"></td>
-		<td><input type=text name=firstname size=20 value="<TMPL_VAR NAME=firstname>"></td>
-		<td><input type=text name=surname size=20 value="<TMPL_VAR NAME=surname>"></td>
-		<td><input type=text name=othernames size=20 value="<TMPL_VAR NAME=othernames>"></td>
-	</tr>
-
-
-	<tr valign=top bgcolor=white>
-		<TMPL_IF NAME=ethcatpopup><TMPL_VAR NAME=ethcatpopup>
-		<td colspan=2><FONT SIZE=2>Ethnicity</FONT></td>
-		<td colspan=2><FONT SIZE=2>Ethnicity Notes</FONT></td>
-		<TMPL_ELSE>
-		<td colspan=2>&nbsp;</td><td colspan=2>&nbsp;</td>
-		</TMPL_IF>
-		<td><FONT SIZE=2><b>Categor&iacute;a de membrec&iacute;a*</b></FONT></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td colspan=2>
-			<TMPL_IF name="ethcatpopup">
-				<select name="ethnicity" size=1>
-					<TMPL_LOOP NAME=ethnicityloop>
-					<option value=<TMPL_VAR NAME=value><TMPL_VAR NAME=selected>><TMPL_VAR NAME=label>
-					</TMPL_LOOP>
+				</td>
+				<td colspan="2">
+					<!-- TMPL_UNLESS name="institution" -->
+					Fecha de Nacimiento (<!-- TMPL_VAR NAME="dateformat" -->) <input type="text" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
+					<!-- /TMPL_UNLESS -->
+				</td>
+				<td>
+					Categor&iacute;a <!-- TMPL_VAR NAME="catcodepopup" -->
+				</td>
+			</tr>
+			<!-- TMPL_IF NAME="ethcatpopup" -->
+				<tr valign="top" bgcolor="white">
+					<!-- TMPL_VAR NAME="ethcatpopup" -->
+					<td colspan="2">Raza</td>
+					<td colspan="2">Notas de Raza</td>
+				</tr>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ethcatpopup" -->
+				<tr valign="top" bgcolor="white">
+					<td colspan="2">
+						<!-- TMPL_IF NAME="ethcatpopup" -->
+							<select name="ethnicity" size="1">
+								<!-- TMPL_LOOP NAME="ethnicityloop" -->
+								<option value=<!-- TMPL_VAR NAME="value" --><!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="label" -->
+								<!-- /TMPL_LOOP -->
 				</select>
-			</TMPL_IF>
+						<!-- /TMPL_IF -->
 			</td>
-			<TMPL_IF NAME=ethcatpopup><TMPL_VAR NAME=ethcatpopup>
-			<td colspan=2><input type=text name=ethnicnotes size=40 ></td>
-			<TMPL_ELSE>
-			<td colspan=2>&nbsp;</td>
-			</TMPL_IF>
-		<td><TMPL_VAR NAME=catcodepopup></td>
+						<!-- TMPL_IF NAME="ethcatpopup" --><!-- TMPL_VAR NAME="ethcatpopup" -->
+						<td colspan="2"><input type="text" name="ethnicnotes" size="40" ></td>
+						<!-- TMPL_ELSE -->
+						<td colspan="2">&nbsp;</td>
+						<!-- /TMPL_IF -->
 	</tr>
+			<!-- /tmpl_if -->
 
-
-	<tr valign=top bgcolor="99cc33" >
-		<td COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>DIRECCION DEL USUARIO</b></td>
+			<tr>
+				<th colspan="5">DIRECCI&Oacute;N DEL USUARIO</th>
 	</tr>
 
-	<tr valign=top bgcolor=white>
-		<td  COLSPAN=3><FONT SIZE=2><b>Direcci&oacute;n Postal*</b></FONT></td>
-		<td><FONT SIZE=2><b>Ciudad*</b></FONT></td>
-		<td><FONT SIZE=2>Provincia</FONT></td>
+			<tr>
+				<td  colspan="2"><b>Direcci&oacute;n Postal*</b></td>
+				<td>Cod. Postal</td>
+				<td><b> Ciudad*</b></td>
+				<td>Sede de inscripci&oacute;n</td>
 	</tr>
-	<tr valign=top bgcolor=white>
-		<td COLSPAN=3><input type=text name=address size=40 value="<TMPL_VAR NAME=address>"></td>
-		<td><input type=text name=city size=20 value="<TMPL_VAR NAME=city>"></td>
+			<tr>
+				<td colspan="2"><input type="text" name="streetaddress" size="40" value="<!-- TMPL_VAR NAME="address" -->"></td>
+				<td>
+					<input type="text" name="zipcode" size="10" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->">
+				</td>
 		<td>
-			<TMPL_VAR name="CGIbranch">
+					<input type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
+				</td>
+				<td>
+					<!-- TMPL_VAR NAME="CGIbranch" -->
 		</td>
 	</tr>
 
 
-	<tr valign=top bgcolor=white>
-		<td COLSPAN=3><FONT SIZE=2>Direcci&oacute;n de la calle, si es diferente</FONT></td>
-		<td><FONT SIZE=2>Ciudad</FONT></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td COLSPAN=3><input type=text name=streetaddress size=40 value="<TMPL_VAR NAME=streetaddress>"></td>
-		<td><input type=text name=streetcity size=20 value="<TMPL_VAR NAME=streetcity>"></td>
+			<tr>
+				<td colspan="2">Direcci&oacute;n alternativa</td>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
 	</tr>
-
-
-	<tr valign=top bgcolor="99cc33">
-		<td COLSPAN=5 background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>INFORMACION DE CONTACTO</b></td>
+			<tr>
+				<td colspan="2"><input type="text" name="physstreet" size="40" value="<!-- TMPL_VAR NAME="physstreet" -->"></td>
+				<td>
+					<input type="text" name="homezipcode" size="10" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->">
+				</td>
+				<td>
+					<input type="text" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->"></td>
 	</tr>
 
-	<tr valign=top bgcolor=white>
-		<td COLSPAN=2 ><FONT SIZE=2>Tel&eacute;fono (Casa)</td>
-		<td><FONT SIZE=2>Fax</td>
-		<td><FONT SIZE=2>Email</td>
-		<td><FONT SIZE=2>Mensajero de texto</td>
+			<tr>
+				<td colspan="2" >Tel&eacute;fono de casa</td>
+				<td>Fax</td>
+				<td>Correo electr&oacute;nico</td>
 	</tr>
-	<tr valign=top bgcolor=white>
-		<td COLSPAN=2><input type=text name=phone size=20 value="<TMPL_VAR NAME=phone>"></td>
-		<td><input type=text name=faxnumber size=20 value="<TMPL_VAR NAME=faxnumber>"></td>
-		<td><input type=text name=emailaddress size=20 value="<TMPL_VAR NAME=emailaddress>"></td>
-		<td><input type=text name=textmessaging size=20 value="<TMPL_VAR NAME=textmessaging>"></td>
+			<tr>
+				<td colspan="2"><input type="text" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->"></td>
+				<td><input type="text" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->"></td>
+				<td><input type="text" name="emailaddress" size="20" value="<!-- TMPL_VAR NAME="emailaddress" -->"></td>
 	</tr>
 
 
-	<tr valign=top bgcolor=white>
-		<td COLSPAN=2 ><FONT SIZE=2>Tel&eacute;fono (D&iacute;a)</td>
-		<td></td>
-		<td></td>
-		<td></td>
+			<tr>
+				<td colspan="2" >Tel&eacute;fono m&oacute;vil</td>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
 	</tr>
-	<tr valign=top bgcolor=white>
-		<td COLSPAN=2><input type=text name=phoneday size=20 value="<TMPL_VAR NAME=phoneday>"></td>
-		<td></td>
-		<td></td>
-		<td></td>
+			<tr>
+				<td colspan="2"><input type="text" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->"></td>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
 	</tr>
 
-
-	<tr valign=top bgcolor="99cc33">
-		<td  COLSPAN=5  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>INFORMACION DE CONTACTO ALTERNATIVO</b></td>
+			<!-- TMPL_UNLESS name="institution" -->
+			<tr>
+				<th colspan="5">DETALLES DE CONTACTO ALTERNATIVOS</th>
 	</tr>
 
-	<tr valign=top bgcolor=white>
-		<td   COLSPAN=3 ><FONT SIZE=2><b>Nombre*</b></td>
-		<td><FONT SIZE=2>Tel&eacute;fono</td>
-		<td><FONT SIZE=2><b>Parentesco*</b></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td COLSPAN=3 ><input type=text name=contactname size=40 value="<TMPL_VAR NAME=contactname>"></td>
-		<td><input type=text name=altphone size=20 value="<TMPL_VAR NAME=altphone>"></td>
-		<td>
-		<select name=altrelationship size=1>
-		<TMPL_LOOP NAME=relshiploop>
-			<OPTION <TMPL_VAR NAME=selected>><TMPL_VAR NAME=relationship>
-		</TMPL_LOOP>
+			<tr>
+				<td colspan="3">Nombre completo</td>
+				<td>Tel&eacute;fono</td>
+					<td>Relaci&oacute;n</td>
+			</tr>
+			<tr>
+				<td colspan="3"><input type="text" name="contactname" size="40" value="<!-- TMPL_VAR NAME="contactname" -->"></td>
+				<td><input type="text" name="altphone" size="20" value="<!-- TMPL_VAR NAME="altphone" -->"></td>
+					<td>
+					<select name="altrelationship" size="1">
+					<!-- TMPL_LOOP NAME="relshiploop" -->
+						<option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
+					<!-- /TMPL_LOOP -->
 		</select>
 		</td>
 	</tr>
+				<!-- /TMPL_UNLESS -->
 
-
-	<tr valign=top bgcolor="99cc33">
-		<td  COLSPAN=5  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>PARA USO DE LA BIBLIOTECA</B></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td><FONT SIZE=2>Notas</font></td>
-		<td COLSPAN=4><textarea name=altnotes wrap=physical cols=70 rows=3><TMPL_VAR NAME=altnotes></textarea></td>
+			<tr>
+				<td> Notas</td>
+				<td colspan="4"><textarea name="altnotes" cols="70" rows="3"><!-- TMPL_VAR NAME="altnotes" --></textarea></td>
 	</tr>
 
 
-	<tr valign=top >
-		<td><FONT SIZE=2>Notes</font></td>
-		<td COLSPAN=4><textarea name=borrowernotes wrap=physical cols=70 rows=3><TMPL_VAR NAME=borrowernotes></textarea></td>
+			<tr>
+				<th colspan="5" >USO INTERNO</th>
+			</tr>
+			<tr>
+				<!-- TMPL_IF NAME="addAction" -->
+					<td>Fecha de alta (dejar en blanco para hoy)</td>
+					<td><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->"></td>
+				<!-- TMPL_ELSE -->
+					<td>Fecha de alta</td>
+					<td><!-- TMPL_VAR name="joining" --></td>
+				<!-- /TMPL_IF -->
+				<td>Fecha de Vencimiento (dejar en blanco para autocalcular)</td>
+				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->"></td>
+			</tr>
+			<tr>
+				<td>Mensaje para el usuario (aparece en el OPAC)</td>
+				<td colspan="4"><textarea name="textmessaging" cols="70" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td>
+			</tr>
+			<tr>
+				<td>Nota de Circulaci&oacute;n (aparece durante los pr&eacute;stamos/devoluciones)</td>
+				<td colspan="4"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td>
 	</tr>
+				<tr><td colspan="5">PERMISOS</td></tr>
+				<!-- TMPL_LOOP NAME="flagloop" -->
+				<tr>
+					<td colspan="2"><!-- TMPL_VAR NAME="html" --></td>
+					<td colspan="3"><input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Si <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No
+					</td>
+				</tr>
+				<!-- /TMPL_LOOP -->
 
-	<TMPL_IF NAME=modify>
-		<tr><td COLSPAN=5><Font size=2>PERMISOS</font></td></tr>
-		<TMPL_LOOP NAME=flagloop>
 		<tr>
-			<td COLSPAN=2><TMPL_VAR NAME=html></td>
-			<td COLSPAN=3><input type=radio name="<TMPL_VAR NAME=name>" value="1" <TMPL_VAR NAME=yes>>Si
-			<input type=radio name="<TMPL_VAR NAME=name>" value="0" <TMPL_VAR NAME=no>>No
+				<td colspan="5">Los siguientes 2 campos est&aacute;n disponibles para su uso interno. Pueden ser &uacute;tiles para prop&oacute;sitos estad&iacute;sticos</td>
+			<tr>
+				<td>Campo de control 1</td>
+				<td colspan="4">
+					<!-- TMPL_IF Name="CGIsort1" -->
+						<!-- TMPL_VAR Name="CGIsort1" -->
+					<!-- TMPL_ELSE -->
+						<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
+					<!--/TMPL_IF -->
+				</td>
+			</tr>
+			<tr>
+				<td>Campo de control 2</td>
+				<td colspan="4">
+					<!-- TMPL_IF Name="CGIsort2" -->
+						<!-- TMPL_VAR Name="CGIsort2" -->
+					<!-- TMPL_ELSE -->
+						<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
+					<!--/TMPL_IF -->
 			</td>
 		</tr>
-		</TMPL_LOOP>
-	</TMPL_IF>
 
 	<tr>
 		<td></td>
-		<td><input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png" ALT="Agregar Usuario" border=0 ></td>
+				<td>
+					<input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
+					<input type="submit" value="Guardar" class="button">
+				</td>
 	</tr>
 	</table>
-</form>
-
-<TMPL_INCLUDE NAME="members-bottom.inc">
-
-</body>
-</HTML>
+	</form>
+</div>
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: es/members/members-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/members/Attic/members-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/members/members-home.tmpl	3 Jun 2003 21:41:17 -0000	1.2
+++ es/members/members-home.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,67 +1,48 @@
-<TMPL_INCLUDE NAME="members-top.inc">
-
-<FONT SIZE=6><em>Usuarios</em></FONT><P>
-
-
-<img src="<TMPL_VAR name="themelang">/images/numbers-mem-1.gif"   WIDTH=45  HEIGHT=44   ALT="1"
-hspace=5 align=left BORDER=0>
-
-<table border=1 cellspacing=0 cellpadding=10 height="100" >
-<tr VALIGN=TOP  >
-<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><FORM ACTION="/cgi-bin/koha/member.pl" method=post><FONT SIZE=4>
-<b>B&uacute;squeda de Usuarios</B>
-</FONT>
-<INPUT TYPE="text" size=50 name=member >
-<BR>
-Renueve Items, vea, agregue, modifique y borre registros, todo empezando con esta b&uacute;squeda.<BR>
-Ingrese el nombre de un usuario, parte del nombre,  o n&uacute;mero en el campo de arriba y presione <BR>
-la tecla ENTER para activar la b&uacute;squeda
-</td></form><tr>
-</table>
-
-<P>
-
-<img src="<TMPL_VAR name="themelang">/images/numbers-mem-2.gif"   WIDTH=45  HEIGHT=44   ALT="2"
-hspace=5 align=left BORDER=0>
-
-
-<table border=1 cellspacing=0 cellpadding=10 height="100" >
-<tr VALIGN=TOP  >
-<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><FONT SIZE=4>
-<b>Listar Usuarios</B>
-</FONT>
-</td></form><tr>
-<TR VALIGN=TOP>
-<TD><CENTER><B>
-<A HREF="/cgi-bin/koha/member.pl?member=a">A</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=b">B</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=c">C</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=d">D</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=e">E</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=f">F</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=g">G</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=h">H</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=i">I</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=j">J</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=k">K</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=l">L</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=m">M</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=n">N</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=o">O</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=p">P</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=q">Q</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=r">R</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=s">S</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=t">T</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=u">U</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=v">V</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=w">W</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=x">X</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=y">Y</a> ||
-<A HREF="/cgi-bin/koha/member.pl?member=z">Z</a>
-
-</B>
-</TD></TR></TABLE>
-
-<P>
-<TMPL_INCLUDE NAME="members-bottom.inc">
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
+<div id="mainbloc">
+<h1>Usuarios</h1>
+
+<div id="bloc25">
+	<div class="bloctitle">B&uacute;squeda de Usuarios</div>
+	<form action="/cgi-bin/koha/members/member.pl" method="post">
+		<p><input type="text" size="30" name="member" > ordenado por 
+		<select name="orderby">
+			<option value="surname,firstname">Apellidos</option>
+			<option value="cardnumber">N&uacute;mero de Carnet</option>
+		</select>
+		<input type="submit" class="button" value="ACEPTAR">
+		<p>Renovar Items, ver, a&ntilde;adir, modificar y borrar registros, todo empezando con esta b&uacute;squeda.</p>
+		<p>Escriba el nombre del usuario, parte del nombre o n&uacute;mero de identificaci&oacute;n en el campo de arriba y presione la tecla Aceptar para iniciar la b&uacute;squeda</p>
+	</form>
+</div>
+<div id="bloc25">
+			<div class="bloctitle">Listar Usuarios</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>
+</div>
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: es/members/moremember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/members/Attic/moremember.tmpl,v
retrieving revision 1.5
retrieving revision 1.5.12.1
diff -u -b -r1.5 -r1.5.12.1
--- es/members/moremember.tmpl	3 Jun 2003 21:41:17 -0000	1.5
+++ es/members/moremember.tmpl	7 May 2007 13:55:50 -0000	1.5.12.1
@@ -1,221 +1,221 @@
-<TMPL_INCLUDE NAME="members-top.inc">
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
-<!-- main site -->
-
-<FONT SIZE=6><em><TMPL_VAR NAME=firstname> <TMPL_VAR NAME=surname></em></FONT><P>
-<p>
-
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width=270>
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>REGISTRO DE MEMBRES&Iacute;A</TD>
-	</TR>
-
-	<tr VALIGN=TOP  >
-	<TD>
-		<TMPL_IF name="IS_ADULT">
-			<p align=right>
-			<form action=/cgi-bin/koha/jmemberentry.pl method=post>
-				<INPUT TYPE="image" name="submit"  VALUE="add-child" height=42  WIDTH=120 BORDER=0 src="<TMPL_VAR name="themelang">/images/add-child.gif">
-				<input type=hidden name=type value=Add>
-				<input type=hidden name=bornum value="<TMPL_VAR NAME=borrowernumber>">
-			</form>
-			</P>
-		</TMPL_IF>
-		<br>
-		<FONT SIZE=2  face="arial, helvetica"><TMPL_VAR NAME="title"> <TMPL_VAR NAME="othernames"> <TMPL_VAR NAME="surname"> <TMPL_IF name="IS_ADULT">(<TMPL_VAR NAME="firstname">, <TMPL_VAR NAME="initials">)</TMPL_IF><p>
-		Identificaci&oacute;n: <TMPL_VAR NAME="cardnumber"><BR>
-		Direcci&oacute;n Postal: <TMPL_VAR NAME="streetaddress">, <TMPL_VAR NAME="city"><BR>
-		Residencia: <TMPL_VAR NAME="physstreet">, <TMPL_VAR NAME="streetcity"><BR>
-		Tel&eacute;fono (Casa): <TMPL_VAR NAME="phone"><BR>
-		Tel&eacute;fono (Diurno): <TMPL_VAR NAME="phoneday"><BR>
-		Fax: <TMPL_VAR NAME="faxnumber"><BR>
-		E-mail: <a href="mailto:<TMPL_VAR NAME="emailaddress">"><TMPL_VAR NAME="emailaddress"></a><br>
-		Mensajero de texto: <TMPL_VAR NAME="textmessaging"><p>
-		N&uacute;mero de Membres&iacute;a: <TMPL_VAR NAME="borrowernumber"><BR>
-		Membres&iacute;a: <TMPL_VAR NAME="categorycode"><BR>
-		Area: <TMPL_VAR NAME="area"><BR>
-		Cuota:$30/an&ntilde;o, Pagada<BR>
-		Fecha de Alta: <TMPL_VAR NAME="dateenrolled">,  Caduca: <TMPL_VAR NAME="expiry"><BR>
-		Asociado en Biblioteca: <TMPL_VAR NAME="branchcode"><P>
-		<TMPL_IF NAME="printethnicityline">
-			Ethnicity: <TMPL_VAR NAME="ethnicity">, <TMPL_VAR NAME="ethnotes"><br>
-		</TMPL_IF>
-		Fecha de Nac.: <TMPL_VAR NAME="dateofbirth"><BR>
-		Sexo: <TMPL_VAR NAME="sex"><P>
-		Contacto Alternativo: <TMPL_VAR NAME="contactname"><BR>
-		Tel&eacute;fono: <TMPL_VAR NAME="altphone"><BR>
-		Parentesco: <TMPL_VAR NAME="altrelationship"><BR>
-		Notas: <TMPL_VAR NAME="altnotes"><P>
-		<TMPL_IF NAME="isguarantee">
-			Garant&iacute;as:<TMPL_LOOP NAME="guaranteeloop"><A HREF="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME="borrowernumber">"><TMPL_VAR NAME="cardnumber"></a><br></TMPL_LOOP>
-		<TMPL_ELSE>
+<div id="mainbloc">
+	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
+	<div class="bloc25">
+		<h2 class="members">Registro de Membres&iacute;a</h2>
+		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
+		<p><label class="label100">N&uacute;mero de Carnet: </label><!-- TMPL_VAR NAME="cardnumber" --><br>
+		<label class="label100">Direcci&oacute;n Postal: </label><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
+		<!-- TMPL_UNLESS name="I" --><label class="label100">Direcci&oacute;n: </label><!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
+		<label class="label100">Tel&eacute;fono de casa: </label><!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
+		<label class="label100">Tel&eacute;fono m&oacute;vil: </label><!-- TMPL_VAR NAME="phoneday" --><br>
+		<label class="label100">Fax: </label><!-- TMPL_VAR NAME="faxnumber" --><br>
+		<label class="label100">Correo: </label><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
+		<label class="label100">Mensajero de texto: </label><!-- TMPL_VAR NAME="textmessaging" --><br>
+		<label class="label100">N&uacute;mero de Membres&iacute;a: </label><!-- TMPL_VAR NAME="borrowernumber" --><br>
+		<label class="label100">Categor&iacute;a de Membres&iacute;a: </label><!-- TMPL_VAR NAME="categorycode" --><br>
+		<label class="label100">Registrado: </label><!-- TMPL_VAR NAME="dateenrolled" -->,<br>
+		<label class="label100"> Vencimiento:</label><!-- TMPL_VAR NAME="expiry" --><br>
+		<label class="label100">Sede de inscripci&oacute;n:  </label><!-- TMPL_VAR NAME="branchcode" -->
+		</p>
+		<p>
+		<!-- TMPL_IF NAME="printethnicityline" -->
+			<label class="label100">Raza: </label><!-- TMPL_VAR NAME="ethnicity" -->, <!-- TMPL_VAR NAME="ethnotes" --><br>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_UNLESS name="I" -->
+			<label class="label100">Fecha de Nac: %s </label><!-- TMPL_VAR NAME="dateofbirth" --><br>
+			<label class="label100">Sexo: </label><!-- TMPL_VAR NAME="sex" --><br>
+		<!-- /TMPL_UNLESS -->
+		<label class="label100">Contacto: </label><!-- TMPL_VAR NAME="contactname" --><br>
+		<label class="label100">Tel&eacute;fono: </label><!-- TMPL_VAR NAME="altphone" --><br>
+		<!-- TMPL_UNLESS name="I" -->
+			<label class="label100">Relaci&oacute;n: </label><!-- TMPL_VAR NAME="altrelationship" --><br>
+		<!-- /TMPL_UNLESS -->
+		<label class="label100">Notas: </label><!-- TMPL_VAR NAME="altnotes" -->
+		<!-- TMPL_IF NAME="sort1" -->
+			<p><label class="label100">Campo de control 1 : </label><!-- TMPL_VAR NAME="sort1" --></p>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="sort2" -->
+			<p><label class="label100">Campo de control 2 : </label><!-- TMPL_VAR NAME="sort2" --></p>
+		<!-- /TMPL_IF -->
+		</p>
+		<p>
+		<!-- TMPL_UNLESS name="I" -->
+			<!-- TMPL_IF NAME="isguarantee" -->
+				Garant&iacute;as:<br><!-- TMPL_LOOP NAME="guaranteeloop" --><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="name" --> - <!-- TMPL_VAR NAME="cardnumber" --></a><br><!-- /TMPL_LOOP -->
+			<!-- TMPL_ELSE -->
 			Garante:
-			<TMPL_IF NAME="guarantorborrowernumber">
-				<A HREF="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME="guarantorborrowernumber">"><TMPL_VAR NAME="guarantorcardnumber"></a><br>
-			<TMPL_ELSE>
-				sin garante<br>
-			</TMPL_IF>
-		</TMPL_IF>
-		<P>
-		Notas Generales: <!--<A HREF="popbox.html" onclick="messenger(200,250,'Form that lets you add to and delete notes.'); return false">-->
-		<TMPL_VAR NAME="borrowernotes"><!--</a>-->
-		<p align=right>
-		<form action=/cgi-bin/koha/memberentry.pl method=post>
-			<input type=hidden name=bornum value="<TMPL_VAR NAME="bornum">">
-			<INPUT TYPE="image" name="modify"  VALUE="modify" height=42  WIDTH=93 BORDER=0 src="<TMPL_VAR name="themelang">/images/modify-mem.gif">
-			<INPUT TYPE="image" name="delete"  VALUE="delete" height=42  WIDTH=93 BORDER=0 src="<TMPL_VAR name="themelang">/images/delete-mem.gif">
+				<!-- TMPL_IF NAME="guarantorborrowernumber" -->
+					<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorcardnumber" --></a><br>
+				<!-- TMPL_ELSE -->
+					Sin garante<br>
+				<!-- /TMPL_IF -->
+			<!-- /TMPL_IF -->
+		<!-- /TMPL_UNLESS -->
+		</p>
 			<p>
-			<a href="member-password.pl?member=<TMPL_VAR NAME="bornum">"><img height=42  WIDTH=124 BORDER=0 src="<TMPL_VAR NAME='themelang'>/images/password-mem.gif" alt="Clave de Acceso">
+			<label class="label100">Nota de la circulaci&oacute;n: </label>
+			<!-- TMPL_VAR NAME="borrowernotes" -->
 			</p>
-			<a href="member-flags.pl?member=<TMPL_VAR NAME="bornum">"><img height=42  WIDTH=187 BORDER=0 src="<TMPL_VAR NAME='themelang'>/images/modify-user-flags.gif" alt="Privilegios"></a>
-		</form>
-	</TD>
-	</TR>
-</TABLE>
-
-<img src="<TMPL_VAR name="themelang">/images/holder.gif" width=16 height=800 align=left>
-
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=4><B>FINES & CHARGES</TD>
-	</TR>
-
-	<TMPL_LOOP NAME=accountloop>
-		<TMPL_IF NAME=amountoutstanding>
-		<tr VALIGN=TOP>
-			<td><TMPL_VAR NAME="date"></td>
-			<td>
-				<TMPL_IF NAME=biblionumber>
-				<a href="/cgi-bin/koha/moredetail.pl?itemnumber=<TMPL_VAR NAME="itemnumber">&bib=<TMPL_VAR NAME="blionumber">&bi=<TMPL_VAR NAME="biblioitemnumber">"><TMPL_VAR NAME="description"> <TMPL_VAR NAME="title"></a>
-				<TMPL_ELSE>
-				&nbsp;
-				</TMPL_IF>
-			</td>
-			<td><TMPL_VAR NAME="amount"></td>
-			<td><TMPL_VAR NAME="amountoutstanding"></td>
-		</tr>
-		</TMPL_IF>
-	</TMPL_LOOP>
-
-	<tr VALIGN=TOP  >
-	<TD colspan=3 align=right>
-		<nobr>
-		<a href=/cgi-bin/koha/boraccount.pl?bornum=<TMPL_VAR NAME="bornum">><img height=42  WIDTH=187 BORDER=0 src="<TMPL_VAR name="themelang">/images/view-account.gif"></a>
-		<a href=/cgi-bin/koha/pay.pl?bornum=<TMPL_VAR NAME="bornum">><img height=42  WIDTH=187 BORDER=0 src="<TMPL_VAR name="themelang">/images/pay-fines.gif"></a>
-		</nobr>
-	</td>
-	</tr>
-</table>
+		<p>
+			 <label class="label100">Plugin :%s, </label><!-- TMPL_VAR name="userid" -->
+			 <!-- TMPL_IF name="password" -->(clave definida)<!-- TMPL_ELSE -->(no hay clave)<!-- /TMPL_IF -->
+		</p>
+		<p>
+		<!-- TMPL_UNLESS NAME="unvalidlibrarian"--> 
+			<!-- TMPL_IF NAME="I" -->
+				<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="bornum" -->&categorycode=I" class="button">Modificar</a>
+			<!-- TMPL_ELSE -->
+				<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modificar</a>
+			<!-- /TMPL_IF -->
+			<a href="javascript:confirm_deletion()" class="button">Borrar</a> <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" class="button">Pr&eacute;stamo de libros</a> <a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Cambio de clave</a>
+			</p>
+			<br/>
+			<p>
+			<!-- TMPL_IF NAME="IS_ADULT" -->
+				<a href="/cgi-bin/koha/members/jmemberentry.pl?type=Add&bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="button">A&ntilde;adir Hijo</a>
+			<!-- /TMPL_IF -->
+			<a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Modificar permisos de usuario</a>
+		<!-- /TMPL_UNLESS -->
+		<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page" class="button">Imprimir P&aacute;gina</a> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip" class="button">Imprimir</a>
+		</p>
+	</div>
 
-<p>
-<form action="renewscript.pl" method=post>
-	<input type="hidden" name="bornum" value="<TMPL_VAR name="bornum">">
-	<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=6><B>ITEMS CURRENTLY ON ISSUE</b></TD>
-	</TR>
-
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>T&iacute;tulo</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Due</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Tipo de Item</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Costo</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Renovado</b></TD>
-	</TR>
-
-	<TMPL_LOOP NAME=issueloop>
-	<tr VALIGN=TOP>
-		<td><TMPL_IF NAME=red><font color=red></TMPL_IF>
-		<TMPL_VAR NAME="title">
-		<a href="/cgi-bin/koha/moredetail.pl?item=<TMPL_VAR NAME="itemnumber">&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR NAME="biblioitemnumber">">
-			<TMPL_VAR NAME="barcode">
-		</a>
-		</td>
-		<td><TMPL_VAR NAME="date_due"></td>
-		<td><TMPL_VAR NAME="itemtype"></td>
-		<td><TMPL_VAR NAME="charge"></td>
-		<td>
-		<TMPL_IF NAME=norenew>
-			<a href="/cgi-bin/koha/request.pl?bib=<TMPL_VAR NAME="biblionumber">">On Request - no renewals</a>
+<!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
+		<h2 class="members">Permisos de Usuario</h2>
+		<ul>
+		<!-- TMPL_IF NAME="debarred" --><li>El usuario esta excluido</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="gonenoaddress" --><li>La direcci&oacute;n de usuario est&aacute; dudosa</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="lost" --><li>El carnet de usuario aparece como perdido.</li><!-- /TMPL_IF -->
+		</ul>
+		<!-- TMPL_VAR NAME="borrowernotes" -->
+	</div><!-- /TMPL_IF -->
+
+	<div class="bloc25">
+		<h2 class="members">Cuentas &amp; Cargos</h2>
+		<!-- TMPL_IF NAME="totaldue" -->
+			Deuda Total <!-- TMPL_VAR NAME="totaldue"-->
 		<TMPL_ELSE>
-			<input type=radio name="renew_item_<TMPL_VAR NAME="itemnumber">" value=y>S
-			<input type=radio name="renew_item_<TMPL_VAR NAME="itemnumber">" value=n>N
-		</TMPL_IF>
-		<TMPL_IF NAME=red></font></TMPL_IF>
-		</td>
-	</tr>
-	</TMPL_LOOP>
-
-	<tr VALIGN=TOP  >
-		<TD colspan=5 align=right>
-		<INPUT TYPE="image" name="submit"  VALUE="Actualizar" height=42  WIDTH=187 BORDER=0 src="<TMPL_VAR name="themelang">/images/update-renewals.gif">
-		</td>
-	</tr>
-
-	</table>
-</form>
-
-<P>
-
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=5><B>ITEMS SOLICITADOS</b></TD>
-	</TR>
-
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>T&iacute;tulo</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Solicitado</b></TD>
-		<td  bgcolor="99cc33" background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>Borrar</b></TD>
-	</TR>
-
-	<form action=/cgi-bin/koha/modrequest.pl method=post>
-	<input type=hidden name=from value=borrower>
-
-	<TMPL_LOOP NAME=reserveloop>
-	<tr VALIGN=TOP>
-		<td>
-			<a href="/cgi-bin/koha/request.pl?bib=<TMPL_VAR NAME="biblionumber">"><TMPL_VAR NAME="btitle"></a>
-			<TMPL_IF NAME=volumeddesc>
-				<TMPL_VAR NAME="volumeddesc">
-				<TMPL_VAR NAME="itemtype">
+			Sin deudas
 			</TMPL_IF>
+		<p>
+		<!-- TMPL_UNLESS NAME="unvalidlibrarian"--> 
+			<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"> Ver Cuenta </a> <a class="button" href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"> Pagar Deudas </a>
+		<!-- /TMPL_UNLESS -->
+		</p>
+	</div>
+	<div class="bloc25">
+		<h2 class="members">Ejemplares reservados</h2>
+			<!-- TMPL_IF NAME="reserveloop" -->
+			<form action="/cgi-bin/koha/modrequest.pl" method="post">
+			<table>
+				<tr>
+					<th>T&iacute;tulo</th>
+					<th>Reservado</th>
+					<th>Borrar</th>
+				</tr>
+					<!-- TMPL_LOOP NAME="reserveloop" -->
+					<tr>
+						<td><input type="hidden" name="from" value="borrower">
+							<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
+							<!-- TMPL_IF NAME="volumeddesc" -->
+								<!-- TMPL_VAR NAME="volumeddesc" -->
+								<!-- TMPL_VAR NAME="itemtype" -->
+							<!-- /TMPL_IF -->
 		</td>
-		<td><TMPL_VAR NAME="reservedate2"></td>
+						<td><!-- TMPL_VAR NAME="reservedate2" --></td>
 		<td>
 			<select name="rank-request">
-			<option value=n>No
-			<option value=del>Si
-			</select>
+							<option value="n">No
+							<option value="del">Si
+							</select><input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+						<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->">
 		</td>
-		<input type=hidden name=biblio value="<TMPL_VAR NAME="biblionumber">">
-		<input type=hidden name=borrower value="<TMPL_VAR NAME="bornum">">
-	</tr>
-	</TMPL_LOOP>
 
-	<tr VALIGN=TOP  >
-		<td colspan=5 align=right>
-		<TMPL_IF name="reserveloop">
-			<INPUT TYPE="image" name="submit" VALUE="Actualizar" height=42 WIDTH=187 BORDER=0 src="<TMPL_VAR name="themelang">/images/cancel-requests.gif">
-		</TMPL_IF>
+					</tr>
+					<!-- /TMPL_LOOP -->
+					<tr>
+						<td colspan="5" align="right">
+						<!-- TMPL_UNLESS NAME="unvalidlibrarian"--> 
+							<!-- TMPL_IF NAME="reserveloop" -->
+								<input type="submit" name="submit" value="Actualizar" class="button">
+							<!-- /TMPL_IF -->
+						<!-- /TMPL_UNLESS -->
 		</td>
 	</tr>
+				</table>
 	</form>
-</table>
-<br />
-<br />
-<table>
-	<tr VALIGN=TOP  >
-		<td colspan=5 align=right>
-			<p align=right>
-			<a href="/cgi-bin/koha/readingrec.pl?bornum=<TMPL_VAR NAME="bornum">"><img height=42 WIDTH=187 BORDER=0 src="<TMPL_VAR name="themelang">/images/reading-record.gif"></a>
-			</p>
+			<!-- TMPL_ELSE -->
+				Ninguno
+			<!-- /TMPL_IF -->
+	</div>
+
+	<div class="bloc25">
+		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Registro de Lectura</a>
+	</div>
+	<!-- TMPL_IF NAME="patronimages" -->
+		<div class="bloc25">
+			<img src="/patronimages/<!-- TMPL_VAR NAME="cardnumber" -->.<!-- TMPL_VAR NAME="patronimages" -->" alt="SIN IMAGEN" border="0">
+		</div>
+	<!-- /TMPL_IF -->
+	<div class="bloc25">
+		<h2 class="members">Ejemplares actualmente prestados</h2>
+		<!-- TMPL_IF NAME="issueloop" -->
+			<form action="../renewscript.pl" method="post">
+			<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
+
+			<table>
+			<tr>
+				<th>T&iacute;tulo</th>
+				<th>Deuda</th>
+				<th>Tipo de art&iacute;culo</th>
+				<th>Costo</th>
+				<!-- TMPL_UNLESS Name ="unvalidlibrarian"--> 
+					<th>Renovar</th>
+				<!-- /TMPL_UNLESS -->
+			</tr>
+
+			<!-- TMPL_LOOP NAME="issueloop" -->
+			<tr>
+				<td><!-- TMPL_IF NAME="red" --><p class="problem"><!-- TMPL_ELSE --> <p><!-- /TMPL_IF -->
+				<!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF name="itemcallnumber" --> <i>(<!-- TMPL_VAR name="itemcallnumber" -->)</i> <!-- /TMPL_IF -->
+				<a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+					<!-- TMPL_VAR NAME="barcode" -->
+				</a></p>
+				</td>
+				<td><!-- TMPL_IF NAME="red" --><p class="problem"><!-- TMPL_ELSE --> <p><!-- /TMPL_IF --><!-- TMPL_VAR NAME="date_due" --></p></td>
+				<td><!-- TMPL_VAR NAME="itemtype" --></td>
+				<td><!-- TMPL_VAR NAME="charge" --></td>
+				<!-- TMPL_UNLESS Name ="unvalidlibrarian"--> 
+					<td>
+						<!-- TMPL_IF NAME="norenew" -->
+							<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Reservado - Sin Renovaciones</a>
+						<!-- TMPL_ELSE -->
+							<input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y">Si <input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="n">No
+						<!-- /TMPL_IF -->
 		</td>
+				<!-- /TMPL_UNLESS --> 
 	</tr>
-</table>
-
+			<!-- /TMPL_LOOP -->
+			</table>
+			<!-- TMPL_UNLESS Name ="unvalidlibrarian"--> 
+				<input type="submit" class="button" value="Renovar Items">
+			<!-- /TMPL_UNLESS --> 
+		</form>
+		<!-- TMPL_ELSE -->
+			Ninguno
+		<!-- /TMPL_IF -->
+	</div>
+</div>
+<script language="JavaScript" type="text/javascript">
+function confirm_deletion() {
+	var is_confirmed = confirm('do you confirm deletetion ?');
+	if (is_confirmed) {
+		window.location="/cgi-bin/koha/members/deletemem.pl?member=<!-- TMPL_VAR NAME="bornum" -->";
+	}
+}
+</script>
 <!-- endmenu -->
 
-<TMPL_INCLUDE NAME="members-bottom.inc">
-</body>
-</HTML>
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: es/members/pay.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/members/Attic/pay.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/members/pay.tmpl	3 Jun 2003 21:41:17 -0000	1.2
+++ es/members/pay.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,48 +1,44 @@
-<TMPL_INCLUDE NAME="members-top.inc">
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
+<div id="mainbloc">
+<h1>Pagar Cuentas de <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
 
-<FONT SIZE=6><em>Pago de Fines para <TMPL_VAR name="firstname"> <TMPL_VAR name="surname"></em></FONT><P>
-<center>
-<p>
-	<form action=/cgi-bin/koha/pay.pl method=post>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-<TR VALIGN=TOP>
-	<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan=4><B>FINES & CHARGES</B></TD>
-	<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan=4><B>MONTO ADEUDADO</B></TD>
-</TR>
-	<input type="hidden" name="bornum" value="<TMPL_VAR name="bornum">">
-<TMPL_LOOP name="loop_pay">
-<tr VALIGN=TOP  >
-	<TD><input type=radio name="payfine<TMPL_VAR name="i">" value="no" checked>Impago
-	<input type=radio name="payfine<TMPL_VAR name="i">" value="yes">Pagar
-	<input type=radio name="payfine<TMPL_VAR name="i">" value="wo">Writeoff
-	<input type=hidden name="itemnumber<TMPL_VAR name="i">" value="<TMPL_VAR name="itemnumber">">
-	<input type=hidden name="accounttype<TMPL_VAR name="i">" value="<TMPL_VAR name="accounttype">">
-	<input type=hidden name="amount<TMPL_VAR name="i">" value="<TMPL_VAR name="amount'}">">
-	<input type=hidden name="out<TMPL_VAR name="i">" value="<TMPL_VAR name="amountoutstanding">">
-	<input type=hidden name="bornum<TMPL_VAR name="i">" value="<TMPL_VAR name="bornum">">
-	<input type=hidden name="accountno<TMPL_VAR name="i">" value="<TMPL_VAR name="accountno">">
+<form action="/cgi-bin/koha/pay.pl" method="post">
+<table>
+<tr>
+	<th colspan="3">Cuentas &amp; Cargos</th>
+	<th colspan="2">MONTO ADEUDADO</th>
+</tr>
+	
+<!-- TMPL_LOOP NAME="loop_pay" -->
+<tr>
+	<td>
+		<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
+		<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Impagado <input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Pagar <input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Anular
+		<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
+		<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">
+		<input type="hidden" name="amount<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amount'}" -->">
+		<input type="hidden" name="out<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amountoutstanding" -->">
+		<input type="hidden" name="bornum<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
+		<input type="hidden" name="accountno<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accountno" -->">
 	</td>
-	<TD><TMPL_VAR name="description"> <TMPL_VAR name="title"></td>
-	<TD><TMPL_VAR name="accounttype"></td>
-	<td><TMPL_VAR name="amount"></td>
-	<TD><TMPL_VAR name="amountoutstanding"></td>
+	<td><!-- TMPL_VAR NAME="description" --> <!-- TMPL_VAR NAME="title" --></td>
+	<td><!-- TMPL_VAR NAME="accounttype" --></td>
+	<td><!-- TMPL_VAR NAME="amount" --></td>
+	<td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
 </tr>
-</TMPL_LOOP>
-<tr VALIGN=TOP  >
-	<TD colspan=4 align=right><b>Deuda Total</b></td>
-	<TD><b><TMPL_VAR name="total"></b></td>
-	</tr>
-	<tr VALIGN=TOP  >
-	<TD colspan=5 align=right>
-	<INPUT TYPE="image" name="submit"  VALUE="pay" height=42  WIDTH=187 BORDER=0 src="/images/pay-fines.gif"></td>
+<!-- /TMPL_LOOP -->
+<tr valign="top">
+	<th colspan="4" align="right">Deuda Total</th>
+	<th><!-- TMPL_VAR NAME="total" --></th>
+</tr>
+<tr>
+	<td colspan="5" align="right">
+	<input type="submit" name="submit" value="Pagar" class="button"></td>
 </tr>
 </table>
 </form>
-<br clear=all>
-<p> &nbsp; </p>
-
-<br>
-<a href="moremember.pl?bornum=<TMPL_VAR name="bornum">">Volver</a> al Registro de Usuario
 
-<TMPL_INCLUDE NAME="members-bottom.inc">
+<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button member">Volver al registro del Usuario </a>
+</div>
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
 

Index: es/members/readingrec.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/members/Attic/readingrec.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/members/readingrec.tmpl	3 Jun 2003 21:41:17 -0000	1.2
+++ es/members/readingrec.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,46 +1,71 @@
-<TMPL_INCLUDE NAME="members-top.inc">
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
+<div id="mainbloc">
+	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
+	<p>N&uacute;mero de Usuario: <!-- TMPL_VAR NAME="bornum" --></p>
+	<p>N&uacute;mero de Carnet <!-- TMPL_VAR NAME="cardnumber" --></p>
 
-<FONT SIZE=6><em><TMPL_VAR NAME=firstname> <TMPL_VAR NAME=surname></em></FONT>
-<br>Usuario N&uacute;mero: <TMPL_VAR NAME=bornum>
-<br>Identificaci&oacute;n: <TMPL_VAR NAME=cardnumber>
-<P>
-<a href="readingrec.pl?bornum=<TMPL_VAR name="bornum">&limit=full">Salida completa</a>
-<br/><br/>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-<TR VALIGN=TOP>
-	<TD background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<a href="readingrec.pl?bornum=<TMPL_VAR name="bornum">&order=title&limit=<TMPL_VAR name="limit">"><b>TITULO</b></a>
-	</TD>
-	<TD background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<a href="readingrec.pl?bornum=<TMPL_VAR name="bornum">&order=author&limit=<TMPL_VAR name="limit">"><b>AUTOR</b></a>
-	</TD>
-	<TD background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<a href="readingrec.pl?bornum=<TMPL_VAR name="bornum">&limit=<TMPL_VAR name="limit">"><b>FECHA</b></a>
-	</TD>
-	<TD background="<TMPL_VAR name="themelang">/images/background-mem.gif">
-		<b>Volumen</b>
-	</TD>
-</TR>
-<TMPL_LOOP name="loop_reading">
-<TR VALIGN=TOP>
-	<TD  bgcolor="white">
- 		<TMPL_VAR name="title">&nbsp;
-	</TD>
-	<TD  bgcolor="white">
- 		<TMPL_VAR name="author">&nbsp;
-	</TD>
-	<TD  bgcolor="white">
-		<TMPL_VAR name="returndate">&nbsp;
-	</TD>
-	<TD  bgcolor="white">
-		<TMPL_VAR name="volumeddesc">&nbsp;
-	</TD>
-</TMPL_LOOP>
-</TABLE>
+	<!-- TMPL_IF NAME="showfulllink" -->
+	<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=50">Mostrar s&oacute;lo los 50 &uacute;ltimos</a></p><!-- TMPL_ELSE -->
+	<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=full">Salida completa</a></p>
+	<!-- /TMPL_IF -->
 
-<br>
-<a href="moremember.pl?bornum=<TMPL_VAR name="bornum">">Volver</a> al Registro de Usuario
+	<table>
+	<tr>
+		<th>
+			<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=title&amp;limit=<!-- TMPL_VAR NAME="limit" -->">T&iacute;tulo</a></th>
+		</th>
+		<th>
+			<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=author&amp;limit=<!-- TMPL_VAR NAME="limit" -->">Autor</a>
+		</th>
+		<th>
+			<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=<!-- TMPL_VAR NAME="limit" -->">Fecha de Devoluci&oacute;n</a>
+		</th>
+		<th>
+			<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=returndate&amp;limit=<!-- TMPL_VAR NAME="limit" -->">Devuelto</a></th>
+		</th>
+	</tr>
+	<!-- TMPL_LOOP NAME="loop_reading" -->
+	<!-- TMPL_IF NAME="toggle" -->
+		<tr class="hilighted">
+	<!-- TMPL_ELSE -->
+		<tr>
+	<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="even" -->
+					<td class="hilighted">
+				<!-- TMPL_ELSE -->
+					<td>
+				<!-- /TMPL_IF -->
+							<!-- TMPL_IF name="MARC_ON" -->
+								<a class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
+							<!-- TMPL_ELSE -->
+								<a class="transparent resultlist" href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="volume" --> vol <!-- TMPL_VAR name="volume" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="volumeddesc" --> : <!-- TMPL_VAR name="volumeddesc" --> <!-- /TMPL_IF -->
+						<!-- TMPL_IF name="number" --> parte: <!-- TMPL_VAR name="number" --><!-- /TMPL_IF -->
+					<p><!-- TMPL_VAR NAME="author" -->
+						<!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
+					</p>
+				</td>
+				<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
+					<p><!-- TMPL_VAR NAME="description" --></p>
+				</td>
+		<td>
+			<!-- TMPL_VAR NAME="date_due" -->&nbsp;
+		</td>
+		<td>
+			<!-- TMPL_VAR NAME="returndate" -->&nbsp;
+		</td>
+	<!-- /TMPL_LOOP -->
+	</table>
 
-<TMPL_INCLUDE NAME="members-bottom.inc">
+	<br>
+	<a href="members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button member">Regresar</a> al Registro de Usuario
+</div>
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
 
 

Index: es/parameters/admin-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/admin-home.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.12.1
diff -u -b -r1.4 -r1.4.12.1
--- es/parameters/admin-home.tmpl	3 Jun 2003 21:41:18 -0000	1.4
+++ es/parameters/admin-home.tmpl	7 May 2007 13:55:50 -0000	1.4.12.1
@@ -1,89 +1,139 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
-<center>
-<FONT SIZE=6><em>Página de administración de Koha</em></FONT><br>
-<table width=100% cellspacing=0 cellpadding=5 border=1>
-<tr background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">
-	<th>Parametros </th>
-</tr>
-</table>
-<table cellspacing=0 cellpadding=1 width=80%>
-<th colspan=2>Relacionados con los registros bibliográficos</th>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/itemtypes.pl>Tipos de Materiales</a></td>
-	<td>Define los tipos de Materiales usados por Koha, el tiempo de préstamo, etc</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/aqbudget.pl>Presupuesto</a></td>
-	<td>Define las distintas proveniencias de fondos por las cuales es posible adquirir publicaciones</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/aqbookfund.pl>Fondos Bibliográficos</a></td>
-	<td>Administración de los fondos bibliográficos</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/authorised_values.pl>Valores Autorizados</a></td>
-	<td>Define categories and authorized values for them.  Authorised values are used in MARC form to limit/help editing MARC biblios.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/thesaurus.pl>Thesaurus</a></td>
-	<td>Management of thesaurus and authorities files.</td>
-</tr>
-
-<th colspan=2>MARC related</th>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/marctagstructure.pl>MARC tag structure</a></td>
-	<td>MARC structure: tags then subfields.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><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>
-	<td valign="top" width="25%"><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>
-
-<th colspan=2>Various parameters</th>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/branches.pl>Library branches</a></td>
-	<td>The differents branches you manage with this Koha server.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/categorie.pl>Categories</a></td>
-	<td>Define the categories of borrowers.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/currency.pl>Currencies</a></td>
-	<td>Define exchange rates.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/printers.pl>Printers</a></td>
-	<td>Printers (UNIX paths).</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/stopwords.pl>Stop words</a></td>
-	<td>Words deleted during searches.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/z3950servers.pl>Z39.50 Servers</a></td>
-	<td>Servers to query for MARC data.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/systempreferences.pl>System preferences</a></td>
-	<td>System preferences.</td>
-</tr>
-</table>
-
-<table width=100% cellspacing=0 cellpadding=5 border=1>
-<tr background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">
-	<th>Tools</th>
-</tr>
-</table>
-<table cellspacing=0 cellpadding=1 width=80%>
-<th colspan=2>Export</th>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/export/marc.pl>MARC biblio export</a></td>
-	<td>Exporting in MARC format.</td>
-</tr>
-</table>
-</center>
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+<div id="mainbloc">
+<!-- TMPL_IF name="CAN_user_management" -->
+<h1>Par&aacute;metros</h1><br>
+<!-- /TMPL_IF -->
+
+<div id="bloc100">
+<!-- TMPL_IF name="CAN_user_management" -->
+	<div id="bloctitle">Par&aacute;metros del Sistema </div>
+
+	<table>
+	<tr>
+	<td colspan="2"><b>Rellene las tablas en el orden en el que aparecen para poner a funcionar Koha</b></td>
+	</tr>
+	<!-- TMPL_IF name="CAN_user_parameters" -->	
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/branches.pl">Sedes</a></td>
+			<td>Las distintas sedes que administra con este servidor Koha.</td>
+		</tr>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF name="CAN_user_management" -->
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/aqbookfund.pl">Fondos Bibliogr&aacute;ficos</a></td>
+			<td>Administraci&oacute;n del fondo biblioogr&aacute;fico. Recuerde editar sus fondos de  biblioogr&aacute;ficos antes de comenzar a editar los presupuestos.</td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/currency.pl">Monedas</a></td>
+			<td>Defina la tasa de cambio.</td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/itemtypes.pl">Tipos de art&iacute;culo</a></td>
+			<td>Defina tipos de art&iacute;culo.</td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/categorie.pl">Categor&iacute;as de Usuario</a></td>
+			<td>Defina las categor&iacute;as de los usuarios.</td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/issuingrules.pl">Reglas de Pr&eacute;stamo</a></td>
+			<td>Defina las reglas de pr&eacute;stamo para sedes / usuarios / tipos de art&iacute;culo (cant. de pr&eacute;stamos, duraci&oacute;n, costo...)</td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/authorised_values.pl">Valores autorizados</a></td>
+			<td>Defina categor&iacute;as y valores autorizados para ellas. Los valores autorizados se usan en el formulario MARC para limitar y ayudar en la edici&oacute;n de registros MARC.</td>
+		</tr>
+	<!-- /TMPL_IF -->
+		
+	<!-- TMPL_IF name="CAN_user_parameters" -->
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/authtypes.pl">Estructura de Tesauro</a></td>
+			<td>Defina la estructura MARC de las categor&iacute;as y los tesauros/autoridades.</td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/biblio_framework.pl">Formato de Registro (estructura MARC)</a></td>
+			<td>los formatos definidos para el editor MARC. Cree formatos, luego defina la estructura de MARC (campos &amp; subcampos)</td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Equivalencias entre Koha - MARC</a></td>
+			<td>Defina equivalencias entre la base de datos est&aacute;ndar de the Koha y la base MARC. Note que estas equivalencias pueden ser definidas en la estructura MARC. Esta herramienta es s&oacute;lo un atajo para acelerar el trabajo.</td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/checkmarc.pl">Chequeo MARC</a></td>
+			<td>Revise la estructura MARC. USELO antes de trabajar con datos reales. Mostrar&aacute; errores que pueden CORROMPER la base de datos de Koha.</td>
+		</tr>
+	<!-- /TMPL_IF -->
+	
+	<tr>
+	<th colspan="2">Par&aacute;metros varios</th>
+	</tr>
+	<!-- TMPL_IF name="CAN_user_parameters" -->
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/printers.pl">Impresoras</a></td>
+			<td>Impresoras (UNIX paths).</td>
+		</tr>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF name="CAN_user_management" -->
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/stopwords.pl">Palabras eliminadas</a></td>
+			<td>Palabras eliminadas durante las b&uacute;squedas.
+				<!-- TMPL_UNLESS name="stopwords" --><p class="problem">ADVERTENCIA: debe definir palabras eliminadas</p><!-- /TMPL_UNLESS --></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF name="CAN_user_parameters" -->
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/z3950servers.pl">Servidores Z39.50</a></td>
+			<td>Servidores para consultar los datos MARC</td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/systempreferences.pl">Preferencias del Sistema</a></td>
+			<td>Preferencias del Sistema.</td>
+		</tr>
+	<!-- /TMPL_IF -->
+	</table>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF name="CAN_user_tools" -->
+	<h1>Herramientas</h1>
+	<table>
+		<tr>
+		<th colspan="2"> Exportar</th>
+		</tr>
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/export/marc.pl">Exportaci&oacute;n de registro MARC</a></td>
+			<td> Exportando en formato MARC.</td>
+		</tr>
+		<tr>
+		<th colspan="2">Importar</th>
+		</tr>
+		<tr valign="top">
+			<td width="20%"><a href="/cgi-bin/koha/import/breeding.pl">Subir registros MARC al dep&oacute;sito</a></td>
+			<td>El dep&oacute;sito es una tabla donde los registros MARC importados son almacenados. El registro MARC es almacenado en el dep&oacute;sito mientras no tienga ning&uacute;n art&iacute;culo. Cuando escribe el ISBN o el t&iacute;tulo de un libro, este es buscado en el dep&oacute;sito. Si es encontrado, el libro es a&ntilde;adido a la tabla de Koha .
+			</td>
+		</tr>
+		<tr>
+		<th colspan="2">Generador de C&oacute;digo de barras</th>
+		</tr>
+		<tr valign="top">
+			<td width="20%"><a href="/cgi-bin/koha/barcodes/barcodes.pl">Generar C&oacute;digos de Barras</a></td>
+			<td>el generador de c&oacute;digos de barras se encarga de generar los c&oacute;digos de barras para los art&iacute;culos que adquiere
+			</td>
+		</tr>
+	</table>
+<!-- /TMPL_IF -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/aqbookfund.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/aqbookfund.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -u -b -r1.3 -r1.3.12.1
--- es/parameters/aqbookfund.tmpl	3 Jun 2003 21:41:18 -0000	1.3
+++ es/parameters/aqbookfund.tmpl	7 May 2007 13:55:50 -0000	1.3.12.1
@@ -1,39 +1,80 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
-<TMPL_IF name=else>
-<FONT SIZE=6><em>bookfund admin</em></FONT><form action=<TMPL_VAR name=scriptname> method=post>
-<input type=text name=searchfield value=""><input type=reset name=reset value="clr"></form>
-<TMPL_IF name=search>
-	<br>You Searched for <b><TMPL_VAR name=searchfield><b><p><br>
-</TMPL_IF>
-<table border=0 cellspacing=0 cellpadding=2 width="80%">
-<tr valign=top bgcolor=#99cc33>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Book fund</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Name</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Group</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Budget</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">Edit</td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">Delete</td>
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="else" -->
+	<h1>Administraci&oacute;n del Fondo Bibliogr&aacute;fico</h1>
+	<form action="<!-- TMPL_VAR NAME="scriptname" -->" method="post">
+	<input type="text" name="searchfield" value=""><input type="reset" name="reset" value="Borrar"></form>
+	<!-- TMPL_IF NAME="search" -->
+		<br>Usted busc&oacute; <b><!-- TMPL_VAR NAME="searchfield" --></b><p><br>
+	<!-- /TMPL_IF -->
+		<p><br>Presupuestos <!-- TMPL_VAR NAME="min" --> a <!-- TMPL_VAR NAME="max" --> fuera de <!-- TMPL_VAR NAME="nbresults" -->  <!--TMPL_IF Name="Next" --><a href="/cgi-bin/koha/admin/aqbookfund.pl?offset=<!-- TMPL_VAR NAME="max" -->">Mas </a><!-- /TMPL_IF--></p><br><p>
+	<table border="0" cellspacing="0" cellpadding="2" width="80%">
+	<tr>
+		<th>Fondo Bibliogr&aacute;fico</th>
+		<th>Nombre</th>
+		<th>Sede</th>
+		<th>Editar</th>
+		<th>Borrar</th>
 	</tr>
-<TMPL_LOOP name="bookfund">
-	<tr valign=top bgcolor="<TMPL_VAR name="toggle">">
-		<td><TMPL_VAR name="bookfundid"></td>
-		<td><TMPL_VAR name="bookfundname"></td>
-		<td><TMPL_VAR name="bookfundgroup"> &nbsp;</td>
-		<td><a href="aqbudget.pl?bookfundid=<TMPL_VAR name="bookfundid"> "><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/filefind.png" width=32 hspace=0 vspace=0 border=0 title="budget"></a></td>
-		<td><a href="<TMPL_VAR name="action">?op=add_form&bookfundid=<TMPL_VAR name="bookfundid"> "><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="action">?op=delete_confirm&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
+	<!-- TMPL_LOOP NAME="bookfund" -->
+		<tr valign="top" bgcolor="ffffcc">
+			<td><!-- TMPL_VAR NAME="bookfundid" --></td>
+			<td><!-- TMPL_VAR NAME="bookfundname" --></td>
+			<td align="center">
+			<!--TMPL_VAR Name="branchname"-->
+			</td>
+			<td><a href="<!-- TMPL_VAR NAME="action" -->?op=add_form&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" --> ">
+				<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" alt="Editar" title="Editar" width="32" hspace="0" vspace="0" border="0"></a>
+			</td>
+			<td><a href="<!-- TMPL_VAR NAME="action" -->?op=delete_confirm&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" alt="Borrar" title="Borrar" width="32" hspace="0" vspace="0" border="0"></a></td>
 	</tr>
-</TMPL_LOOP>
-</table>
-<form action='<TMPL_VAR name=scriptname>' method=post>
-	<input type=hidden name=op value=add_form>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-	<br><input type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/filenew.png" title="Add bookfund" ALT="Add" BORDER=0 ><br>
-	<br></form><br clear=all>
-<p> &nbsp; </p>
-</TMPL_IF>
+		<tr>
+			<td>&nbsp;</td>
+			<th>Presupuesto</th>
+			<th>Sede</th>
+			<td>
+				<a href="aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->" class="button">
+				A&ntilde;adir Presupuesto</a>
+			</td>
+			<td>&nbsp;</td>
+		</tr>
+		<!-- TMPL_LOOP NAME="budget" -->
+			<tr valign="top">
+				<td>&nbsp;</td>
+				<td>
+					<!-- TMPL_VAR NAME="startdate" --> - <!-- TMPL_VAR NAME="enddate" --> : <b><!-- TMPL_VAR NAME="budgetamount" --></b>
+				</td>
+				<td align="center">
+				<!--TMPL_IF Name="branchcode"-->
+				 	<!--TMPL_VAR Name="branchcode"-->
+				<!--TMPL_ELSE -->
+					&nbsp;
+				<!--/TMPL_IF-->
+				</td>
+				<td>
+					<a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;aqbudgetid=<!-- TMPL_VAR NAME="aqbudgetid" -->">
+						<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" alt="Editar" title="Editar" width="32" hspace="0" vspace="0" border="0">
+					</a>
+				</td>
+				<td>
+					<a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&amp;aqbudgetid=<!-- TMPL_VAR NAME="aqbudgetid" -->">
+						<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" alt="Borrar" title="Borrar" width="32" hspace="0" vspace="0" border="0">
+					</a>
+				</td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
+	</table>
+	<form action="<!-- TMPL_VAR NAME="scriptname" -->" method="post">
+		<input type="hidden" name="op" value="add_form">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+		<br><input type="submit" class="button" value="A&ntilde;adir Fondo" title="A&ntilde;adir Fondo" alt="A&ntilde;adir Fondo"><br>
+		<br></form><br clear="all">
+	<p> &nbsp; </p>
+	<!-- /TMPL_IF -->
 
-<TMPL_IF name="add_form">
-<script>
+	<!-- TMPL_IF NAME="add_form" -->
+	<script language="javascript" type="text/javascript">
+		function _(s) { return s } // dummy function for gettext
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	function isNotNull(f,noalert) {
 		if (f.value.length ==0) {
@@ -71,60 +112,76 @@
 		var _alertString="";
 		var alertString2;
 		if (f.bookfundid.value.length==0) {
-			_alertString += "- bookfundid missing\n";
+				_alertString += "\n- " + _("falta bookfundid");
 		}
 		if (f.bookfundname.value.length==0) {
-			_alertString += "- bookfundname missing\n";
+				_alertString += "\n- " + _("falta bookfundname");
 		}
 		if (_alertString.length==0) {
 			document.Aform.submit();
 		} else {
-			alertString2 = "Form not submitted because of the following problem(s)\n";
-			alertString2 += "------------------------------------------------------------------------------------\n\n";
+				alertString2  = _("El Formulario no fue procesado debido a los siguientes problemas");
+				alertString2 += "\n------------------------------------------------------------------------------------\n";
 			alertString2 += _alertString;
 			alert(alertString2);
 		}
 	}
-	</SCRIPT>
-<h1><TMPL_VAR name="header"></h1>
-<form action='<TMPL_VAR name="action">' name=Aform method=post>
-<input type=hidden name=op value='add_validate'>
-<input type=hidden name=checked value=0>
-<table>
-<TMPL_IF name="add_or_modify">
-<tr><td>Book fund</td><td><input type=hidden name=bookfundid value=<TMPL_VAR name="bookfundid">><TMPL_VAR name="bookfundid"></td></tr>
-<TMPL_ELSE>
-<tr><td>Book fund</td><td><input type=text name=bookfundid size=5 maxlength=5 onBlur=toUC(this)></td></tr>
-</TMPL_IF>
-<tr><td>Name</td><td><input type=text name=bookfundname size=40 maxlength=80 value='<TMPL_VAR name="bookfundname">'>&nbsp;</td></tr>
-<tr><td>Group</td><td><input type=text name=bookfundgroup value='<TMPL_VAR name="bookfundgroup">'></td></tr>
-<tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
-</table>
-</form>
-</TMPL_IF>
-
-<TMPL_IF name="add_validate">
-data recorded
-<form action='<TMPL_VAR name="action">' method=post>
-<input type=submit value=OK>
-</form>
-</TMPL_IF>
+		</script>
+	<h1>
+		<!-- TMPL_IF NAME="use-header-flags-p" -->
+		<!-- TMPL_IF NAME="header-is-add-p" -->A&ntilde;adir Fondo de Libros<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="header-is-modify-p" -->Modificar Fondo de Libros<!-- /TMPL_IF -->
+		<!-- TMPL_ELSE -->
+		<!-- TMPL_VAR NAME="header" -->
+		<!-- /TMPL_IF -->
+	</h1>
+	<form action="<!-- TMPL_VAR NAME="action" -->" name="Aform" method="post">
+	<input type="hidden" name="op" value="add_validate">
+	<input type="hidden" name="checked" value="0">
+	<!-- TMPL_IF NAME="add_or_modify" -->
+	<p>
+		<label>Fondo Bibliogr&aacute;fico</label><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->"><!-- TMPL_VAR NAME="bookfundid" -->
+	</p>
+	<!-- TMPL_ELSE -->
+	<p>
+		<label>Fondo Bibliogr&aacute;fico</label><input type="text" name="bookfundid" size="5" maxlength="5" onblur="toUC(this)">
+	</p>
+	<!-- /TMPL_IF -->
+	<p>
+		<label>Nombre</label><input type="text" name="bookfundname" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="bookfundname" escape=HTML -->">&nbsp;
+	</p>
+	<p>
+		<label>Sede</label><!-- TMPL_VAR NAME="CGIbranch"-->&nbsp;
+		<br/> Seleccionar uno si el presupuesto es espec&iacute;fico de la sede, si no, dejelo en blanco.
+	</p>
+	<p>
+		<label>&nbsp;</label><input type="button" value="ACEPTAR" onclick="Check(this.form)" class="button">
+	</p>
+	</form>
+	<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_confirm">
-<table border=0 cellspacing=0 cellpadding=5>
-<tr valign=top bgcolor=#99cc33><td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Book fund</b></td><td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b><TMPL_VAR name="bookfundid"></b></td></tr>
-<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">'>
-<tr><td>Name</td><td><TMPL_VAR name="bookfundname"></td></tr><tr><td>Group</td><td><TMPL_VAR name="bookfundgroup"></td></tr>
-<tr><td colspan=2 align=center>CONFIRM DELETION</td></tr>
-<tr><td><INPUT type=submit value='YES'></form></td><td><form action='<TMPL_VAR name="action">' method=post><input type=submit value=NO></form></td></tr><br clear=all>
-<p> &nbsp; </p>
-</TMPL_IF>
+	<!-- TMPL_IF NAME="add_validate" -->
+	Datos guardados
+	<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+	<input type="submit" value="ACEPTAR">
+	</form>
+	<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_confirmed">
-data deleted
-<form action='<TMPL_VAR name="action">' method=post>
-<input type=submit value=OK>
-"</form>"
-</TMPL_IF>
+	<!-- TMPL_IF NAME="delete_confirm" -->
+	<table border="0" cellspacing="0" cellpadding="5">
+	<tr valign="top" bgcolor="#99cc33"><td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Fondo Bibliogr&aacute;fico</b></td><td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR NAME="bookfundid" --></b></td></tr>
+	<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" -->">
+	<tr><td>Nombre</td><td><!-- TMPL_VAR NAME="bookfundname" --></td></tr>
+	<tr><td colspan="2" align="center">CONFIRMAR BORRADO</td></tr>
+	<tr><td><input type="submit" value="SI"></form></td><td><form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="submit" value="NO"></form></td></tr><br clear="all">
+	<p> &nbsp; </p>
+	<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+	<!-- TMPL_IF NAME="delete_confirmed" -->
+	Datos borrados
+	<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+	<input type="submit" value="ACEPTAR">
+	</form>
+	<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/aqbudget.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/aqbudget.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -u -b -r1.3 -r1.3.12.1
--- es/parameters/aqbudget.tmpl	3 Jun 2003 21:41:18 -0000	1.3
+++ es/parameters/aqbudget.tmpl	7 May 2007 13:55:50 -0000	1.3.12.1
@@ -1,32 +1,52 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
-
-<TMPL_IF name="else">
-	<FONT SIZE=6><em>Budget admin</em></FONT><form action=/cgi-bin/koha/admin/aqbudget.pl method=post>
-	<input type=text name=searchfield value=""><input type=reset name=reset value="clr"></form>
-	<TMPL_IF name=search>
-	<br>You Searched for <b><TMPL_VAR name=searchfield><b><p><br>
-	</TMPL_IF>
-	<table border=0 cellspacing=0 cellpadding=5>
-	<tr valign=top bgcolor=#99cc33><td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Book fund</b></td><td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Start date</b></td><td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>End date</b></td><td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Budget amount</b></td><td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">&nbsp;</td><td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">&nbsp;</td></tr>
-	<TMPL_LOOP name="budget">
-		<tr valign=top bgcolor=<TMPL_VAR name="toggle"> >
-			<td><TMPL_VAR name="bookfundid"> (<TMPL_VAR name="bookfundname">)</td>
-			<td><TMPL_VAR name="startdate"></td>
-			<td><TMPL_VAR name="enddate"></td>
-			<td><TMPL_VAR name="budgetamount"></td>
-			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&bookfundid=<TMPL_VAR name="bookfundid">"><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="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&bookfundid=<TMPL_VAR name="bookfundid">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="else" -->
+		<h1>Administraci&oacute;n de Presupuesto</h1><form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
+		<input type="text" name="searchfield" value="">
+		<input type="submit" class="button" value="ACEPTAR"></form>
+		<!-- TMPL_IF NAME="search" -->
+		<br>Usted busc&oacute; <b><!-- TMPL_VAR NAME="searchfield" --></b><p><br>
+		<!-- /TMPL_IF -->
+		<table>
+		<tr>
+			<th>Fondo Bibliogr&aacute;fico</th>
+			<th>Fecha de Inicio</th>
+			<th>Fecha final</th>
+			<th>Monto del Presupuesto</th>
+			<th>&nbsp;</th>
+			<th>&nbsp;</th>
+		</tr>
+		<!-- TMPL_LOOP NAME="budget" -->
+			<tr bgcolor=<!-- TMPL_VAR NAME="toggle" --> >
+				<td><!-- TMPL_VAR NAME="bookfundid" --> (<!-- TMPL_VAR NAME="bookfundname" -->)</td>
+				<td><!-- TMPL_VAR NAME="startdate" --></td>
+				<td><!-- TMPL_VAR NAME="enddate" --></td>
+				<td align="right"><!-- TMPL_VAR NAME="budgetamount" --></td>
+				<td>
+					<a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->">
+						<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="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->">
+						<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0">
+					</a>
+				</td>
 		</tr>
-	</TMPL_LOOP>
+		<!-- /TMPL_LOOP -->
 	</table>
-	<form action='/cgi-bin/koha/admin/aqbudget.pl' method=post>
-	<input type=hidden name=op value=add_form>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<br><input type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/filenew.png" title="Add budget" ALT="Add" BORDER=0 ><br>
-	</form><br clear=all>
-</TMPL_IF>
-
-<TMPL_IF name="add_form">
-<script>
+		<form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
+			<input type="hidden" name="op" value="add_form">
+			<br>
+			<input type="submit" class="button" value="A&ntilde;adir Presupuesto" title="A&ntilde;adir Presupuesto" alt="A&ntilde;adir Presupuesto">
+			<br>
+		</form>
+		<br clear="all">
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="add_form" -->
+	<script language="javascript" type="text/javascript">
+		function _(s) { return s } // dummy function for gettext
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	function isNotNull(f,noalert) {
 		if (f.value.length ==0) {
@@ -63,67 +83,96 @@
 		var ok=1;
 		var _alertString="";
 		var alertString2;
-		if (f.bookfundid.value.length==0) {
-			_alertString += "- bookfundid missing\n";
-		}
 		if (!(isNotNull(window.document.Aform.budgetamount,1))) {
-			_alertString += "- Budget missing\n";
+				_alertString += "\n- " + _("Presupuesto faltante");
 		}
 		if (_alertString.length==0) {
 			document.Aform.submit();
 		} else {
-			alertString2 = "Form not submitted because of the following problem(s)\n";
-			alertString2 += "------------------------------------------------------------------------------------\n\n";
+				alertString2  = _("El Formulario no fue procesado debido a los siguientes problemas");
+				alertString2 += "\n------------------------------------------------------------------------------------\n";
 			alertString2 += _alertString;
 			alert(alertString2);
 		}
 	}
-	</SCRIPT>
-<h1><TMPL_VAR name="header"></h1>
-<form action='/cgi-bin/koha/admin/aqbudget.pl' name=Aform method=post>
-<input type=hidden name=op value=add_validate>
-<input type=hidden name=checked value=0>
-<table>
-<TMPL_IF name="modify">
-<tr><td>Book fund</td><td><input type=hidden name=bookfundid value=<TMPL_VAR name=bookfundid>><TMPL_VAR name="bookfundid"></td></tr>
-<tr><td>Book fund name</td><td><TMPL_VAR name="bookfundname"></td></tr>
-</TMPL_IF>
-<TMPL_IF name="adding">
-<tr><td>Book fund</td><td><input type=text name=bookfundid size=5 maxlength=5 onBlur=toUC(this)></td></tr>
-</TMPL_IF>
-<tr><td>Start date (<TMPL_VAR NAME=dateformat>)</td><td><input type=text name=startdate size=40 maxlength=80 value='<TMPL_VAR name="startdate">'>&nbsp;</td></tr>
-<tr><td>End date (<TMPL_VAR NAME=dateformat>)</td><td><input type=text name=enddate value='<TMPL_VAR name="enddate">'></td></tr>
-<tr><td>Budget amount</td><td><input type=text name=budgetamount value='<TMPL_VAR name="budgetamount">'></td></tr>
-<tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
-</table>
-</form>
-<br clear=all>
-<p> &nbsp; </p>
-</TMPL_IF>
-
-<TMPL_IF name="add_validate">
-data recorded
-<form action='<TMPL_VAR name="action">' method=post>
-<input type=submit value=OK>
-</form>
-</TMPL_IF>
-
-<TMPL_IF name="delete_confirm">
-<table border=0 cellspacing=0 cellpadding=5>
-<tr valign=top bgcolor=#99cc33><td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Book fund</b></td><td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b><TMPL_VAR name="bookfundid"></b></td></tr>
-<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">'>
-<tr><td>Start date</td><td><TMPL_VAR name="startdate"></td></tr>
-<tr><td>End date</td><td><TMPL_VAR name="enddate"></td></tr>
-<tr><td>budgetamount</td><td><TMPL_VAR name="budgetamount"></td></tr>
-<tr><td colspan=2 align=center>CONFIRM DELETION</td></tr>
-<tr><td><INPUT type=submit value='YES'></form></td><td><form action='<TMPL_VAR name="action">' method=post><input type=submit value=NO></form></td></tr>"
-</TMPL_IF>
-
-<TMPL_IF name="delete_confirmed">
-data deleted
-<form action='<TMPL_VAR name="action">' method=post>
-<input type=submit value=OK>
-</form>
-</TMPL_IF>
+		</script>
+	<h1><!-- TMPL_VAR NAME="header" --></h1>
+	<div id="bloc25">
+		<form action="/cgi-bin/koha/admin/aqbudget.pl" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate">
+		<input type="hidden" name="checked" value="0">
+		<!-- TMPL_IF NAME="modify" -->
+			<p>
+				<label class="label100">Fondo Bibliogr&aacute;fico</label><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->"><!-- TMPL_VAR NAME="bookfundid" -->
+			</p>
+			<p>
+				<label class="label100">Nombre del Fondo Bibliogr&aacute;fico</label><!-- TMPL_VAR NAME="bookfundname" -->
+			</p>
+		<!-- /TMPL_IF -->
+		
+		<!-- TMPL_IF NAME="adding" -->
+			<p>
+				<label class="label100">Fondo Bibliogr&aacute;fico</label><input type="hidden" name="bookfundid" size="5" maxlength="5" value="<!-- TMPL_VAR NAME="bookfundid" -->"><!-- TMPL_VAR NAME="bookfundid" -->
+			</p>
+		<!-- /TMPL_IF -->
+		
+		<p>
+			<label class="label100">Fecha de Inicio <i>(<!-- TMPL_VAR NAME="dateformat" -->)</i></label><input type="text" name="startdate" size="11" value="<!-- TMPL_VAR NAME="startdate" -->">
+		</p>
+		<p>
+			<label class="label100">Fecha Final <i>(<!-- TMPL_VAR NAME="dateformat" -->)</i></label><input type="text" name="enddate" size="11" value="<!-- TMPL_VAR NAME="enddate" -->">
+		</p>
+		<p>
+			<label class="label100">Monto del Presupuesto</label><input type="text" name="budgetamount" value="<!-- TMPL_VAR NAME="budgetamount" -->">
+		</p>
+		<p><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->"><input type="button" value="ACEPTAR" onclick="Check(this.form)" class="button"></p>
+		</form>
+	</div>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="add_validate" -->
+	Datos guardados
+	<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+	<input type="submit" value="ACEPTAR">
+	</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirm" -->
+	<table border="0" cellspacing="0" cellpadding="5">
+		<tr valign="top" bgcolor="#99cc33">
+			<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>Fondo Bibliogr&aacute;fico</b>
+			</td>
+			<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b><!-- TMPL_VAR NAME="bookfundid" --></b>
+			</td>
+		</tr>
+	
+		<form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->">
+		<tr>
+			<td>Fecha de Inicio</td>
+			<td><!-- TMPL_VAR NAME="startdate" --></td>
+		</tr>
+		<tr>
+			<td>Fecha final</td><td><!-- TMPL_VAR NAME="enddate" --></td>
+		</tr>
+		<tr>
+			<td>budgetamount</td><td><!-- TMPL_VAR NAME="budgetamount" --></td>
+		</tr>
+		<tr>
+			<td colspan="2" align="center">CONFIRMAR BORRADO</td>
+		</tr>
+		<tr>
+			<td><input type="submit" value="SI"></form></td><td><form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="submit" value="NO"></form></td>
+		</tr>
+	</table>
+	<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+	<!-- TMPL_IF NAME="delete_confirmed" -->
+	Datos borrados
+	<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+	<input type="submit" value="ACEPTAR">
+	</form>
+	<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/authorised_values.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/authorised_values.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/parameters/authorised_values.tmpl	3 Jun 2003 21:41:18 -0000	1.2
+++ es/parameters/authorised_values.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,91 +1,91 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
-
-<TMPL_IF name="add_form">
-<!-------------------------------------------------------------------------------------------------->
-	<H1><TMPL_VAR name="action"></H1>
-	<form action='<TMPL_VAR name="script_name">' name=Aform method=post>
-	<input type=hidden name=op value='add_validate'>
-	<table>
-	<tr>
-		<td>Category</td>
-		<td><TMPL_VAR name="category"></td>
-	</tr>
-	<tr>
-		<td>Authorised value</td>
-		<td><input type=text name="authorised_value" value='<TMPL_VAR name="authorised_value">'></td>
-	</tr>
-	<tr>
-		<td>Lib</td>
-		<td><input type=text name="lib" value='<TMPL_VAR name="lib">'></td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td><input type="hidden" name="id" value="<TMPL_VAR name="id">">
-			<INPUT type="submit" value='OK'></td>
-	</tr>
-	</table>
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+<div id="mainbloc">
+<!-- TMPL_IF NAME="add_form" -->
+<!-- ------------------------------------------------------------------------ -->
+	<h1>
+	<!-- TMPL_IF NAME="use-heading-flags-p" -->
+	<!-- TMPL_IF NAME="heading-modify-authorized-value-p" -->Modificar Valor Autorizado<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="heading-add-new-category-p" -->A&ntilde;adir Nueva Categor&iacute;a<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="heading-add-authorized-value-p" -->A&ntilde;adir Valor autoridad<!-- /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">
+		<p><label>Categor&iacute;a</label><!-- TMPL_VAR NAME="category" --></p>
+		<p><label>Valor autorizado</label><input type="text" name="authorised_value" value="<!-- TMPL_VAR NAME="authorised_value" escape=HTML -->"></p>
+		<p><label>Texto</label><input type="text" name="lib" value="<!-- TMPL_VAR NAME="lib" -->"></p>
+		<p>
+			<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->">
+			<input type="submit" value="ACEPTAR" class="button parameters">
+		</p>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
 
-<TMPL_IF name="delete_confirm">
-<!-------------------------------------------------------------------------------------------------->
-<table border=0 cellspacing=0 cellpadding=2>
-	<tr valign=top bgcolor=#99cc33>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Variable</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Lib</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b><TMPL_VAR name="searchfield"></b></td>
-	</tr>
-	<tr><td>Value</td><td><TMPL_VAR name="Tvalue"></td></tr>
-	<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="searchfield" value="<TMPL_VAR name="searchfield">">
-	<tr><td colspan=2 align=center>CONFIRM DELETION</td></tr>
-	<tr><td><INPUT type=submit value='YES'></form></td>
-		<td><form action='<TMPL_VAR name="script_name">' method=post><input type=submit value=NO></form></td></tr>
-</TMPL_IF>
+<!-- TMPL_IF NAME="delete_confirm" -->
+<!-- ------------------------------------------------------------------------ -->
+<table border="0" cellspacing="0" cellpadding="2">
+	<tr valign="top" bgcolor="#99cc33">
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Variable</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Texto</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
+	</tr>
+	<tr><td>Valor</td><td><!-- TMPL_VAR NAME="Tvalue" --></td></tr>
+	<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="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+	<tr><td colspan="2" align="center">CONFIRMAR BORRADO</td></tr>
+	<tr><td><input type="submit" value="SI"></form></td>
+		<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO"></form></td></tr>
+<!-- /TMPL_IF -->
 
-<!-------------------------------------------------------------------------------------------------->
-<TMPL_IF name="else">
-<font SIZE=6><em>Authorised values admin</em></font>
-<p>This table is used in MARC definition. You can define as many categories as you want, and as many authorised values as you want in each category.</p>
-<p>When you define the MARC subfield structure, you can link a subfield to a authorised-value category. When the user ask for adding of modifying a biblio,
-the subfield is not entered through a free field, but though a list of authorised values</p>
-<form action=/cgi-bin/koha/admin/authorised_values.pl method=post>
-	<TMPL_VAR name="tab_list"><input type="submit" value="OK">   <a href="authorised_values.pl?op=add_form">New category...</a>
+<!-- ------------------------------------------------------------------------ -->
+<!-- TMPL_IF NAME="else" -->
+<h1>Administraci&oacute;n de valores autorizados</h1>
+<p>Esta tabla se utiliza en la definici&oacute;n MARC. Puede definir tantas categor&iacute;as como quiera, y tantos valores autorizados como quiera en cada categor&iacute;a.</p>
+<p>Cuando defina la estructura de subcampo de MARC, puede unir un subcampo para una categor&iacute;a de valor autorizado. Cuando el usuario a&ntilde;ade o modifica un registro, el subcampo no entra por un campo libre, pero si en una lista de valores autorizados.</p>
+<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post">
+	<!-- TMPL_VAR NAME="tab_list" --><input type="submit" value="ACEPTAR" class="button parameters">
+		<a href="authorised_values.pl?op=add_form" class="button parameters">Nueva categor&iacute;a...</a>
 </form>
-<TMPL_VAR name="searchfield">
-<table border=0 cellspacing=0 cellpadding=2 width="80%">
-<tr valign=top bgcolor=#99cc33>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Category</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Authorised value</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Lib</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">Edit</td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">Delete</td>
-<TMPL_LOOP name="loop">
-</tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
-	<td><TMPL_VAR name="category"></td>
-	<td><TMPL_VAR name="authorised_value"></td>
-	<td><TMPL_VAR name="lib"></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>
+<!-- TMPL_VAR NAME="searchfield" -->
+<table>
+<tr>
+	<th class="parameters">Categor&iacute;a</h>
+	<th class="parameters">Valor autorizado</th>
+	<th class="parameters">Texto</th>
+	<th class="parameters">Editar</th>
+	<th class="parameters">Borrar</th>
 </tr>
-</TMPL_LOOP>
-<form action='<TMPL_VAR name="script_name">' method=post>
-<input type=hidden name=op value=add_form>
-</table>
-<table width=40%>
-	<tr>
-		<td width=50%><TMPL_VAR name="previous"></td>
-		<td width=50%><TMPL_VAR name="next"></td>
-	</tr>
+<!-- TMPL_LOOP NAME="loop" -->
+<tr>
+	<td><!-- TMPL_VAR NAME="category" --></td>
+	<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+	<td><!-- TMPL_VAR NAME="lib" --></td>
+	<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
+	<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
+</tr>
+<!-- /TMPL_LOOP -->
 </table>
-<form action='<TMPL_VAR name="script_name">' method=post>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+<input type="hidden" name="op" value="add_form">
+<!-- TMPL_IF NAME="isprevpage" -->
+	<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">
+	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="anterior" alt="anterior" border="0">
+	</a>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="nextpage" -->
+	<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">
+		<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="Siguiente" alt="Siguiente" border="0">
+	</a>
+<!-- /TMPL_IF -->
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 <input type="hidden" name="op" value="add_form">
-<input type="hidden" name="category" value="<TMPL_VAR name="category">">
-<br><input type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/filenew.png" title="Add Authorised Value" ALT="Add" BORDER=0 ><br>
+<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
+<br><input type="submit" class="button" value="A&ntilde;adir Valor autorizado" title="A&ntilde;adir Valor autoridad" alt="A&ntilde;adir Valor autorizado"><br>
 </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+</div>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/branches.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/branches.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.12.1
diff -u -b -r1.4 -r1.4.12.1
--- es/parameters/branches.tmpl	3 Jun 2003 21:41:18 -0000	1.4
+++ es/parameters/branches.tmpl	7 May 2007 13:55:50 -0000	1.4.12.1
@@ -1,117 +1,277 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="add" -->
 
-<TMPL_IF name="add">
-<form action='<TMPL_VAR name=action>' name=Aform method=post>
-<input type=hidden name=op value='add_validate'>
-<table>
-<tr>
-	<td>Branch code</td>
+	<h1>
+	<!-- TMPL_IF NAME="heading-branches-p" -->Sedes<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="heading-branches-add-branch-p" -->Sedes: A&ntilde;adir Sede<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="heading-branches-edit-branch-p" -->Sedes: Editar Sede<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="heading-branches-edit-category-p" -->Sedes: Editar Categor&iacute;a<!-- /TMPL_IF -->
+	</h1>
+	
+	<form action="<!-- TMPL_VAR NAME="action" -->" name="Aform" method="post">
+	<input type="hidden" name="op" value="add_validate">
+	<table>
+		<tr>
+			<td>C&oacute;digo de sede</td>
+			<td>
+				<!-- TMPL_IF NAME="branchcode" -->
+					<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" escape="HTML" -->">
+					<!-- TMPL_VAR NAME="branchcode" -->
+				<!-- TMPL_ELSE -->
+					<input type="text" name="branchcode" size="4" maxlength="4" value="<!-- TMPL_VAR NAME="branchcode" escape="HTML" -->">
+				<!-- /TMPL_IF -->
+			</td>
+		</tr>
+		<tr>
+			<td>Nombre</td>
+			<td><input type="text" name="branchname" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="branchname" escape="HTML" -->">&nbsp;</td>
+		</tr>
+	
+		<tr>
+			<td><!-- TMPL_LOOP NAME="categoryloop" -->
+						<tr>
+							<td><!-- TMPL_VAR NAME="categoryname" --></td>
+							<td><input type="checkbox" NAME="<!-- TMPL_VAR NAME="categorycode" -->" <!-- TMPL_VAR NAME="checked" -->><!-- TMPL_VAR NAME="codedescription" --></td>
+						</tr>
+					<!-- /TMPL_LOOP -->
+			</td>
+		</tr>
+		<tr>
+			<td>Direcci&oacute;n</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>Tel&eacute;fono</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>Correo</td>
+			<td><input type="text" name="branchemail" value="<!-- TMPL_VAR NAME="branchemail" escape="HTML" -->"></td>
+		</tr>
+		<tr>
+			<td>&nbsp;</td>
+			<td><input type="submit" value="Guardar" class="button"></td>
+		</tr>
+	</table>
+	</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirm" -->
+		Confirmar borrado de <!-- TMPL_VAR NAME="branchname" --> (<!-- TMPL_VAR NAME="branchcode" -->)
+		<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+			<input type="hidden" name="op" value="delete_confirmed">
+			<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" escape="HTML" -->">
+			<input type="hidden" name="branchname" value="<!-- TMPL_VAR NAME="branchname" escape="HTML" -->">
+			<input type="submit" value="SI" class="button">
+		</form>
+		<form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="hidden" name="op" value="">
+			<input type="submit" value="NO" class="button">
+		</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="else" -->
+		<h1>
+		<!-- TMPL_IF NAME="heading-branches-p" -->Sedes<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="heading-branches-add-branch-p" -->Sedes: A&ntilde;adir Sede<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="heading-branches-edit-branch-p" -->Sedes: Editar Sede<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="heading-branches-edit-category-p" -->Sedes: Editar Categor&iacute;a<!-- /TMPL_IF -->
+		</h1>
+	
+		<font color="red">
+		<!-- TMPL_IF name="MESSAGE1" -->
+			No puede cambiar el registro de sede: Debe especificar un Nombre de sede y un c&oacute;digo
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="MESSAGE2" -->
+			Registro de sede modificado
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="MESSAGE3" -->
+			Registro de sede eliminado
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="MESSAGE4" -->
+			No puede cambiar el registro de sede: Debe especificar un Nombre de sede y un c&oacute;digo
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="MESSAGE5" -->
+			C&oacute;digo de categor&iacute;a modificado
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="MESSAGE6" -->
+			La categor&acute;a ha sido borrada
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="MESSAGE7" -->
+			Sede no puede borrarse ya que existen art&iacute;culos en esa sede
+		<!-- /TMPL_IF -->
+		</font>
+		<table border="1" cellpadding="5" cellspacing="0">
+			<tr>
+				<th colspan="6" align="left" bgcolor="#99cc33">
+					<font size="5"><b>Sedes</b></font>
+				</th>
+			</tr>
+			<tr bgcolor="#889999">
+				<td width="175"><b>Nombre</b></td>
+				<td width="25"><b>C&oacute;digo</b></td>
+				<td width="175"><b>Direcci&oacute;n</b></td>
+				<td width="175"><b>Categor&iacute;as</b></td>
+				<td width="50"><b>&nbsp;</b></td>
+				<td width="50"><b>&nbsp;</b></td>
+			</tr>
+			<!-- TMPL_LOOP NAME="branches" -->
+				<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
+					<td align="left" valign="top"><!-- TMPL_VAR NAME="branch_name" escape="HTML" --></td>
+					<td align="left" valign="top"><!-- TMPL_VAR NAME="branch_code" escape="HTML" --></td>
+					<td align="left" valign="top">
+						<!-- TMPL_IF NAME="address-empty-p" -->
+							(nada introducido)
+						<!-- TMPL_ELSE -->
+							<!-- TMPL_IF NAME="branchaddress1" -->
+								<!-- TMPL_VAR NAME="branchaddress1" escape="HTML" --><!-- /TMPL_IF -->
+							<!-- TMPL_IF NAME="branchaddress2" -->
+								<br><!-- TMPL_VAR NAME="branchaddress2" escape="HTML" --><!-- /TMPL_IF -->
+							<!-- TMPL_IF NAME="branchaddress3" -->
+								<br><!-- TMPL_VAR NAME="branchaddress3" escape="HTML" --><!-- /TMPL_IF -->
+							<!-- TMPL_IF NAME="branchphone" -->
+								<br>Tel&eacute;fono: <!-- TMPL_VAR NAME="branchphone" escape="HTML" --><!-- /TMPL_IF -->
+							<!-- TMPL_IF NAME="branchfax" -->
+								<br>Fax: <!-- TMPL_VAR NAME="branchfax" escape="HTML" --><!-- /TMPL_IF -->
+							<!-- TMPL_IF NAME="branchemail" -->
+								<br>Correo: <!-- TMPL_VAR NAME="branchemail" escape="HTML" --><!-- /TMPL_IF -->
+						<!-- /TMPL_IF -->
+					</td>
+					<td align="left" valign="top">
+						<!-- TMPL_IF NAME="no-categories-p" -->
+							(no hay categor&iacute;as definidas)
+						<!-- TMPL_ELSE -->
+							<!-- TMPL_LOOP NAME="category_list" -->
+								<!-- TMPL_VAR NAME="categoryname" --><br>
+							<!-- /TMPL_LOOP -->
+						<!-- /TMPL_IF -->
+					</td>
+					<td align="left" valign="top">
+						<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="Editar" class="button">
+						</form>
+					</td>
+					<td align="left" valign="top">
+						<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="Borrar" class="button">
+						</form>
+					</td>
+				</tr>
+			<!-- /TMPL_LOOP -->
+		</table>
+		<br>
+		<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+			<input type="hidden" name="op" value="add">
+			<input type="submit" class="button" value="A&ntilde;adir Nueva Sede">
+		</form>
+	
+		<br>
+		<table border="1" cellpadding="5" cellspacing="0">
+		<tr>
+			<th colspan="5" align="left" bgcolor="#99cc33">
+				<font size="5"><b>Categor&iacute;as de Sedes</b></font>
+			</th>
+		</tr>
+		<tr bgcolor="#889999">
+			<td width="175"><b>Nombre</b></td>
+			<td width="25"><b>C&oacute;digo</b></td>
+			<td width="200"><b>Descripci&oacute;n</b></td>
+			<td>&nbsp;</td>
+			<td>&nbsp;</td>
+		</tr>
+		<!-- TMPL_LOOP NAME="branchcategories" -->
+			<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
+			<td align="left" valign="top"><!-- TMPL_VAR NAME="categoryname" --></td>
+			<td align="left" valign="top"><!-- TMPL_VAR NAME="categorycode" --></td>
+			<td align="left" valign="top"><!-- TMPL_VAR NAME="codedescription" --></td>
+			<td align="left" valign="top">
+				<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+				<input type="hidden" name="op" value="editcategory">
+				<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->">
+				<input type="submit" value="Editar" class="button">
+				</form>
+			</td>
+			<td align="left" valign="top">
+				<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+				<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->">
+				<input type="hidden" name="op" value="delete_category"><input type="submit" value="Borrar" class="button">
+				</form>
+			</td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+		</table>
+		<br />
+		<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+			<input type="hidden" name="op" value="editcategory">
+			<input type="submit" class="button" value="A&ntilde;adir Nueva Categor&iacute;a">
+		</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="editcategory" -->
+		<h1>
+		<!-- TMPL_IF NAME="use-heading-flags-p" -->
+		<!-- TMPL_IF NAME="heading-branches-p" -->Sedes<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="heading-branches-add-branch-p" -->Sedes: A&ntilde;adir Sede<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="heading-branches-edit-branch-p" -->Sedes: Editar Sede<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="heading-branches-edit-category-p" -->Sedes: Editar Categor&iacute;a<!-- /TMPL_IF -->
+		<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="head" --><!-- /TMPL_IF -->
+		</h1>
+	
+		<form action="<!-- TMPL_VAR NAME="action" -->" name="Aform" method="post">
+		<input type="hidden" name="op" value="addcategory_validate">
+		<table>
+			<tr>
+				<td>C&oacute;digo de Categor&iacute;a</td>
 	<td>
-		<TMPL_IF name="branchcode">
-			<input type=hidden name=branchcode value='<TMPL_VAR name=branchcode escape="HTML">'>
-			<TMPL_VAR name="branchcode">
-		<TMPL_ELSE>
-			<input type=text name=branchcode size=5 maxlength=5 value='<TMPL_VAR name=branchcode escape="HTML">'>
-		</TMPL_IF>
-	</td>
-</tr>
-<tr><td>Name</td><td><input type=text name=branchname size=40 maxlength=80 value="<TMPL_VAR name=branchname escape="HTML">">&nbsp;</td></tr>
-<FONT SIZE=6><em><TMPL_VAR name=head></em></FONT><br>
-<tr><td><TMPL_VAR name=categoryname></td>
-<td><INPUT TYPE="checkbox" NAME="<TMPL_VAR name=categorycode>" VALUE="1" ><TMPL_VAR name=codedescription></td></tr>
-<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>&nbsp;</td><td><input type=submit value='Submit'></td></tr>
-</table>
-</form>
-</TMPL_IF>
-
-<TMPL_IF name="delete_confirm">
-Confirm delete:
-<form action='<TMPL_VAR name=action>' method=post><input type='hidden' name='op' value='delete_confirmed'>
-<input type='hidden' name='branchcode' value=<TMPL_VAR name=branchcode escape="HTML">>
-<input type=submit value=YES></form>
-<form action='<TMPL_VAR name=action>' method=post><input type='hidden' name='op' value=''>
-<input type=submit value=NO></form>
-</TMPL_IF>
-
-<TMPL_IF name="else">
-<FONT SIZE=6><em><TMPL_VAR name=head></em></FONT><br>
-<font color='red'><TMPL_VAR name="message"></font>
-<form action=<TMPL_VAR name=action> method=post><input type='hidden' name='op' value='add'><input type=submit value='Add New Branch'></form>
-<table border='1' cellpadding='5' cellspacing='0' width='550'>
-<tr> <th colspan='5' align='left' bgcolor='#99cc33'>
-<font size='5'><b>Branches</b></font></th> </tr>
-<tr bgcolor='#889999'>
-<td width='175'><b>Name</b></td>
-<td width='25'><b>Code</b></td>
-<td width='175'><b>Address</b></td>
-<td width='175'><b>Categories</b></td>
-<td width='50'><b>&nbsp;</b></td>
-</tr>
-<TMPL_LOOP name="branches">
-<tr bgcolor='<TMPL_VAR name=color>'>
-    <td align='left' valign='top'><TMPL_VAR name=branch_name escape="HTML"></td>
-    <td align='left' valign='top'><TMPL_VAR name=branch_code escape="HTML"></td>
-    <td align='left' valign='top'>
-<TMPL_IF name=address-empty-p>
-(nothing entered)
-<TMPL_ELSE>
-<TMPL_IF name=branchaddress1>
-<TMPL_VAR name=branchaddress1 escape="HTML"></TMPL_IF>
-<TMPL_IF name=branchaddress2>
-<br><TMPL_VAR name=branchaddress2 escape="HTML"></TMPL_IF>
-<TMPL_IF name=branchaddress3>
-<br><TMPL_VAR name=branchaddress3 escape="HTML"></TMPL_IF>
-<TMPL_IF name=branchphone>
-<br>Ph: <TMPL_VAR name=branchphone escape="HTML"></TMPL_IF>
-<TMPL_IF name=branchfax>
-<br>Fax: <TMPL_VAR name=branchfax escape="HTML"></TMPL_IF>
-<TMPL_IF name=branchemail>
-<br>Email: <TMPL_VAR name=branchemail escape="HTML"></TMPL_IF>
-</TMPL_IF>
-    </td>
-    <td align='left' valign='top'>
-<TMPL_IF name=no-categories-p>
-(no categories set)
-<TMPL_ELSE>
-<TMPL_LOOP name=category_list>
-<TMPL_VAR name=categoryname><br>
-</TMPL_LOOP>
-</TMPL_IF>
-    </td>
-    <td align='left' valign='top'>
-<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>
-<form action='<TMPL_VAR name=action>' method=post>
-<input type='hidden' name='branchcode' value='<TMPL_VAR name=value escape="HTML">'>
-<input type='hidden' name='op' value='delete'><input type=submit value=Delete>
-</form></td>
-</tr>
-</TMPL_LOOP>
-</table>
-<br>
-<table border='1' cellpadding='5' cellspacing='0'>
-<tr> <th colspan='5' align='left' bgcolor='#99cc33'>
-<font size='5'><b>Branches Categories</b></font></th> </tr> 
-<tr bgcolor='#889999'> 
-<td width='175'><b>Name</b></td> 
-<td width='25'><b>Code</b></td> 
-<td width='200'><b>Description</b></td>
-</tr>
-<tr bgcolor='<TMPL_VAR name="color">'>
-    <td align='left' valign='top'><TMPL_VAR name=categoryname></td>
-    <td align='left' valign='top'><TMPL_VAR name=categorycode></td>
-    <td align='left' valign='top'><TMPL_VAR name=codedescription></td>
-</tr>
-</table>
-</TMPL_IF>
+					<!-- TMPL_IF NAME="categorycode" -->
+						<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->">
+						<!-- TMPL_VAR NAME="categorycode" -->
+					<!-- TMPL_ELSE -->
+						<input type="text" name="categorycode" size="5" maxlength="5" value="<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->">
+					<!-- /TMPL_IF -->
+				</td>
+			</tr>
+			<tr>
+				<td>Nombre</td>
+				<td><input type="text" name="categoryname" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="categoryname" escape="HTML" -->">&nbsp;</td>
+			</tr>
+			<tr>
+				<td>Descripci&oacute;n</td>
+				<td><input type="text" name="codedescription" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="codedescription" escape="HTML" -->">&nbsp;</td>
+			</tr>
+			<tr>
+				<td colspan="2" align="center"><input type="submit" value="ACEPTAR" class="button"></td>
+			</tr>
+		</table>
+		</form>
+	<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+	<!-- TMPL_IF NAME="delete_category" -->
+		Confirmar borrado:
+		<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+			<input type="hidden" name="op" value="categorydelete_confirmed">
+			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" escape="HTML" -->">
+			<input type="submit" value="SI" class="button">
+		</form>
+		<form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="hidden" name="op" value="">
+			<input type="submit" value="NO" class="button">
+		</form>
+	<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/categorie.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/categorie.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/parameters/categorie.tmpl	3 Jun 2003 21:44:41 -0000	1.1
+++ es/parameters/categorie.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,7 +1,8 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
-
-<TMPL_IF NAME=add_form>
-	<script>
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="add_form" -->
+		<script language="javascript" type="text/javascript">
+		function _(s) { return s } // dummy function for gettext
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	function isNotNull(f,noalert) {
 		if (f.value.length ==0) {
@@ -39,268 +40,250 @@
 		var _alertString="";
 		var alertString2;
 		if (f.categorycode.value.length==0) {
-			_alertString += "- categorycode missing\\n";
+				_alertString += "\n- " + _("falta categorycode");
 		}
-//		alert(window.document.Aform.description.value);
+	//		alert(window.document.Aform.description.value);
 		if (!(isNotNull(window.document.Aform.description,1))) {
-			_alertString += "- description missing\\n";
+				_alertString += "\n- " + _("falta descripci&oacute;n");
 		}
 		if (!isNum(f.upperagelimit,0)) {
-			_alertString += "- upperagelimit is not a number\\n";
+				_alertString += "\n- " + _("el l&iacute;mite de edad superior no es un n&uacute;mero");
 		}
 		if (_alertString.length==0) {
 			document.Aform.submit();
 		} else {
-			alertString2 = "Form not submitted because of the following problem(s)\\n";
-			alertString2 += "------------------------------------------------------------------------------------\\n\\n";
+				alertString2  = _("El Formulario no fue procesado debido a los siguientes problemas");
+				alertString2 += "\n------------------------------------------------------------------------------------\n";
 			alertString2 += _alertString;
 			alert(alertString2);
 		}
 	}
-	</SCRIPT>
+		</script>
 
-	<TMPL_IF NAME=categorycode>
-		<h1>Modify category</h1>
-	<TMPL_ELSE>
-		<h1>Add category</h1>
-	</TMPL_IF>
-	
-	<form action=<TMPL_VAR NAME=script_name> name=Aform method=post>
-	<input type=hidden name=op value='add_validate'>
-	<input type=hidden name=checked value=0>
+		<!-- TMPL_IF NAME="categorycode" -->
+			<h1>Modificar Categor&iacute;a</h1>
+		<!-- TMPL_ELSE -->
+			<h1>A&ntilde;adir Categor&iacute;a</h1>
+		<!-- /TMPL_IF -->
+
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate">
+		<input type="hidden" name="checked" value="0">
 
 	<table>
-	<TMPL_IF NAME=categorycode>
+		<!-- TMPL_IF NAME="categorycode" -->
 		<tr>
-			<td>Category code</td>
+				<td>C&oacute;digo de Categor&iacute;a</td>
 			<td>
-				<input type=hidden name=categorycode value=<TMPL_VAR NAME=categorycode>>
+					<b><!-- TMPL_VAR NAME="categorycode" --></b>
+					<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
 			</td>
 		</tr>
-	<TMPL_ELSE>
+		<!-- TMPL_ELSE -->
 		<tr>
-			<td>Category code</td>
+				<td>C&oacute;digo de Categor&iacute;a</td>
 			<td>
-				<input type=text name=categorycode size=3 maxlength=2 onBlur=toUC(this)>
+					<input type="text" name="categorycode" size="3" maxlength="2" onblur="toUC(this)">
 			</td>
 		</tr>
-	</TMPL_IF>
+		<!-- /TMPL_IF -->
 
 		<tr>
-			<td>Description</td>
+				<td>Descripci&oacute;n</td>
 			<td>
-				<input type=text name=description size=40 maxlength=80 value=<TMPL_VAR NAME=description>>
+					<input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
 				&nbsp;
 			</td>
 		</tr>
 		<tr>
-			<td>Enrolment period</td>
-			<td>
-				<input type=text name=enrolmentperiod value=<TMPL_VAR NAME=enrolmentperiod>>
-			</td>
-		</tr>
-		<tr>
-			<td>Upperage limit</td>
-			<td>
-				<input type=text name=upperagelimit value=<TMPL_VAR NAME=upperagelimit>>
-			</td>
-		</tr>
-		<tr>
-			<td>Age Required</td>
-			<td>
-				<input type=text name=dateofbirthrequired value=<TMPL_VAR NAME=dateofbirthrequired>>
-			</td>
-		</tr>
-		<tr>
-			<td>Fine type</td>
+				<td>Per&iacute;odo de asociaci&oacute;n</td>
 			<td>
-				<input type=text name=finetype size=30 maxlength=30 value=<TMPL_VAR NAME=finetype>>
+					<input type="text" name="enrolmentperiod" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->"> a&ntilde;o(s)
 			</td>
 		</tr>
 		<tr>
-			<td>Bulk</td>
+				<td>L&iacute;mite de edad superior</td>
 			<td>
-				<input type=text name=bulk value=<TMPL_VAR NAME=bulk>>
+					<input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="upperagelimit" -->"> a&ntilde;os
 			</td>
 		</tr>
 		<tr>
-			<td>Enrolment fee</td>
+				<td>Edad Requerida</td>
 			<td>
-				<input type=text name=enrolmentfee value=<TMPL_VAR NAME=enrolmentfee>>
+					<input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->" size="3" maxlength="2"> a&ntilde;o(s)
 			</td>
 		</tr>
 		<tr>
-			<td>Overdue notice required</td>
+				<td>Costo de asociaci&oacute;n</td>
 			<td>
-				<input type=text name=overduenoticerequired value=<TMPL_VAR NAME=overduenoticerequired>>
+					<input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME="enrolmentfee" -->">
 			</td>
 		</tr>
 		<tr>
-			<td>Issue limit</td>
+				<td>Nota de retraso requerida</td>
 			<td>
-				<input type=text name=issuelimit value=<TMPL_VAR NAME=issuelimit>>
+					<select name="overduenoticerequired">
+						<option<!-- TMPL_UNLESS name="overduenoticerequired" --> selected<!-- /TMPL_UNLESS --> value="0">No</option>
+						<option<!-- TMPL_IF NAME="overduenoticerequired" --> selected<!-- /TMPL_IF --> value="1">Si</option>
+					</select>
 			</td>
 		</tr>
 		<tr>
-			<td>Reserve fee</td>
+				<td>Costo de reserva</td>
 			<td>
-				<input type=text name=reservefee value=<TMPL_VAR NAME=reservefee>>
+					<input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->">
 			</td>
 		</tr>
 		<tr>
 			<td>&nbsp;</td>
 			<td>
-				<INPUT type=button value='OK' onClick='Check(this.form)'>
+					<input type="button" value="ACEPTAR" onclick="Check(this.form)">
 			</td>
 		</tr>
 	</table>
 	</form>
 
-</TMPL_IF>
+	<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=add_validate>
-	Data recorded
-	<form action=<TMPL_VAR NAME=script_name> method=post>
-		<input type=submit value=OK>
+	<!-- TMPL_IF NAME="add_validate" -->
+		Datos guardados
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="ACEPTAR">
 	</form>
-</TMPL_IF>
+	<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirm>
-	TOTAL : <TMPL_VAR NAME=categorycode> : <TMPL_VAR NAME=total><br>
+	<!-- TMPL_IF NAME="delete_confirm" -->
+		TOTAL : <!-- TMPL_VAR NAME="categorycode" --> : <!-- TMPL_VAR NAME="total" --><br>
 
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr bgcolor='#99cc33'>
-			<td background='/images/background-mem.gif'>
-				<b>Category code</b>
+		<table border="0" cellspacing="0" cellpadding="5">
+			<tr bgcolor="#99cc33">
+				<td background="/images/background-mem.gif">
+					<b>C&oacute;digo de Categor&iacute;a</b>
 			</td>
-			<td background='/images/background-mem.gif'>
-				<TMPL_VAR NAME=categorycode>
+				<td background="/images/background-mem.gif">
+					<!-- TMPL_VAR NAME="categorycode" -->
 			</td>
 		</tr>
-        	<form action='<TMPL_VAR NAME=script_name>' method=post>
-			<input type=hidden name=op value=delete_confirmed>
-			<input type=hidden name=categorycode value=<TMPL_VAR NAME=categorycode>>        
-		<tr>
-			<td>Description</td>
-			<td><TMPL_VAR NAME=description></td>
-		</tr>
-		<tr>
-			<td>Enrolment period</td>
-			<td><TMPL_VAR NAME=enrolmentperiod></td>
-		</tr>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="op" value="delete_confirmed">
+				<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">        
 		<tr>
-			<td>Upperage limit</td>
-			<td><TMPL_VAR NAME=upperagelimit></td>
+				<td>Descripci&oacute;n</td>
+				<td><!-- TMPL_VAR NAME="description" --></td>
 		</tr>
 		<tr>
-			<td>Age Required</td>
-			<td><TMPL_VAR NAME=dateofbirthrequired></td>
+				<td>Per&iacute;odo de asociaci&oacute;n</td>
+				<td><!-- TMPL_VAR NAME="enrolmentperiod" --> a&ntilde;o(s)</td>
 		</tr>
 		<tr>
-			<td>Fine type</td>
-			<td><TMPL_VAR NAME=finetype></td>
+				<td>L&iacute;mite de edad superior</td>
+				<td><!-- TMPL_VAR NAME="upperagelimit" --> a&ntilde;os</td>
 		</tr>
 		<tr>
-			<td>Bulk</td>
-			<td><TMPL_VAR NAME=bulk></td>
+				<td>Edad Requerida</td>
+				<td><!-- TMPL_VAR NAME="dateofbirthrequired" --> a&ntilde;o(s)</td>
 		</tr>
 		<tr>
-			<td>Enrolment fee</td>
-			<td><TMPL_VAR NAME=enrolmentfee></td>
+				<td>Costo de asociaci&oacute;n</td>
+				<td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
 		</tr>
 		<tr>
-			<td>Overdue notice required</td>
-			<td><TMPL_VAR NAME=overduenoticerequired></td>
+				<td>Nota de retraso requerida</td>
+				<td><!-- TMPL_IF NAME="overduenoticerequired" -->Si<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
 		</tr>
 		<tr>
-			<td>Issue limit</td>
-			<td><TMPL_VAR NAME=issuelimit></td>
+				<td>Costo de reserva</td>
+				<td><!-- TMPL_VAR NAME="reservefee" --></td>
 		</tr>
+			<!-- TMPL_IF NAME="totalgtzero" -->
 		<tr>
-			<td>Reserve fee</td>
-			<td><TMPL_VAR NAME=reservefee></td>
+				<td colspan="2" align="center" class="problem">Este registro es usado <!-- TMPL_VAR NAME="total" --> veces. No es posible borrarlo</td>
 		</tr>
-		<TMPL_IF NAME=totalgtzero>
                 <tr>
-			<td colspan=2 align=center><b>This record is used <TMPL_VAR NAME=total> times. Deletion not possible</b></td>
-		</tr>
-               <tr>
-			<td colspan=2>
-				</form><form action='<TMPL_VAR NAME=script_name>' method=post>
-				<input type=submit value=OK>
+				<td colspan="2">
+					</form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="submit" value="ACEPTAR">
 				</form>
 			</td>
 		</tr>
-		<TMPL_ELSE>
+			<!-- TMPL_ELSE -->
                 <tr>
-			<td colspan=2 align=center>CONFIRM DELETION</td>
+				<td colspan="2" align="center">CONFIRMAR BORRADO</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>
+				<td><input type="submit" value="SI"></form></td>
+				<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO"></form></td>
 		</tr>
-		</TMPL_IF>
-
-</TMPL_IF>
+			<!-- /TMPL_IF -->
+	</table>
+	<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirmed>
-	data deleted
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
-        <input type=submit value=OK>
+	<!-- TMPL_IF NAME="delete_confirmed" -->
+		Datos borrados
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="submit" value="ACEPTAR">
         </form>
 
-</TMPL_IF>
+	<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=else>
-	<h2>Category admin</h2>
-	<TMPL_IF NAME=searchfield>
-		You Searched for <TMPL_VAR NAME=searchfield>
-	</TMPL_IF>
-
-	<form action='<TMP_VAR NAME=script_name>' method=post>
-		<input type=text name=description value=<TMPL_VAR NAME=searchfield>>
-		<input type=reset name=reset value="clr">
+	<!-- TMPL_IF NAME="else" -->
+		<h2>Administraci&oacute;n de Categor&iacute;as</h2>
+		<!-- TMPL_IF NAME="searchfield" -->
+			Usted busc&oacute; <!-- TMPL_VAR NAME="searchfield" -->
+		<!-- /TMPL_IF -->
+		<!-- TMPL_UNLESS name="categoryChild" -->
+			<div id="problem">
+				ADVERTENCIA : debe tener un c&oacute;digo de categor&iacute;a = N para ni&ntilde;os
+			</div>
+		<!-- /TMPL_UNLESS -->
+		<!-- TMPL_UNLESS name="categoryInstitution" -->
+			<div id="problem">
+				ADVERTENCIA : debe tener un c&oacute;digo de categor&iacute;a = I para Instituciones
+			</div>
+		<!-- /TMPL_UNLESS -->
+		<form action="<TMPL_VAR NAME="script_name">" method="post">
+			<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
+			<input type="submit" name="submit" value="ACEPTAR" class="button">
 	</form>
 	
-        <table border=0 cellspacing=0 cellpadding=5>
-		<tr bgcolor='#99cc33'>
-			<td background='/images/background-mem.gif'><b>Category</b></td>
-			<td background='/images/background-mem.gif'><b>Description</b></td>
-			<td background='/images/background-mem.gif'><b>Enrolment</b></td>
-			<td background='/images/background-mem.gif'><b>Upper Age Limit</b></td>
-			<td background='/images/background-mem.gif'><b>Age Required</b></td>
-			<td background='/images/background-mem.gif'><b>Fine</b></td>
-			<td background='/images/background-mem.gif'><b>Bulk</b></td>
-			<td background='/images/background-mem.gif'><b>Fee</b></td>
-			<td background='/images/background-mem.gif'><b>Overdue</b></td>
-			<td background='/images/background-mem.gif'><b>Issue Limit</b></td>
-			<td background='/images/background-mem.gif'><b>Reserve</b></td>
-			<td background='/images/background-mem.gif'> </td>
-			<td background='/images/background-mem.gif'> </td>
-		</tr>
-		<TMPL_LOOP NAME=loop>
-		<tr bgcolor="<TMPL_VAR NAME=toggle">
-                        <td><TMPL_VAR NAME=categorycode></td>
-                        <td><TMPL_VAR NAME=description></td>
-                        <td><TMPL_VAR NAME=enrolmentperiod></td>
-                        <td><TMPL_VAR NAME=upperagelimit></td>
-                        <td><TMPL_VAR NAME=dateofbirthrequired></td>
-                        <td><TMPL_VAR NAME=finetype></td>
-                        <td><TMPL_VAR NAME=bulk></td>
-                        <td><TMPL_VAR NAME=enrolmentfee></td>
-                        <td><TMPL_VAR NAME=overduenoticerequired></td>
-                        <td><TMPL_VAR NAME=issuelimit></td>
-                        <td><TMPL_VAR NAME=reservefee></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=add_form&categorycode=<TMPL_VAR NAME=categorycode>">Edit</a></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=delete_confirm&categorycode=<TMPL_VAR NAME=categorycode>">Delete</a></td>
+		<table border="0" cellspacing="0" cellpadding="5">
+			<tr bgcolor="#99cc33">
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Categor&iacute;a</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Descripci&oacute;n</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Per&iacute;odo de asociaci&oacute;n</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Costo de asociaci&oacute;n</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>L&iacute;mite de edad superior</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Edad Requerida</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Retraso</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Reserva</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"> </td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"> </td>
+			</tr>
+			<!-- TMPL_LOOP NAME="loop" -->
+			<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPl_IF -->>
+				<td><!-- TMPL_VAR NAME="categorycode" --></td>
+				<td><!-- TMPL_VAR NAME="description" --></td>
+				<td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
+				<td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
+				<td><!-- TMPL_VAR NAME="upperagelimit" --></td>
+				<td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
+				<td><!-- TMPL_IF NAME="overduenoticerequired" -->
+						<i>Si</i>
+					<!-- TMPL_ELSE -->
+						<i>No</i>
+					<!-- /TMPL_IF -->
+				</td>
+				<td><!-- TMPL_VAR NAME="reservefee" --></td>
+				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
+				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" border="0"></a></td>
 		</tr>
-		</TMPL_LOOP>
+			<!-- /TMPL_LOOP -->
 
 	</table>
-	<p><form action='<TMPL_VAR NAME=script_name>' method=post>
-		<input type=hidden name=op value=add_form>
-		<input type=image src="/images/button-add-new.gif"  WIDTH=188  HEIGHT=44  ALT="Add Category" BORDER=0 ></a><br>
+		<p><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_form">
+			<input type="submit" class="button" value="A&ntilde;adir Categor&iacute;a" alt="A&ntilde;adir Categor&iacute;a"><br>
 	</form></p>
-</TMPL_IF>
-
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+	<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/categoryitem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/categoryitem.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/parameters/categoryitem.tmpl	3 Jun 2003 21:44:42 -0000	1.1
+++ es/parameters/categoryitem.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,7 +1,8 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<TMPL_IF NAME=add_form>
-        <script>
+<!-- TMPL_IF NAME="add_form" -->
+        <script language="javascript" type="text/javascript">
+	function _(s) { return s } // dummy function for gettext
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         function isNotNull(f,noalert) {
                 if (f.value.length ==0) {
@@ -39,266 +40,255 @@
                 var _alertString="";
                 var alertString2;
                 if (f.categorycode.value.length==0) {
-                        _alertString += "- categorycode missing\\n";
+                        _alertString += "\n- " + _("falta categorycode");
                 }
 //              alert(window.document.Aform.description.value);
                 if (!(isNotNull(window.document.Aform.description,1))) {
-                        _alertString += "- description missing\\n";
+                        _alertString += "\n- " + _("falta descripci&oacute;n");
                 }
                 if (!isNum(f.upperagelimit,0)) {
-                        _alertString += "- upperagelimit is not a number\\n";
+                        _alertString += "\n- " + _("el l&iacute;mite de edad superior no es un n&uacute;mero");
                 }
                 if (_alertString.length==0) {
                         document.Aform.submit();
                 } else {
-                        alertString2 = "Form not submitted because of the following problem(s)\\n";
-                        alertString2 += "------------------------------------------------------------------------------------\\n\\n";
+                        alertString2  = _("El Formulario no fue procesado debido a los siguientes problemas");
+                        alertString2 += "\n------------------------------------------------------------------------------------\n";
                         alertString2 += _alertString;
                 }
         }
-        </SCRIPT>
+        </script>
 
-        <TMPL_IF NAME=categorycode>
-                <h1>Modify category</h1>
-        <TMPL_ELSE>
-                <h1>Add category</h1>
-        </TMPL_IF>
-
-        <form action=<TMPL_VAR NAME=script_name> name=Aform method=post>
-        <input type=hidden name=op value='add_validate'>
-        <input type=hidden name=checked value=0>
+        <!-- TMPL_IF NAME="categorycode" -->
+                <h1>Modificar Categor&iacute;a</h1>
+        <!-- TMPL_ELSE -->
+                <h1>A&ntilde;adir Categor&iacute;a</h1>
+        <!-- /TMPL_IF -->
+
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+        <input type="hidden" name="op" value="add_validate">
+        <input type="hidden" name="checked" value="0">
                         
         <table>  
-        <TMPL_IF NAME=categorycode>
+        <!-- TMPL_IF NAME="categorycode" -->
                 <tr>
-                        <td>Category code</td>
+                        <td>C&oacute;digo de Categor&iacute;a</td>
                         <td>
-                                <input type=hidden name=categorycode value=<TMPL_VAR NAME=categorycode>>
+                                <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
                         </td>
                 </tr>
-        <TMPL_ELSE>
+        <!-- TMPL_ELSE -->
                 <tr>
-                        <td>Category code</td>
+                        <td>C&oacute;digo de Categor&iacute;a</td>
                         <td>
-                                <input type=text name=categorycode size=3 maxlength=2 onBlur=toUC(this)>
+                                <input type="text" name="categorycode" size="3" maxlength="2" onblur="toUC(this)">
                         </td>
                 </tr>
-        </TMPL_IF>
+        <!-- /TMPL_IF -->
                 <tr>
-                        <td>Description</td>
+                        <td>Descripci&oacute;n</td>
                         <td>
-                                <input type=text name=description size=40 maxlength=80 value=<TMPL_VAR NAME=description>>
+                                <input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
                                 &nbsp;
                         </td>
                 </tr>
                 <tr>
-                        <td>Enrolment period</td>
+                        <td>Per&iacute;odo de asociaci&oacute;n</td>
                         <td>
-                                <input type=text name=enrolmentperiod value=<TMPL_VAR NAME=enrolmentperiod>>
+                                <input type="text" name="enrolmentperiod" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->">
                         </td>
                 </tr>
                 <tr>
-                        <td>Upperage limit</td>
+                        <td>L&iacute;mite de edad superior</td>
                         <td>
-                                <input type=text name=upperagelimit value=<TMPL_VAR NAME=upperagelimit>>
+                                <input type="text" name="upperagelimit" value="<!-- TMPL_VAR NAME="upperagelimit" -->">
                         </td>
                 </tr>
                 <tr>
-                        <td>Age Required</td>
+                        <td>Edad Requerida</td>
                         <td>
-                                <input type=text name=dateofbirthrequired value=<TMPL_VAR NAME=dateofbirthrequired>>
+                                <input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->">
                         </td>
                 </tr>
                 <tr>
-                        <td>Fine type</td>
+                        <td>Tipo de Cuenta</td>
                         <td>
-                                <input type=text name=finetype size=30 maxlength=30 value=<TMPL_VAR NAME=finetype>>
+                                <input type="text" name="finetype" size="30" maxlength="30" value="<!-- TMPL_VAR NAME="finetype" -->">
                         </td>
                 </tr>
                 <tr>
                         <td>Bulk</td>
                         <td>
-                                <input type=text name=bulk value=<TMPL_VAR NAME=bulk>>
+                                <input type="text" name="bulk" value="<!-- TMPL_VAR NAME="bulk" -->">
                         </td>
                 </tr>
                 <tr>
-                        <td>Enrolment fee</td>
+                        <td>Costo de Asociaci&oacute;n</td>
                         <td>
-                                <input type=text name=enrolmentfee value=<TMPL_VAR NAME=enrolmentfee>>
+                                <input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME="enrolmentfee" -->">
                         </td>
                 </tr>
                 <tr>
-                        <td>Overdue notice required</td>
+                        <td>Nota de retraso requerida</td>
                         <td>
-                                <input type=text name=overduenoticerequired value=<TMPL_VAR NAME=overduenoticerequired>>
+                                <input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->">
                         </td>
                 </tr>
                 <tr>
-                        <td>Issue limit</td>
+                        <td>Costo de reserva</td>
                         <td>
-                                <input type=text name=issuelimit value=<TMPL_VAR NAME=issuelimit>>
-                        </td>
-                </tr>
-                <tr>
-                        <td>Reserve fee</td>
-                        <td>
-                                <input type=text name=reservefee value=<TMPL_VAR NAME=reservefee>>
+                                <input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->">
                         </td>
                 </tr>
                 <tr>
                         <td>&nbsp;</td>
                         <td>
-                                <INPUT type=button value='OK' onClick='Check(this.form)'>
+                                <input type="button" value="ACEPTAR" onclick="Check(this.form)">
                         </td>
                 </tr>
         </table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=add_validate>
-        Data recorded
-        <form action=<TMPL_VAR NAME=script_name> method=post>
-                <input type=submit value=OK>
+<!-- TMPL_IF NAME="add_validate" -->
+        Datos guardados
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                <input type="submit" value="ACEPTAR">
         </form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-        TOTAL : <TMPL_VAR NAME=categorycode> : <TMPL_VAR NAME=total><br>
+        TOTAL : <!-- TMPL_VAR NAME="categorycode" --> : <!-- TMPL_VAR NAME="total" --><br>
                     
-        <table border=0 cellspacing=0 cellpadding=5>
-                <tr bgcolor='#99cc33'>
-                        <td background='/images/background-mem.gif'>
-                                <b>Category code</b>
+        <table border="0" cellspacing="0" cellpadding="5">
+                <tr bgcolor="#99cc33">
+                        <td background="/images/background-mem.gif">
+                                <b>C&oacute;digo de Categor&iacute;a</b>
                         </td>
-                        <td background='/images/background-mem.gif'>
-                                <TMPL_VAR NAME=categorycode>
+                        <td background="/images/background-mem.gif">
+                                <!-- TMPL_VAR NAME="categorycode" -->
                         </td>
                 </tr>
-                <form action='<TMPL_VAR NAME=script_name>' method=post>
-                        <input type=hidden name=op value=delete_confirmed>
-                        <input type=hidden name=categorycode value=<TMPL_VAR NAME=categorycode>>
+                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                        <input type="hidden" name="op" value="delete_confirmed">
+                        <input type="hidden" name="categorycode" value=<!-- TMPL_VAR NAME="categorycode" -->>
                 <tr>
-                        <td>Description</td>
-                        <td><TMPL_VAR NAME=description></td>
+                        <td>Descripci&oacute;n</td>
+                        <td><!-- TMPL_VAR NAME="description" --></td>
                 </tr>
                 <tr>
-                        <td>Enrolment period</td>
-                        <td><TMPL_VAR NAME=enrolmentperiod></td>
+                        <td>Per&iacute;odo de asociaci&oacute;n</td>
+                        <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
                 </tr>
                 <tr>
-                        <td>Upperage limit</td>
-                        <td><TMPL_VAR NAME=upperagelimit></td>
+                        <td>L&iacute;mite de edad superior</td>
+                        <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
                 </tr>
                 <tr>
-                        <td>Age Required</td>
-                        <td><TMPL_VAR NAME=dateofbirthrequired></td>
+                        <td>Edad Requerida</td>
+                        <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
                 </tr>
                 <tr>
-                        <td>Fine type</td>
-                        <td><TMPL_VAR NAME=finetype></td>
+                        <td>Tipo de Cuenta</td>
+                        <td><!-- TMPL_VAR NAME="finetype" --></td>
                 </tr>
                 <tr>
                         <td>Bulk</td>
-                        <td><TMPL_VAR NAME=bulk></td>
+                        <td><!-- TMPL_VAR NAME="bulk" --></td>
                 </tr>
                 <tr>
-                        <td>Enrolment fee</td>
-                        <td><TMPL_VAR NAME=enrolmentfee></td>
+                        <td>Costo de Asociaci&oacute;n</td>
+                        <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
                 </tr>
                 <tr>
-                        <td>Overdue notice required</td>
-                        <td><TMPL_VAR NAME=overduenoticerequired></td>
+                        <td>Nota de retraso requerida</td>
+                        <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
                 </tr>
                 <tr>
-                        <td>Issue limit</td>
-                        <td><TMPL_VAR NAME=issuelimit></td>
+                        <td>Costo de reserva</td>
+                        <td><!-- TMPL_VAR NAME="reservefee" --></td>
                 </tr>
+                <!-- TMPL_IF NAME="totalgtzero" -->
                 <tr>
-                        <td>Reserve fee</td>
-                        <td><TMPL_VAR NAME=reservefee></td>
+                        <td colspan="2" align="center"><b>Este registro es usado <!-- TMPL_VAR NAME="total" --> veces. No es posible borrarlo</b></td>
                 </tr>
-                <TMPL_IF NAME=totalgtzero>
                 <tr>
-                        <td colspan=2 align=center><b>This record is used <TMPL_VAR NAME=total> times. Deletion not possible</b></td>
-                </tr>
-               <tr>
-                        <td colspan=2>
-                                </form><form action='<TMPL_VAR NAME=script_name>' method=post>
-                                <input type=submit value=OK>
+                        <td colspan="2">
+                                </form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                                <input type="submit" value="ACEPTAR">
                                 </form>
                         </td>
                 </tr>
-                <TMPL_ELSE>
+                <!-- TMPL_ELSE -->
                 <tr>
-                        <td colspan=2 align=center>CONFIRM DELETION</td>
+                        <td colspan="2" align="center">CONFIRMAR BORRADO</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>
+                        <td><input type="submit" value="SI"></form></td>
+                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO"></form></td>
                 </tr>
-                </TMPL_IF>
+                <!-- /TMPL_IF -->
 
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirmed>
-        data deleted
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
-        <input type=submit value=OK>
+<!-- TMPL_IF NAME="delete_confirmed" -->
+        Datos borrados
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="submit" value="ACEPTAR">
         </form>
 
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=else>
-        <h2>Category admin</h2>
-        <TMPL_IF NAME=searchfield>
-                You Searched for <TMPL_VAR NAME=searchfield>
-        </TMPL_IF>
-
-        <form action='<TMP_VAR NAME=script_name>' method=post>
-                <input type=text name=description value=<TMPL_VAR NAME=searchfield>>
-                <input type=reset name=reset value="clr">
+<!-- TMPL_IF NAME="else" -->
+        <h2>Administraci&oacute;n de Categor&iacute;as</h2>
+        <!-- TMPL_IF NAME="searchfield" -->
+                Usted busc&oacute; <!-- TMPL_VAR NAME="searchfield" -->
+        <!-- /TMPL_IF -->
+
+        <form action="<!-- TMPL_VAR NAME="script_name">" method="post">
+                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
+                <input type="reset" name="reset" value="Borrar">
         </form>
 
-        <table border=0 cellspacing=0 cellpadding=5>
-                <tr bgcolor='#99cc33'>
-                        <td background='/images/background-mem.gif'><b>Category</b></td>
-                        <td background='/images/background-mem.gif'><b>Description</b></td>
-                        <td background='/images/background-mem.gif'><b>Enrolment</b></td>
-                        <td background='/images/background-mem.gif'><b>Upper Age Limit</b></td>
-                        <td background='/images/background-mem.gif'><b>Age Required</b></td>
-                        <td background='/images/background-mem.gif'><b>Fine</b></td>
-                        <td background='/images/background-mem.gif'><b>Bulk</b></td>
-                        <td background='/images/background-mem.gif'><b>Fee</b></td>
-                        <td background='/images/background-mem.gif'><b>Overdue</b></td>
-                        <td background='/images/background-mem.gif'><b>Issue Limit</b></td>
-                        <td background='/images/background-mem.gif'><b>Reserve</b></td>
-                        <td background='/images/background-mem.gif'> </td>
-                        <td background='/images/background-mem.gif'> </td>
-                </tr>
-                <TMPL_LOOP NAME=loop>
-                <tr bgcolor="<TMPL_VAR NAME=toggle>">
-                        <td><TMPL_VAR NAME=categorycode></td>
-                        <td><TMPL_VAR NAME=description></td>
-                        <td><TMPL_VAR NAME=enrolmentperiod></td>
-                        <td><TMPL_VAR NAME=upperagelimit></td>
-                        <td><TMPL_VAR NAME=dateofbirthrequired></td>
-                        <td><TMPL_VAR NAME=finetype></td>
-                        <td><TMPL_VAR NAME=bulk></td>
-                        <td><TMPL_VAR NAME=enrolmentfee></td>
-                        <td><TMPL_VAR NAME=overduenoticerequired></td>
-                        <td><TMPL_VAR NAME=issuelimit></td>
-                        <td><TMPL_VAR NAME=reservefee></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=add_form&categorycode=<TMPL_VAR NAME=categorycode>">Edit</a></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=delete_confirm&categorycode=<TMPL_VAR NAME=categorycode>">Delete</a></t$                </tr>
-                </TMPL_LOOP>
+        <table border="0" cellspacing="0" cellpadding="5">
+                <tr bgcolor="#99cc33">
+                        <td background="/images/background-mem.gif"><b>Categor&iacute;a</b></td>
+                        <td background="/images/background-mem.gif"><b>Descripci&oacute;n</b></td>
+                        <td background="/images/background-mem.gif"><b>Asociaci&oacute;n</b></td>
+                        <td background="/images/background-mem.gif"><b>L&iacute;mite de edad superior</b></td>
+                        <td background="/images/background-mem.gif"><b>Edad Requerida</b></td>
+                        <td background="/images/background-mem.gif"><b>Cuenta</b></td>
+                        <td background="/images/background-mem.gif"><b>Bulk</b></td>
+                        <td background="/images/background-mem.gif"><b>Costo</b></td>
+                        <td background="/images/background-mem.gif"><b>Retraso</b></td>
+                        <td background="/images/background-mem.gif"><b>Reserva</b></td>
+                        <td background="/images/background-mem.gif"> </td>
+                        <td background="/images/background-mem.gif"> </td>
+                </tr>
+                <!-- TMPL_LOOP NAME="loop" -->
+                <tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+                        <td><!-- TMPL_VAR NAME="categorycode" --></td>
+                        <td><!-- TMPL_VAR NAME="description" --></td>
+                        <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
+                        <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
+                        <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
+                        <td><!-- TMPL_VAR NAME="finetype" --></td>
+                        <td><!-- TMPL_VAR NAME="bulk" --></td>
+                        <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
+                        <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
+                        <td><!-- TMPL_VAR NAME="reservefee" --></td>
+                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Editar</a></td>
+                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Borrar</a></td>
+		</tr>
+                <!-- /TMPL_LOOP -->
 
         </table>
-        <p><form action='<TMPL_VAR NAME=script_name>' method=post>
-                <input type=hidden name=op value=add_form>
-                <input type=image src="/images/button-add-new.gif"  WIDTH=188  HEIGHT=44  ALT="Add Category" BORDER=0 ></a><br>
+        <p><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                <input type="hidden" name="op" value="add_form">
+                <input type="submit" class="button" value="A&ntilde;adir Categor&iacute;a" alt="A&ntilde;adir Categor&iacute;a"><br>
         </form></p>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
 
 
 

Index: es/parameters/checkmarc.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/checkmarc.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/parameters/checkmarc.tmpl	3 Jun 2003 21:44:42 -0000	1.1
+++ es/parameters/checkmarc.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,105 +1,158 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<table width="100%" cellpadding=5 cellspacing=5>
-	<tr background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">
-		<td><b>Test</b></td>
-		<td><b>Result</b></td>
+<div id="mainbloc">
+	<h1>Revisando configuraci&oacute;n MARC</h1>
+	<table>
+		<tr>
+			<th>Prueba</th>
+			<th>Resultado</th>
+		</tr>
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="itemnum" -->
+		<tr>
+			<td><b>n&uacute;mero de art&iacute;culo</b></td>
+			<td><li>El campo n&uacute;mero de art&iacute;culo DEBE estar mapeado </li>
+				<li>El subcampo correspondiente DEBE estar con pesta&ntilde;a -1 (ignorar) </td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>ACEPTAR</td>
+			<td><i>n&uacute;mero de art&iacute;culo : el campo n&uacute;mero de art&iacute;culo est&aacute; mapeado a un campo en la secci&oacute;n -1</i></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="itemfields" -->
+		<tr>
+			<td><b>campos del art&iacute;culo</b></td>
+			<td>TODOS los campos DEBEN :<br/>
+				<li>tiene que ser mapeado a la misma etiqueta,</li>
+				<li>y deben estar todos en los 10 (art&iacute;culos) de etiqueta</li></td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>ACEPTAR</td>
+			<td><i>Todos los campos de art&iacute;culo estan en el mismo campo y en la etiqueta art&iacute;culo</i></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="itemtags" -->
+		<tr>
+			<td><b>Etiqueta del ejemplar</b></td>
+			<td>Hay mas de 1 etiqueta MARC relacionada con el campo (10) de los art&iacute;culos (10): <!-- TMPL_VAR name="itemtags" --></td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>ACEPTAR</td>
+			<td><i>Solamente 1 etiqueta de marc se ha mapeado a los art&iacute;culos</i></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="itemtypes_empty" -->
+		<tr>
+			<td><b>tabla vac&iacute;a de tipos de art&iacute;culo</b></td>
+			<td>la tabla de los tipos de art&iacute;culo esta vac&iacute;a. Esta debe contener al menos 1 valor </td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>ACEPTAR</td>
+			<td><i>tabla de tipos de art&iacute;culo llena con al menos 1 valor</i></td>
 	</tr>
-<!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="itemnum">
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="itemtype" -->
 	<tr>
-		<td><b>itemnum</b></td>
-		<td><li>The field itemnum MUST be mapped </li>
-			<li>The correspounding subfield MUST be in with -1 (ignore) tab</td>
+			<td><b>el tipo de art&iacute;culo no est&aacute; mapeado</b></td>
+			<td>el campo biblioitems.itemtype DEBE :<br/>
+				<li>tiene que ser mapeado a un campo MARC </li>
+				<li>el subcampo correspondiente DEBE autorizarse el valor ="tipo de art&iacute;culo"</li></td>
 	</tr>
-<TMPL_ELSE>
+	<!-- TMPL_ELSE -->
 	<tr>
-		<td>OK</td>
-		<td><i>itemnum : the field itemnumber is mapped to a field in tab -1</i></td>
+			<td>ACEPTAR</td>
+			<td><i>biblioitems.itemtype definido</i></td>
 	</tr>
-</TMPL_IF>
-<!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="itemfields">
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="branches_empty" -->
 	<tr>
-		<td><b>item fields</b></td>
-		<td>ALL items fields MUST :<br/>
-			<li>be mapped to the same tag,</li>
-			<li>and they must all be in the 10 (items) tab</li></td>
+			<td><b>tabla de sedes vac&iacute;a</b></td>
+			<td>la tabla de la sede est&aacute; vac&iacute;a. &iexcl; Debe contener al menos 1 valor!</td>
 	</tr>
-<TMPL_ELSE>
+	<!-- TMPL_ELSE -->
 	<tr>
-		<td>OK</td>
-		<td><i>All item fields are in the same tag and in item tab</i></td>
+			<td>ACEPTAR</td>
+			<td><i>tabla de sedes contiene por lo menos un valor</i></td>
 	</tr>
-</TMPL_IF>
-<!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="itemtype">
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="branch" -->
 	<tr>
-		<td><b>itemtype NOT mapped</b></td>
-		<td>the biblioitems.itemtype field MUST :<br/>
-			<li>be mapped to a MARC subfield, </li>
-			<li>the correspounding subfield MUST have authorised_value=itemtype</li></td>
+			<td><b>la sede central NO est&aacute; mapeada</b></td>
+			<td>el campo items.homebranch DEBE<br/>
+				<li>tiene que ser mapeado a un campo MARC</li>
+				<li>el subcampo correspondiente DEBE autorizarse el valor ="sedes"</li></td>
 	</tr>
-<TMPL_ELSE>
+	<!-- TMPL_ELSE -->
 	<tr>
-		<td>OK</td>
-		<td><i>biblioitems.itemtype defined</i></td>
+			<td>ACEPTAR</td>
+			<td><i>sede propietaria definida</i></td>
 	</tr>
-</TMPL_IF>
-<!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="branch">
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="holdingbranch" -->
 	<tr>
-		<td><b>homebranch NOT mapped</b></td>
-		<td>the items.homebranch field MUST :<br/>
-			<li>be mapped to a MARC subfield,</li>
-			<li>the correspounding subfield MUST have authorised value=branches</li></td>
+			<td><b>la sede NO est&aacute; mapeada</b></td>
+			<td>el campo items.holdingbranch DEBE :<br/>
+				<li>tiene que ser mapeado a un campo MARC </li>
+				<li>el subcampo correspondiente DEBE autorizarse el valor ="sedes"</li></td>
 	</tr>
-<TMPL_ELSE>
+	<!-- TMPL_ELSE -->
 	<tr>
-		<td>OK</td>
-		<td><i>homebranch defined</i></td>
+			<td>ACEPTAR</td>
+			<td><i>sede definida</i></td>
 	</tr>
-</TMPL_IF>
-<!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="holdingbranch">
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="biblionumber" -->
 	<tr>
-		<td><b>holdingbranch NOT mapped</b></td>
-		<td>the items.holdingbranch field MUST :<br/>
-			<li>be mapped to a MARC subfield, </li>
-			<li>the correspounding subfield MUST have authorised value=branches</li></td>
+			<td><b>biblio y biblionumber</b></td>
+			<td>Los campos biblio.biblionumber y biblioitems.biblioitemnumber DEBEN :<br/>
+				<li>tiene que ser mapeado a un campo MARC</li>
+				<li>est&aacute; en la etiqueta -1</li></td>
 	</tr>
-<TMPL_ELSE>
+	<!-- TMPL_ELSE -->
 	<tr>
-		<td>OK</td>
-		<td><i>holdingbranch defined</i></td>
+			<td>ACEPTAR</td>
+			<td><i>biblionumber y biblioitemnumber mapeados correctamente</i></td>
 	</tr>
-</TMPL_IF>
-<!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="biblionumber">
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="frameworknull" -->
 	<tr>
-		<td><b>biblio and biblionumber</b></td>
-		<td>The biblio.biblionumber and biblioitems.biblioitemnumber fields MUST :<br/>
-			<li>be mapped to a MARC subfield,</li>
-			<li>be in the SAME tag (for example : 090$a and 090$b)</li>
-			<li>be in tab -1</li></td>
+			<td><b>valores del formato</b></td>
+			<td>hay un valor nulo en un c&oacute;digo de formato. Compruebe las tablas siguientes<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>
+	<!-- TMPL_ELSE -->
 	<tr>
-		<td>OK</td>
-		<td><i>biblionumber and biblioitemnumber mapped correctly</i></td>
+			<td>ACEPTAR</td>
+			<td><i>ning&uacute;n valor NULO en el c&oacute;digo del formato</i></td>
 	</tr>
-</TMPL_IF>
-<!----------------------------------------------------------------------------------------------------------->
-<TMPL_IF name="total">
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="total" -->
 	<tr>
 		<td><b>TOTAL</b></td>
-		<td>You have <TMPL_VAR name="total"> error(s) in your MARC configuration. Please fix them before using koha</td>
+			<td>Tiene <b><!-- TMPL_VAR NAME="total" --></b> error(es) en su configuraci&oacute;n MARC. Por favor, arr&eacute;glelo(s) antes de usar Koha</td>
 	</tr>
-<TMPL_ELSE>
+	<!-- TMPL_ELSE -->
 	<tr>
 		<td>&nbsp;</td>
-		<td><b>Configuration OK, you don't have errors in your MARC parameters table</b></td>
+			<td><b>La configuraci&oacute;n est&aacute; OK, no hay errores en su tabla de par&aacute;metros MARC</b></td>
 	</tr>
-</TMPL_IF>
-</table>
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+	<!-- /TMPL_IF -->
+	</table>
+</div>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/currency.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/currency.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/parameters/currency.tmpl	3 Jun 2003 21:44:42 -0000	1.1
+++ es/parameters/currency.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,7 +1,8 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
-
-<TMPL_IF NAME=add_form>
-        <script>
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="add_form" -->
+			<script language="javascript" type="text/javascript">
+		function _(s) { return s } // dummy function for gettext
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         function isNotNull(f,noalert) {
                 if (f.value.length ==0) {
@@ -39,173 +40,151 @@
                 var _alertString="";
                 var alertString2;
                 if (f.currency.value.length==0) {
-                        _alertString += "- Currency name missing\\n";
+							_alertString += "\n- " + _("Falta Nombre de la Moneda");
                 }
                 if (f.rate.value.length==0) {
-                        _alertString += "- Rate missing\\n";
+							_alertString += "\n- " + _("Falta Equivalencia");
                 }
                 if (_alertString.length==0) {
                         document.Aform.submit();
                 } else {
-                        alertString2 = "Form not submitted because of the following problem(s)\\n";
-                        alertString2 += "------------------------------------------------------------------------------------\\n\\n";
+							alertString2  = _("El Formulario no fue procesado debido a los siguientes problemas");
+							alertString2 += "\n------------------------------------------------------------------------------------\n";
                         alertString2 += _alertString;
                         alert(alertString2);
                 }
         }
-        </SCRIPT>
-
-	<TMPL_IF NAME=searchfield>
-		<h1>Modify currency</h1>
-	<TMPL_ELSE>
-		<h1>Add currency</h1>
-	</TMPL_IF>
-
-        <form action='<TMPL_VAR NAME=script_name>' name=Aform method=post>
-        <input type=hidden name=op value='add_validate'>
+			</script>
 
-	<table>
+		<!-- TMPL_IF NAME="searchfield" -->
+			<h1 class="parameters">Modificar Moneda</h1>
+		<!-- TMPL_ELSE -->
+			<h1 class="parameters">A&ntilde;adir moneda</h1>
+		<!-- /TMPL_IF -->
 
-	<TMPL_IF NAME=searchfield>
-		<tr>
-			<td>Currency</td>
-			<td>
-				<input type=hidden name=currency value='<TMPL_VAR NAME=searchfield>'><TMPL_VAR NAME=searchfield>
-			</td>
-		</tr>
-	<TMPL_ELSE>
-		<tr>
-			<td>Currency</td>
-			<td>
-				<input type=text name=currency size=50 maxlength=50 onBlur=toUC(this)>
-			</td>
-		</tr>
-	</TMPL_IF>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+			<input type="hidden" name="op" value="add_validate">
 
-        	<tr>
-			<td>Rate</td>
-			<td>
-				<input type=text name=rate size=10 maxlength=10 value='<TMPL_VAR NAME=rate>'>
-			</td>
-		</tr>
-        	<tr>
-			<td> </td>
-			<td><INPUT type=button value='OK' onClick='Check(this.form)'></td>
-		</tr>
-        </table>
+		<!-- TMPL_IF NAME="searchfield" -->
+			<p>
+				<label>Moneda</label>
+				<input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
+			</p>
+		<!-- TMPL_ELSE -->
+			<p>
+				<label>Moneda</label>
+				<input type="text" name="currency" size="50" maxlength="50" onblur="toUC(this)">
+			</p>
+		<!-- /TMPL_IF -->
+		<p>
+			<label>Equivalencia</label>
+			<input type="text" name="rate" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="rate" -->">
+		</p>
+		<p><input type="button" value="ACEPTAR" onclick="Check(this.form)" class="button parameters"></p>
         </form>
 
-</TMPL_IF>
+	<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=add_validate>
-	data recorded
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
-        <input type=submit value=OK>
+	<!-- TMPL_IF NAME="add_validate" -->
+		Datos guardados
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="ACEPTAR">
         </form>
-</TMPL_IF>
+	<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirm>
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr bgcolor='#99cc33'>
-			<td background='/images/background-mem.gif'><b>Currency</b></td>
-			<td background='/images/background-mem.gif'><b><TMPL_VAR NAME=searchfield></b></td>
+	<!-- TMPL_IF NAME="delete_confirm" -->
+		<table border="0" cellspacing="0" cellpadding="5">
+			<tr bgcolor="#99cc33">
+				<td background="/images/background-mem.gif"><b>Moneda</b></td>
+				<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
 		</tr>
 
-        	<form action='<TMPL_VAR NAME=script_name>' method=post>
-			<input type=hidden name=op value=delete_confirmed>
-			<input type=hidden name=searchfield value='<TMPL_VAR NAME=searchfield>'>
+				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="op" value="delete_confirmed">
+				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
         
         	<tr>
-			<td>Rate</td>
-			<td><TMPL_VAR NAME=rate></td>
+				<td>Equivalencia</td>
+				<td><!-- TMPL_VAR NAME="rate" --></td>
 		</tr>
-		<TMPL_IF NAME=totalgtzero>
+			<!-- TMPL_IF NAME="totalgtzero" -->
 		<tr>
-			<td colspan=2 align=center>
-				<b>This record is used <TMPL_VAR NAME=total> times. Deletion not possible</b>
+				<td colspan="2" align="center">
+					<b>Este registro es usado <!-- TMPL_VAR NAME="total" --> veces. No es posible borrarlo</b>
 			</td>
 		</tr>
 		<tr>
-			<td colspan=2>
+				<td colspan="2">
 				</form>
-				<form action='<TMPL_VAR NAME=script_name>' method=post>
-					<input type=submit value=OK>
+					<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+						<input type="submit" value="ACEPTAR">
 				</form>
 			</td>
 		</tr>
-		<TMPL_ELSE>
+			<!-- TMPL_ELSE -->
 		<tr>
-			<td colspan=2 align=center>CONFIRM DELETION</td>
+				<td colspan="2" align="center">CONFIRMAR BORRADO</td>
 		</tr>
 		<tr>
 			<td>
-				<INPUT type=submit value='YES'>
+					<input type="submit" value="SI">
 				</form>
 			</td>
 			<td>
-				<form action='<TMPL_VAR NAME=script_name>' method=post>
-					<input type=submit value=NO>
+					<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+						<input type="submit" value="NO">
 				</form>
 			</td>
 		</tr>
-		</TMPL_IF>
+			<!-- /TMPL_IF -->
 	</table>
-</TMPL_IF>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirmed" -->
+		Datos borrados
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="ACEPTAR">
+		</form>
+	<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirmed>
-	data deleted
-	<form action='<TMPL_VAR NAME=script_name>' method=post>
-		<input type=submit value=OK>
-	</form>
-</TMPL_IF>
-
-<TMPL_IF NAME=else>
-	<h2>Currencies admin</h2>
-        <form action='<TMP_VAR NAME=script_name>' method=post>
-                <input type=text name=description value=<TMPL_VAR NAME=searchfield>>
-                <input type=reset name=reset value="clr">
-        </form>
-
-	<TMPL_IF NAME=searchfield>
-		You searched for <b><TMPL_VAR NAME=searchfield></b>
-	</TMPL_IF>
-
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr bgcolor='#99cc33'>
-			<td background='/images/background-mem.gif'><b>Currency</b></td>
-			<td background='/images/background-mem.gif'><b>Rate</b></td>
-			<td background='/images/background-mem.gif'> </td>
-			<td background='/images/background-mem.gif'> </td>
-		</tr>
-		<TMPL_LOOP NAME=loop>
-		<tr bgcolor="<TMPL_VAR NAME=toggle>">
-			<td><TMPL_VAR NAME=currency></td>
-			<td><TMPL_VAR NAME=rate></td>
-			<td><a href="<TMPL_VAR NAME=script_name>?op=add_form&searchfield=<TMPL_VAR NAME=currency>">Edit</a></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=delete_confirm&searchfield=<TMPL_VAR NAME=currency>">Delete</a></td>
+	<!-- TMPL_IF NAME="else" -->
+		<h1 class="parameters">Administraci&oacute;n de monedas</h1>
+		<table>
+			<tr>
+				<th class="parameters"><b>Moneda</b></td>
+				<th class="parameters"><b>Equivalencia</b></td>
+				<th class="parameters"> </td>
+				<th class="parameters"> </td>
+			</tr>
+			<!-- TMPL_LOOP NAME="loop" -->
+			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+				<td><!-- TMPL_VAR NAME="currency" --></td>
+				<td><!-- TMPL_VAR NAME="rate" --></td>
+				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->" class="button parameters">Editar</a></td>
+							<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->" class="button parameters">Borrar</a></td>
 		</tr>
-		</TMPL_LOOP>
+			<!-- /TMPL_LOOP -->
 	</table>
 
-	<form action='<TMPL_VAR NAME=script_name>' method=post>
-        <input type=hidden name=op value=add_form>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_form">
 	
-	<TMPL_IF NAME=offsetgtzero>
-		<a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=prevpage>"><< Prev</a>
-	</TMPL_IF>
+		<!-- TMPL_IF NAME="offsetgtzero" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Anterior</a>
+		<!-- /TMPL_IF -->
 
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
-	<TMPL_IF NAME=ltcount>
-		<a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=nextpage>">Next >></a>	
-	</TMPL_iF>
+		<!-- TMPL_IF NAME="ltcount" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Siguiente &gt;</a>	
+		<!-- /TMPL_iF -->
 
         <br>
-	<input type=image src="/images/button-add-new.gif" WIDTH=188 HEIGHT=44 ALT="Add Currency" BORDER=0 ></a>
+		<input type="submit" class="button parameters" value="A&ntilde;adir moneda" alt="A&ntilde;adir moneda">
 	<br>
         </form>
 
-</TMPL_IF>
-
+	<!-- /TMPL_IF -->
+</div>
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/itemtypes.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/itemtypes.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/parameters/itemtypes.tmpl	3 Jun 2003 21:44:42 -0000	1.1
+++ es/parameters/itemtypes.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,6 +1,7 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<script>
+<script language="javascript" type="text/javascript">
+function _(s) { return s } // dummy function for gettext
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 function isNotNull(f,noalert) {
 	if (f.value.length ==0) {
@@ -38,115 +39,128 @@
 	var _alertString="";
 	var alertString2;
 	if (f.itemtype.value.length==0) {
-		_alertString += "- itemtype missing\\n";
+		_alertString += "\n- " + _("Falta el tipo de art&iacute;culo");
 	}
 	if (!(isNotNull(window.document.Aform.description,1))) {
-		_alertString += "- description missing\\n";
-	}
-	if ((!isNum(f.loanlength,0)) && f.loanlength.value.length > 0) {
-		_alertString += "- loan length is not a number\\n";
+		_alertString += "\n- " + _("Falta Descripci&oacute;n");
 	}
 	if ((!isNum(f.rentalcharge,0)) && f.rentalcharge.value.length > 0) {
-		_alertString += "- rental charge is not a number\\n";
+		_alertString += "\n- " + _("El costo por pr&eacute;stamo no es un n&uacute;mero");
 	}
 	if (_alertString.length==0) {
 		document.Aform.submit();
 	} else {
-		alertString2 = "Form not submitted because of the following problem(s)\\n";
-		alertString2 += "------------------------------------------------------------------------------------\\n\\n";
+		alertString2  = _("El Formulario no fue procesado debido a los siguientes problemas");
+		alertString2 += "\n------------------------------------------------------------------------------------\n";
 		alertString2 += _alertString;
 		alert(alertString2);
 	}
 }
-</SCRIPT>
-<TMPL_IF name="add_form">
-	<TMPL_IF name="itemtype">
-		<h1>Modify item type</h1>
-	<TMPL_ELSE>
-		<h1>Add item type</h1>
-	</TMPL_IF>
-	<form action='<TMPL_VAR name="script_name">' name=Aform method=post>
-		<input type=hidden name=op value='add_validate'>
-		<input type=hidden name=checked value=0>
-		<table>
-			<TMPL_IF name="itemtype">
-				<tr><td>Item type</td><td><input type=hidden name=itemtype value=<TMPL_VAR name="itemtype">><TMPL_VAR name="itemtype"></td></tr>
-			<TMPL_ELSE>
-				<tr><td>Item type</td><td><input type=text name=itemtype size=5 maxlength=3 onBlur="toUC(this)"></td></tr>
-			</TMPL_IF>
-			<tr>
-				<td>Description</td>
-				<td><input type=text name=description size=40 maxlength=80 value='<TMPL_VAR name="description">'>&nbsp;</td>
-			</tr>
-			<tr>
-				<td>loan length</td>
-				<td><input type=text name=loanlength value='<TMPL_VAR name="loanlength">'></td>
-			</tr>
-			<tr>
-				<td>Renewals allowed</td>
-				<td><input type=checkbox name=renewalsallowed <TMPL_IF name="renewalsallowed">checked</TMPL_IF> value=1></td>
-			</tr>
-			<tr>
-				<td>Rental charge</td>
-				<td><input type=text name=rentalcharge value='<TMPL_VAR name="rentalcharge">'></td>
-			</tr>
-			<tr>
-				<td>&nbsp;</td>
-				<td><INPUT type=button value='OK' onClick='Check(this.form)'></td>
-			</tr>
-		</table>
+</script>
+<div id="mainbloc">
+<!-- TMPL_IF NAME="add_form" -->
+	<!-- TMPL_IF NAME="itemtype" -->
+		<h1 class="parameters">Modificar Tipo de art&iacute;culo</h1>
+	<!-- TMPL_ELSE -->
+		<h1 class="parameters">A&ntilde;adir tipo de art&iacute;culo</h1>
+	<!-- /TMPL_IF -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate">
+		<input type="hidden" name="checked" value="0">
+			<!-- TMPL_IF NAME="itemtype" -->
+				<p><label class="label100">Tipo de art&iacute;culo<label><input type="hidden" name="itemtype" value="<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="itemtype" --></p>
+			<!-- TMPL_ELSE -->
+				<p><label class="label100">Tipo de art&iacute;culo<label><input type="text" name="itemtype" size="6" maxlength="4" onblur="toUC(this)"></p>
+			<!-- /TMPL_IF -->
+			<p>
+				<label class="label100">Descripci&oacute;n</label>
+				<input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
+			</p>
+			<p>
+				<label class="label100">No se presta</label>
+				<!-- TMPL_IF NAME="notforloan" -->
+					<input type="checkbox" name="notforloan" checked value="1">
+				<!-- TMPL_ELSE -->
+					<input type="checkbox" name="notforloan" value="1">
+				<!-- /TMPL_IF -->
+				si est&aacute; seleccionado, ning&uacute;n art&iacute;culo de este tipo podr&aacute; ser prestado. Si no est&aacute; seleccionado, todos los art&iacute;culos de este tipo podr&aacute;n ser prestados, a menos que se establezca que un art&iacute;culo en particular no sale a domicilio
+			</p>
+			<p>
+				<label class="label100" name="renewalsallowed">Cantidad de renovaciones permitidas</label>
+				<input type="text" name="renewalsallowed" value="<!-- TMPL_VAR NAME="renewalsallowed" -->">
+			</p>
+			<p>
+				<label class="label100">Costo por pr&eacute;stamo</label>
+				<input type="text" name="rentalcharge" size="10" value="<!-- TMPL_VAR NAME="rentalcharge" -->">
+			</p>
+			<p>
+				<input type="button" value="ACEPTAR" class="button" onclick="Check(this.form)">
+			</p>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_confirm">
-	<TABLE bg="#99cc33">
-		<tr>
-			<th>Item type</th>
-			<th><TMPL_VAR name="itemtype"></th>
-		</tr>
-	<form action='<TMPL_VAR name="script_name">' method=post>
-		<input type=hidden name=op value=delete_confirmed><input type=hidden name=itemtype value='<TMPL_VAR name="itemtype">'>
-	<tr><td>Description</td><td><TMPL_VAR name="description"></td></tr>
-	<tr><td>Loan length</td><td><TMPL_VAR name="loanlength"></td></tr>
-	<tr><td>Renewals</td><td><TMPL_IF name="renewalsallowed">Allowed<TMPL_ELSE>Not allowed</TMPL_IF></td></tr>
-	<tr><td>Rental charge</td><td><TMPL_VAR name="rentalcharge"></td></tr>
-	<TMPL_IF name="total">
-		<tr><td colspan=2 align=center><b>This record is used <TMPL_VAR name="total"> times. Deletion not possible</b></td></tr>
-		<tr><td colspan=2></form><form action='<TMPL_VAR name="script_name">' method=post><input type=submit value=OK></form></td></tr>
-	<TMPL_ELSE>
-		<tr><td colspan=2 align=center>CONFIRM DELETION</td></tr>
-		<tr><td><INPUT type=submit value='YES'></form></td><td><form action='<TMPL_VAR name="script_name">' method=post><input type=submit value=NO></form></td></tr>
-	</TMPL_IF>
+<!-- TMPL_IF NAME="delete_confirm" -->
+		<p><label>Tipo de art&iacute;culo</label><!-- TMPL_VAR NAME="itemtype" --></p>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="itemtype" value="<!-- TMPL_VAR NAME="itemtype" -->">
+	<p><label>Descripci&oacute;n</label><!-- TMPL_VAR NAME="description" --></p>
+	<p><label>Renovaciones</label><!-- TMPL_IF NAME="renewalsallowed" -->Permitido<!-- TMPL_ELSE -->No Permitido<!-- /TMPL_IF --></p>
+	<p><lable>Costo por pr&eacute;stamo</label><!-- TMPL_VAR NAME="rentalcharge" --></p>
+	<!-- TMPL_IF NAME="total" -->
+		<p>
+			<b>Este registro es usado <!-- TMPL_VAR NAME="total" --> veces. No es posible borrarlo</b>
+		</p>
+		<p>
+			</form>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="ACEPTAR" class="button parameters"></form>
+		</p>
+	<!-- TMPL_ELSE -->
+		<p>CONFIRMAR BORRADO</p>
+		<p>
+			<input type="submit" value="SI" class="button parameters"></form>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="button parameters"></form>
+		</p>
+	<!-- /TMPL_IF -->
 
-	</table>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="else">
-<table border='1' cellpadding='5' cellspacing='0' width='550'>
-	<tr>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Code</b></th>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Description</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>loan length</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Renewable</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>charge</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">Edit</td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">Delete</td>
-	</tr>
-	<TMPL_LOOP name="loop">
-		<tr>
-			<td><TMPL_VAR name="itemtype"></td>
-			<td><TMPL_VAR name="description"></td>
-			<td><TMPL_VAR name="loanlength"></td>
-			<td><TMPL_IF name="renewalsallowed">Yes<TMPL_ELSE>No</TMPL_IF></td>
-			<td><TMPL_VAR name="rentalcharge"></td>
-			<td><a href="<TMPL_VAR name="script_name">?op=add_form&itemtype=<TMPL_VAR name="itemtype" escape="HTML">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
-			<td><a href="<TMPL_VAR name="script_name">?op=delete_confirm&itemtype=<TMPL_VAR name="itemtype" escape="HTML">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
+<!-- TMPL_IF NAME="else" -->
+<h1 class="parameters">Administraci&oacute;n de tipos de art&iacute;culo</h1>
+<table>
+	<tr>
+		<th class="parameters">C&oacute;digo</th>
+		<th class="parameters">Descripci&oacute;n</th>
+		<th class="parameters">no prestable</th>
+		<th class="parameters">Renovable</th>
+		<th class="parameters">Costo</th>
+		<th class="parameters">Editar</th>
+		<th class="parameters">Borrar</th>
+	</tr>
+	<!-- TMPL_LOOP NAME="loop" -->
+		<tr>
+			<td><!-- TMPL_VAR NAME="itemtype" --></td>
+			<td><!-- TMPL_VAR NAME="description" --></td>
+			<td><!-- TMPL_IF NAME="notforloan" -->Si<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_UNLESS name="notforloan" -->
+					<!-- TMPL_IF NAME="renewalsallowed" -->
+						<!-- TMPL_VAR name="renewalsallowed" --> vez(veces)
+					<!-- TMPL_ELSE -->
+						No
+					<!-- /TMPL_IF -->
+				<!-- /TMPL_UNLESS -->
+			</td>
+			<td><!-- TMPL_UNLESS name="notforloan" --><!-- TMPL_VAR NAME="rentalcharge" --><!-- /TMPL_UNLESS --></td>
+			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&itemtype=<!-- TMPL_VAR NAME="itemtype" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
+			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&itemtype=<!-- TMPL_VAR NAME="itemtype" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
 		</tr>
-	</TMPL_LOOP>
+	<!-- /TMPL_LOOP -->
 </table>
-<form action='<TMPL_VAR name="script_name">' method=post>
-<input type=hidden name=op value=add_form>
-<br><input type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/filenew.png" title="Add itemtype" ALT="Add" BORDER=0 ><br>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form">
+	<input type="submit" class="button parameters" value="A&ntilde;adir tipo de art&iacute;culo" title="A&ntilde;adir tipo de art&iacute;culo" alt="A&ntilde;adir tipo de art&iacute;culo">
+	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="anterior" alt="anterior" border="0"></a><!-- /TMPL_IF --></td>
+	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="Siguiente" alt="Siguiente" border="0"></a><!-- /TMPL_IF --></td>
 </form>
-</TMPL_IF>
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+</div>
+<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/koha2marclinks.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/koha2marclinks.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/parameters/koha2marclinks.tmpl	3 Jun 2003 21:41:18 -0000	1.2
+++ es/parameters/koha2marclinks.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,182 +1,186 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<TMPL_IF name="add_form">
-<!-------------------------------------------------------------------------------------------------->
-	<H1><TMPL_VAR name="action"></H1>
-	<p>Choose and validate 1 of the following for <b><TMPL_VAR name="tablename">.<TMPL_VAR name="kohafield"></b></p>
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="add_form" -->
+	<!-- ------------------------------------------------------------------------ -->
+		<h1>Elija y valide 1 de los siguientes para <b><!-- TMPL_VAR NAME="tablename" -->.<!-- TMPL_VAR NAME="kohafield" --></b></h1>
 	<table>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+				<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist0">
+						<input type="hidden" name="op" value="add_validate">
+						<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+						<!-- TMPL_VAR NAME="marclist0" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+						<input type="submit" value="ACEPTAR" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist1">
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist1" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="ACEPTAR" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist2">
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist2" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="ACEPTAR" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist3">
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist3" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="ACEPTAR" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist4">
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist4" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="ACEPTAR" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist5">
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist5" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="ACEPTAR" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist6">
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist6" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="ACEPTAR" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist7">
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist7" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="ACEPTAR" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist8">
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist8" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="ACEPTAR" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<TMPL_VAR name="script_name">'method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-			<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
-			<TMPL_VAR name="marclist9">
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist9" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="ACEPTAR" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
 		<td>
-			<p align="right">To "unmap", click ==></p>
+					<p align="right">Para "des-mapear", haga click ==></p>
 		</td>
 		<td>
-			<form action='<TMPL_VAR name="script_name">' name=Aform method=put>
-				<input type=hidden name=op value='add_validate'>
-				<input type="hidden" name="tablename" value="<TMPL_VAR name="tablename">">
-				<input type="hidden" name="kohafield" value="<TMPL_VAR name="kohafield">">
+					<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method=put>
+						<input type="hidden" name="op" value="add_validate">
+						<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
 				<input type="hidden" name="choice" value="">
-				<INPUT type=submit value='HERE'>
+						<input type="submit" value="AQUI" class="button">
 			</form>
 		</td>
 	</tr>
 	</table>
-</TMPL_IF>
+	<!-- /TMPL_IF -->
 
-<!-------------------------------------------------------------------------------------------------->
-<TMPL_IF name="else">
-<font SIZE=6><em>MARC links<TMPL_VAR name="tagfield"></em></font>
-<p></p>
-<form action='<TMPL_VAR name="script_name">' method=post>
-<TMPL_VAR name="tablename"> <input type="submit" value="OK">
-</form>
-
-<table border=0 cellspacing=0 cellpadding=2>
-<tr valign=top bgcolor=#99cc33>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=10%><b>koha field</b> <span style="font-size:8;color:red" title="the koha-DB field linked to this subfield">?</span></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=5%><b>Tag</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=5%><b>Subfield</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=42%><b>Lib</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=8%>
-<TMPL_LOOP name="loop">
-<tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
-	<td><b><TMPL_VAR name="kohafield"></b></td>
-	<td><TMPL_VAR name="tagfield"></td>
-	<td><TMPL_VAR name="tagsubfield"></td>
-	<td><TMPL_VAR name="liblibrarian"></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>
-</tr>
-</TMPL_LOOP>
-</table>
-</TMPL_IF>
+	<!-- ------------------------------------------------------------------------ -->
+	<!-- TMPL_IF NAME="else" -->
+	<h1 class="parameters">enlaces MARC <!-- TMPL_VAR NAME="tagfield" --></h1>
+	<p><b>NOTAS :</b></p>
+	<ul>
+		<p>Si cambia el enlace entre una un subcampo MARC y un campo no-MARC, pidale a su administrador que ejecute el script misc/rebuildnonmarc.</p>
+		<p>Si cambia un enlace aqui, TODOS los formatos ser&aacute;n modificados.</p>
+	</p>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<!-- TMPL_VAR NAME="tablename" --> <input type="submit" value="ACEPTAR" class="button parameters">
+	</form>
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+	<table>
+		<tr>
+			<th width="10%">Campo Koha <span style="font-size:8;color:red" title="el campo de la base de datos de koha se vincul&oacute; a este subcampo">?</span></th>
+			<th width="5%">Etiqueta</th>
+			<th width="5%">Subcampo</th>
+			<th width="42%">Lib</th>
+			<th width="8%">&nbsp;</th>
+		<!-- TMPL_LOOP NAME="loop" -->
+			<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
+				<td><b><!-- TMPL_VAR NAME="kohafield" --></b></td>
+				<td><!-- TMPL_VAR NAME="tagfield" --></td>
+				<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
+				<td><!-- TMPL_VAR NAME="liblibrarian" --></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>
+			</tr>
+		<!-- /TMPL_LOOP -->
+	</table>
+	<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/marc_subfields_structure.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/marc_subfields_structure.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -u -b -r1.3 -r1.3.12.1
--- es/parameters/marc_subfields_structure.tmpl	3 Jun 2003 21:41:18 -0000	1.3
+++ es/parameters/marc_subfields_structure.tmpl	7 May 2007 13:55:50 -0000	1.3.12.1
@@ -1,112 +1,155 @@
-<html>
-<!-- clarification needed about this page. many questions... what is Lib? a Library? -->
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<TMPL_INCLUDE NAME="parameters-top.inc">
-
-<TMPL_IF name="add_form">
-<!-------------------------------------------------------------------------------------------------->
-	<H1><TMPL_VAR name="action"></H1>
-	<form action='<TMPL_VAR name="script_name">' name=Aform method=post>
-	<input type=hidden name=op value='add_validate'>
+<div id="mainbloc">
+<!-- TMPL_IF NAME="add_form" -->
+<!-- ------------------------------------------------------------------------ -->
+	<h1>
+	<!-- TMPL_IF NAME="use-heading-flags-p" -->
+	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Editar restricciones de subcampo MARC <!-- TMPL_IF name="frameworkcode" --><!-- TMPL_VAR NAME="frameworkcode" --><!-- TMPL_ELSE -->por defecto<!-- /TMPL_IF --><!-- /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="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
 	<table>
-	<tr><th>Field</th>
-		<th>Lib for librarians / for opac</th>
-		<th>Repet</th>
-		<th>Mand</th>
-		<th>Koha field</th>
-		<th>Tab</th>
-		<th>Authorised value or<br/>
-				Thesaurus category</th>
-	</tr>
-	<TMPL_LOOP name="loop">
-		<tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
-		<td><TMPL_VAR name="tagfield"> - <TMPL_VAR name="tagsubfield"></td>
-		<td><input type=text name="liblibrarian" value='<TMPL_VAR name="liblibrarian">' size=40 maxlength=80><br/>
-				<input type=text name="libopac" value='<TMPL_VAR name="libopac">' size=40 maxlength=80></td>
-		<td><TMPL_VAR name="repeatable"></td>
-		<td><TMPL_VAR name="mandatory"></td>
-		<td><TMPL_VAR name="kohafield"></td>
-		<td><TMPL_VAR name="tab"></td>
-		<td><TMPL_VAR name="authorised_value"><br/>
-				or <TMPL_VAR name="thesaurus_category"><br/>
-				or <TMPL_VAR name="value_builder"></td>
-	</TMPL_LOOP>
-	</table>
-	<INPUT type=submit value='OK'>
-	<p>Note : in the last column, you can choose :
-	<ul><li>An "authorised value" : it refers to a list of authorised value for this subfield. See the corresponding admin table</li>
-	<li>A "thesaurus category" : it refers to a thesaurus category. See the corresponding admin table</li>
-	<li>A "value builder" : values builders are perl programm that helps you select the value of the field. They are MARC-flavor dependant and sometimes fills an other subfield automaticaly</li>
+	<!-- TMPL_LOOP NAME="loop" -->
+		<tr>
+		<td>
+			<h2 class="parameters">Etiqueta <!-- TMPL_VAR NAME="tagfield" -->, Subcampo <!-- TMPL_VAR NAME="tagsubfield" --></h2>
+			<h3>restricciones MARC</h3>
+			<p>
+			<ul>
+				<p><!-- TMPL_VAR NAME="repeatable" --> repetible </p>
+				<p><!-- TMPL_VAR NAME="mandatory" --> obligatorio</p>
+				<!-- TMPL_IF name="frameworkcode" -->
+					<p>Buscar tambi&eacute;n: <i>(s&oacute;lo aplicable para el entorno por defecto)</i></p>
+				<!-- TMPL_ELSE -->
+					<p>
+						<label>Buscar tambi&eacute;n:</label> <input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (ejemplo para  200a : '200c','200d','200e'...)
+					</p>
+				<!-- /TMPL_IF -->
+				<p><label>Enlace de Koha:</label><!-- TMPL_VAR NAME="kohafield" --></p>
 	</ul>
 	</p>
+			<h3>Restricciones del Editor</h3>
+			<ul><p>Descripci&oacute;n
+				<p><label>para bibliotecarios:</label> <input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80"> para OPAC: <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
+				</p>
+				<p><label>En etiqueta</label><!-- TMPL_VAR NAME="tab" --> (ignornar significa que el subcampo NO es administrado por Koha)</p>
+				<p><label>oculto</label><input type="text" id="hidden<!-- TMPL_VAR NAME="row" -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" /> (ver ayuda en l&iacute;nea)</label></p>
+				<p><!-- TMPL_VAR NAME="isurl" --> URL (si est&aacute; seleccionado, el subcampo es una URL y puede ser pinchada)</p>
+				<p>
+					<label>Valor autoridad</label> <!-- TMPL_VAR NAME="authorised_value" --> o tesauro: <!-- TMPL_VAR NAME="authtypes" --> o plugin: <!-- TMPL_VAR NAME="value_builder" -->
+				</p>
+				<p>
+					<label>&nbsp;</label>Enlace para campo : <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (ejemplo :200b)
+				</p>
+			</ul>
+		</td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+	</table>
+	<input type="submit" value="ACEPTAR">
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_confirm">
-<!-------------------------------------------------------------------------------------------------->
-<table border=0 cellspacing=0 cellpadding=2>
-	<tr valign=top bgcolor=#99cc33>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Subfield</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b><TMPL_VAR name="tagsubfield"></b></td>
+<!-- TMPL_IF NAME="delete_confirm" -->
+<!-- ------------------------------------------------------------------------ -->
+<table border="0" cellspacing="0" cellpadding="2">
+	<tr valign="top" bgcolor="#99cc33">
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Subcampo</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR NAME="tagsubfield" --></b></td>
+	</tr>
+	<tr><td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+	<tr><td colspan="2" align="center">CONFIRMAR BORRADO</td></tr>
+	<tr>
+		<td>
+			<form 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" -->">
+				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
+				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
+				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+				<input type="submit" value="SI">
+			</form>
+		</td>
+		<td>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
+				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
+				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+				<input type="submit" value="NO">
+			</form>
+		</td>
 	</tr>
-	<tr><td>&nbsp;</td><td><TMPL_VAR name="liblibrarian"></td></tr>
-	<form 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">'>
-	<input type=hidden name=tagfield value='<TMPL_VAR name="tagfield">'>
-	<input type=hidden name=tagsubfield value='<TMPL_VAR name="tagsubfield">'>
-	<tr><td colspan=2 align=center>CONFIRM DELETION</td></tr>
-	<tr><td><INPUT type=submit value='YES'></form></td><td><form action='<TMPL_VAR name="script_name">' method=post><input type="hidden" name="tagfield" value="<TMPL_VAR name="tagfield">"><input type=submit value=NO></form></td></tr>
-</TMPL_IF>
-
-<TMPL_IF name="delete_confirmed">
-<!-------------------------------------------------------------------------------------------------->
-	data deleted
-	<form action='<TMPL_VAR name="script_name"> method=post><input type="hidden" name="tagfield" value="<TMPL_VAR name="tagfield">">
-	<input type=submit value=OK>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirmed" -->
+<!-- ------------------------------------------------------------------------ -->
+	Datos borrados
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
+	<input type="submit" value="ACEPTAR">
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<!-------------------------------------------------------------------------------------------------->
-<TMPL_IF name="else">
-<font SIZE=6><em>MARC subfield structure admin for <TMPL_VAR name="tagfield"></em></font>
-<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, or a koha interface. This link
-ensure that both DB are synchronized, thus you can change from MARC to KOHA interface easily.</p>
-<table border=0 cellspacing=0 cellpadding=2 width="80%">
-<tr valign=top bgcolor=#99cc33>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=5%><b>Subfield</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=30%><b>Lib</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=10%><b>koha field</b> <span style="font-size:8;color:red" title="the koha-DB field linked to this subfield">?</span></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=8%><b>Rep</b> <span style="font-size:8;color:red" title="subfield may be repeated (1=yes, 0=no)">?</span></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=8%><b>Mand</b> <span style="font-size:8;color:red" title="subfield is mandatory (1=yes, 0=no)">?</span></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=8%><b>Tab</b> <span style="font-size:8;color:red" title="subfield is shown in which tab (0-9 or item)">?</span></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=8%><b>Auth value</b> <span style="font-size:8;color:red" title="values authorised for this subfield">?</span></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=8%><b>Thesaurus</b> <span style="font-size:8;color:red" title="Thesaurus linked to this subfield">?</span></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=8%><b>Val build</b> <span style="font-size:8;color:red" title="Value builder">?</span></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width=8%>Delete</td>
-<TMPL_LOOP name="loop">
-<tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
-	<td><TMPL_VAR name="tagsubfield"></td>
-	<td><TMPL_VAR name="liblibrarian"></td>
-	<td><TMPL_VAR name="kohafield"></td>
-	<td><TMPL_IF name="repeatable">Yes<TMPL_ELSE>No</TMPL_IF></td>
-	<td><TMPL_IF name="mandatory">Yes<TMPL_ELSE>No</TMPL_IF></td>
-	<td><TMPL_VAR name="tab"></td>
-	<td><TMPL_VAR name="authorised_value"></td>
-	<td><TMPL_VAR name="thesaurus_category"></td>
-	<td><TMPL_VAR name="value_builder"></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>
+<!-- ------------------------------------------------------------------------ -->
+<!-- TMPL_IF NAME="else" -->
+<h1>administraci&oacute;n de estructura de subcampos MARC para el <!-- TMPL_VAR NAME="tagfield" --> (formato <!--TMPL_VAR NAME="frameworkcode" -->)</h1>
+<p>Esta pantalla muestra los subcampos asociados con la etiqueta seleccionada. Puede editar los subcampos o a&ntilde;adir uno nuevo haciendo click en Editar. </p>
+<p>La columna <b>campo Koha</b> muestra que el subcampo est&aacute; vinculado con un campo Koha. Koha puede administrar una interfaz MARC, o una interfaz Koha. Este v&iacute;nculo asegura que ambas bases est&eacute;n sincronizadas, permitiendo el cambio entre una interfaz y otra sin problemas.</p>
+
+<table>
+<tr>
+	<th>Subcampo</th>
+	<th>Texto</th>
+	<th>Restricciones</th>
+	<th>Borrar</th>
+<!-- TMPL_LOOP NAME="loop" -->
+<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
+	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
+	<td>
+		<!-- TMPL_IF NAME="subfield_ignored" -->
+			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
+		<!-- TMPL_ELSE -->
+			<!-- TMPL_VAR NAME="liblibrarian" -->
+		<!-- /TMPL_IF -->
+	</td>
+	<td>
+		<!-- TMPL_IF NAME="subfield_ignored" -->
+			<i>subcampo ignorado</i>
+		<!-- TMPL_ELSE -->
+			Pesta&ntilde;a :<!-- TMPL_VAR NAME="tab" -->,
+			<!-- TMPL_IF NAME="kohafield" -->Campo Koha : <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
+			<!-- TMPL_IF NAME="repeatable" -->Repetible, <!-- TMPL_ELSE -->No repetible,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="mandatory" -->Obligatorio, <!-- TMPL_ELSE -->No obligatorio,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="seealso" -->ver tambi&eacute;n : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="hidden" -->oculto,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="isurl" -->es una URL,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="authorised_value" --> Valor autorizado :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="authtypecode" --> Autoridad :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="link" -->Enlace:<!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
+		<!-- /TMPL_IF -->
+	</td>
+	<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
 </tr>
-</TMPL_LOOP>
+<!-- /TMPL_LOOP -->
 </table>
-<table width=60%>
-	<tr>
-		<td width="25%"><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 width="25%"><a href="marctagstructure.pl?searchfield=<TMPL_VAR name="tagfield">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/2uparrow.png" width=32 hspace=0 vspace=0 border=0></a></td>
-		<td width="25%"><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></td>
-		<td width="25%"><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></td>
-	</tr>
-</table>
-</TMPL_IF>
+<a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;tagfield=<!-- TMPL_VAR NAME="edit_tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="edit_frameworkcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a>
+<a href="marctagstructure.pl?searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
+	<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/2uparrow.png" width="32" hspace="0" vspace="0" border="0">
+</a>
+<!-- TMPL_IF NAME="previous" -->
+	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="anterior" alt="anterior" border="0">
+	</a><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="next" -->
+	<!-- TMPL_VAR NAME="next" -->
+		<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="Siguiente" alt="Siguiente" border="0">
+	</a>
+<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+</div>
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
-</html>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/marctagstructure.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/marctagstructure.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/parameters/marctagstructure.tmpl	3 Jun 2003 21:41:18 -0000	1.2
+++ es/parameters/marctagstructure.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,6 +1,9 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<script>
+<div id="mainbloc">
+<h1 class="parameters">administraci&oacute;n de estructura de etiquetas MARC para <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->formato MARC por defecto<!-- /TMPL_IF --></h1>
+<script language="javascript" type="text/javascript">
+	function _(s) { return s } // dummy function for gettext
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	function isNotNull(f,noalert) {
 		if (f.value.length ==0) {
@@ -38,103 +41,179 @@
 		var _alertString="";
 		var alertString2;
 		if (f.tagfield.value.length==0) {
-			_alertString += "- tag number missing\\n";
+			_alertString += "\n- " + _("falta el n&uacute;mero de etiqueta");
 		}
 		if (_alertString.length==0) {
 			document.Aform.submit();
 		} else {
-			alertString2 = "Form not submitted because of the following problem(s)\\n";
-			alertString2 += "------------------------------------------------------------------------------------\\n\\n";
+			alertString2  = _("El Formulario no fue procesado debido a los siguientes problemas");
+			alertString2 += "\n------------------------------------------------------------------------------------\n";
 			alertString2 += _alertString;
 			alert(alertString2);
 		}
 	}
-	</SCRIPT>
+	</script>
 
-<TMPL_IF name="add_form">
-<!-------------------------------------------------------------------------------------------------->
-	<H1><TMPL_VAR name="action"></H1>
-	<form action='<TMPL_VAR name="script_name">' name="Aform" method="post">
-	<input type=hidden name=op value='add_validate'>
-	<table>
-	<tr><td>Tag</td><td><TMPL_VAR name="searchfield"></td></tr>
-	<tr><td>Lib for librarians</td><td><input type="text" name="liblibrarian" value='<TMPL_VAR name="liblibrarian">' size=80 maxlength=100></td></tr>
-	<tr><td>Lib for opac</td><td><input type="text" name="libopac" value='<TMPL_VAR name="libopac">' size=80 maxlength=100></td></tr>
-	<tr><td>Repeatable</td><td><TMPL_VAR name="repeatable"></td></tr>
-	<tr><td>Mandatory</td><td><TMPL_VAR name="mandatory"></td></tr>
-	<tr><td>Authorised value</td><td><TMPL_VAR name="authorised_value"> (if you select a value here, the indicators will be limited to the authorised value list)</td></tr>
-	<tr><td>&nbsp;</td><td><INPUT type="button" value='OK' onClick='Check(this.form)'></td></tr>
-	</table>
+<!-- TMPL_IF NAME="add_form" -->
+<!-- ------------------------------------------------------------------------ -->
+	<h1 class="parameters">
+	<!-- TMPL_IF NAME="use-heading-flags-p" -->
+	<!-- TMPL_IF NAME="heading-modify-tag-p" -->Modificar Etiqueta<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="heading-add-tag-p" -->A&ntilde;adir etiqueta<!-- /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="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+		<p><label>Etiqueta<label><!-- TMPL_IF Name="searchfield" -->
+		<!-- TMPL_VAR NAME="searchfield" -->
+		<!-- TMPL_ELSE -->
+		<input type="text" name="tagfield" value="" escape="HTML">
+		<!-- /TMPL_IF -->
+		</p>
+		<p><label>Description for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100"></p>
+		<p><label>Description for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></p>
+		<p><label>Repetible</label><!-- TMPL_VAR NAME="repeatable" --></p>
+		<p><label>Obligatorio</label><!-- TMPL_VAR NAME="mandatory" --></p>
+		<p><label>Valor autorizado</label><!-- TMPL_VAR NAME="authorised_value" --> (si selecciona un valor aqu&iacute;, los indicadores ser&aacute;n limitados a la lista de valores autorizados)</p>
+		<p><label>&nbsp;</label><input type="button" value="ACEPTAR" class="button" onclick="Check(this.form)"></p>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
 
-<TMPL_IF name="delete_confirm">
-<!-------------------------------------------------------------------------------------------------->
-<table border=0 cellspacing=0 cellpadding=2>
-	<tr valign=top bgcolor=#99cc33>
-		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>tag</b></td>
-		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b><TMPL_VAR name="searchfield"></b></td>
+<!-- TMPL_IF NAME="delete_confirm" -->
+<!-- ------------------------------------------------------------------------ -->
+<table>
+	<tr>
+		<td>etiqueta</td>
+		<td><!-- TMPL_VAR NAME="searchfield" --></td>
 	</tr>
-	<tr><td>&nbsp;</td><td><TMPL_VAR name="liblibrarian"></td></tr>
-	<form action='<TMPL_VAR name="script_name">' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=searchfield value='<TMPL_VAR name="searchfield">'>
-	<tr><td colspan=2 align=center>CONFIRM DELETION</td></tr>
-	<tr><td><INPUT type=submit value='YES'></form></td><td><form action='<TMPL_VAR name="script_name">' method=post><input type=submit value=NO></form></td></tr>
-</TMPL_IF>
-
-<TMPL_IF name="delete_confirmed">
-<!-------------------------------------------------------------------------------------------------->
-	data deleted
-	<form action='<TMPL_VAR name="script_name">' method=post>
-	<input type=submit value=OK>
+	<tr><td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+	<tr><td colspan="2" align="center">CONFIRMAR BORRADO</td></tr>
+	<tr><td><input type="submit" value="SI"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO"></form></td></tr>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirmed" -->
+<!-- ------------------------------------------------------------------------ -->
+	Datos borrados
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+	<input type="submit" value="ACEPTAR">
 	</form>
-</TMPL_IF>
-
-<!-------------------------------------------------------------------------------------------------->
-<TMPL_IF name="else">
-<font SIZE=6><em>MARC tag structure admin</em></font>
-<form action='<TMPL_VAR name="script_name">' method=post>
-	<input type=text name=searchfield value="">
-	<input type=reset name=reset value="clr">
-</form>
-<TMPL_VAR name="searchfield">
-<table border=0 cellspacing=0 cellpadding=2>
-<tr valign=top bgcolor=#99cc33>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Tag</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Lib</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Repeatable</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Mandatory</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Authorised<br />value</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif"><b>Subfields</b></td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif">Edit</td>
-	<td background="<TMPL_VAR name="themelang">/images/background-mem.gif">Delete</td>
-<TMPL_LOOP name="loop">
-<tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
-	<td><b><TMPL_VAR name="tagfield"></b></td>
-	<td><TMPL_VAR name="liblibrarian"></td>
-	<td><TMPL_IF name="repeatable">Yes<TMPL_ELSE>No</TMPL_IF></td>
-	<td><TMPL_IF name="mandatory">Yes<TMPL_ELSE>No</TMPL_IF></td>
-	<td><TMPL_VAR name="authorised_value"></td>
-	<td><a href="<TMPL_VAR name="subfield_link">">subfields</a></td>
-	<td><a href="<TMPL_VAR name="edit">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
-	<td><a href="<TMPL_VAR name="delete">"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
-</tr>
-</TMPL_LOOP>
-<form action='<TMPL_VAR name="script_name">' method=post>
-<input type=hidden name=op value=add_form>
-</table>
-	<form action='<TMPL_VAR name="script_name">' method=post>
-	<input type=hidden name=op value=add_form>
-<table width=40%>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="framework_create" -->
+<!-- ------------------------------------------------------------------------ -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="framework_create_confirm">
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+		Create framework for <!-- TMPL_VAR NAME="frameworkcode" --> (<!-- TMPL_VAR NAME="frameworktext" -->) using
+		<select name="existingframeworkcode">
+			<option value="">Predeterminado</option>
+		<!-- TMPL_LOOP NAME="existingframeworkloop" -->
+			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
+		<!-- /TMPL_LOOP -->
+		</select>
+		<input type="submit" value="ACEPTAR" class="button">
+	</form>
+<!-- /TMPL_IF -->
+<!-- ------------------------------------------------------------------------ -->
+<!-- TMPL_IF NAME="else" -->
+	<div id="bloc25">
+	<h2 class="parameters">Select a framework</h2>
+	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<select name="frameworkcode">
+			<option value="">Predeterminado</option>
+		<!-- TMPL_LOOP NAME="frameworkloop" -->
+                    <!-- TMPL_IF NAME="selected" -->
+			<option value="<!-- TMPL_VAR NAME="value" -->" selected>
+                    <!-- TMPL_ELSE -->
+			<option value="<!-- TMPL_VAR NAME="value" -->" >
+                    <!-- /TMPL_IF -->
+			<!-- TMPL_VAR NAME="frameworktext" --></option>
+		<!-- /TMPL_LOOP -->
+		</select>
+		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+		<input type="submit" value="ACEPTAR" class="button">
+		<p><!-- TMPL_IF Name="select_display"-->
+				<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" checked OnChange="javascript:document.f.submit()">
+			<!-- TMPL_ELSE -->
+				<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" OnChange="javascript:document.f.submit()">
+			<!--/TMPL_IF --> 
+		</p>
+	</form>
+	<b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
+	</div>
+	<div id="bloc100">
+	<table>
+		<tr>
+			<th>Etiqueta</th>
+			<th>Lib</th>
+			<th>Repetible</th>
+			<th>Obligatorio</th>
+			<th>Autorizado<br />valor</th>
+			<th>Subcampos</th>
+			<th>Editar</th>
+			<th>Borrar</th>
 	<tr>
-		<td width="33%">
-			<input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" title="Add tag" ALT="Add" BORDER=0 >
+	<!-- TMPL_IF NAME="select_display" -->
+		<!-- TMPL_LOOP NAME="loop" -->
+		<tr class="hilighted">
+			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+			<td><!-- TMPL_IF NAME="repeatable" -->Si<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="mandatory" -->Si<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subcampos</a></td>
+			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
+			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
+		</tr>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
+			<td>
+				&nbsp;
 		</td>
-		<td width=33%><TMPL_IF name="previous"><TMPL_VAR name="previous"><input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/1leftarrow.png" title="previous" ALT="previous" BORDER=0 ></a></TMPL_IF></td>
-		<td width=33%><TMPL_IF name="next"><TMPL_VAR name="next"><input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/1rightarrow.png" title="next" ALT="next" BORDER=0></a></TMPL_IF></td>
+			<td colspan=7 border=0>
+				<!-- TMPL_LOOP NAME="subfields" -->
+					<p><label>&nbsp;</label>
+							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->  <!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
+					</p>
+				<!-- /TMPL_LOOP -->
+			</td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	<!-- TMPL_ELSE -->
+		<!-- TMPL_LOOP NAME="loop" -->
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
+			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+			<td><!-- TMPL_IF NAME="repeatable" -->Si<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="mandatory" -->Si<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subcampos</a></td>
+			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
+			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
 	</tr>
-</table>
+		<!-- /TMPL_LOOP -->
+	<!--/TMPL_IF -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form">
+	</table>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="add_form">
+	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+		<input type="submit" class="button" value="A&ntilde;adir Etiqueta" title="A&ntilde;adir Etiqueta" alt="A&ntilde;adir Etiqueta">
+		<!-- TMPL_IF NAME="isprevpage" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
+			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="anterior" alt="anterior" border="0">
+			</a>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="nextpage" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
+				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="Siguiente" alt="Siguiente" border="0">
+			</a>
+		<!-- /TMPL_IF -->
 </form>
-</TMPL_IF>
+</div>
+<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+</div>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/printers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/printers.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/parameters/printers.tmpl	3 Jun 2003 21:44:42 -0000	1.1
+++ es/parameters/printers.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,7 +1,10 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<TMPL_IF NAME=add_form>
-        <script>
+<div id="mainbloc">
+		<h1>Administraci&oacute;n de Impresora</h1>
+	<!-- TMPL_IF NAME="add_form" -->
+			<script language="javascript" type="text/javascript">
+		function _(s) { return s } // dummy function for gettext
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         function isNotNull(f,noalert) {
                 if (f.value.length ==0) {
@@ -39,166 +42,140 @@
                 var _alertString="";
                 var alertString2;
                 if (f.printername.value.length==0) {
-                        _alertString += "- printer name missing\\n";
+							_alertString += "\n- " + _("Falta el nombre de la impresora");
                 }
                 if (f.printqueue.value.length==0) {
-                        _alertString += "- Queue missing\\n";
+							_alertString += "\n- " + _("Falta Cola");
                 }
                 if (_alertString.length==0) {
                         document.Aform.submit();
                 } else {
-                        alertString2 = "Form not submitted because of the following problem(s)\\n";
-                        alertString2 += "------------------------------------------------------------------------------------\\n\\n";
+							alertString2  = _("El Formulario no fue procesado debido a los siguientes problemas");
+							alertString2 += "\n------------------------------------------------------------------------------------\n";
                         alertString2 += _alertString;
                         alert(alertString2);
                 }
         }
-        </SCRIPT>
+			</script>
+	<div id="bloc25">
+		<!-- TMPL_IF NAME="searchfield" -->
+			<h2 class="parameters">Modificar Impresora</h2>
+		<!-- TMPL_ELSE -->
+			<h2 class="parameters">A&ntilde;adir Impresora</h2>
+		<!-- /TMPL_IF -->
 
-	<TMPL_IF NAME=searchfield>
-		<h1>Modify printer</h1>
-	<TMPL_ELSE>
-		<h1>Add printer</h1>
-	</TMPL_IF>
-
-        <form action='<TMPL_VAR NAME=script_name>' name=Aform method=post>
-        <input type=hidden name=op value='add_validate'>
-        
-
-	<table>
-
-	<TMPL_IF NAME=searchfield>
-		<tr>
-			<td>Printer Name</td>
-			<td>
-				<input type=hidden name=printername value='<TMPL_VAR NAME=searchfield>'><TMPL_VAR NAME=searchfield>
-			</td>
-		</tr>
-	<TMPL_ELSE>
-		<tr>
-			<td>Printer Name</td>
-			<td>
-				<input type=text name=printername size=50 maxlength=50>
-			</td>
-		</tr>
-	</TMPL_IF>
-
-        	<tr>
-			<td>Queue</td>
-			<td><input type=text name=printqueue size=50 maxlength=50 value='<TMPL_VAR NAME=printqueue>'> </td>
-		</tr>
-        	<tr>
-			<td>Type</td>
-			<td><input type=text name=printtype size=50 maxlength=50 value='<TMPL_VAR NAME=printtype>'> </td>
-		</tr>
-        	<tr>
-			<td> </td>
-			<td><INPUT type=button value='OK' onClick='Check(this.form)'></td>
-		</tr>
-        </table>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+				<input type="hidden" name="op" value="add_validate">
+				<!-- TMPL_IF NAME="searchfield" -->
+						<p><label>Nombre de Impresora</label><input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" --></p>
+				<!-- TMPL_ELSE -->
+						<p><label>Nombre de Impresora</label><input type="text" name="printername" size="50" maxlength="50"></p>
+				<!-- /TMPL_IF -->
+				<p><label>Cola</label><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->"> </p>
+				<p><label>Tipo</label><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->"> </p>
+				<p><input type="button" value="ACEPTAR" onclick="Check(this.form)" class="button"></p>
         </form>
+	</div>
+	<!-- /TMPL_IF -->
 
-</TMPL_IF>
-
-<TMPL_IF NAME=add_validate>
-	data recorded
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
-        <input type=submit value=OK>
+	<!-- TMPL_IF NAME="add_validate" -->
+		Datos guardados
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="ACEPTAR" class="button">
         </form>
-</TMPL_IF>
+	<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirm>
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr bgcolor='#99cc33'>
-			<td background='/images/background-mem.gif'><b>Printer</b></td>
-			<td background='/images/background-mem.gif'><b><TMPL_VAR NAME=searchfield></b></td>
+	<!-- TMPL_IF NAME="delete_confirm" -->
+		<table border="0" cellspacing="0" cellpadding="5">
+			<tr bgcolor="#99cc33">
+				<td background="/images/background-mem.gif"><b>Impresora</b></td>
+				<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
 		</tr>
 
-        	<form action='<TMPL_VAR NAME=script_name>' method=post>
-			<input type=hidden name=op value=delete_confirmed>
-			<input type=hidden name=searchfield value='<TMPL_VAR NAME=searchfield>'>
+				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="op" value="delete_confirmed">
+				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
         
 		<tr>
-			<td>Queue</td>
-			<td><TMPL_VAR NAME=printqueue></td>
+				<td>Cola</td>
+				<td><!-- TMPL_VAR NAME="printqueue" --></td>
 		</tr>
         	<tr>
-			<td>Type</td>
-			<td><TMPL_VAR NAME=printtype></td>
+				<td>Tipo</td>
+				<td><!-- TMPL_VAR NAME="printtype" --></td>
 		</tr>
         	<tr>
-			<td colspan=2 align=center>CONFIRM DELETION</td>
+				<td colspan="2" align="center">CONFIRMAR BORRADO</td>
 		</tr>
         	<tr>
 			<td>
-				<input type=submit value=YES>
+					<input type="submit" value="SI">
 				</form>
 			</td>
 			<td>
-				<form action='<TMPL_VAR NAME=script_name>' method=post>
-				<input type=submit value=NO>
+					<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="submit" value="NO">
 				</form>
 			</td>
 		</tr>
 	</table>
-</TMPL_IF>
+	<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=delete_confirmed>
-	data deleted
-	<form action='<TMPL_VAR NAME=script_name>' method=post>
-		<input type=submit value=OK>
-	</form>
-</TMPL_IF>
-
-<TMPL_IF NAME=else>
-	<h2>Printer admin</h2>
-        <form action='<TMP_VAR NAME=script_name>' method=post>
-                <input type=text name=description value=<TMPL_VAR NAME=searchfield>>
-                <input type=reset name=reset value="clr">
-        </form>
-
-	<TMPL_IF NAME=searchfield>
-		You searched for <b><TMPL_VAR NAME=searchfield></b>
-	</TMPL_IF>
-
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr bgcolor='#99cc33'>
-			<td background='/images/background-mem.gif'><b>Name</b></td>
-			<td background='/images/background-mem.gif'><b>Queue</b></td>
-			<td background='/images/background-mem.gif'><b>Type</b></td>
-			<td background='/images/background-mem.gif'> </td>
-			<td background='/images/background-mem.gif'> </td>
-		</tr>
-		<TMPL_LOOP NAME=loop>
-		<tr bgcolor="<TMPL_VAR NAME=toggle>">
-			<td><TMPL_VAR NAME=printername></td>
-			<td><TMPL_VAR NAME=printqueue></td>
-			<td><TMPL_VAR NAME=printtype></td>
-			<td><a href="<TMPL_VAR NAME=script_name>?op=add_form&searchfield=<TMPL_VAR NAME=printername>">Edit</a></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=delete_confirm&searchfield=<TMPL_VAR NAME=printername>">Delete</a></td>
+	<!-- TMPL_IF NAME="delete_confirmed" -->
+		Datos borrados
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="ACEPTAR">
+		</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="else" -->
+			<form action="<!-- TMPL_VAR NAME="script_name">" method="post">
+					<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+					<input type="reset" name="reset" value="Borrar">
+			</form>
+	
+		<!-- TMPL_IF NAME="searchfield" -->
+			Usted busc&oacute; <b><!-- TMPL_VAR NAME="searchfield" --></b>
+		<!-- /TMPL_IF -->
+	
+		<table border="0" cellspacing="0" cellpadding="5">
+			<tr bgcolor="#99cc33">
+				<td background="/images/background-mem.gif"><b>Nombre</b></td>
+				<td background="/images/background-mem.gif"><b>Cola</b></td>
+				<td background="/images/background-mem.gif"><b>Tipo</b></td>
+				<td background="/images/background-mem.gif"> </td>
+				<td background="/images/background-mem.gif"> </td>
+			</tr>
+			<!-- TMPL_LOOP NAME="loop" -->
+			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+				<td><!-- TMPL_VAR NAME="printername" --></td>
+				<td><!-- TMPL_VAR NAME="printqueue" --></td>
+				<td><!-- TMPL_VAR NAME="printtype" --></td>
+				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Editar</a></td>
+							<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Borrar</a></td>
 		</tr>
-		</TMPL_LOOP>
+			<!-- /TMPL_LOOP -->
 	</table>
 
-	<form action='<TMPL_VAR NAME=script_name>' method=post>
-        <input type=hidden name=op value=add_form>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_form">
 	
-	<TMPL_IF NAME=offsetgtzero>
-		<a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=prevpage>"><< Prev</a>
-	</TMPL_IF>
+		<!-- TMPL_IF NAME="offsetgtzero" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Anterior</a>
+		<!-- /TMPL_IF -->
 
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
-	<TMPL_IF NAME=ltcount>
-		<a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=nextpage>">Next >></a>	
-	</TMPL_iF>
+		<!-- TMPL_IF NAME="ltcount" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Siguiente &gt;</a>	
+		<!-- /TMPL_iF -->
 
         <br>
-	<input type=image src="/images/button-add-new.gif" WIDTH=188 HEIGHT=44 ALT="Add printers" title="Add" BORDER=0 ></a>
+		<input type="submit" class="button" value="A&ntilde;adir Impresora" alt="A&ntilde;adir Impresora">
 	<br>
         </form>
 
-</TMPL_IF>
-
+	<!-- /TMPL_IF -->
+</div>
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/stopwords.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/stopwords.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/parameters/stopwords.tmpl	3 Jun 2003 21:44:42 -0000	1.1
+++ es/parameters/stopwords.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,7 +1,8 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
-
-<TMPL_IF NAME=add_form>
-        <script>
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="add_form" -->
+		<script language="javascript" type="text/javascript">
+			function _(s) { return s } // dummy function for gettext
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         function isNotNull(f,noalert) {
                 if (f.value.length ==0) {
@@ -39,137 +40,106 @@
                 var _alertString="";
                 var alertString2;
                 if (f.word.value.length==0) {
-                        _alertString += "- word missing\\n";
+							_alertString += "\n- " + _("falta la palabra ");
                 }
                 if (_alertString.length==0) {
                         document.Aform.submit();
                 } else {
-                        alertString2 = "Form not submitted because of the following problem(s)\\n";
-                        alertString2 += "------------------------------------------------------------------------------------\\n\\n";
+							alertString2  = _("El Formulario no fue procesado debido a los siguientes problemas");
+							alertString2 += "\n------------------------------------------------------------------------------------\n";
                         alertString2 += _alertString;
                         alert(alertString2);
                 }
         }
-        </SCRIPT>
-
-        <TMPL_IF NAME=searchfield>
-                <h1>Modify word</h1>
-        <TMPL_ELSE>
-                <h1>Add word</h1>
-        </TMPL_IF>
-
-        <form action="<TMPL_VAR NAME=script_name>" name=Aform method=post>
-        <input type=hidden name=op value='add_validate'>
-         
-        <table>
-        
-        <TMPL_IF NAME=searchfield>
-                <tr>
-                        <td>Word</td>
-                        <td>
-                                <input type=hidden name=word value='<TMPL_VAR NAME=searchfield>'><TMPL_VAR NAME=searchfield>
-                        </td>
-                </tr>
-        <TMPL_ELSE>
-                <tr>
-                        <td>Word</td>
-                        <td>
-                                <input type=text name=word size=80 maxlength=250 onBlur=toUC(this)>
-                        </td>
-                </tr>
-        </TMPL_IF>
-                <tr>
-                        <td> </td>
-                        <td><INPUT type=button value='OK' onClick='Check(this.form)'></td>
-                </tr>
-        </table>
-        </form>
-</TMPL_IF>
-
-<TMPL_IF NAME=add_validate>
-        data recorded
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
-        <input type=submit value=OK>
-        </form>
-</TMPL_IF>
-
-<TMPL_IF NAME=delete_confirm>
-        <table border=0 cellspacing=0 cellpadding=5>
-                <tr bgcolor='#99cc33'>
-                        <td background='/images/background-mem.gif'><b>Word</b></td>
-                        <td background='/images/background-mem.gif'><b><TMPL_VAR NAME=searchfield></b></td>
-                </tr>
+			</script>
 
-                <form action='<TMPL_VAR NAME=script_name>' method=post>
-                        <input type=hidden name=op value=delete_confirmed>
-                        <input type=hidden name=searchfield value='<TMPL_VAR NAME=searchfield>'>
+			<!-- TMPL_IF NAME="searchfield" -->
+					<h1>Modificar Palabra</h1>
+			<!-- TMPL_ELSE -->
+					<h1>A&ntilde;adir palabra</h1>
+			<!-- /TMPL_IF -->
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+			<input type="hidden" name="op" value="add_validate">
+			<!-- TMPL_IF NAME="searchfield" -->
+				<p>
+					<label>Palabra</label>
+					<label>
+						<input type="hidden" name="word" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
+					</label>
+				</p>
+			<!-- TMPL_ELSE -->
+				<p>
+					<label>Palabra</label>
+					<input type="text" name="word" size="80" maxlength="250" onblur="toUC(this)">
+				</p>
+			<!-- /TMPL_IF -->
+					<p>
+						<td><input type="button" value="ACEPTAR" onclick="Check(this.form)" class="button"></td>
+					</p>
+			</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="add_validate" -->
+			Datos guardados
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="ACEPTAR">
+			</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirm" -->
+		<p>CONFIRMAR BORRADO de <!-- TMPL_VAR NAME="searchfield" --></p>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="delete_confirmed">
+			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+			<input type="submit" value="SI" class="button">
+		</form>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="NO" class="button">
+		</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirmed" -->
+			Datos borrados
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="submit" value="ACEPTAR" class="button">
+			</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="else" -->
+		<h1 class="parameters">Administraci&oacute;n de Palabras eliminadas</h1>
+		<b>NOTA : if you change something in this table, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+					<input type="submit" name="ok" value="ACEPTAR" class="button">
+			</form>
+	
+			<!-- TMPL_IF NAME="searchfield" -->
+					Usted busc&oacute; <b><!-- TMPL_VAR NAME="searchfield" --></b>
+			<!-- /TMPL_IF -->
 
+			<table class="small">
                 <tr>
-                        <td colspan=2 align=center>CONFIRM DELETION</td>
-                </tr>
-                <tr>
-                        <td>
-                                <input type=submit value='YES'>
-                                </form>
-                        </td>
-                        <td>
-                                <form action='<TMPL_VAR NAME=script_name>' method=post>
-                                        <input type=submit value=NO>
-                                </form>
-                        </td>
-                </tr>
-	</table>
-</TMPL_IF>
-
-<TMPL_IF NAME=delete_confirmed>
-        data deleted
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
-                <input type=submit value=OK>
-        </form>
-</TMPL_IF>
-
-<TMPL_IF NAME=else>
-        <h2>Stopwords admin</h2>
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
-                <input type=text name=description value=<TMPL_VAR NAME=searchfield>>
-                <input type=reset name=reset value="clr">
-        </form>
-
-        <TMPL_IF NAME=searchfield>
-                You searched for <b><TMPL_VAR NAME=searchfield></b>
-        </TMPL_IF>
-
-        <table border=0 cellspacing=0 cellpadding=5>
-                <tr bgcolor='#99cc33'>
-                        <td background='/images/background-mem.gif'><b>Word</b></td>
-                        <td background='/images/background-mem.gif'> </td>
+					<th>Palabra</th>
+					<th> </th>
                 </tr>
-                <TMPL_LOOP NAME=loop>
-                <tr bgcolor="<TMPL_VAR NAME=toggle>">
-                        <td><TMPL_VAR NAME=word></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=delete_confirm&searchfield=<TMPL_VAR NAME=word>">Delete</a></td>
+				<!-- TMPL_LOOP NAME="loop" -->
+					<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+						<td><!-- TMPL_VAR NAME="word" --></td>
+						<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="word" -->" class="button">Borrar</a></td>
                 </tr>
-                </TMPL_LOOP>
+				<!-- /TMPL_LOOP -->
         </table>
-
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
-        <input type=hidden name=op value=add_form>
-
-        <TMPL_IF NAME=offsetgtzero>
-                <a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=prevpage>"><< Prev</a>
-        </TMPL_IF>
-
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-
-        <TMPL_IF NAME=ltcount>
-                <a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=nextpage>">Next >></a>
-        </TMPL_iF>
-
-        <br>
-        <input type=image src="/images/button-add-new.gif" WIDTH=188 HEIGHT=44 ALT="Add Word" title="Add" BORDER=0 ></a>
-        <br>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="op" value="add_form">
+				<!-- TMPL_IF NAME="offsetgtzero" -->
+						<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->" class="button">&lt;&lt; Anterior</a>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="ltcount" -->
+					<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->" class="button">Siguiente &gt;</a>
+				<!-- /TMPL_iF -->
+				<input type="submit" class="button" value="A&ntilde;adir una Palabra eliminada" alt="A&ntilde;adir una Palabra eliminada">
         </form>
-</TMPL_IF>
-
+	<!-- /TMPL_IF -->
+</div>
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/systempreferences.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/systempreferences.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.12.1
diff -u -b -r1.3 -r1.3.12.1
--- es/parameters/systempreferences.tmpl	16 Jul 2003 06:06:24 -0000	1.3
+++ es/parameters/systempreferences.tmpl	7 May 2007 13:55:50 -0000	1.3.12.1
@@ -1,20 +1,21 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
-
-<script>
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+<div id="mainbloc">
+	<script language="JavaScript" type="text/javascript">
+		function _(s) { return s } // dummy function for gettext
+		//
 	function isNotNull(f,noalert) {
 		if (f.value.length ==0) {
    return false;
 		}
 		return true;
 	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		//
 	function toUC(f) {
 		var x=f.value.toUpperCase();
 		f.value=x;
 		return true;
 	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		//
 	function isNum(v,maybenull) {
 	var n = new Number(v.value);
 	if (isNaN(n)) {
@@ -25,125 +26,236 @@
 	}
 	return true;
 	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		//
 	function isDate(f) {
 		var t = Date.parse(f.value);
 		if (isNaN(t)) {
 			return false;
 		}
 	}
-	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		//
 	function Check(f) {
 		var ok=1;
 		var _alertString="";
 		var alertString2;
 		if (f.variable.value.length==0) {
-			_alertString += "- variable missing\n";
+				_alertString += "\n- " + _("falta la variable ");
 		}
 		if (f.value.value.length==0) {
-			_alertString += "- value missing\n";
+				_alertString += "\n- " + _("falta el valor ");
 		}
 		if (_alertString.length==0) {
 			document.Aform.submit();
 		} else {
-			alertString2 = "Form not submitted because of the following problem(s)\n";
-			alertString2 += "------------------------------------------------------------------------------------\n\n";
+				alertString2  = _("El Formulario no fue procesado debido a los siguientes problemas");
+				alertString2 += "\n------------------------------------------------------------------------------------\n";
 			alertString2 += _alertString;
 			alert(alertString2);
 		}
 	}
-	</SCRIPT>
+		</script>
 
-<TMPL_IF name="add_form">
-<!-------------------------------------------------------------------------------------------------->
-	<TMPL_IF NAME=modify>
-		<h1>Modify a system preference</h1>
-	<TMPL_ELSE>
-		<H1>Add a system preference</H1>
-	</TMPL_IF>
-	<form action='<TMPL_VAR name="script_name">' name=Aform method=post>
-	<input type=hidden name=op value='add_validate'>
-	<table>
-	<TMPL_IF NAME=searchfield>
-		<tr><td>Variable</td><td><TMPL_VAR name="searchfield"><input type=hidden name=variable value='<TMPL_VAR NAME=searchfield>'></td></tr>
-	<TMPL_ELSE>
-		<tr><td>Variable</td><td><input type=text name=variable></td></tr>
-	</TMPL_IF>
-	<tr><td>Value</td><td><input type=text name=value value='<TMPL_VAR name="value" escape=HTML>'></td></tr>
-	<tr><td>Explanation</td><td><input type=text name=explanation size=80 value='<TMPL_VAR name="explanation" escape=HTML>'></td></tr>
-	<tr><td>&nbsp;</td><td><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
-	</table>
+	<!-- TMPL_IF NAME="add_form" -->
+	
+		<!-- TMPL_IF NAME="modify" -->
+			<h1>Modificar preferencias del sistema</h1>
+		<!-- TMPL_ELSE -->
+			<h1>A&ntilde;adir una preferencia del sistema</h1>
+		<!-- /TMPL_IF -->
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		<div id="bloc25">
+			<h2 class="parameters"><input type="text" name="explanation" size="60" value="<!-- TMPL_VAR NAME="explanation" escape="HTML" -->"></h2>
+			<input type="hidden" name="op" value="add_validate">
+			<p>
+			<!-- TMPL_IF NAME="searchfield" -->
+				<label>Variable</label><!-- TMPL_VAR NAME="searchfield" --><input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->">
+			<!-- TMPL_ELSE -->
+				<label>Variable</label><input type="text" name="variable" size="60">
+			<!-- /TMPL_IF -->
+			</p>
+			<p><label>Valor</label>
+				<!-- TMPL_IF NAME="type-free" -->
+					<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" escape="HTML" -->" size="<!-- TMPL_VAR NAME="fieldlength" -->">
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="type-textarea" -->
+					<textarea name="value" rows="<!--TMPL_VAR NAME="rows" -->" cols="<!-- TMPL_VAR NAME="cols" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="type-choice" -->
+					<select name="value">
+						<!-- TMPL_LOOP NAME="options" -->
+							<option value="<!-- TMPL_VAR NAME="option" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="option" --></option>
+						<!-- /TMPL_LOOP -->
+					</select>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="type-yesno" -->
+					<input type="radio" name="value" value="1"<!-- TMPL_IF NAME="value-yes" --> checked<!-- /TMPL_IF -->>Si <input type="radio" name="value" value="0"<!-- TMPL_IF NAME="value-no" --> checked<!-- /TMPL_IF -->>No
+				<!-- /TMPL_IF -->
+	
+			</p>
+			<p><label>&nbsp;</label><input type="submit" value="ACEPTAR" class="button"></p>
+		</div>
+		<div id="bloc25">
+			<h2 class="parameters">Dato interno de Koha (No deber&iacute;a tener razones para cambiar los valores predeterminados)</h2>
+			<p>Tipo de variable: <input type="text" name="preftype" value="<!--TMPL_VAR NAME="preftype" -->" size="40" maxlength="40"> (Choice,YesNo,Integer,Textarea,Float,Themes,Languages)</p>
+			Opciones variables : <input type="text" name="prefoptions" value="<!-- TMPL_VAR NAME="prefoptions" -->" size="80" maxlength="80"> (lista selecta para Choice (separado por |) y columnas|filas para Texarea)
+		</div>
 	</form>
-</TMPL_IF>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="add_validate" -->
 
-<TMPL_IF name="add_validate">
-<!-------------------------------------------------------------------------------------------------->
-	Data recorded
-	<form action='<TMPL_VAR name="script_name">' method=post>
-	<input type=submit value=OK>
+		Datos guardados
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="submit" value="ACEPTAR">
 	</form>
-</TMPL_IF>
+	<!-- /TMPL_IF -->
 
-<TMPL_IF name="delete_confirm">
-<!-------------------------------------------------------------------------------------------------->
-<table border=0 cellspacing=0 cellpadding=2>
-	<tr valign=top bgcolor=#99cc33>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Variable</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b><TMPL_VAR name="searchfield"></b></td>
+	<!-- TMPL_IF NAME="delete_confirm" -->
+	
+	<table border="0" cellspacing="0" cellpadding="2">
+		<tr valign="top" bgcolor="#99cc33">
+			<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Variable</b></td>
+			<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
 	</tr>
-	<tr><td>Value</td><td><TMPL_VAR name="Tvalue"></td></tr>
-	<form action='<TMPL_VAR name="script_name">' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=searchfield value='<TMPL_VAR name="searchfield">'>
-	<tr><td colspan=2 align=center>CONFIRM DELETION</td></tr>
-	<tr><td><INPUT type=submit value='YES'></form></td><td><form action='$script_name' method=post><input type=submit value=NO></form></td></tr>
-</table>
-
-</TMPL_IF>
-
-<TMPL_IF name="delete_confirmed">
-<!-------------------------------------------------------------------------------------------------->
-	Data deleted
-	<form action='<TMPL_VAR name="script_name">' method=post>
-	<input type=submit value=OK>
+		<tr><td>Valor</td><td><!-- TMPL_VAR NAME="Tvalue" --></td></tr>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+		<tr><td colspan="2" align="center">CONFIRMAR BORRADO</td></tr>
+		<tr><td><input type="submit" value="SI"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO"></form></td></tr>
+	</table>
+	
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirmed" -->
+	
+		Datos borrados
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="submit" value="ACEPTAR">
 	</form>
-</TMPL_IF>
+	<!-- /TMPL_IF -->
 
-<!-------------------------------------------------------------------------------------------------->
-<TMPL_IF name="else">
-<h1>System preferences admin</h1>
-<form action=/cgi-bin/koha/admin/systempreferences.pl method=post>
-	<input type=text name=searchfield value="">
-	<input type=reset name=reset value="clr">
-</form>
-<TMPL_VAR name="searchfield">
-<table border=0 cellspacing=0 cellpadding=2>
-<tr valign=top bgcolor=#99cc33>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Variable</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Value</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Explanation</b></td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">&nbsp;</td>
-	<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">&nbsp;</td>
-<TMPL_LOOP name="loop">
-</tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
-	<td><TMPL_VAR name="variable"></td>
-	<td><TMPL_VAR name="value"></td>
-	<td><TMPL_VAR name="explanation"></td>
-	<td><a href="<TMPL_VAR name="edit">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
-	<td><a href="<TMPL_VAR name="delete">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
-</tr>
-</TMPL_LOOP>
-<form action='<TMPL_VAR name="script_name">' method=post>
-<input type=hidden name=op value=add_form>
-</table>
-<table width=40%>
+	<!-- TMPL_IF NAME="else" -->
+	<h1>Administraci&oacute;n de Preferencias del Sistema</h1>
+	<table>
+		<tr>
+			<td>
+				<!--TMPL_IF Name="Admin"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin" class="button">Administraci&oacute;n
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Administraci&oacute;n
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="Acquisitions"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions" class="button">Adquisiciones
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Adquisiciones
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="Authorities"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities" class="button">Autoridades
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Autoridades
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="Librarian"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet" class="button">Intranet
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet">Intranet
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="Catalogue"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="button">Cat&aacute;logo
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Cat&aacute;logo
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="Circulation"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation" class="button">Circulaci&oacute;n
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulaci&oacute;n
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="Members"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="button">Usuarios
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Usuarios
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="OPAC"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC" class="button">OPAC
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="Others"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=" class="button">Otros
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Otros
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+		</tr>
+	</table>
+	<table>
+	<!-- TMPL_LOOP NAME="loop" -->
+		<!-- TMPL_IF NAME="toggle" -->
+			<tr valign="top" class="hilighted">
+		<!-- TMPL_ELSE -->
+			<tr valign="top">
+		<!-- /TMPL_IF -->
+		<td>
+			<p><b><!-- TMPL_VAR NAME="variable" -->:</b> <!-- TMPL_VAR NAME="value" --></p>
+			<p align="right"><i>(<!-- TMPL_VAR NAME="explanation" -->)</i></p>
+		</td>
+		<td>
+			<p><a href="<!-- TMPL_VAR NAME="edit" -->" class="button parameters">Modificar</a></p>
+		</td>
+		<td>
+			<p><a href="<!-- TMPL_VAR NAME="delete" -->" class="button parameters">Borrar</a></p>
+		</td>
+	</tr>
+	<!-- /TMPL_LOOP -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form">
+	</table>
+	<table width="40%">
 	<tr>
-		<td width=50%><TMPL_VAR name="previous"></td>
-		<td width=50%><TMPL_VAR name="next"></td>
+			<td width="50%"><!-- TMPL_VAR NAME="previous" --></td>
+			<td width="50%"><!-- TMPL_VAR NAME="next" --></td>
 	</tr>
-</table>
-<br><input type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/filenew.png" title="Add system parameter" ALT="Add" BORDER=0 ><br>
-</form>
+	</table>
+	</form>
 
-</TMPL_IF>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="add_form">
+		<input type="submit" class="button" value="A&ntilde;adir una Preferencia del Sistema">
+	</form>
 
+	<!-- /TMPL_IF -->
+</div>
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/thesaurus.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/thesaurus.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/parameters/thesaurus.tmpl	3 Jun 2003 21:41:18 -0000	1.2
+++ es/parameters/thesaurus.tmpl	7 May 2007 13:55:50 -0000	1.2.12.1
@@ -1,145 +1,151 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
-
-<TMPL_IF name="detail_form">
-	<!-------------------------------------------------------------------------------------------------->
-	<font SIZE=6><em>Thesaurus management</em></font><br />
-	<table border=0 cellspacing=0 cellpadding=2>
-	<tr valign=top bgcolor=#99cc33>
-		<td  background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Values related to <TMPL_VAR name="stdlib"> (<TMPL_VAR name="category">)</b></td>
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+<div id="mainbloc">
+<!-- TMPL_IF NAME="detail_form" -->
+	<!-- ---------------------------------------------------------------- -->
+	<font size="6"><em>Administraci&oacute;n de Tesauro</em></font><br />
+	<table border="0" cellspacing="0" cellpadding="2">
+	<tr valign="top" bgcolor="#99cc33">
+		<td  background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Valores relacionados con <!-- TMPL_VAR NAME="stdlib" --> (<!-- TMPL_VAR NAME="category" -->)</b></td>
 	</tr>
 	</table>
 	<br/><br/>
-	<table border=0 cellspacing=0 cellpadding=2>
-	<tr valign=top bgcolor=#99cc33>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Other forms</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">&nbsp;</td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif">&nbsp;</td>
-	<TMPL_LOOP name="loop">
-	</tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
-		<td><TMPL_VAR name="freelib"></td>
-		<td><a href="<TMPL_VAR name="edit">">Edit</a></td>
-		<td><a href="<TMPL_VAR name="delete">">Delete</a></td>
-	</tr>
-	</TMPL_LOOP>
-	<form action='<TMPL_VAR name="script_name">' method=post>
-	<input type=hidden name=op value=add_form>
+	<table border="0" cellspacing="0" cellpadding="2">
+	<tr valign="top" bgcolor="#99cc33">
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Otras formas</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">&nbsp;</td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">&nbsp;</td>
+	<!-- TMPL_LOOP NAME="loop" -->
+	</tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
+		<td><!-- TMPL_VAR NAME="freelib" --></td>
+		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Editar</a></td>
+		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Borrar</a></td>
+	</tr>
+	<!-- /TMPL_LOOP -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form">
 	</table>
-	<form action='<TMPL_VAR name="script_name">' method=post>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 	<input type="hidden" name="op" value="add_form">
-	<input type="hidden" name="category" value="<TMPL_VAR name="category">">
-	<input type="hidden" name="stdlib" value="<TMPL_VAR name="stdlib">">
-	<br><input type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/filenew.png" title="Add thesaurus entry" ALT="Add" BORDER=0 ><br>
+	<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
+	<input type="hidden" name="stdlib" value="<!-- TMPL_VAR NAME="stdlib" -->">
+	<br><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" title="A&ntilde;adir entrada de tesauro" alt="A&ntilde;adir" border="0"><br>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_IF name="add_form">
-<!-------------------------------------------------------------------------------------------------->
-	<H1><TMPL_VAR name="action"></H1>
-	<form action='<TMPL_VAR name="script_name">' name=Aform method=post>
-	<input type=hidden name=op value='add_validate'>
-	<table cellpadding=3 cellspacing=3>
+<!-- TMPL_IF NAME="add_form" -->
+<!-- ------------------------------------------------------------------------ -->
+<h1><!-- TMPL_IF NAME="search_category" -->Modificar<!-- TMPL_ELSE -->A&ntilde;adir<!-- /TMPL_IF --></h1>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+	<!-- TMPL_IF NAME="search_category" -->
+		<input type="hidden" name="op" value="mod_validate">
+	<!-- TMPL_ELSE -->
+		<input type="hidden" name="op" value="add_validate">
+	<!-- /TMPL_IF -->
+	<table cellpadding="3" cellspacing="3">
 	<tr>
-		<td>Category</td>
-		<td><TMPL_VAR name="category"></td>
+		<td>Categor&iacute;a</td>
+		<td><!-- TMPL_VAR NAME="category" --></td>
 	</tr>
 	<tr>
-		<td>Authority lib</td>
-		<td><TMPL_VAR name="father"><input type="text" name="stdlib" value="<TMPL_VAR name="stdlib">" maxlength="80" size="80"></td>
+		<td>Autorizar lib</td>
+		<!-- TMPL_IF NAME="id" -->
+			<td><!-- TMPL_VAR NAME="father" --><!-- TMPL_VAR NAME="stdlib" --><input type="hidden" name="stdlib" value="<!-- TMPL_VAR NAME="stdlib" -->" ></td>
+		<!-- TMPL_ELSE -->
+			<td><!-- TMPL_VAR NAME="father" --><input type="text" name="stdlib" value="<!-- TMPL_VAR NAME="stdlib" escape=HTML -->" maxlength="80" size="80"></td>
+		<!-- /TMPL_IF -->
 	</tr>
 	<tr>
-		<td>Other lib</td>
-		<td><TMPL_VAR name="father"><input type="text" name="freelib" value="<TMPL_VAR name="freelib">" maxlength="80" size="80"></td>
+		<td>Otro lib</td>
+		<td><!-- TMPL_VAR NAME="father" --><input type="text" name="freelib" value="<!-- TMPL_VAR NAME="freelib" escape=HTML -->" maxlength="80" size="80"></td>
 	</tr>
 	<tr>
 		<td>&nbsp;</td>
-		<td><input type="hidden" name="id" value="<TMPL_VAR name="id">">
-			<input type="hidden" name="father" value="<TMPL_VAR name="father">">
-			<input type="hidden" name="branch" value="<TMPL_VAR name="branch">">
-			<input type="hidden" name="toponly" value="<TMPL_VAR name="toponly">">
-			<input type="hidden" name="search_category" value="<TMPL_VAR name="search_category">">
-			<input type="hidden" name="searchstring" value="<TMPL_VAR name="searchstring">">
-			<input type="hidden" name="offset" value="<TMPL_VAR name="offset">">
-			<INPUT type="submit" value='OK'></td>
+		<td><input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->">
+			<input type="hidden" name="father" value="<!-- TMPL_VAR NAME="father" escape=HTML -->">
+			<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" escape=HTML -->">
+			<input type="hidden" name="search_category" value="<!-- TMPL_VAR NAME="search_category" -->">
+			<input type="hidden" name="searchstring" value="<!-- TMPL_VAR NAME="searchstring" escape=HTML -->">
+			<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="offset" -->">
+			<input type="submit" value="ACEPTAR"></td>
 	</tr>
 	</table>
 	</form>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
 
-<TMPL_IF name="delete_confirm">
-<!-------------------------------------------------------------------------------------------------->
-	<table border=0 cellspacing=0 cellpadding=2>
-		<tr valign=top bgcolor=#99cc33>
-			<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>lib</b></td>
-			<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b><TMPL_VAR name="search_category"></b></td>
+<!-- TMPL_IF NAME="delete_confirm" -->
+<!-- ------------------------------------------------------------------------ -->
+	<table border="0" cellspacing="0" cellpadding="2">
+		<tr valign="top" bgcolor="#99cc33">
+			<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>lib</b></td>
+			<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR NAME="search_category" --></b></td>
 		</tr>
-		<tr><td>Value</td><td><TMPL_VAR name="Tvalue"></td></tr>
+		<tr><td>Valor</td><td><!-- TMPL_VAR NAME="Tvalue" --></td></tr>
 		<tr><td>
-			<form action='<TMPL_VAR name="script_name">' method=post>
-				<input type=hidden name=op value=delete_confirmed>
-				<input type=hidden name=id value='<TMPL_VAR name="id">'>
-				<input type="hidden" name="search_category" value="<TMPL_VAR name="search_category">">
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="op" value="delete_confirmed">
+				<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->">
+				<input type="hidden" name="search_category" value="<!-- TMPL_VAR NAME="search_category" -->">
 		</tr></td>
-		<tr><td colspan=2 align=center>CONFIRM DELETION of this entry <b>and all entries depending from this one</b></td></tr>
-		<tr><td><INPUT type=submit value='YES'></form></td>
-				<td><form action='<TMPL_VAR name="script_name">' method=post><input type=submit value=NO></form></td></tr>
-	</table>
-</TMPL_IF>
-
-<!-------------------------------------------------------------------------------------------------->
-<TMPL_IF name="else">
-	<font SIZE=6><em>Thesaurus management</em></font>
-	<p>Manages thesaurus and authorities files.<br />
+		<tr><td colspan="2" align="center">CONFIRMAR BORRADO de esta entrada <b>y todas las entradas dependen de &eacute;ste</b></td></tr>
+		<tr><td><input type="submit" value="SI"></form></td>
+				<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO"></form></td></tr>
+	</table>
+<!-- /TMPL_IF -->
+
+<!-- ------------------------------------------------------------------------ -->
+<!-- TMPL_IF NAME="else" -->
+	<h1>Administraci&oacute;n de Tesauro</h1>
+	<p>Administra los archivos de tesauro y autoridades.<br />
 	<ul>
-		<b>Dig</b> : see datas depending from this one<br />
-		<b>Related</b> : see other forms of this authority entry</p>
+		<b>Dig</b>: ver datos dependientes de este<br />
+		<b>Relacionado</b>: vea otras formas para esta entrada de autoridad</p>
 	</ul>
-	<form action='<TMPL_VAR name="script_name">' method=post>
-	<input type="hidden" name="op" value="add_form">
-	<input type="hidden" name="category" value="<TMPL_VAR name="category">">
-	<input type="hidden" name="branch" value="<TMPL_VAR name="branch">">
-	<input type="hidden" name="father" value="<TMPL_VAR name="father">">
-	<br><input type=image src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/filenew.png" title="Add thesaurus entry" ALT="Add" BORDER=0 ><br>
-	</form>
 	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="post">
-		<TMPL_VAR name="tab_list">
-		<input type="checkbox" name="toponly" value="1" <TMPL_IF name="toponly">checked</TMPL_IF>>Top hierarchy only
-		<input type="text" name="searchstring" value="<TMPL_VAR name="searchstring">">
-		<input type="submit" value="OK">
-		<a href="thesaurus.pl?op=add_form">New category...</a>
+		<!-- TMPL_VAR NAME="tab_list" -->
+		<input type="text" name="searchstring" value="<!-- TMPL_VAR NAME="searchstring" -->">
+		<input type="submit" value="ACEPTAR" class="button parameters">
+		<a href="thesaurus.pl?op=add_form" class="button parameters">Nueva categor&iacute;a...</a>
 	</form>
-	<TMPL_LOOP name="hierarchy_loop">
-		<a href="thesaurus.pl?branch=<TMPL_VAR name="branch">&search_category=<TMPL_VAR name="category">"><TMPL_VAR name="string"></a><br />
-	</TMPL_LOOP>
-	<table border=0 cellspacing=0 cellpadding=0>
-	<tr valign=top bgcolor=#99cc33>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width="5%">&nbsp;</td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>free form</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif"><b>Authority</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width="5%"><b>Dig</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width="5%"><b>Related</b></td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width="5%">Edit</td>
-		<td background="<TMPL_VAR NAME='themelang'>/images/background-mem.gif" width="5%">Delete</td>
-	<TMPL_LOOP name="loop">
-	</tr valign=top bgcolor='<TMPL_VAR name="bgcolor">'>
+	<!-- TMPL_LOOP NAME="hierarchy_loop" -->
+		<a href="thesaurus.pl?branch=<!-- TMPL_VAR NAME="branch" -->&amp;search_category=<!-- TMPL_VAR NAME="category" -->"><!-- TMPL_VAR NAME="string" --></a><br />
+	<!-- /TMPL_LOOP -->
+	<table border="0" cellspacing="0" cellpadding="0">
+	<tr valign="top" bgcolor="#99cc33">
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" width="5%">&nbsp;</td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Forma Libre</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Autoridad</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" width="5%"><b>Dig</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" width="10%"><b>Relacionado</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" width="5%"><b>Editar</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" width="5%"><b>Borrar</b></td>
+	<!-- TMPL_LOOP NAME="loop" -->
+	</tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
 		<td>&nbsp;</td>
-		<td><TMPL_VAR name="freelib"></td>
-		<td><TMPL_VAR name="father"> <TMPL_VAR name="stdlib"></td>
-		<td><TMPL_VAR name="dig">Dig</a></td>
-		<td><TMPL_VAR name="related">Related</a></td>
-		<td><a href="<TMPL_VAR name="edit">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
-		<td><a href="<TMPL_VAR name="delete">"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
-	</tr>
-	</TMPL_LOOP>
-	<form action='<TMPL_VAR name="script_name">' method=post>
-	<input type=hidden name=op value=add_form>
-	</table>
-	<table width=40%>
-		<tr>
-			<td width=50%><TMPL_VAR name="previous"></td>
-			<td width=50%><TMPL_VAR name="next"></td>
+		<td><!-- TMPL_VAR NAME="freelib" --></td>
+		<td><!-- TMPL_VAR NAME="father" --> <!-- TMPL_VAR NAME="stdlib" --></td>
+		<td><!-- TMPL_VAR NAME="dig" -->Dig</a>&nbsp;&nbsp;</td>
+		<td><!-- TMPL_VAR NAME="related" -->Relacionados</a></td>
+		<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
+		<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
 		</tr>
+	<!-- /TMPL_LOOP -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form">
 	</table>
-</TMPL_IF>
+	<p>
+		<a href="<!-- TMPL_VAR NAME="previous" -->" class="button parameters">Anterior</a> <a href="<!-- TMPL_VAR NAME="next" -->" class="button parameters"> Siguiente</a>
+		</tr>
+	</p>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form">
+	<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
+	<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
+	<input type="hidden" name="father" value="<!-- TMPL_VAR NAME="father" -->">
+	<br><input type="submit" class="button" value="A&ntilde;adir" title="A&ntilde;adir entrada de tesauro" alt="A&ntilde;adir entrada de tesauro"><br>
+	</form>
+
 
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/parameters/z3950servers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/parameters/Attic/z3950servers.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/parameters/z3950servers.tmpl	3 Jun 2003 21:44:42 -0000	1.1
+++ es/parameters/z3950servers.tmpl	7 May 2007 13:55:50 -0000	1.1.12.1
@@ -1,7 +1,8 @@
-<TMPL_INCLUDE NAME="parameters-top.inc">
-
-<TMPL_IF NAME=add_form>
-        <script>
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="add_form" -->
+		<script language="javascript" type="text/javascript">
+			function _(s) { return s } // dummy function for gettext
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         function isNotNull(f,noalert) {
                 if (f.value.length ==0) {
@@ -39,239 +40,205 @@
                 var _alertString="";
                 var alertString2;
                 if (f.searchfield.value.length==0) {
-                        _alertString += "- site name missing\\n";
+							_alertString += "\n- " + _("falta el nombre de sitio");
                 }
                 if (f.host.value.length==0) {
-                        _alertString += "- host missing\\n";
+							_alertString += "\n- " + _("falta host ");
                 }
                 if (f.port.value.length==0) {
-                        _alertString += "- port missing\\n";
+							_alertString += "\n- " + _("falta el puerto");
                 }
                 if (f.db.value.length==0) {
-                        _alertString += "- database missing\\n";
+							_alertString += "\n- " + _("falta base de datos");
                 }
                 if (isNaN(f.port.value)) {
-                        _alertString += "- port must be a number\\n";
+							_alertString += "\n- " + _("el puerto debe ser un n&uacute;mero");
                 }
                 if (isNaN(f.rank.value)) {
-                        _alertString += "- rank must be a number\\n";
+							_alertString += "\n- " + _("la fila debe ser un n&uacute;mero");
                 }
                 if (isNaN(f.checked.value) || f.checked.value<0 || f.checked.value>1) {
-                        _alertString += "- checked must be 0 or 1\\n";
+							_alertString += "\n- " + _("la selecci&oacute;n debe ser 0 o 1");
                 }
                 if (_alertString.length==0) {
                         document.Aform.submit();
                 } else {
-                        alertString2 = "Form not submitted because of the following problem(s)\\n";
-                        alertString2 += "------------------------------------------------------------------------------------\\n\\n";
+							alertString2  = _("El Formulario no fue procesado debido a los siguientes problemas");
+							alertString2 += "\n------------------------------------------------------------------------------------\n";
                         alertString2 += _alertString;
                         alert(alertString2);
                 }
         }
-        </SCRIPT>
+		</script>
+		<!-- TMPL_IF NAME="searchfield" -->
+				<h1>Modificar Servidor Z39.50</h1>
+		<!-- TMPL_ELSE -->
+				<h1>A&ntilde;adir servidor Z39.50</h1>
+		<!-- /TMPL_IF -->
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+			<input type="hidden" name="op" value="add_validate">
+			<!-- TMPL_IF NAME="searchfield" -->
+				<p>
+					<label class="label100">Servidor Z39.50</label>
+					<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
+				</p>
+			<!-- TMPL_ELSE -->
+				<p>
+					<label class="label100">Servidor Z39.50</label>
+					<input type="text" name="searchfield" size="100" maxlength="100" onblur="toUC(this)">
+				</p>
+			<!-- /TMPL_IF -->
+			<p>
+				<label class="label100">Hostname</label>
+				<input type="text" name="host" size="30" value="<!-- TMPL_VAR NAME="host" -->">
+			</p>
+			<p>
+				<label class="label100">Puerto</label>
+				<input type="text" name="port" size="5" value="<!-- TMPL_VAR NAME="port" -->" onblur="isNum(this)">
+			</p>
+			<p>
+				<label class="label100">Base de Datos</label>
+				<input type="text" name="db" value="<!-- TMPL_VAR NAME="db" -->">
+			</p>
+			<p>
+				<label class="label100">ID de usuario</label>
+				<input type="text" name="userid" value="<!-- TMPL_VAR NAME="userid" -->">
+			</p>
+			<p>
+				<label class="label100">Clave</label>
+				<input type="text" name="password" value="<!-- TMPL_VAR NAME="password" -->">
+			</p>
+			<p>
+				<label class="label100">Marcado (buscado por defecto)</label>
+				<input type="text" size="1" name="checked" value="<!-- TMPL_VAR NAME="checked" -->" onblur="isNum(this)">
+			</p>
+			<p>
+				<label class="label100">Orden (Orden de aparici&oacute;n)</label>
+				<input type="text" name="rank" size="4" value="<!-- TMPL_VAR NAME="rank" -->" onblur="isNum(this)">
+			</p>
+			<p>
+				<label class="label100">Sintaxis (z3950 puede enviar registros en varios formatos. Elija uno)</label>
+				<select name="syntax">
+					<option value="MARC21">MARC21</option>
+					<option value="UNIMARC">UNIMARC</option>
+				</select>
+			</p>
+			<input type="button" value="ACEPTAR" onclick="Check(this.form)" class="button">
+		</form>
+	<!-- /TMPL_IF -->
 
-        <TMPL_IF NAME=searchfield>
-                <h1>Modify Z39.50 Server</h1>
-        <TMPL_ELSE>
-                <h1>Add Z39.50 Server</h1>
-        </TMPL_IF>
-        <form action="<TMPL_VAR NAME=script_name>" name=Aform method=post>
-        <input type=hidden name=op value='add_validate'>
+	<!-- TMPL_IF NAME="add_validate" -->
+		Datos guardados
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="ACEPTAR" class="button">
+		</form>
+	<!-- /TMPL_IF -->
                 
+	<!-- TMPL_IF NAME="delete_confirm" -->
+		<!-- TMPL_VAR NAME="reqsel" -->
         <table>
-        
-        <TMPL_IF NAME=searchfield>
-                <tr>
-                        <td>Z39.50 Server</td>
-                        <td>
-                                <input type=hidden name=searchfield value='<TMPL_VAR NAME=searchfield>'><TMPL_VAR NAME=searchfield>
-                        </td>
-                </tr>
-        <TMPL_ELSE>
-                <tr>
-                        <td>Z39.50 Server</td>
-                        <td>
-                                <input type=text name=searchfield size=100 maxlength=100 onBlur=toUC(this)>
-                        </td>
-                </tr>
-        </TMPL_IF>
-
-		<tr>
-			<td>Hostname</td>
-			<td>
-				<input type=text name=host size=30 value='<TMPL_VAR NAME=host>'>
-			</td>
-		</tr>
-		<tr>
-			<td>Port</td>
-			<td>
-				<input type=text name=port size=5 value='<TMPL_VAR NAME=port>' onBlur=isNum(this)>
-			</td>
-		</tr>
-		<tr>
-			<td>Database</td>
-			<td>
-				<input type=text name=db value='<TMPL_VAR NAME=db>'>
-			</td>
-		</tr>
-		<tr>
-			<td>Userid</td>
-			<td>
-				<input type=text name=userid value='<TMPL_VAR NAME=userid>'>
-			</td>
-		</tr>
-		<tr>
-			<td>Password</td>
-			<td>
-				<input type=text name=password value='<TMPL_VAR NAME=password>'>
-			</td>
-		</tr>
 		<tr>
-			<td>Checked (searched by default)</td>
-			<td>
-				<input type=text size=1 name=checked value='<TMPL_VAR NAME=checked>' onBlur=isNum(this)>  
-		<tr>
-			<td>Rank (display order)</td>
-			<td>
-				<input type=text name=rank size=4 value='<TMPL_VAR NAME=rank>' onBlur=isNum(this)>
-			</td>
-		</tr>
-		<tr>
-			<td> </td>
-			<td>
-				<INPUT type=button value='OK' onClick='Check(this.form)'>
-			</td>
+				<th>Sitio</th>
+				<th><!-- TMPL_VAR NAME="searchfield" --></th>
 		</tr>
-        </table>
-        </form>
-</TMPL_IF>
-
-<TMPL_IF NAME=add_validate>
-        data recorded
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
-        <input type=submit value=OK>
-        </form>
-</TMPL_IF>
-
-<TMPL_IF NAME=delete_confirm>
-	<TMPL_VAR NAME=reqsel>
-	
-        <table border=0 cellspacing=0 cellpadding=5>
-                <tr bgcolor='#99cc33'>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'>
-                                <b>Site</b>
-                        </td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'>
-                                <TMPL_VAR NAME=searchfield>
-                        </td>
-                </tr>
-                <form action='<TMPL_VAR NAME=script_name>' method=post>
-                        <input type=hidden name=op value=delete_confirmed>
-                        <input type=hidden name=searchfield value=<TMPL_VAR NAME=searchfield>>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="op" value="delete_confirmed">
+				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
                 <tr>
                         <td>Hostname</td>
-                        <td><TMPL_VAR NAME=host></td>
+				<td><!-- TMPL_VAR NAME="host" --></td>
                 </tr>
                 <tr>
-                        <td>Port</td>
-                        <td><TMPL_VAR NAME=port></td>
+				<td>Puerto</td>
+				<td><!-- TMPL_VAR NAME="port" --></td>
                 </tr>
                 <tr>
-                        <td>Database</td>
-                        <td><TMPL_VAR NAME=db></td>
+				<td>Base de Datos</td>
+				<td><!-- TMPL_VAR NAME="db" --></td>
                 </tr>
                 <tr>
-                        <td>Userid</td>
-                        <td><TMPL_VAR NAME=userid></td>
+				<td>ID de usuario</td>
+				<td><!-- TMPL_VAR NAME="userid" --></td>
                 </tr>
                 <tr>
-                        <td>Password</td>
-                        <td><TMPL_VAR NAME=password></td>
+				<td>Clave</td>
+				<td><!-- TMPL_VAR NAME="password" --></td>
                 </tr>
                 <tr>
-                        <td>Checked</td>
-                        <td><TMPL_VAR NAME=checked></td>
+				<td>Marcado</td>
+				<td><!-- TMPL_VAR NAME="checked" --></td>
                 </tr>
                 <tr>
-                        <td>Rank</td>
-                        <td><TMPL_VAR NAME=rank></td>
+				<td>Orden</td>
+				<td><!-- TMPL_VAR NAME="rank" --></td>
                 </tr>
                 <tr>
-                        <td colspan=2 align=center>CONFIRM DELETION</td>
+				<td colspan="2" align="center">CONFIRMAR BORRADO</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>
+				<td><input type="submit" value="SI"></form></td>
+				<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO"></form></td>
                 </tr>
 	</table>
+	<!-- /TMPL_IF -->
 
-</TMPL_IF>
-
-<TMPL_IF NAME=delete_confirmed>
-        data deleted
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
-                <input type=submit value=OK>
+	<!-- TMPL_IF NAME="delete_confirmed" -->
+			Datos borrados
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="submit" value="ACEPTAR">
         </form>
-</TMPL_IF>
+	<!-- /TMPL_IF -->
 
-<TMPL_IF NAME=else>
-        <h2>Z39.50 Servers admin</h2>
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
-                <input type=text name=description value=<TMPL_VAR NAME=searchfield>>
-                <input type=reset name=reset value="clr">
+	<!-- TMPL_IF NAME="else" -->
+			<h1 class="parameters">Administraci&oacute;n de Servidores Z39.50</h1>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
+				<input type="submit" name="ok" value="ACEPTAR" class="button">
         </form>
-
-        <TMPL_IF NAME=searchfield>
-                You searched for <b><TMPL_VAR NAME=searchfield></b>
-        </TMPL_IF>
-
-        <table border=0 cellspacing=0 cellpadding=5>
-                <tr bgcolor='#99cc33'>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Site</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Hostname</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Port</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Database</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Userid</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Password</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Checked</b></td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'><b>Rank</b></td>       
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'> </td>
-                        <td background='<TMPL_VAR name="themelang">/images/background-mem.gif'> </td>
-                </tr>
-                <TMPL_LOOP NAME=loop>
-                <tr bgcolor="<TMPL_VAR NAME=toggle>">
-                        <td><TMPL_VAR NAME=name></td>
-                        <td><TMPL_VAR NAME=host></td>
-                        <td><TMPL_VAR NAME=port></td>
-                        <td><TMPL_VAR NAME=db></td>
-                        <td><TMPL_VAR NAME=userid></td>
-                        <td><TMPL_VAR NAME=password></td>
-                        <td><TMPL_VAR NAME=checked></td>
-                        <td><TMPL_VAR NAME=rank></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=add_form&searchfield=<TMPL_VAR NAME=name>"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/fileopen.png" ALT="Edit" title="edit" BORDER=0 ></a></td>
-                        <td><a href="<TMPL_VAR NAME=script_name>?op=delete_confirm&searchfield=<TMPL_VAR NAME=name>"><img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/edittrash.png" ALT="Delete" title="delete" BORDER=0 ></a></td>                
+			<!-- TMPL_IF NAME="searchfield" -->
+				Usted busc&oacute; <b><!-- TMPL_VAR NAME="searchfield" --></b>
+			<!-- /TMPL_IF -->
+			<table>
+				<tr>
+					<th>Sitio</th>
+					<th>Hostname</th>
+					<th>Puerto</th>
+					<th>Base de Datos</th>
+					<th>ID de usuario</th>
+					<th>Clave</th>
+					<th>Marcado</th>
+					<th>Orden</th>
+					<th>Sintaxis</th>
+					<th> </td>
+					<th> </td>
+				</tr>
+				<!-- TMPL_LOOP NAME="loop" -->
+				<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
+					<td><!-- TMPL_VAR NAME="name" --></td>
+					<td><!-- TMPL_VAR NAME="host" --></td>
+					<td><!-- TMPL_VAR NAME="port" --></td>
+					<td><!-- TMPL_VAR NAME="db" --></td>
+					<td><!-- TMPL_VAR NAME="userid" --></td>
+					<td><!-- TMPL_VAR NAME="password" --></td>
+					<td><!-- TMPL_VAR NAME="checked" --></td>
+					<td><!-- TMPL_VAR NAME="rank" --></td>
+					<td><!-- TMPL_VAR NAME="syntax" --></td>
+					<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="name" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" alt="Editar" title="editar" border="0"></a></td>
+					<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="name" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" alt="Borrar" title="borrar" border="0"></a></td>
 			</tr>
-                </TMPL_LOOP>
+				<!-- /TMPL_LOOP -->
 	</table>
-
-        <form action='<TMPL_VAR NAME=script_name>' method=post>
-        <input type=hidden name=op value=add_form>
-                        
-        <TMPL_IF NAME=offsetgtzero>
-                <a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=prevpage>"><< Prev</a>
-        </TMPL_IF>
-        
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                
-        <TMPL_IF NAME=ltcount>
-                <a href="<TMPL_VAR NAME=script_name>?offset=<TMPL_VAR NAME=nextpage>">Next >></a>
-        </TMPL_iF>
-                
-        <br>
-        <input type=image src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" ALT="Add z3950 server" title="add" BORDER=0 ></a>
-        <br>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_form">
+			<!-- TMPL_IF NAME="offsetgtzero" -->
+					<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->" class="button">&lt;&lt; Anterior</a>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ltcount" -->
+					<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->" class="button">Siguiente &gt;</a>
+			<!-- /TMPL_iF -->
+			<input type="submit" class="button" alt="A&ntilde;adir servidor Z39.50" value="A&ntilde;adir servidor Z39.50">
         </form>
 
-</TMPL_IF>
-
-<TMPL_INCLUDE NAME="parameters-bottom.inc">
+	<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: es/reports/reports-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/reports/Attic/reports-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/reports/reports-home.tmpl	3 Jun 2003 21:41:18 -0000	1.2
+++ es/reports/reports-home.tmpl	7 May 2007 13:55:51 -0000	1.2.12.1
@@ -1,16 +1,46 @@
-<TMPL_INCLUDE NAME="reports-top.inc">
-<!-------------------------MAIN BODY OF PAGE-------------------------->
-
-<FONT SIZE=6><em>Reportes</em></FONT><br>
-
-
-
-
-<ul><li><a href=/cgi-bin/koha/stats.pl?time=yesterday>Till Reconciliation:</a> Reporte Diario (ayer)
-<li><a href=/cgi-bin/koha/stats.pl?time=today>Till Reconciliation:</a> Reporte Diario (hoy)
-
-
-
-</ul>
-<TMPL_INCLUDE NAME="reports-bottom.inc">
+<!-- TMPL_INCLUDE NAME="reports-top.inc" -->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
+<div id="mainbloc">
+
+
+<h1 class="reports">Informes</h1>
+<div id="bloc25">
+	<h2 class="reports">Estad&iacute;sticas Compuestas</h2>
+	<ul>
+		<li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Adquisiciones</a></li>
+		<li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Usuarios</a></li>
+		<li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Cat&aacute;logo</a></li>
+		<li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulaci&oacute;n</a></li>
+	</ul>
+</div>
+<div id="bloc25">
+	<h2 class="reports">Infomes principales</h2>
+	<ul>
+		<li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Los usuarios con m&aacute;s pr&eacute;stamos</a></li>
+		<li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Los ejemplares m&aacute;s prestados</a></li>
+	</ul>
+	<h2 class="reports">Forasteros</h2>
+	<ul>
+		<li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Usuarios sin pr&eacute;stamos</a></li>
+		<li><a href="/cgi-bin/koha/reports/catalogue_out.pl">El ejemplar no est&aacute; prestado</a></li>
+	</ul>
+</div>
+<div id="bloc25">
+	<h2 class="reports">Otro estado</h2>
+	<p>sobre cat&aacute;logo</p>
+	<ul>
+		<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventario</a></li>
+		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Cat&aacute;logo por tipo de art&iacute;culo</a></li>
+	</ul>
+	<p>sobre pr&eacute;stamos</p>
+	<ul>
+		<li><a href="/cgi-bin/koha/stats.pl?time=yesterday">Till Reconciliation:</a> Informe diario (ayer)</li>
+		<li><a href="/cgi-bin/koha/stats.pl?time=today">Till Reconciliation:</a> Informe diario (hoy)</li>
+		<li><a href="/cgi-bin/koha/overdue.pl">Ejemplares atrasados</a></li>
+		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Pr&eacute;stamos por categor&iacute;a de usuario</a></li>
+		<li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Tiempo de pr&eacute;stamo medio</a></li>
+	</ul>
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->
 

Index: es/search.marc/result.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/search.marc/Attic/result.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/search.marc/result.tmpl	3 Jun 2003 21:56:30 -0000	1.1
+++ es/search.marc/result.tmpl	7 May 2007 13:55:51 -0000	1.1.12.1
@@ -1,35 +1,91 @@
-<TMPL_IF NAME="opac">
-    <TMPL_INCLUDE NAME="opac-top.inc">
-<TMPL_ELSE>
-    <TMPL_INCLUDE NAME="cat-top.inc">
-</TMPL_IF>
-
-<center>
-
-<table border=0 cellspacing=0 cellpadding=2 width="90%">
-<thead>
-	<tr
-	<TMPL_IF NAME="opac">
-			bgcolor=#99cccc background=/images/background-opac.gif
-		<TMPL_ELSE>
-			bgcolor="#ad11ad"
-		</TMPL_IF>
-	>
-	<th>Biblio #</th>
-	<th>Author</th>
-	<th>Title</th>
+<!-- TMPL_IF NAME="opac" -->
+    <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<!-- TMPL_ELSE -->
+    <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<!-- /TMPL_IF -->
+<div id="mainbloc">
+	<h1 class="catalogue">Resultados de la B&uacute;squeda</h1>
+	<div id="resultnumber">
+		<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search">&lt;&lt; Anterior</a><!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search">Siguiente&gt;&gt;</a><!-- /TMPL_IF --></p>
+		<p class="resultcount"><!-- TMPL_IF NAME="total" -->Resultados <!-- TMPL_VAR NAME="from" --> a <!-- TMPL_VAR NAME="to" --> de <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->No se encontraron resultados<!-- /TMPL_IF --></p></div>
+	<div id="resultlist">
+		<table>
+			<tr>
+				<th class="catalogue">Resumen</th>
+				<th class="catalogue">Tipo de art&iacute;culo</th>
+				<th class="catalogue">Cantidad de Ejemplares</th>
+				<th class="catalogue">Ubicaci&oacute;n</th>
+				<th class="catalogue">&nbsp;</th>
 	</tr>
-<tbody>
-	<TMPL_LOOP name="result">
+			<!-- TMPL_LOOP NAME="result" -->
 		<tr>
-			<td><a href="../MARCdetail.pl?bibid=<TMPL_VAR name="bibid">"><TMPL_VAR name="bibid"></a></td>
-			<td><TMPL_VAR name="author"></td>
-			<td><TMPL_VAR name="title"></td>
+				<!-- TMPL_IF NAME="even" -->
+					<td class="hilighted">
+				<!-- TMPL_ELSE -->
+					<td>
+				<!-- /TMPL_IF -->
+							<!-- TMPL_IF name="MARC_ON" -->
+								<a class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!--TMPL_IF Name="title" --><!-- TMPL_VAR NAME="title" --><!--TMPL_ELSE --><em>Sin T&iacute;tulo</em><!--/TMPL_IF--></a> <!-- TMPL_VAR NAME="subtitle" --> 
+							<!-- TMPL_ELSE -->
+								<a class="transparent resultlist" href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="volume" --> vol <!-- TMPL_VAR name="volume" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="volumeddesc" --> : <!-- TMPL_VAR name="volumeddesc" --> <!-- /TMPL_IF -->
+						<!-- TMPL_IF name="number" --> parte: <!-- TMPL_VAR name="number" --><!-- /TMPL_IF -->
+					<p><!-- TMPL_VAR NAME="author" -->
+						<!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
+					</p>
+				</td>
+				<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
+					<p><!-- TMPL_VAR NAME="description" --></p>
+				</td>
+				<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_VAR NAME="totitem" -->
+				</td>
+				<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_LOOP NAME="CN" -->
+						<p>
+							<!-- TMPL_VAR NAME="holdingbranch" -->
+							<!-- TMPL_IF name="date_due" -->
+								Prestado hasta <!-- TMPL_VAR NAME="date_due" -->
+							<!-- TMPL_ELSE -->
+								<!-- TMPL_IF NAME="itemcallnumber" -->
+									(<!-- TMPL_VAR NAME="itemcallnumber" -->)
+                                <!-- TMPL_IF name="cnt" -->
+                                  x <!-- TMPL_VAR name="cnt" -->
+                                <!--/TMPL_IF-->
+								<!-- /TMPL_IF -->
+							<!-- /TMPL_IF -->
+							<!-- TMPL_IF name="notforloan" -->
+								<i>(<!-- TMPL_VAR name="notforloan" -->)</i>
+							<!-- /TMPL_IF -->
+						</p>
+					<!-- /TMPL_LOOP -->
+					<!-- TMPL_IF name="onorder" --><p>Pedido</p><!-- /TMPL_IF -->
+				</td>
+				<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_UNLESS name="norequests" -->
+						<p><a class="button catalogue" href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">Reserva</a></p>
+					<!-- TMPL_ELSE -->
+						<p>No Reservable</p>
+					<!-- /TMPL_UNLESS -->
+				</td>
 		</tr>
-	</TMPL_LOOP>
-</table>
-<TMPL_IF NAME="opac">
-    <TMPL_INCLUDE NAME="opac-bottom.inc">
-<TMPL_ELSE>
-    <TMPL_INCLUDE NAME="cat-bottom.inc">
-</TMPL_IF>
+			<!-- /TMPL_LOOP -->
+		</table>
+	</div>
+	<div id="resultnumber">
+		<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search">&lt;&lt; Anterior</a><!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search">Siguiente&gt;&gt;</a><!-- /TMPL_IF --></p>
+	</div>	
+</div>
+<!-- TMPL_IF NAME="opac" -->
+    <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+<!-- TMPL_ELSE -->
+    <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
+<!-- /TMPL_IF -->

Index: es/search.marc/search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/search.marc/Attic/search.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/search.marc/search.tmpl	3 Jun 2003 21:56:30 -0000	1.1
+++ es/search.marc/search.tmpl	7 May 2007 13:55:51 -0000	1.1.12.1
@@ -1,131 +1,216 @@
-<TMPL_IF NAME="opac">
-    <TMPL_INCLUDE NAME="opac-top.inc">
-<TMPL_ELSE>
-    <TMPL_INCLUDE NAME="cat-top.inc">
-</TMPL_IF>
-
-<center>
-
-<form name="f" method="post">
-<input type="hidden" name="type" value="intranet">
-	<table border=0 cellspacing=0 cellpadding=2>
-		<tr
-		<TMPL_IF NAME="opac">
-			bgcolor="#ad11ad"
-				bgcolor="#99cccc" background="/images/background-opac.gif"
-			<TMPL_ELSE>
-				bgcolor="#ad11ad"
-			</TMPL_IF>
-		>
-			<th colspan=6>Search</th>
-		</tr>
-		<tr align="center">
-			<td colspan=6>
-			<div name="sql">
+<!-- TMPL_IF NAME="opac" -->
+    <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
+<!-- TMPL_ELSE -->
+    <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<!-- /TMPL_IF -->
+<div id="mainbloc">
+
+<h1 class="catalogue">B&uacute;squeda en el Cat&aacute;logo</h1>
+
+<form name="f" method="post" action="/cgi-bin/koha/search.marc/search.pl">
 			<input type="hidden" name="op" value="do_search">
-			<textarea name="sql" rows=5 cols=80 disabled readonly></textarea>
-			</td>
-		</tr>
-
-		<!-- 000000000000000000000000000000000000000000000000000000 -->
-		<tr>
-			<td>
-				<input type=hidden name="and_or" value="">&nbsp;
-			</td>
-			<td><TMPL_VAR name="marclist"></td>
-			<td>
-				<select name="excluding" size="1" onchange="sql_update()">
-					<option value=""> </option>
-					<option value="not">not</option>
-				</select>
-			</td>
-			<td>
-				<select name="operator" size="1" onchange="sql_update()">
-					<option value="=">equals</option>
-					<option value=">">is more than</option>
-					<option value=">=">is more than or equal to</option>
-					<option value="<">is less than</option>
-					<option value="<=">is less than or equal to</option>
-					<option value="start">starts with</option>
-					<option value="contains">contains</option>
-				</select>
-			</td>
-			<td><input type="text" name="value" onChange="sql_update()"></td>
-		</tr>
-		<tr>
-			<td>
-				<select name="and_or" size="1" onchange="sql_update()">
-					<option value="and">and</option>
-					<option value="or">or</option>
-				</select>
-			</td>
-			<td><TMPL_VAR name="marclist"></td>
-			<td>
-				<select name="excluding" size="1" onchange="sql_update()">
-					<option value=""> </option>
-					<option value="not">not</option>
-				</select>
-			</td>
-			<td>
-				<select name="operator" size="1" onchange="sql_update()">
-					<option value="=">equals</option>
-					<option value=">">is more than</option>
-					<option value=">=">is more than or equal to</option>
-					<option value="<">is less than</option>
-					<option value="<=">is less than or equal to</option>
-					<option value="start">starts with</option>
-					<option value="contains">contains</option>
-				</select>
-			</td>
-			<td><input type="text" name="value" onChange="sql_update()"></td>
-		</tr>
-		<tr>
-			<td>
+	<input type="hidden" name="type" value="intranet">
+	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
+	<div class="bloc25">
+		<h2 class="catalogue">Buscar</h2>
+		<p>
+			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
+			<label class="label100" for="keyword">Cualquier palabra</label>
+			<input type="hidden" name="marclist" value="">
+			<input type="hidden" name="and_or" value="and">
+			<input type="hidden" name="excluding" value="">
+			<input type="hidden" name="operator" value="contains">
+			<input type="text" name="value" id="keyword" onchange="sql_update()" size="35">
+		</p>
+		<p>
+			<label class="label100" for="title">T&iacute;tulo</label>
+			<input type="hidden" name="marclist" value="biblio.title">
+			<input type="hidden" name="and_or" value="and">
+			<input type="hidden" name="excluding" value="">
+			<input type="hidden" name="operator" value="contains">
+			<input type="text" name="value" id="title" onchange="sql_update()" size="35">
+			<!-- TMPL_UNLESS Name="Disable_Dictionary" -->
+				<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)" class="button catalogue">
+					...
+				</a>
+			<!-- /TMPL_UNLESS -->
+		</p>
+		<p>
+			<label class="label100" for="author">Autor</label> <input type="hidden" name="marclist" value="biblio.author">
+			<input type="hidden" name="and_or" value="and">
+			<input type="hidden" name="excluding" value="">
+			<input type="hidden" name="operator" value="contains">
+			<input type="text" name="value" id="author" onchange="sql_update()" size="35">
+			<!-- TMPL_UNLESS Name="Disable_Dictionary" -->
+				<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)" class="button catalogue">
+					...
+				</a>
+			<!-- /TMPL_UNLESS -->
+		</p>
+		<p>
+			<label class="label100" for="subject">Tema</label>
+			<input type="hidden" name="marclist" value="bibliosubject.subject">
+			<input type="hidden" name="and_or" value="and">
+			<input type="hidden" name="excluding" value="">
+			<input type="hidden" name="operator" value="contains">  
+			<input type="text" name="value" id="subject" onchange="sql_update()" size="35">
+			<!-- TMPL_UNLESS Name="Disable_Dictionary" -->
+				<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)" class="button catalogue">
+					...
+				</a>
+			<!-- /TMPL_UNLESS -->
+		</p>
+		<p>
+			<label class="label100" for="itemtype">Tipo de art&iacute;culo</label>
+			<input type="hidden" name="marclist" value="biblioitems.itemtype">
+			<input type="hidden" name="and_or" value="and">
+			<input type="hidden" name="excluding" value="">
+			<input type="hidden" name="operator" value="=">
+			<!-- TMPL_VAR name="CGIitemtype" -->
+		</p>
+		<p>
+				<label class="label100" for="branch">Sede</label>
+				<input type="hidden" name="marclist" value="items.holdingbranch">
+				<input type="hidden" name="and_or" value="and">
+				<input type="hidden" name="excluding" value="">
+				<input type="hidden" name="operator" value="=">  
+				<!-- TMPL_VAR name="CGIbranch" -->
+		</p>
+	</div>
+	<div class="bloc25">
+		<h2 class="catalogue">Otras opciones</h2>
+		<p>
+				<label class="label100" for="barcode">C&oacute;digo de barras del ejemplar</label>
+				<input type="hidden" name="marclist" value="items.barcode">
+				<input type="hidden" name="and_or" value="and">
+				<input type="hidden" name="excluding" value="">
+				<input type="hidden" name="operator" value="contains">
+				<input type="text" name="value" id="barcode" onchange="sql_update()"> 
+		</p>
+		<p>
+			<label class="label100" for="callno">N&uacute;mero del art&iacute;culo</label>
+			<input type="hidden" name="marclist" value="items.itemcallnumber">
+			<input type="hidden" name="and_or" value="and">
+			<input type="hidden" name="excluding" value="">
+			<input type="hidden" name="operator" value="start">
+			<input type="text" name="value" id="callno" onchange="sql_update()">
+		</p>
+		<p>
+			<label class="label100" for="isbn">ISBN</label>
+			<input type="hidden" name="marclist" value="biblioitems.isbn">
+			<input type="hidden" name="and_or" value="and">
+			<input type="hidden" name="excluding" value="">
+			<input type="hidden" name="operator" value="=">
+			<input type="text" name="value" id="isbn" onchange="sql_update()">
+		</p>
+		<p>
+			<label class="label100" for="publisher">Editor</label>
+			<input type="hidden" name="marclist" value="biblioitems.publishercode">
+			<input type="hidden" name="and_or" value="and">
+			<input type="hidden" name="excluding" value="">
+			<input type="hidden" name="operator" value="contains">
+			<input type="text" name="value" id="publisher" onchange="sql_update()">
+		</p>
+	</div>
+	<div id="bloc100">
+		<h2 class="catalogue">M&aacute;s Campos</h2>
+		<!-- TMPL_LOOP NAME="statements" -->
+			<p>
 				<select name="and_or" size="1" onchange="sql_update()">
-					<option value="and">and</option>
-					<option value="or">or</option>
+					<option value="and">y</option>
+					<option <!-- TMPL_IF NAME="or" -->selected <!-- /TMPL_IF -->value="or">o</option>
 				</select>
-			</td>
-			<td><TMPL_VAR name="marclist"></td>
-			<td>
+				<!-- TMPL_VAR NAME="marclist" -->
 				<select name="excluding" size="1" onchange="sql_update()">
-					<option value=""> </option>
-					<option value="not">not</option>
+					<option value="0"> </option>
+					<option <!-- TMPL_IF NAME="not" -->selected <!-- /TMPL_IF -->value="1">no</option>
 				</select>
-			</td>
-			<td>
 				<select name="operator" size="1" onchange="sql_update()">
-					<option value="=">equals</option>
-					<option value=">">is more than</option>
-					<option value=">=">is more than or equal to</option>
-					<option value="<">is less than</option>
-					<option value="<=">is less than or equal to</option>
-					<option value="start">starts with</option>
-					<option value="contains">contains</option>
-				</select>
-			</td>
-			<td><input type="text" name="value" onChange="sql_update()"></td>
-		</tr>
-		<tr><td colspan=5 align=center><input type="submit" value="OK"></td></tr>
-	</table>
+					<option <!-- TMPL_IF NAME="contains" -->selected<!-- /TMPL_IF --> value="contains">Contiene</option>
+					<option <!-- TMPL_IF NAME="eq" -->selected<!-- /TMPL_IF --> value="=">Es igual a</option>
+					<option <!-- TMPL_IF NAME="start" -->selected<!-- /TMPL_IF --> value="start">Comienza con</option>
+					<option <!-- TMPL_IF NAME="gt" -->selected<!-- /TMPL_IF --> value=">">Es mayor que</option>
+					<option <!-- TMPL_IF NAME="ge" -->selected<!-- /TMPL_IF --> value=">=">Es mayor o igual a</option>
+					<option <!-- TMPL_IF NAME="lt" -->selected<!-- /TMPL_IF --> value="<">Es menor que</option>
+					<option <!-- TMPL_IF NAME="le" -->selected<!-- /TMPL_IF --> value="<=">Es menor o igual a</option>
+				</select>
+				<input type="text" name="value" onChange="sql_update()" <!-- TMPL_IF NAME="value" -->value="<!-- TMPL_VAR NAME="value" -->"<!-- /TMPL_IF -->>
+			</p>
+		<!-- /TMPL_LOOP -->
+		<p>
+		<input type="button" value="A&ntilde;adir criterio" onclick="AddStatement()" class="button catalogue">
+		Advertencia : el campo "contiene" NO funciona si introduce 2 letras o menos.</p>
+	</div>
+	<div class="bloc25">
+		<p><textarea name="sql" rows="3" cols="70" disabled readonly></textarea></p>
+		<p>Resultados por p&aacute;gina :
+			<select name="resultsperpage" size="1">
+				<option value="20">20</option>
+				<option value="50">50</option>
+				<option value="100">100</option>
+			</select>
+		Ordenado por
+			<select name="orderby" size="1">
+				<option value="biblio.title">T&iacute;tulo</option>
+				<option value="biblio.author">Autor</option>
+				<option value="biblioitems.dewey">Dewey</option>
+				<option value="biblioitems.publicationyear">A&ntilde;o de Publicaci&oacute;n</option>
+				<option value="biblioitems.publishercode">Editor</option>
+			</select>
+			<select name="desc_or_asc" size="1">
+				<option value="ASC">Ascendente</option>
+				<option value="DESC">Descendente</option>
+			</select>
+		</p>
+		<p>
+			<input type="submit" value="Iniciar b&uacute;squeda" class="button catalogue">
+			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Sugerencia del deletreo</a>
+		</p>
+	</div>
 </form>
-<script>
+
+<script language="javascript" type="text/javascript">
 function sql_update() {
 document.f.sql.value="";
 	for (i=0 ; i<document.f.marclist.length ; i++) {
-		if (document.f.marclist[i].value != '') {
+		if (document.f.value[i].value.length>0) {
 			document.f.sql.value = document.f.sql.value+
 										document.f.and_or[i].value + ' (' +
 										document.f.excluding[i].value + ' ' +
-										document.f.marclist[i].value + '' +
-										document.f.operator[i].value + '' +
+										document.f.marclist[i].value + ' ' +
+										document.f.operator[i].value + ' ' +
 										'\''+document.f.value[i].value + '\') ';
 		}
 	}
 }
+
+function AddStatement() {
+
+	document.forms['f'].op.value="AddStatement";
+	document.f.submit();
+}
+
+function Dopop(link,i) {
+	var searchstring=document.forms['f'].value[i].value;
+	newin=window.open(link+'&amp;search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
+}
+
+
+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>
-<TMPL_IF NAME="opac">
-    <TMPL_INCLUDE NAME="opac-bottom.inc">
-<TMPL_ELSE>
-    <TMPL_INCLUDE NAME="cat-bottom.inc">
-</TMPL_IF>
+</div>
+<!-- TMPL_IF NAME="opac" -->
+    <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+<!-- TMPL_ELSE -->
+    <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
+<!-- /TMPL_IF -->
+

Index: es/user/userpage.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/user/Attic/userpage.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.12.1
diff -u -b -r1.2 -r1.2.12.1
--- es/user/userpage.tmpl	3 Jun 2003 21:41:18 -0000	1.2
+++ es/user/userpage.tmpl	7 May 2007 13:55:51 -0000	1.2.12.1
@@ -1,24 +1,24 @@
-<TMPL_INCLUDE NAME="members-top.inc">
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
-<TMPL_IF NAME="loggedinuser">
-	<p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>
+<!-- TMPL_IF NAME="loggedinuser" -->
+	<p align=left>Registrado como: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href="/cgi-bin/koha/logout.pl">Salir</a>]</p>
 	<p>
 	<center>
-	<h3>This page is just a mock up</h3>
+	<h3>Esta p&aacute;gina es s&oacute;lo una prueba</h3>
 
 	<table border=0 cellspacing=15>
 	<tr><td valign=top>
 
 	<table border=1 cellpadding=10>
-	<tr><th bgcolor=#99cccc background=/images/background-opac.gif><font size=+2>Reserves</font></th></tr>
+	<tr><th bgcolor="#99cccc" background="/images/background-opac.gif"><font size="+2">Reservas</font></th></tr>
 	<tr><td>
-	<b>You have the following books waiting to be picked up:</b>
+	<b>Los siguientes libros est&aacute;n esperando a ser retirados:</b>
 	<ul>
 	<li>The Great Mom Swap by Betsy Hanes at Main Library
 	<li>Between Brothers by Irene Morck at Main Library
 	</ul>
 	<p>
-	<b>You have the following requests for items on loan:</b>
+	<b>Tiene las siguientes solicitudes de art&iacute;culos prestados:</b>
 	<ul>
 	<li>The Amazing Apple Book by Paulette Bourgeois
 	<li>Tracey the Great by Alan Cliburn
@@ -29,36 +29,36 @@
 
 	</td><td valign=top>
 
-		<form method=post>
+		<form method="post">
 		<table border=1 cellpadding=10>
-		<tr><th bgcolor=#99cccc background=/images/background-opac.gif><font size=+2>User Preferences</font></th></tr>
-		<tr><td align =center>
+		<tr><th bgcolor="#99cccc" background="/images/background-opac.gif"><font size="+2">Preferencias del usuario</font></th></tr>
+		<tr><td align ="center">
 		<table border=0 cellpadding=5>
-			<tr><td>Language</td><td>
+			<tr><td>Idioma</td><td>
 			<select name=language>
-			<option value=english>English
-			<option value=english>French
-			<option value=english>German
-			<option value=english>Polish
+			<option value=english>Ingl&eacute;s
+			<option value=english>Franc&eacute;s
+			<option value=english>Alem&aacute;n
+			<option value=english>Polaco
 			</select>
 			</td></tr>
-			<tr><td>E-mail Address</td><td><input name=email size=30 value=<TMPL_VAR NAME=loggedinuser>@mylibrary.com></td></tr>
-			<tr><td>Preferred Branch<br>for reserve pickups</td><td>
+			<tr><td>Direcci&oacute;n de Correo electr&oacute;nico</td><td><input type= name=email size=30 value="<!-- TMPL_VAR NAME=loggedinuser -->@mibiblioteca.com"></td></tr>
+			<tr><td>Sede Preferida<br>para las recolecciones de reservas</td><td>
 			<select name=pickupbranch>
-			<option value=MAIN>Main Library
-			<option value=SEDGE>Sedgewick Library
-			<option value=HANSEN selected>Rick Hansen Library
+			<option value=MAIN>Biblioteca Central
+			<option value=SEDGE>Biblioteca Sedgewick
+			<option value=HANSEN selected>Biblioteca Rick Hansen
 			<option value=CAT>Cataline Library
 			</select>
 			</td></tr>
 			<tr><td colspan=2>
-			<input name=specialeventsbyemail type=checkbox checked> Notify me about Special Events by email<br>
-			<input name=overduesbyemail type=checkbox checked> Notify me about overdues by email<br>
-			<input name=recordreadingrecord type=checkbox> Keep a record of books I have read<br>
-			<input name=recordreadingrecord type=checkbox> Allow library staff to see my reading record<br>
+			<input name="specialeventsbyemail" type="checkbox" checked> Notificarme de Eventos Especiales por email<br>
+			<input name="overduesbyemail" type="checkbox" checked> Notificarme acerca de retrasos por email<br>
+			<input name="recordreadingrecord" type="checkbox"> Mantenga un registro de los libros que he leido<br>
+			<input name="recordreadingrecord" type="checkbox"> Permitir al personal de la biblioteca ver mi registro de lectura<br>
 			</td></tr>
 			<tr><td align=center colspan=2>
-			<input type=submit value="Set Preferences">
+			<input type=submit value="Establecer Preferencias">
 			</td>
 			</tr>
 		</table>
@@ -70,20 +70,20 @@
 	</table>
 
 	</center>
-<TMPL_ELSE>
+<!-- TMPL_ELSE -->
 	<center>
 	<form method=post>
 		<table border=1 cellpadding=10>
-		<tr><th bgcolor=#99cccc background=/images/background-opac.gif colspan=2><font size=+2>User Preferences</font></th></tr>
-		<tr><td>Name:</td><td><input name="userid"></td></tr>
-		<tr><td>Password:</td><td><input type=password name=password></td></tr>
-		<tr><td align=center colspan=2>
-		    <input type=submit value="Login">
+		<tr><th bgcolor="#99cccc" background="/images/background-opac.gif" colspan=2><font size=+2>Preferencias del usuario</font></th></tr>
+		<tr><td>Nombre:</td><td><input name="userid"></td></tr>
+		<tr><td>Clave:</td><td><input type="password" name="password"></td></tr>
+		<tr><td align="center" colspan=2>
+		    <input type="submit" value="Entrar">
 		</td>
 		</tr>
 	    </table>
 	</form>
 	</center>
-</TMPL_IF>
+<!-- /TMPL_IF -->
 
-<TMPL_INCLUDE NAME="members-bottom.inc">
+<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: es/value_builder/unimarc_field_100.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/value_builder/Attic/unimarc_field_100.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/value_builder/unimarc_field_100.tmpl	3 Jun 2003 21:44:42 -0000	1.1
+++ es/value_builder/unimarc_field_100.tmpl	7 May 2007 13:55:51 -0000	1.1.12.1
@@ -6,40 +6,691 @@
 <form name="f_pop" onSubmit="javascript:report()">
 <table>
 	<tr>
-		<td>Date d'enregistrement </td>
-		<td><input type="text" name="f1" maxlength=8 size=8 value="<TMPL_VAR name="f1">"></td>
+		<td>Date d'enregistrement</td>
+		<td><input type="text" name="f1" maxlength=8 size=9 value="<!-- TMPL_VAR name="f1" -->"></td>
 	</tr>
 	<tr>
-		<td>Code date publication </td><td><select name="f2" size="1">
-		<option value="a" <TMPL_IF name="f2a">SELECTED</TMPL_IF>>périodique en cours</option>
-			<option value="b" <TMPL_IF name="f2b">SELECTED</TMPL_IF>>périodique mort</option>
-			<option value="c" <TMPL_IF name="f2c">SELECTED</TMPL_IF>>périodique d'état inconnu</option>
-			<option value="d" <TMPL_IF name="f2d">SELECTED</TMPL_IF>>monographie complète</option>
-			<option value="e" <TMPL_IF name="f2e">SELECTED</TMPL_IF>>reproduction</option>
+		<td>Code de date de publication </td>
+		<td>
+			<select name="f2" size="1">
+	    <!-- TMPL_IF name="f2 " -->
+              <option value=" " SELECTED>Ninguno</option>
+                 <!-- TMPL_ELSE -->
+                    <option value=" ">Ninguno</option>
+
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f2a" -->
+				<option value="a" SELECTED>Periodique
+				en cours</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Periodique en cours</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2b" -->
+				<option value="b" SELECTED>Periodique mort</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Periodique mort</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2c" -->
+				<option value="c" SELECTED>Periodique
+				d'etat inconnu</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">Periodique d'etat inconnu</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2d" -->
+				<option value="d" SELECTED>Monographie
+				complete</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">Monographie
+				complete</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2e" -->
+				<option value="e" SELECTED>reproduction</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">reproduction</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f2f" -->
+				<option value="f"
+				SELECTED>monographie, date de
+				publication incertaine</option>
+			<!-- TMPL_ELSE -->
+				<option value="f">monographie, date de
+				publication incertaine</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f2g" -->
+				<option value="g"
+				SELECTED>monographie dont la
+				publication s'etend sur plus d'un an</option>
+			<!-- TMPL_ELSE -->
+				<option value="g">monographie dont la
+				publication s'etend sur plus d'un an</option>
+			<!-- /TMPL_IF -->
+			
+			
+			<!-- TMPL_IF name="f2h" -->
+				<option value="h"
+				SELECTED>monographie ayant a la fois
+				une date reelle et une date de
+				copyright ou de privilege</option>
+			<!-- TMPL_ELSE -->
+				<option value="h">monographie ayant a la fois
+				une date reelle et une date de
+				copyright ou de privilege</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f2i" -->
+				<option value="i"
+				SELECTED>monographie ayant a la fois
+				une date d'edition ou de reedition et
+				une date de production</option>
+			<!-- TMPL_ELSE -->
+				<option value="i">monographie ayant a la fois
+				une date d'edition ou de reedition et
+				une date de production</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f2j" -->
+				<option value="j"
+				SELECTED>monographie avec date
+				publication detaillee</option>
+			<!-- TMPL_ELSE -->
+				<option value="j">monographie avec date
+				publication detaillee </option>
+			<!-- /TMPL_IF -->
+			
 			</select>
 		</td>
 	</tr>
 	<tr>
-		<td>Année début</td>
-		<td><input type="text" name="f3" maxlength=4 size=5 value="<TMPL_VAR name="f3">"></td>
+		<td>Premiere date de publication</td>
+		<td><input type="text" name="f3" maxlength=4 size=5 value="<!-- TMPL_VAR name="f3" -->"></td>
 	</tr>
 	<tr>
-	<td>Année fin</td>
-	<td><input type="text" name="f4" maxlength=4 size=5 value="<TMPL_VAR name="f4">"></td>
+	<td>Deuxieme date de publication</td>
+	<td><input type="text" name="f4" maxlength=4 size=5
+		value="<!-- TMPL_VAR name="f4" -->"></td>
+        
 	</tr>
-	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
+	<tr>
+		<td>Niveau intellectuel ou public destinataire 1</td>
+		<td>
+			<select name="f5" size="1">
+	    <!-- TMPL_IF name="f5 " -->
+              <option value=" " SELECTED>Ninguno</option>
+                 <!-- TMPL_ELSE -->
+                    <option value=" ">Ninguno</option>
+
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5a" -->
+				<option value="a" SELECTED>Jeunesse en
+	general </option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Jeunesse en general</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5b" -->
+				<option value="b"
+	SELECTED>Pre-scolaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Pre-scolaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5c" -->
+				<option value="c" SELECTED>scolaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">scolaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5d" -->
+				<option value="d" SELECTED>enfant</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">enfant</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5e" -->
+				<option value="e" SELECTED>jeune adulte</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">jeune adulte</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f5k" -->
+				<option value="k"
+				SELECTED>adulte, haut niveau</option>
+			<!-- TMPL_ELSE -->
+				<option value="k">adulte, haut niveau</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f5m" -->
+				<option value="m"
+				SELECTED>fiction ou vulg adulte</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">fiction ou vulg adulte</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f5u" -->
+				<option value="u"
+				SELECTED>inconnu</option>
+			<!-- TMPL_ELSE -->
+				<option value="u">inconnu</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>Niveau intellectuel ou public destinataire 2</td>
+		<td>
+			<select name="f6" size="1">
+	    <!-- TMPL_IF name="f6 " -->
+              <option value=" " SELECTED>Ninguno</option>
+                 <!-- TMPL_ELSE -->
+                    <option value=" ">Ninguno</option>
+
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6a" -->
+				<option value="a" SELECTED>Jeunesse en
+	general </option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Jeunesse en general</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6b" -->
+				<option value="b"
+	SELECTED>Pre-scolaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Pre-scolaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6c" -->
+				<option value="c" SELECTED>scolaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">scolaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6d" -->
+				<option value="d" SELECTED>enfant</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">enfant</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6e" -->
+				<option value="e" SELECTED>jeune adulte</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">jeune adulte</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f6k" -->
+				<option value="k"
+				SELECTED>adulte, haut niveau</option>
+			<!-- TMPL_ELSE -->
+				<option value="k">adulte, haut niveau</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f6m" -->
+				<option value="m"
+				SELECTED>fiction ou vulg adulte</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">fiction ou vulg adulte</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f6u" -->
+				<option value="u"
+				SELECTED>inconnu</option>
+			<!-- TMPL_ELSE -->
+				<option value="u">inconnu</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>Niveau intellectuel ou public destinataire 3</td>
+		<td>
+			<select name="f7" size="1">
+	    <!-- TMPL_IF name="f7 " -->
+              <option value=" " SELECTED>Ninguno</option>
+                 <!-- TMPL_ELSE -->
+                    <option value=" ">Ninguno</option>
+
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7a" -->
+				<option value="a" SELECTED>Jeunesse en
+	general </option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Jeunesse en general</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7b" -->
+				<option value="b"
+	SELECTED>Pre-scolaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Pre-scolaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7c" -->
+				<option value="c" SELECTED>scolaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">scolaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7d" -->
+				<option value="d" SELECTED>enfant</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">enfant</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7e" -->
+				<option value="e" SELECTED>jeune adulte</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">jeune adulte</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f7k" -->
+				<option value="k"
+				SELECTED>adulte, haut niveau</option>
+			<!-- TMPL_ELSE -->
+				<option value="k">adulte, haut niveau</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f7m" -->
+				<option value="m"
+				SELECTED>fiction ou vulg adulte</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">fiction ou vulg adulte</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f7u" -->
+				<option value="u"
+				SELECTED>inconnu</option>
+			<!-- TMPL_ELSE -->
+				<option value="u">inconnu</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>Publication officielle</td>
+		<td>
+			<select name="f8" size="1">
+                   <!-- TMPL_IF name="f8 " -->
+                                <option value=" " SELECTED>Ninguno</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">Ninguno</option>
+                        <!-- /TMPL_IF -->
+		<!-- TMPL_IF name="f8a" -->
+				<option value="a" SELECTED>Federal/national</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Federal/national</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8b" -->
+				<option value="b" SELECTED>etat/province</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">etat/province</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8c" -->
+				<option value="c" SELECTED>compte/departement</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">compte/departement</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8d" -->
+				<option value="d"
+				SELECTED>local(municipal, etc.)</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">local(municipal, etc.)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8e" -->
+				<option value="e"
+				SELECTED>multi-local(inter-departemental,
+				etc. sous le niveau national)</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">multi-local(inter-departemental,
+				etc. sous le niveau national)</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f8f" -->
+				<option value="f"
+				SELECTED>Inter-gouvernemental</option>
+			<!-- TMPL_ELSE -->
+				<option value="f">Inter-gouvernemental</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f8g" -->
+				<option value="g"
+				SELECTED>gouvernement en exil ou clandestin</option>
+			<!-- TMPL_ELSE -->
+				<option value="g">gouvernement en exil
+				ou clandestin</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f8h" -->
+				<option value="h"
+				SELECTED>Niveau indetermine</option>
+			<!-- TMPL_ELSE -->
+				<option value="h">Niveau indetermine</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8u" -->
+				<option value="u"
+				SELECTED>inconnu</option>
+			<!-- TMPL_ELSE -->
+				<option value="u">inconnu</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8y" -->
+				<option value="y"
+				SELECTED>il ne s'agit pas d'une
+				publication officielle</option>
+			<!-- TMPL_ELSE -->
+				<option value="y">il ne s'agit pas
+				d'une publication officielle</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8z" -->
+				<option value="z"
+				SELECTED>Autre instance officielle</option>
+			<!-- TMPL_ELSE -->
+				<option value="z">Autre instance officielle</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+
+	<tr>
+		<td>Code de modification de la notice</td>
+		<td>
+			<select name="f9" size="1">
+	                  <!-- TMPL_IF name="f9 " -->
+                                <option value=" " SELECTED>Ninguno</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">Ninguno</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f90" -->
+				<option value="0" SELECTED>Notice non modifiee</option>
+			<!-- TMPL_ELSE -->
+				<option value="0">Notice non modifiee</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f91" -->
+				<option value="1" SELECTED>notice modifiee</option>
+			<!-- TMPL_ELSE -->
+				<option value="1">notice modifiee</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+
+
+	<tr>
+	<td>Langue de catalogage (obligatoire)</td>
+	<td><input type="text" name="f10" maxlength=3 size=4
+		value="<!-- TMPL_VAR name="f10" -->"></td>
+        
+	</tr>
+
+
+
+	<tr>
+		<td>Code de transliteration</td>
+		<td>
+			<select name="f11" size="1">
+	                  <!-- TMPL_IF name="f11 " -->
+                                <option value=" " SELECTED>Ninguno</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">Ninguno</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f11a" -->
+				<option value="a" SELECTED>Norme ISO
+		pour la translitteration</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Norme ISO
+		pour la translitteration</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f11b" -->
+				<option value="b" SELECTED>autre</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">autre</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f11c" -->
+				<option value="c"
+		SELECTED>Translitterations multiples : ISO et autres regles</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">Translitterations multiples : ISO et autres regles</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f11y" -->
+				<option value="y" SELECTED>Sans regles
+		de translitteration</option>
+			<!-- TMPL_ELSE -->
+				<option value="y">Sans regles
+		de translitteration</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+
+	<tr>
+	<td>Jeux de caracteres (obligatoire) 1</td>
+		<td>
+			<select name="f12" size="1">
+	   <!-- TMPL_IF name="f12  " -->
+                                <option value="  " SELECTED>Ninguno</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="  ">Ninguno</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f1201" -->
+				<option value="01" SELECTED>ISO 646,
+	version IRV (caracteres latins de base)</option>
+			<!-- TMPL_ELSE -->
+				<option value="01">ISO 646,
+	version IRV (caracteres latins de base)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1202" -->
+				<option value="02" SELECTED>Registre
+	ISO #37 (caracteres cyrilliques de base)</option>
+			<!-- TMPL_ELSE -->
+				<option value="02">Registre
+	ISO #37 (caracteres cyrilliques de base)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1203" -->
+				<option value="03"
+		SELECTED>ISO 5426 (jeu de caractere latin etendu)</option>
+			<!-- TMPL_ELSE -->
+				<option value="03">ISO 5426 (jeu de caractere latin etendu)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1204" -->
+				<option value="04" SELECTED>ISO DIS
+	5427 (jeu de caracteres cyrilliques etendu)</option>
+			<!-- TMPL_ELSE -->
+				<option value="04">ISO DIS
+	5427 (jeu de caracteres cyrilliques etendu)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1205" -->
+				<option value="05" SELECTED>ISO  5428
+	(caracteres grecs)</option>
+			<!-- TMPL_ELSE -->
+				<option value="05">ISO  5428
+	(caracteres grecs)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1206" -->
+				<option value="06" SELECTED>ISO 6438
+	(caracteres africains codes)</option>
+			<!-- TMPL_ELSE -->
+				<option value="06">ISO 6438
+	(caracteres africains codes)</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+
+        
+	</tr>
+	<tr>
+	<td>Jeux de caracteres (obligatoire) 2</td>
+		<td>
+			<select name="f13" size="1">
+	   <!-- TMPL_IF name="f13  " -->
+                                <option value="  " SELECTED>Ninguno</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="  ">Ninguno</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f1301" -->
+				<option value="01" SELECTED>ISO 646,
+	version IRV (caracteres latins de base)</option>
+			<!-- TMPL_ELSE -->
+				<option value="01">ISO 646,
+	version IRV (caracteres latins de base)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1302" -->
+				<option value="02" SELECTED>Registre
+	ISO #37 (caracteres cyrilliques de base)</option>
+			<!-- TMPL_ELSE -->
+				<option value="02">Registre
+	ISO #37 (caracteres cyrilliques de base)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1303" -->
+				<option value="03"
+		SELECTED>ISO 5426 (jeu de caractere latin etendu)</option>
+			<!-- TMPL_ELSE -->
+				<option value="03">ISO 5426 (jeu de caractere latin etendu)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1304" -->
+				<option value="04" SELECTED>ISO DIS
+	5427 (jeu de caracteres cyrilliques etendu)</option>
+			<!-- TMPL_ELSE -->
+				<option value="04">ISO DIS
+	5427 (jeu de caracteres cyrilliques etendu)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1305" -->
+				<option value="05" SELECTED>ISO  5428
+	(caracteres grecs)</option>
+			<!-- TMPL_ELSE -->
+				<option value="05">ISO  5428
+	(caracteres grecs)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1306" -->
+				<option value="06" SELECTED>ISO 6438
+	(caracteres africains codes)</option>
+			<!-- TMPL_ELSE -->
+				<option value="06">ISO 6438
+	(caracteres africains codes)</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+
+        
+	</tr>
+
+	<tr>
+	<td>Jeu de caracteres additionnels</td>
+	<td><input type="text" name="f14" maxlength=4 size=5
+		value="<!-- TMPL_VAR name="f14" -->"></td>
+        
+	</tr>
+
+	<tr>
+	<td>Alphabet du titre</td>
+	<td>
+	<select name="f15" size="1">
+	   <!-- TMPL_IF name="f15  " -->
+                                <option value="  " SELECTED>Ninguno</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="  ">Ninguno</option>
+                        <!-- /TMPL_IF -->
+
+	<!-- TMPL_IF name="f15ba" -->
+				<option value="ba" SELECTED>Latin</option>
+			<!-- TMPL_ELSE -->
+				<option value="ba">Latin</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15ca" -->
+				<option value="ca" SELECTED>Cyrillique</option>
+			<!-- TMPL_ELSE -->
+				<option value="ca">Cyrillique</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f15da" -->
+				<option value="da" SELECTED>Japonais -
+				alphabet non precise</option>
+			<!-- TMPL_ELSE -->
+				<option value="da">Japonais non precise</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f15db" -->
+				<option value="db" SELECTED>Japonais -
+				Kanji</option>
+			<!-- TMPL_ELSE -->
+				<option value="db">Japonais - Kanji</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f15dc" -->
+				<option value="dc" SELECTED>Japonais -
+				Kana</option>
+			<!-- TMPL_ELSE -->
+				<option value="dc">Japonais - Kana</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15ea" -->
+				<option value="ea" SELECTED>Chinois</option>
+			<!-- TMPL_ELSE -->
+				<option value="ea">Chinois</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15fa" -->
+				<option value="fa" SELECTED>Arabe</option>
+			<!-- TMPL_ELSE -->
+				<option value="fa">Arabe</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15ga" -->
+				<option value="ga" SELECTED>Grec</option>
+			<!-- TMPL_ELSE -->
+				<option value="ga">Grec</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15ha" -->
+				<option value="ha" SELECTED>Hebreu</option>
+			<!-- TMPL_ELSE -->
+				<option value="ha">Hebreu</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15ia" -->
+				<option value="ia" SELECTED>Thai</option>
+			<!-- TMPL_ELSE -->
+				<option value="ia">Thai</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15ja" -->
+				<option value="ja" SELECTED>Devanagari</option>
+			<!-- TMPL_ELSE -->
+				<option value="ja">Devanagari</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15ka" -->
+				<option value="ka" SELECTED>Coreen</option>
+			<!-- TMPL_ELSE -->
+				<option value="ka">Coreen</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15la" -->
+				<option value="la" SELECTED>Tamil</option>
+			<!-- TMPL_ELSE -->
+				<option value="la">Tamil</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15zz" -->
+				<option value="zz" SELECTED>autres</option>
+			<!-- TMPL_ELSE -->
+				<option value="zz">autres</option>
+			<!-- /TMPL_IF -->
+			</select>
+
+
+	</td>
+        
+	</tr>
+	
+	<tr><td colspan=2><input type="submit" value="ACEPTAR"></td></tr>
 </table>
 </form>
 <script>
 	function report() {
+
 		document.f_pop.f1.value=document.f_pop.f1.value+'        ';
 		document.f_pop.f3.value=document.f_pop.f3.value+'    ';
 		document.f_pop.f4.value=document.f_pop.f4.value+'    ';
-		document.f_pop.f1.value=document.f_pop.f1.value.substring(0,8);
-		document.f_pop.f3.value=document.f_pop.f3.value.substring(0,4);
-		document.f_pop.f4.value=document.f_pop.f4.value.substring(0,4);
+		document.f_pop.f10.value=document.f_pop.f10.value+'   ';
+		document.f_pop.f14.value=document.f_pop.f14.value+'    ';
+
+		
+
+document.f_pop.f1.value=document.f_pop.f1.value.substring(0,8);
+document.f_pop.f3.value=document.f_pop.f3.value.substring(0,4);
+document.f_pop.f4.value=document.f_pop.f4.value.substring(0,4);
+document.f_pop.f10.value=document.f_pop.f10.value.substring(0,3);
+document.f_pop.f14.value=document.f_pop.f14.value.substring(0,4);
+
 
-		opener.document.f.field_value[<TMPL_VAR name="index">].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value;
+		opener.document.f.field_value[<!-- TMPL_VAR
+		name="index" -->].value= document.f_pop.f1.value +
+		document.f_pop.f2.value +document.f_pop.f3.value
+		+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value;
 		self.close();
 		return false;
 	}

Index: es/value_builder/unimarc_field_225a.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/value_builder/Attic/unimarc_field_225a.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/value_builder/unimarc_field_225a.tmpl	3 Jun 2003 21:44:42 -0000	1.1
+++ es/value_builder/unimarc_field_225a.tmpl	7 May 2007 13:55:51 -0000	1.1.12.1
@@ -1,23 +1,19 @@
-<html>
-<head>
+<!-- TMPL_INCLUDE name="auth-search-top.inc" -->
 <title>UNIMARC Field 225a builder</title>
 </head>
 <body>
-<form name="f_pop" onSubmit="javascript:report()">
-<table>
-	<tr>
-		<td>Select a collection</td>
-		<td><TMPL_VAR name="collection"></td>
-	</tr>
-	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
-</table>
-</form>
+<div id="mainbloc">
+	<form name="f_pop" onSubmit="javascript:report()">
+		<h2 class="authority">Collection</h2>
+		<p><label>Select a collection</label><!-- TMPL_VAR name="collection" --></p>
+		<input type="submit" value="ACEPTAR" class="button authority"></p>
+	</form>
+</div>
 <script>
 	function report() {
-		opener.document.f.field_value[<TMPL_VAR name="index">].value= document.f_pop.f1.value;
+		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
 		self.close();
 		return false;
 	}
 </script>
-</body>
-</html>
+<!-- TMPL_INCLUDE name="auth-search-bottom.inc" -->

Index: es/value_builder/unimarc_field_700-4.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/es/value_builder/Attic/unimarc_field_700-4.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- es/value_builder/unimarc_field_700-4.tmpl	3 Jun 2003 21:44:42 -0000	1.1
+++ es/value_builder/unimarc_field_700-4.tmpl	7 May 2007 13:55:51 -0000	1.1.12.1
@@ -8,23 +8,23 @@
 <table>
 	<tr>
 		<td>Code date publication </td><td><select name="f1" size="1">
-		<option value="075 - postface" <TMPL_IF name="f1_075">SELECTED</TMPL_IF>>postface</option>
-			<option value="651 - dir. de publication" <TMPL_IF name="f1_651">SELECTED</TMPL_IF>>dir. de publication</option>
-			<option value="440 - illustrateur" <TMPL_IF name="f1_440">SELECTED</TMPL_IF>>illustrateur</option>
-			<option value="080 - préface, notes" <TMPL_IF name="f1_080">SELECTED</TMPL_IF>>préface, notes</option>
-			<option value="730 - traducteur" <TMPL_IF name="f1_730">SELECTED</TMPL_IF>>traducteur</option>
+		<option value="075 - postface" <!-- TMPL_IF name="f1_075" -->SELECTED<!-- /TMPL_IF -->>postface</option>
+			<option value="651 - dir. de publication" <!-- TMPL_IF name="f1_651" -->SELECTED<!-- /TMPL_IF -->>dir. de publication</option>
+			<option value="440 - illustrateur" <!-- TMPL_IF name="f1_440" -->SELECTED<!-- /TMPL_IF -->>illustrateur</option>
+			<option value="080 - préface, notes" <!-- TMPL_IF name="f1_080" -->SELECTED<!-- /TMPL_IF -->>préface, notes</option>
+			<option value="730 - traducteur" <!-- TMPL_IF name="f1_730" -->SELECTED<!-- /TMPL_IF -->>traducteur</option>
 			</select>
 		</td>
 	</tr>
-	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
+	<tr><td colspan=2><input type="submit" value="ACEPTAR"></td></tr>
 </table>
 </form>
 <script>
 	function report() {
 		x = document.f_pop.f1.value.split(' - ');
-		opener.document.f.field_value[<TMPL_VAR name="index">].value= x[0];
-		if (<TMPL_VAR name="index2">>0) {
-			opener.document.f.field_value[<TMPL_VAR name="index2">].value= x[1];
+		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= x[0];
+		if (<!-- TMPL_VAR name="index2" -->>0) {
+			opener.document.f.field_value[<!-- TMPL_VAR name="index2" -->].value= x[1];
 		}
 		self.close();
 		return false;

Index: uk_UA/about.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/Attic/about.tmpl,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -b -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- uk_UA/about.tmpl	7 May 2007 09:08:32 -0000	1.1.2.1.2.1
+++ uk_UA/about.tmpl	7 May 2007 13:55:51 -0000	1.1.2.1.2.2
@@ -15,7 +15,7 @@
 		<p><b>Бібліотечна опіка Horowhenua</b>у Новій Зеландії, та голова бібліотек Розалі Блейк {Rosalie Blake}, (Коха 1.0)</p>
 		<p><b>Нельсонвільська{Nelsonville} публічна бібліотека</b>, США, Огайо (підтримка щодо MARC-у)</p>
 		<p><b>EMN (Ecole des Mines de Nantes)</b>, Франція (підтримка запропонування, модулів статистики та покращеного LDAP)</p>
-		<p><b>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</b>, France (biblio frameworks, MARC authorities, OPAC basket, Serials support funding)</p>
+		<p><b>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</b> у Франції (структури бібліотечних записів, авторитетні джерела згідно MARC, поличка замовлень для електронічного каталогу, підтримка періодичних видань)</p>
 	</div>
 	<div id="bloc25">
 		<h2>Основна група версії 2.2</h2>
@@ -29,7 +29,7 @@
 			<p>та керівники груп супроводу Саймон Блейк {Simon Blake} і Аманда Аткінс {Amanda Atkins}, Олвен Вілліамс {Olwen Williams}, Фінлі Томпсон {Finlay Thompson},</p>
 			<p>Гин Ломакс {Gynn Lomax}, Річард Андерсон {Richard Anderson}, Джеремі Блейк {Jeremy Blake}, Ребека Холден {Rebecca Holden}, Олайв Т. Кейнін {Olive T. Canine}</p>
 		</ul>
-		<p>Emiliano Marmonti, Matías Veleda & Sebastian Catañeda <b>La Plata University, Argentina</b> (barcode printing)</p>
+		<p>Емільяно Мармонті {Emiliano Marmonti}, Матіас Веледа {Matías Veleda} та Себастьян Кейтанеда {Sebastian Catañeda} з <b>університету ла-Плати {La Plata} у Аргентині</b> (друк штрих-коду)</p>
 		<p>MJ Ray та <b>Turo Текнолоджі LLP</b>, (перевірка якості, інсталятор та модуль оновлення, відповідальні за випуск 2.0 версії)</p>
 		<p>Ніколас Розаско {Nicholas Rosasco} (укладач документації)</p>
 		<p>Майк Хансен {Mike Hansen}</p>
@@ -49,7 +49,7 @@
 					<p>Доріан Мейд {Dorian Meid} (переклад на німецьку мову)</p>
 					<p>doXulting (Метью Бранлат {Matthieu Branlat}) бібліотечна поличка у електронічному каталозі</p>
 					<p>Ед Саммерс {Ed Summers} (деякий код та Perl-пакунки такі як MARC::Record)</p>
-					<p>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</p>
+					<p>Школа Єсії{Esiee} (Джером Віскано {Jérome Vizcaino}, Мішель Леренард {Michel Lerenard}, Пієрр Кошуа {Pierre Cauchois})</p>
 					<p>Флоріан Бішоф {Florian Bischof}</p>
 					<p>Франціско М. Марсоа Алонсо {Francisco M. Marzoa Alonso}</p>
 					<p>Глен Стюарт {Glen Stewart}</p>

Index: uk_UA/acqui/newbiblio.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/acqui/Attic/newbiblio.tmpl,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -b -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- uk_UA/acqui/newbiblio.tmpl	7 May 2007 09:08:32 -0000	1.1.2.1.2.1
+++ uk_UA/acqui/newbiblio.tmpl	7 May 2007 13:55:51 -0000	1.1.2.1.2.2
@@ -189,19 +189,35 @@
 		</p>
 		<p>
 			<label class="label100">Асигнована вартість</label>
-			<input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->"<!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
+			<!-- TMPL_IF name="close" -->
+                            <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly >
+			<!-- TMPL_ELSE -->
+                            <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->">
+			<!--/TMPL_IF-->
 		</p>
 <!-- TMPL_IF NAME="GST" -->		<p>
 			<label class="label100">Асигноване ПДВ</label>
-			<input type="text" size="20" name="GST" value="<!-- TMPL_VAR NAME="GST" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
+			<!-- TMPL_IF name="close" -->
+                            <input type="text" size="20" name="GST" value="<!-- TMPL_VAR NAME="GST" -->" readonly >
+			<!-- TMPL_ELSE -->
+                            <input type="text" size="20" name="GST" value="<!-- TMPL_VAR NAME="GST" -->" >
+			<!--/TMPL_IF-->
 		</p><!-- TMPL_ELSE --><input type="hidden" name="GST" value="0"><!-- /TMPL_IF -->
 		<p>
 			<label class="label100"><b>АСИГНОВАНО ЗАГАЛОМ</b></label>
-			<input type="text" size="20" name="total" value="" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
+			<!-- TMPL_IF name="close" -->
+                            <input type="text" size="20" name="total" value="" readonly >
+                        <!-- TMPL_ELSE -->
+                            <input type="text" size="20" name="total" value="" readonly >
+			<!--/TMPL_IF-->
 		</p>
 		<p>
 			<label class="label100">Фактична вартість</label>
-			<input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
+			<!-- TMPL_IF name="close" -->
+                            <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" readonly >
+			<!-- TMPL_ELSE -->
+                            <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" >
+			<!--/TMPL_IF-->
 		</p>
 		<p>
 			<label class="label100"><i>Код пакету</i></label>

Index: uk_UA/help/bull/subscription-add.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/help/bull/Attic/subscription-add.tmpl,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -b -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- uk_UA/help/bull/subscription-add.tmpl	7 May 2007 09:08:34 -0000	1.1.2.1.2.1
+++ uk_UA/help/bull/subscription-add.tmpl	7 May 2007 13:55:51 -0000	1.1.2.1.2.2
@@ -17,13 +17,13 @@
 				<li>Останнє значення / починається з: останнє обраховане значення або 1-ше значення (при додаванні передплати </li>
 			</ul>
 		<h2>Зразок</h2>
-		Consider the formula <b>N°{X}/{Y}</b>. The following XYZ settings :
+		Розглянемо формулу <b>№{X}/{Y}</b>. Наступні  XYZ-налаштування: 
 		<ul>
 			<li> <b>X</b> додається <b>1</b> раз в  <b>4</b>  разів. Коли більш ніж  <b>9999999</b>  повернути назад до  <b>пусто</b>. Починається з  <b>2004</b></li>
 			<li> <b>Y</b> додається <b>1</b> раз в  <b>1</b>  разів. Коли більш ніж  <b>4</b>  повернути назад до  <b>4</b>. Починається з  <b>1</b></li>
 		</ul>
 		приводитиме до наступних номерів випусків: 
-		<p>N°2004/1, N°2004/2, N°2004/3, N°2004/4, N°2005/1, N°2005/2, N°2005/3, N°2005/4, N°2006/1</p>
+		<p>â„–2004/1, â„–2004/2, â„–2004/3, â„–2004/4, â„–2005/1, â„–2005/2, â„–2005/3, â„–2005/4, â„–2006/1</p>
 		<p>
 			<b>Примітка:</b> коли Ви додаєте передплату, Коха вважає, що Ви вже зробили замовлення або зробите це незабаром. Тобто, модулю надходжень НЕ відправляється жодна інформація.  Це не випадок, коли передплата вичерпується. У даному випадку, передплатне відновлення створює "пропозицію" що відправляється модулю надходжень.
 		</p>

Index: uk_UA/help/bull/subscription-detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/help/bull/Attic/subscription-detail.tmpl,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -b -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- uk_UA/help/bull/subscription-detail.tmpl	7 May 2007 09:08:34 -0000	1.1.2.1.2.1
+++ uk_UA/help/bull/subscription-detail.tmpl	7 May 2007 13:55:51 -0000	1.1.2.1.2.2
@@ -18,11 +18,11 @@
 				<li>Останнє значення / починається з: останнє обраховане значення або 1-ше значення (при додаванні передплати </li>
 			</ul>
 		<h2>Зразок</h2>
-			Consider the formula <b>N°{X}/{Y}</b>. The following XYZ settings :
+			Розглянемо формулу <b>№{X}/{Y}</b>. Наступні  XYZ-налаштування: 
 			<li> <b>X</b> додається <b>1</b> раз в  <b>4</b>  разів. Коли більш ніж  <b>9999999</b>  повернути назад до  <b>пусто</b>. Починається з  <b>2004</b></li>
 			<li> <b>Y</b> додається <b>1</b> раз в  <b>1</b>  разів. Коли більш ніж  <b>4</b>  повернути назад до  <b>4</b>. Починається з  <b>1</b></li>
 			приводитиме до наступних номерів випусків: 
-			<b>N°2004/1,N°2004/2,N°2004/3,N°2004/4,N°2005/1,N°2005/2,N°2005/3,N°2005/4,N°2006/1
+			<b>â„–2004/1, â„–2004/2, â„–2004/3, â„–2004/4, â„–2005/1, â„–2005/2, â„–2005/3, â„–2005/4, â„–2006/1
 		<p>
 		</p>
 <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: uk_UA/help/reports/borrowers_stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/help/reports/Attic/borrowers_stats.tmpl,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -b -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- uk_UA/help/reports/borrowers_stats.tmpl	7 May 2007 09:08:34 -0000	1.1.2.1.2.1
+++ uk_UA/help/reports/borrowers_stats.tmpl	7 May 2007 13:55:51 -0000	1.1.2.1.2.2
@@ -22,7 +22,7 @@
  <h2>  Критерії для рядка/стовпчика</h2>
  <ul> <li>Ви можете вибрати сортувальне_поле1, сортувальне_поле1, якщо заповнювалися.</li>
  <li>Ви можете вибрати підрозділ, індекс або код_категорії.</li>
- <li>If you chose zipcode, since the 2 first digits in France represents the country (Hérault 34, Haute-Garonne 31), some may want to have stats on representation of this countries. That is why you can select to group stats on some digits of zipcode.</li>
+ <li>If you chose zipcode, since the 2 first digits in France represents the country (Herault 34, Haute-Garonne 31), some may want to have stats on representation of this countries. That is why you can select to group stats on some digits of zipcode.</li>
  </ul>
  
 </p>

Index: uk_UA/includes/calendar/calendar-setup.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/includes/calendar/Attic/calendar-setup.js,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -b -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- uk_UA/includes/calendar/calendar-setup.js	7 May 2007 09:08:34 -0000	1.1.2.1.2.1
+++ uk_UA/includes/calendar/calendar-setup.js	7 May 2007 13:55:51 -0000	1.1.2.1.2.2
@@ -19,7 +19,7 @@
  * than modifying calendar.js itself).
  */
 
-// $Id: calendar-setup.js,v 1.1.2.1.2.1 2007/05/07 09:08:34 tipaul Exp $
+// $Id: calendar-setup.js,v 1.1.2.1.2.2 2007/05/07 13:55:51 tipaul Exp $
 
 /**
  *  This function "patches" an input field (or other element) to use a calendar

Index: uk_UA/includes/calendar/calendar.js
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/includes/calendar/Attic/calendar.js,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -b -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- uk_UA/includes/calendar/calendar.js	7 May 2007 09:08:34 -0000	1.1.2.1.2.1
+++ uk_UA/includes/calendar/calendar.js	7 May 2007 13:55:51 -0000	1.1.2.1.2.2
@@ -10,7 +10,7 @@
  * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
  */
 
-// $Id: calendar.js,v 1.1.2.1.2.1 2007/05/07 09:08:34 tipaul Exp $
+// $Id: calendar.js,v 1.1.2.1.2.2 2007/05/07 13:55:51 tipaul Exp $
 
 /** The Calendar object constructor. */
 Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {

Index: uk_UA/members/jmemberentry.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/members/Attic/jmemberentry.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -b -r1.1.2.1 -r1.1.2.1.2.1
--- uk_UA/members/jmemberentry.tmpl	17 Oct 2006 07:32:53 -0000	1.1.2.1
+++ uk_UA/members/jmemberentry.tmpl	7 May 2007 13:55:51 -0000	1.1.2.1.2.1
@@ -4,7 +4,7 @@
 	<form action="/cgi-bin/koha/members/newjmember.pl" method="post">
 		<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->">
 		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
-		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="zipcode" -->">
+		<input type="hidden" name="zipcode" value="<!-- TMPL_VAR NAME="zipcode" -->">
 		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
 		<input type="hidden" name="updtype" value="I">
 		<input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->">
@@ -73,6 +73,15 @@
 			<td><input type="text" name="school_child_<!-- TMPL_VAR NAME="i" -->" size="20" value=""></td>
 		</tr>
 		<tr>
+                        <th colspan="5" >БІБЛІОТЕЧНЕ ВИКОРИСТАННЯ</th>
+                </tr>
+                <tr>
+                    <td>Дата приєднання (якщо сьогодні, то залишіть пустим)</td>
+                    <td><input type="text" name="joining_child_<!-- TMPL_VAR NAME="i" -->" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->"></td>
+                    <td>Дата закінчення терміну (для автоматичного обрахунку залишіть пустим)</td>
+                    <td><input type="text" name="expiry_child_<!-- TMPL_VAR NAME="i" -->" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->"></td>
+                </tr>
+		<tr>
 			<td colspan="5">2 наступні поля доступні для Вашого власного використання. Вони можуть бути корисними для цілей статистики</td>
 		<tr>
 			<td>Поле 1 (для сортування) </td>

Index: uk_UA/members/memberentry.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/members/Attic/memberentry.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -b -r1.1.2.1 -r1.1.2.1.2.1
--- uk_UA/members/memberentry.tmpl	17 Oct 2006 07:32:53 -0000	1.1.2.1
+++ uk_UA/members/memberentry.tmpl	7 May 2007 13:55:51 -0000	1.1.2.1.2.1
@@ -105,7 +105,11 @@
 			<tr>
 				<td colspan="2">
 				<!-- TMPL_UNLESS name="institution" -->
-					<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked<!-- /TMPL_IF -->>F  <input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked<!-- /TMPL_UNLESS -->> M
+                                    <!-- TMPL_IF NAME="female" -->
+					<input type="radio" name="sex" value="F" checked>Female  <input type="radio" name="sex" value="M" > Male
+                                    <!-- TMPL_ELSE -->
+					<input type="radio" name="sex" value="F">Female  <input type="radio" name="sex" value="M" checked> Male
+                                    <!-- /TMPL_IF -->
 				<!-- /TMPL_UNLESS -->
 
 				</td>

Index: uk_UA/members/moremember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/members/Attic/moremember.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -b -r1.1.2.1 -r1.1.2.1.2.1
--- uk_UA/members/moremember.tmpl	17 Oct 2006 07:32:53 -0000	1.1.2.1
+++ uk_UA/members/moremember.tmpl	7 May 2007 13:55:51 -0000	1.1.2.1.2.1
@@ -192,7 +192,7 @@
 						<!-- TMPL_IF NAME="norenew" -->
 							<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">На запит - немає продовжень</a>
 						<!-- TMPL_ELSE -->
-							<input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y">Y  <input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="n">N
+							<input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y">Так <input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="n">Ні
 						<!-- /TMPL_IF -->
 					</td>
 				<!-- /TMPL_UNLESS --> 

Index: uk_UA/members/newjmember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/members/Attic/newjmember.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -u -b -r1.1.2.1 -r1.1.2.1.2.1
--- uk_UA/members/newjmember.tmpl	17 Oct 2006 07:32:53 -0000	1.1.2.1
+++ uk_UA/members/newjmember.tmpl	7 May 2007 13:55:51 -0000	1.1.2.1.2.1
@@ -86,6 +86,22 @@
 						<!-- TMPL_VAR NAME="notes" -->
 						</td>
 					</tr>
+					<tr valign="top" bgcolor="white" >
+						<td>
+						<b>Дата приєднання</b>
+						</td>
+						<td>
+						<!-- TMPL_VAR NAME="joining" -->
+						</td>
+					</tr>
+					<tr valign="top" bgcolor="white" >
+						<td>
+						<b>Expiry date</b>
+						</td>
+						<td>
+						<!-- TMPL_VAR NAME="expiry" -->
+						</td>
+					</tr>
 				</table><p>
 			<!-- /TMPL_IF -->
 	<!-- /TMPL_LOOP -->

Index: uk_UA/parameters/marctagstructure.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/parameters/Attic/marctagstructure.tmpl,v
retrieving revision 1.1.2.1.2.1
retrieving revision 1.1.2.1.2.2
diff -u -b -r1.1.2.1.2.1 -r1.1.2.1.2.2
--- uk_UA/parameters/marctagstructure.tmpl	7 May 2007 09:08:35 -0000	1.1.2.1.2.1
+++ uk_UA/parameters/marctagstructure.tmpl	7 May 2007 13:55:51 -0000	1.1.2.1.2.2
@@ -68,15 +68,15 @@
 		<p><label>Ознака<label><!-- TMPL_IF Name="searchfield" -->
 		<!-- TMPL_VAR NAME="searchfield" -->
 		<!-- TMPL_ELSE -->
-		<input type="text" name="tagfield" value="" escape="HTML" -->
+		<input type="text" name="tagfield" value="" escape="HTML">
 		<!-- /TMPL_IF -->
 		</p>
-		<p><label>Lib for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100"></p>
-		<p><label>Lib for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></p>
-		<p><label>Repeatable</label><!-- TMPL_VAR NAME="repeatable" --></p>
-		<p><label>Mandatory</label><!-- TMPL_VAR NAME="mandatory" --></p>
-		<p><label>Authorised value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</p>
-		<p><label>&nbsp;</label><input type="button" value="OK" class="button" onclick="Check(this.form)"></p>
+		<p><label>Description for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100"></p>
+		<p><label>Description for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></p>
+		<p><label>Повторюване</label><!-- TMPL_VAR NAME="repeatable" --></p>
+		<p><label>Обов'язкове</label><!-- TMPL_VAR NAME="mandatory" --></p>
+		<p><label>Авторитетне джерело </label><!-- TMPL_VAR NAME="authorised_value" --> (якщо Ви задаєте тут значення, індикатори будуть обмежені списком авторитетних значень)</p>
+		<p><label>&nbsp;</label><input type="button" value="Гаразд" class="button" onclick="Check(this.form)"></p>
 	</form>
 <!-- /TMPL_IF -->
 
@@ -85,20 +85,20 @@
 <!-- ------------------------------------------------------------------------ -->
 <table>
 	<tr>
-		<td>tag</td>
+		<td>ознака</td>
 		<td><!-- TMPL_VAR NAME="searchfield" --></td>
 	</tr>
 	<tr><td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
-	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
-	<tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO"></form></td></tr>
+	<tr><td colspan="2" align="center">ПІДТВЕРДІТЬ ВИДАЛЕННЯ</td></tr>
+	<tr><td><input type="submit" value="ТАК"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="НІ"></form></td></tr>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirmed" -->
 <!-- ------------------------------------------------------------------------ -->
-	Data deleted
+	Видалені дані
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
-	<input type="submit" value="OK">
+	<input type="submit" value="Гаразд">
 	</form>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="framework_create" -->
@@ -108,12 +108,12 @@
 		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
 		Create framework for <!-- TMPL_VAR NAME="frameworkcode" --> (<!-- TMPL_VAR NAME="frameworktext" -->) using
 		<select name="existingframeworkcode">
-			<option value="">Default</option>
+			<option value="">По умовчанню</option>
 		<!-- TMPL_LOOP NAME="existingframeworkloop" -->
 			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
 		<!-- /TMPL_LOOP -->
 		</select>
-		<input type="submit" value="OK" class="button">
+		<input type="submit" value="Гаразд" class="button">
 	</form>
 <!-- /TMPL_IF -->
 <!-- ------------------------------------------------------------------------ -->
@@ -122,13 +122,18 @@
 	<h2 class="parameters">Select a framework</h2>
 	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<select name="frameworkcode">
-			<option value="">Default</option>
+			<option value="">По умовчанню</option>
 		<!-- TMPL_LOOP NAME="frameworkloop" -->
-			<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
+                    <!-- TMPL_IF NAME="selected" -->
+			<option value="<!-- TMPL_VAR NAME="value" -->" selected>
+                    <!-- TMPL_ELSE -->
+			<option value="<!-- TMPL_VAR NAME="value" -->" >
+                    <!-- /TMPL_IF -->
+			<!-- TMPL_VAR NAME="frameworktext" --></option>
 		<!-- /TMPL_LOOP -->
 		</select>
 		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
-		<input type="submit" value="OK" class="button">
+		<input type="submit" value="Гаразд" class="button">
 		<p><!-- TMPL_IF Name="select_display"-->
 				<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" checked OnChange="javascript:document.f.submit()">
 			<!-- TMPL_ELSE -->
@@ -141,24 +146,24 @@
 	<div id="bloc100">
 	<table>
 		<tr>
-			<th>Tag</th>
-			<th>Lib</th>
-			<th>Repeatable</th>
-			<th>Mandatory</th>
-			<th>Authorised<br />value</th>
-			<th>Subfields</th>
-			<th>Edit</th>
-			<th>Delete</th>
+			<th>Ознака</th>
+			<th>Мітка/ім'я</th>
+			<th>Повторюване</th>
+			<th>Обов'язкове</th>
+			<th>Авторитетні<br />значення</th>
+			<th>Підполя</th>
+			<th>Редагувати</th>
+			<th>Видалити</th>
 		<tr>
 	<!-- TMPL_IF NAME="select_display" -->
 		<!-- TMPL_LOOP NAME="loop" -->
 		<tr class="hilighted">
 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
-			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="repeatable" -->Так<!-- TMPL_ELSE -->Ні<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="mandatory" -->Так<!-- TMPL_ELSE -->Ні<!-- /TMPL_IF --></td>
 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
-			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
+			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">підполя</a></td>
 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
 		</tr>
@@ -169,8 +174,7 @@
 			<td colspan=7 border=0>
 				<!-- TMPL_LOOP NAME="subfields" -->
 					<p><label>&nbsp;</label>
-							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
-							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
+							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->  <!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
 					</p>
 				<!-- /TMPL_LOOP -->
 			</td>
@@ -181,10 +185,10 @@
 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
-			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="repeatable" -->Так<!-- TMPL_ELSE -->Ні<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="mandatory" -->Так<!-- TMPL_ELSE -->Ні<!-- /TMPL_IF --></td>
 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
-			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
+			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">підполя</a></td>
 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
 		</tr>
@@ -196,15 +200,15 @@
 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<input type="hidden" name="op" value="add_form">
 	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
-		<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
+		<input type="submit" class="button" value="Додати ознаку" title="Додати ознаку" alt="Додати ознаку">
 		<!-- TMPL_IF NAME="isprevpage" -->
 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
-			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
+			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="назад" alt="назад" border="0">
 			</a>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="nextpage" -->
 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
-				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
+				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="далі" alt="далі" border="0">
 			</a>
 		<!-- /TMPL_IF -->
 </form>

Index: uk_UA/value_builder/unimarc_field_100.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_100.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_100.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_100.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,16 +1,16 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 100</title>
+<title>UNIMARC Field 100 builder</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
 <table>
 	<tr>
-		<td>Дата вводу запису до файлу</td>
+		<td>Date d'enregistrement</td>
 		<td><input type="text" name="f1" maxlength=8 size=9 value="<!-- TMPL_VAR name="f1" -->"></td>
 	</tr>
 	<tr>
-		<td>Код типу дати публікації </td>
+		<td>Code de date de publication </td>
 		<td>
 			<select name="f2" size="1">
 	    <!-- TMPL_IF name="f2 " -->
@@ -21,82 +21,100 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f2a" -->
-				<option value="a" SELECTED>Поточне серіальне видання</option>
+				<option value="a" SELECTED>Periodique
+				en cours</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">Поточне серіальне видання</option>
+				<option value="a">Periodique en cours</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2b" -->
-				<option value="b" SELECTED>Серіальне видання, яке більше не публікується</option>
+				<option value="b" SELECTED>Periodique mort</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">Серіальне видання, яке більше не публікується</option>
+				<option value="b">Periodique mort</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>Серіальне видання з невизначеним статусом</option>
+				<option value="c" SELECTED>Periodique
+				d'etat inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">Серіальне видання з невизначеним статусом</option>
+				<option value="c">Periodique d'etat inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
-				<option value="d" SELECTED>Монографія, яка видається повністю або видається протягом одного календарного року</option>
+				<option value="d" SELECTED>Monographie
+				complete</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">Монографія, яка видається повністю або видається протягом одного календарного року</option>
+				<option value="d">Monographie
+				complete</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2e" -->
-				<option value="e" SELECTED>Репродукований документ</option>
+				<option value="e" SELECTED>reproduction</option>
 			<!-- TMPL_ELSE -->
-				<option value="e">Репродукований документ</option>
+				<option value="e">reproduction</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f2f" -->
 				<option value="f"
-				SELECTED>Монографія, дата публікації якої точно не відома</option>
+				SELECTED>monographie, date de
+				publication incertaine</option>
 			<!-- TMPL_ELSE -->
-				<option value="f">Монографія, дата публікації якої точно не відома</option>
+				<option value="f">monographie, date de
+				publication incertaine</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f2g" -->
 				<option value="g"
-				SELECTED>Монографія, публікація якої триває більше одного календарного року</option>
+				SELECTED>monographie dont la
+				publication s'etend sur plus d'un an</option>
 			<!-- TMPL_ELSE -->
-				<option value="g">Монографія, публікація якої триває більше одного календарного року</option>
+				<option value="g">monographie dont la
+				publication s'etend sur plus d'un an</option>
 			<!-- /TMPL_IF -->
 			
 			
 			<!-- TMPL_IF name="f2h" -->
 				<option value="h"
-				SELECTED>Монографія з фактичною датою публікації та датою надання копірайту/ привілею</option>
-			<!-- TMPL_ELSE -->
-				<option value="h">Монографія з фактичною датою публікації та датою надання копірайту/ привілею</option>
+				SELECTED>monographie ayant a la fois
+				une date reelle et une date de
+				copyright ou de privilege</option>
+			<!-- TMPL_ELSE -->
+				<option value="h">monographie ayant a la fois
+				une date reelle et une date de
+				copyright ou de privilege</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f2i" -->
 				<option value="i"
-				SELECTED>Документ (монографія) з датою виходу/ випуску та датою виробництва</option>
-			<!-- TMPL_ELSE -->
-				<option value="i">Документ (монографія) з датою виходу/ випуску та датою виробництва</option>
+				SELECTED>monographie ayant a la fois
+				une date d'edition ou de reedition et
+				une date de production</option>
+			<!-- TMPL_ELSE -->
+				<option value="i">monographie ayant a la fois
+				une date d'edition ou de reedition et
+				une date de production</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f2j" -->
 				<option value="j"
-				SELECTED>Документ з точною датою публікації</option>
+				SELECTED>monographie avec date
+				publication detaillee</option>
 			<!-- TMPL_ELSE -->
-				<option value="j">Документ з точною датою публікації </option>
+				<option value="j">monographie avec date
+				publication detaillee </option>
 			<!-- /TMPL_IF -->
 			
 			</select>
 		</td>
 	</tr>
 	<tr>
-		<td>Дата публікації 1</td>
+		<td>Premiere date de publication</td>
 		<td><input type="text" name="f3" maxlength=4 size=5 value="<!-- TMPL_VAR name="f3" -->"></td>
 	</tr>
 	<tr>
-	<td>Дата публікації 2</td>
+	<td>Deuxieme date de publication</td>
 	<td><input type="text" name="f4" maxlength=4 size=5
 		value="<!-- TMPL_VAR name="f4" -->"></td>
         
 	</tr>
 	<tr>
-		<td>Код цільового призначення 1</td>
+		<td>Niveau intellectuel ou public destinataire 1</td>
 		<td>
 			<select name="f5" size="1">
 	    <!-- TMPL_IF name="f5 " -->
@@ -106,57 +124,58 @@
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5a" -->
-				<option value="a" SELECTED>Для дітей та юнацтва, загальний </option>
+				<option value="a" SELECTED>Jeunesse en
+	general </option>
 			<!-- TMPL_ELSE -->
-				<option value="a">Для дітей та юнацтва, загальний</option>
+				<option value="a">Jeunesse en general</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5b" -->
 				<option value="b"
-	SELECTED>Для дітей дошкільного віку (0-5 років)</option>
+	SELECTED>Pre-scolaire</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">Для дітей дошкільного віку (0-5 років)</option>
+				<option value="b">Pre-scolaire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5c" -->
-				<option value="c" SELECTED>Для дітей молодшого шкільного віку (5-9 років)</option>
+				<option value="c" SELECTED>scolaire</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">Для дітей молодшого шкільного віку (5-9 років)</option>
+				<option value="c">scolaire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5d" -->
-				<option value="d" SELECTED>Для дітей середнього шкільного віку, підлітків (9-14 років)</option>
+				<option value="d" SELECTED>enfant</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">Для дітей середнього шкільного віку, підлітків (9-14 років)</option>
+				<option value="d">enfant</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5e" -->
-				<option value="e" SELECTED>Для дітей старшого шкільного віку, юнацтва (14-20 років)</option>
+				<option value="e" SELECTED>jeune adulte</option>
 			<!-- TMPL_ELSE -->
-				<option value="e">Для дітей старшого шкільного віку, юнацтва (14-20 років)</option>
+				<option value="e">jeune adulte</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f5k" -->
 				<option value="k"
-				SELECTED>Для дорослих, наукова</option>
+				SELECTED>adulte, haut niveau</option>
 			<!-- TMPL_ELSE -->
-				<option value="k">Для дорослих, наукова</option>
+				<option value="k">adulte, haut niveau</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5m" -->
 				<option value="m"
-				SELECTED>Для дорослих, загального змісту</option>
+				SELECTED>fiction ou vulg adulte</option>
 			<!-- TMPL_ELSE -->
-				<option value="m">Для дорослих, загального змісту</option>
+				<option value="m">fiction ou vulg adulte</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f5u" -->
 				<option value="u"
-				SELECTED>Невідомо</option>
+				SELECTED>inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">inconnu</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
 	</tr>
 	<tr>
-		<td>Код цільового призначення 2</td>
+		<td>Niveau intellectuel ou public destinataire 2</td>
 		<td>
 			<select name="f6" size="1">
 	    <!-- TMPL_IF name="f6 " -->
@@ -166,57 +185,58 @@
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6a" -->
-				<option value="a" SELECTED>Для дітей та юнацтва, загальний </option>
+				<option value="a" SELECTED>Jeunesse en
+	general </option>
 			<!-- TMPL_ELSE -->
-				<option value="a">Для дітей та юнацтва, загальний</option>
+				<option value="a">Jeunesse en general</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6b" -->
 				<option value="b"
-	SELECTED>Для дітей дошкільного віку (0-5 років)</option>
+	SELECTED>Pre-scolaire</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">Для дітей дошкільного віку (0-5 років)</option>
+				<option value="b">Pre-scolaire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6c" -->
-				<option value="c" SELECTED>Для дітей молодшого шкільного віку (5-9 років)</option>
+				<option value="c" SELECTED>scolaire</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">Для дітей молодшого шкільного віку (5-9 років)</option>
+				<option value="c">scolaire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6d" -->
-				<option value="d" SELECTED>Для дітей середнього шкільного віку, підлітків (9-14 років)</option>
+				<option value="d" SELECTED>enfant</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">Для дітей середнього шкільного віку, підлітків (9-14 років)</option>
+				<option value="d">enfant</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6e" -->
-				<option value="e" SELECTED>Для дітей старшого шкільного віку, юнацтва (14-20 років)</option>
+				<option value="e" SELECTED>jeune adulte</option>
 			<!-- TMPL_ELSE -->
-				<option value="e">Для дітей старшого шкільного віку, юнацтва (14-20 років)</option>
+				<option value="e">jeune adulte</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f6k" -->
 				<option value="k"
-				SELECTED>Для дорослих, наукова</option>
+				SELECTED>adulte, haut niveau</option>
 			<!-- TMPL_ELSE -->
-				<option value="k">Для дорослих, наукова</option>
+				<option value="k">adulte, haut niveau</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6m" -->
 				<option value="m"
-				SELECTED>Для дорослих, загального змісту</option>
+				SELECTED>fiction ou vulg adulte</option>
 			<!-- TMPL_ELSE -->
-				<option value="m">Для дорослих, загального змісту</option>
+				<option value="m">fiction ou vulg adulte</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f6u" -->
 				<option value="u"
-				SELECTED>Невідомо</option>
+				SELECTED>inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">inconnu</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
 	</tr>
 	<tr>
-		<td>Код цільового призначення 3</td>
+		<td>Niveau intellectuel ou public destinataire 3</td>
 		<td>
 			<select name="f7" size="1">
 	    <!-- TMPL_IF name="f7 " -->
@@ -226,57 +246,58 @@
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7a" -->
-				<option value="a" SELECTED>Для дітей та юнацтва, загальний </option>
+				<option value="a" SELECTED>Jeunesse en
+	general </option>
 			<!-- TMPL_ELSE -->
-				<option value="a">Для дітей та юнацтва, загальний</option>
+				<option value="a">Jeunesse en general</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7b" -->
 				<option value="b"
-	SELECTED>Для дітей дошкільного віку (0-5 років)</option>
+	SELECTED>Pre-scolaire</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">Для дітей дошкільного віку (0-5 років)</option>
+				<option value="b">Pre-scolaire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7c" -->
-				<option value="c" SELECTED>Для дітей молодшого шкільного віку (5-9 років)</option>
+				<option value="c" SELECTED>scolaire</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">Для дітей молодшого шкільного віку (5-9 років)</option>
+				<option value="c">scolaire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>Для дітей середнього шкільного віку, підлітків (9-14 років)</option>
+				<option value="d" SELECTED>enfant</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">Для дітей середнього шкільного віку, підлітків (9-14 років)</option>
+				<option value="d">enfant</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7e" -->
-				<option value="e" SELECTED>Для дітей старшого шкільного віку, юнацтва (14-20 років)</option>
+				<option value="e" SELECTED>jeune adulte</option>
 			<!-- TMPL_ELSE -->
-				<option value="e">Для дітей старшого шкільного віку, юнацтва (14-20 років)</option>
+				<option value="e">jeune adulte</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f7k" -->
 				<option value="k"
-				SELECTED>Для дорослих, наукова</option>
+				SELECTED>adulte, haut niveau</option>
 			<!-- TMPL_ELSE -->
-				<option value="k">Для дорослих, наукова</option>
+				<option value="k">adulte, haut niveau</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7m" -->
 				<option value="m"
-				SELECTED>Для дорослих, загального змісту</option>
+				SELECTED>fiction ou vulg adulte</option>
 			<!-- TMPL_ELSE -->
-				<option value="m">Для дорослих, загального змісту</option>
+				<option value="m">fiction ou vulg adulte</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f7u" -->
 				<option value="u"
-				SELECTED>Невідомо</option>
+				SELECTED>inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">inconnu</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
 	</tr>
 	<tr>
-		<td>Код урядової публікації</td>
+		<td>Publication officielle</td>
 		<td>
 			<select name="f8" size="1">
                    <!-- TMPL_IF name="f8 " -->
@@ -285,77 +306,82 @@
                                 <option value=" ">Немає</option>
                         <!-- /TMPL_IF -->
 		<!-- TMPL_IF name="f8a" -->
-				<option value="a" SELECTED>Національний/федеральний</option>
+				<option value="a" SELECTED>Federal/national</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">Національний/федеральний</option>
+				<option value="a">Federal/national</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8b" -->
-				<option value="b" SELECTED>Автономна республіка/провінція/штат тощо</option>
+				<option value="b" SELECTED>etat/province</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">Автономна республіка/провінція/штат тощо</option>
+				<option value="b">etat/province</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8c" -->
-				<option value="c" SELECTED>Область/графство/департамент тощо</option>
+				<option value="c" SELECTED>compte/departement</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">Область/графство/департамент тощо</option>
+				<option value="c">compte/departement</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8d" -->
 				<option value="d"
-				SELECTED>Місцевий (муніципальний тощо)</option>
+				SELECTED>local(municipal, etc.)</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">Місцевий (муніципальний тощо)</option>
+				<option value="d">local(municipal, etc.)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8e" -->
 				<option value="e"
-				SELECTED>Міжтериторіальний (міжурядові організації нижче найвищого рівня)</option>
+				SELECTED>multi-local(inter-departemental,
+				etc. sous le niveau national)</option>
 			<!-- TMPL_ELSE -->
-				<option value="e">Міжтериторіальний (міжурядові організації нижче найвищого рівня)</option>
+				<option value="e">multi-local(inter-departemental,
+				etc. sous le niveau national)</option>
 			<!-- /TMPL_IF -->
 			
 			<!-- TMPL_IF name="f8f" -->
 				<option value="f"
-				SELECTED>Міжурядовий</option>
+				SELECTED>Inter-gouvernemental</option>
 			<!-- TMPL_ELSE -->
-				<option value="f">Міжурядовий</option>
+				<option value="f">Inter-gouvernemental</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8g" -->
 				<option value="g"
-				SELECTED>Уряд у вигнанні або нелегальний уряд</option>
+				SELECTED>gouvernement en exil ou clandestin</option>
 			<!-- TMPL_ELSE -->
-				<option value="g">Уряд у вигнанні або нелегальний уряд</option>
+				<option value="g">gouvernement en exil
+				ou clandestin</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f8h" -->
 				<option value="h"
-				SELECTED>Рівень не визначено</option>
+				SELECTED>Niveau indetermine</option>
 			<!-- TMPL_ELSE -->
-				<option value="h">Рівень не визначено</option>
+				<option value="h">Niveau indetermine</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8u" -->
 				<option value="u"
-				SELECTED>Невідомо</option>
+				SELECTED>inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8y" -->
 				<option value="y"
-				SELECTED>Неурядова публікація</option>
+				SELECTED>il ne s'agit pas d'une
+				publication officielle</option>
 			<!-- TMPL_ELSE -->
-				<option value="y">Неурядова публікація</option>
+				<option value="y">il ne s'agit pas
+				d'une publication officielle</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8z" -->
 				<option value="z"
-				SELECTED>Інший адміністративний рівень</option>
+				SELECTED>Autre instance officielle</option>
 			<!-- TMPL_ELSE -->
-				<option value="z">Інший адміністративний рівень</option>
+				<option value="z">Autre instance officielle</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
 	</tr>
 
 	<tr>
-		<td>Код модифікації запису</td>
+		<td>Code de modification de la notice</td>
 		<td>
 			<select name="f9" size="1">
 	                  <!-- TMPL_IF name="f9 " -->
@@ -365,14 +391,14 @@
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f90" -->
-				<option value="0" SELECTED>Немодіфікований запис</option>
+				<option value="0" SELECTED>Notice non modifiee</option>
 			<!-- TMPL_ELSE -->
-				<option value="0">Немодіфікований запис</option>
+				<option value="0">Notice non modifiee</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f91" -->
-				<option value="1" SELECTED>Модифікований запис</option>
+				<option value="1" SELECTED>notice modifiee</option>
 			<!-- TMPL_ELSE -->
-				<option value="1">Модифікований запис</option>
+				<option value="1">notice modifiee</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
@@ -380,7 +406,7 @@
 
 
 	<tr>
-	<td>Мова посилань, довідок, приміток тощо каталогізатора</td>
+	<td>Langue de catalogage (obligatoire)</td>
 	<td><input type="text" name="f10" maxlength=3 size=4
 		value="<!-- TMPL_VAR name="f10" -->"></td>
         
@@ -389,7 +415,7 @@
 
 
 	<tr>
-		<td>Код транслітерації</td>
+		<td>Code de transliteration</td>
 		<td>
 			<select name="f11" size="1">
 	                  <!-- TMPL_IF name="f11 " -->
@@ -399,32 +425,36 @@
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f11a" -->
-				<option value="a" SELECTED>ISO-правила транслітерації</option>
+				<option value="a" SELECTED>Norme ISO
+		pour la translitteration</option>
 			<!-- TMPL_ELSE -->
-				<option value="a">ISO-правила транслітерації</option>
+				<option value="a">Norme ISO
+		pour la translitteration</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11b" -->
-				<option value="b" SELECTED>Інші</option>
+				<option value="b" SELECTED>autre</option>
 			<!-- TMPL_ELSE -->
-				<option value="b">Інші</option>
+				<option value="b">autre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11c" -->
 				<option value="c"
-		SELECTED>Одночасне використання ISO та інших стандартів транслітерації</option>
+		SELECTED>Translitterations multiples : ISO et autres regles</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">Одночасне використання ISO та інших стандартів транслітерації</option>
+				<option value="c">Translitterations multiples : ISO et autres regles</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11y" -->
-				<option value="y" SELECTED>Правила транслітерації на застосовувалися</option>
+				<option value="y" SELECTED>Sans regles
+		de translitteration</option>
 			<!-- TMPL_ELSE -->
-				<option value="y">Правила транслітерації на застосовувалися</option>
+				<option value="y">Sans regles
+		de translitteration</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
 	</tr>
 
 	<tr>
-	<td>Набори символів (обов'язкове) 1</td>
+	<td>Jeux de caracteres (obligatoire) 1</td>
 		<td>
 			<select name="f12" size="1">
 	   <!-- TMPL_IF name="f12  " -->
@@ -434,35 +464,45 @@
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1201" -->
-				<option value="01" SELECTED>ISO 646, версія IRV (основний латинський набір)</option>
+				<option value="01" SELECTED>ISO 646,
+	version IRV (caracteres latins de base)</option>
 			<!-- TMPL_ELSE -->
-				<option value="01">ISO 646, версія IRV (основний латинський набір)</option>
+				<option value="01">ISO 646,
+	version IRV (caracteres latins de base)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1202" -->
-				<option value="02" SELECTED>ISO реєстрація #37 (основний кириличний набір)</option>
+				<option value="02" SELECTED>Registre
+	ISO #37 (caracteres cyrilliques de base)</option>
 			<!-- TMPL_ELSE -->
-				<option value="02">ISO реєстрація #37 (основний кириличний набір)</option>
+				<option value="02">Registre
+	ISO #37 (caracteres cyrilliques de base)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1203" -->
 				<option value="03"
-		SELECTED>ISO 5426 (розширений латинський набір)</option>
+		SELECTED>ISO 5426 (jeu de caractere latin etendu)</option>
 			<!-- TMPL_ELSE -->
-				<option value="03">ISO 5426 (розширений латинський набір)</option>
+				<option value="03">ISO 5426 (jeu de caractere latin etendu)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1204" -->
-				<option value="04" SELECTED>ISO DIS 5427 (розширений кириличний набір)</option>
+				<option value="04" SELECTED>ISO DIS
+	5427 (jeu de caracteres cyrilliques etendu)</option>
 			<!-- TMPL_ELSE -->
-				<option value="04">ISO DIS 5427 (розширений кириличний набір)</option>
+				<option value="04">ISO DIS
+	5427 (jeu de caracteres cyrilliques etendu)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1205" -->
-				<option value="05" SELECTED>ISO 5428 (грецький набір)</option>
+				<option value="05" SELECTED>ISO  5428
+	(caracteres grecs)</option>
 			<!-- TMPL_ELSE -->
-				<option value="05">ISO 5428 (грецький набір)</option>
+				<option value="05">ISO  5428
+	(caracteres grecs)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1206" -->
-				<option value="06" SELECTED>ISO 6438 (набір кодований африканських символів)</option>
+				<option value="06" SELECTED>ISO 6438
+	(caracteres africains codes)</option>
 			<!-- TMPL_ELSE -->
-				<option value="06">ISO 6438 (набір кодований африканських символів)</option>
+				<option value="06">ISO 6438
+	(caracteres africains codes)</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
@@ -470,7 +510,7 @@
         
 	</tr>
 	<tr>
-	<td>Набори символів (обов'язкове) 2</td>
+	<td>Jeux de caracteres (obligatoire) 2</td>
 		<td>
 			<select name="f13" size="1">
 	   <!-- TMPL_IF name="f13  " -->
@@ -480,35 +520,45 @@
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f1301" -->
-				<option value="01" SELECTED>ISO 646, версія IRV (основний латинський набір)</option>
+				<option value="01" SELECTED>ISO 646,
+	version IRV (caracteres latins de base)</option>
 			<!-- TMPL_ELSE -->
-				<option value="01">ISO 646, версія IRV (основний латинський набір)</option>
+				<option value="01">ISO 646,
+	version IRV (caracteres latins de base)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1302" -->
-				<option value="02" SELECTED>ISO реєстрація #37 (основний кириличний набір)</option>
+				<option value="02" SELECTED>Registre
+	ISO #37 (caracteres cyrilliques de base)</option>
 			<!-- TMPL_ELSE -->
-				<option value="02">ISO реєстрація #37 (основний кириличний набір)</option>
+				<option value="02">Registre
+	ISO #37 (caracteres cyrilliques de base)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1303" -->
 				<option value="03"
-		SELECTED>ISO 5426 (розширений латинський набір)</option>
+		SELECTED>ISO 5426 (jeu de caractere latin etendu)</option>
 			<!-- TMPL_ELSE -->
-				<option value="03">ISO 5426 (розширений латинський набір)</option>
+				<option value="03">ISO 5426 (jeu de caractere latin etendu)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1304" -->
-				<option value="04" SELECTED>ISO DIS 5427 (розширений кириличний набір)</option>
+				<option value="04" SELECTED>ISO DIS
+	5427 (jeu de caracteres cyrilliques etendu)</option>
 			<!-- TMPL_ELSE -->
-				<option value="04">ISO DIS 5427 (розширений кириличний набір)</option>
+				<option value="04">ISO DIS
+	5427 (jeu de caracteres cyrilliques etendu)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1305" -->
-				<option value="05" SELECTED>ISO 5428 (грецький набір)</option>
+				<option value="05" SELECTED>ISO  5428
+	(caracteres grecs)</option>
 			<!-- TMPL_ELSE -->
-				<option value="05">ISO 5428 (грецький набір)</option>
+				<option value="05">ISO  5428
+	(caracteres grecs)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1306" -->
-				<option value="06" SELECTED>ISO 6438 (набір кодований африканських символів)</option>
+				<option value="06" SELECTED>ISO 6438
+	(caracteres africains codes)</option>
 			<!-- TMPL_ELSE -->
-				<option value="06">ISO 6438 (набір кодований африканських символів)</option>
+				<option value="06">ISO 6438
+	(caracteres africains codes)</option>
 			<!-- /TMPL_IF -->
 			</select>
 		</td>
@@ -517,14 +567,14 @@
 	</tr>
 
 	<tr>
-	<td>Додаткові набори символів</td>
+	<td>Jeu de caracteres additionnels</td>
 	<td><input type="text" name="f14" maxlength=4 size=5
 		value="<!-- TMPL_VAR name="f14" -->"></td>
         
 	</tr>
 
 	<tr>
-	<td>Графіка назви</td>
+	<td>Alphabet du titre</td>
 	<td>
 	<select name="f15" size="1">
 	   <!-- TMPL_IF name="f15  " -->
@@ -534,78 +584,80 @@
                         <!-- /TMPL_IF -->
 
 	<!-- TMPL_IF name="f15ba" -->
-				<option value="ba" SELECTED>латинська</option>
+				<option value="ba" SELECTED>Latin</option>
 			<!-- TMPL_ELSE -->
-				<option value="ba">латинська</option>
+				<option value="ba">Latin</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15ca" -->
-				<option value="ca" SELECTED>кирилична</option>
+				<option value="ca" SELECTED>Cyrillique</option>
 			<!-- TMPL_ELSE -->
-				<option value="ca">кирилична</option>
+				<option value="ca">Cyrillique</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15da" -->
 				<option value="da" SELECTED>Japonais -
 				alphabet non precise</option>
 			<!-- TMPL_ELSE -->
-				<option value="da">японська — невизначена графіка</option>
+				<option value="da">Japonais non precise</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15db" -->
-				<option value="db" SELECTED>японська — канджи</option>
+				<option value="db" SELECTED>Japonais -
+				Kanji</option>
 			<!-- TMPL_ELSE -->
-				<option value="db">японська — канджи</option>
+				<option value="db">Japonais - Kanji</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f15dc" -->
-				<option value="dc" SELECTED>японська — кана</option>
+				<option value="dc" SELECTED>Japonais -
+				Kana</option>
 			<!-- TMPL_ELSE -->
-				<option value="dc">японська — кана</option>
+				<option value="dc">Japonais - Kana</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15ea" -->
-				<option value="ea" SELECTED>китайська</option>
+				<option value="ea" SELECTED>Chinois</option>
 			<!-- TMPL_ELSE -->
-				<option value="ea">китайська</option>
+				<option value="ea">Chinois</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15fa" -->
-				<option value="fa" SELECTED>арабська</option>
+				<option value="fa" SELECTED>Arabe</option>
 			<!-- TMPL_ELSE -->
-				<option value="fa">арабська</option>
+				<option value="fa">Arabe</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15ga" -->
-				<option value="ga" SELECTED>грецька</option>
+				<option value="ga" SELECTED>Grec</option>
 			<!-- TMPL_ELSE -->
-				<option value="ga">грецька</option>
+				<option value="ga">Grec</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15ha" -->
-				<option value="ha" SELECTED>іврит</option>
+				<option value="ha" SELECTED>Hebreu</option>
 			<!-- TMPL_ELSE -->
-				<option value="ha">іврит</option>
+				<option value="ha">Hebreu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15ia" -->
-				<option value="ia" SELECTED>тайська</option>
+				<option value="ia" SELECTED>Thai</option>
 			<!-- TMPL_ELSE -->
-				<option value="ia">тайська</option>
+				<option value="ia">Thai</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15ja" -->
-				<option value="ja" SELECTED>деванагарі</option>
+				<option value="ja" SELECTED>Devanagari</option>
 			<!-- TMPL_ELSE -->
-				<option value="ja">деванагарі</option>
+				<option value="ja">Devanagari</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15ka" -->
-				<option value="ka" SELECTED>корейська</option>
+				<option value="ka" SELECTED>Coreen</option>
 			<!-- TMPL_ELSE -->
-				<option value="ka">корейська</option>
+				<option value="ka">Coreen</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15la" -->
-				<option value="la" SELECTED>тамільська</option>
+				<option value="la" SELECTED>Tamil</option>
 			<!-- TMPL_ELSE -->
-				<option value="la">тамільська</option>
+				<option value="la">Tamil</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15zz" -->
-				<option value="zz" SELECTED>інша</option>
+				<option value="zz" SELECTED>autres</option>
 			<!-- TMPL_ELSE -->
-				<option value="zz">інша</option>
+				<option value="zz">autres</option>
 			<!-- /TMPL_IF -->
 			</select>
 

Index: uk_UA/value_builder/unimarc_field_105.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_105.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_105.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_105.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 105</title>
+<title>UNIMARC constructeur champ 105</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_106.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_106.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_106.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_106.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 106</title>
+<title>UNIMARC Field 106 builder</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_110.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_110.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_110.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_110.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 106</title>
+<title>UNIMARC Field 106 builder</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
@@ -34,9 +34,9 @@
 
 
 			<!-- TMPL_IF name="f1z" -->
-				<option value="z" SELECTED>інша</option>
+				<option value="z" SELECTED>autres</option>
 			<!-- TMPL_ELSE -->
-				<option value="z">інша</option>
+				<option value="z">autres</option>
 
 			<!-- /TMPL_IF -->
 				</select>
@@ -193,9 +193,9 @@
                         <!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f3u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 	
 			<!-- /TMPL_IF -->
 
@@ -601,9 +601,9 @@
 				
 
 			<!-- TMPL_IF name="f8u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 				
 

Index: uk_UA/value_builder/unimarc_field_115a.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_115a.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_115a.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_115a.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 115a</title>
+<title>UNIMARC Field 115a builder</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
@@ -78,9 +78,9 @@
 
 
 			<!-- TMPL_IF name="f3u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 	
 			<!-- /TMPL_IF -->
 
@@ -122,9 +122,9 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4y" -->
@@ -201,9 +201,9 @@
 
 
 			<!-- TMPL_IF name="f5u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 
@@ -506,9 +506,9 @@
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 
@@ -650,9 +650,9 @@
 
 
 			<!-- TMPL_IF name="f9u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 
@@ -967,7 +967,7 @@
 
         </tr>
 
-<tr>		<td>Форма виготовлення: відеозаписи</td>
+<tr>		<td>Presentation materielle: video</td>
 		<td>
 			<select name="f14" size="1">
    <!-- TMPL_IF name="f14 " -->
@@ -1101,9 +1101,9 @@
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15x" -->
@@ -1150,9 +1150,9 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f16u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 
@@ -1231,9 +1231,9 @@
 
 
 			<!-- TMPL_IF name="f17u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f17x" -->

Index: uk_UA/value_builder/unimarc_field_115b.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_115b.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_115b.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_115b.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 115b</title>
+<title>UNIMARC Field 115b builder</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
@@ -37,9 +37,9 @@
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1x" -->
@@ -108,9 +108,9 @@
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2x" -->
@@ -264,9 +264,9 @@
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3x" -->
@@ -311,9 +311,9 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f4x" -->
@@ -370,9 +370,9 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f5u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 
@@ -432,9 +432,9 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f6u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 
@@ -505,9 +505,9 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f7u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 
@@ -641,9 +641,9 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9x" -->
@@ -661,7 +661,7 @@
 
 
    <tr>
-                <td>Дата вводу запису до файлу</td>
+                <td>Date d'enregistrement</td>
                 <td>Annee <input type="text" name="f10" maxlength=4 size=5 value="<!-- TMPL_VAR name="f10" -->"></td>
                 <td>mois <input type="text" name="f11" maxlength=2 size=3 value="<!-- TMPL_VAR name="f11" -->"></td>
         </tr>

Index: uk_UA/value_builder/unimarc_field_116.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_116.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_116.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_116.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 116</title>
+<title>UNIMARC Field 116 builder</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
@@ -138,9 +138,9 @@
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2v" -->
@@ -253,9 +253,9 @@
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4v" -->
@@ -459,9 +459,9 @@
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5uu" -->
-				<option value="uu" SELECTED>Невідомо</option>
+				<option value="uu" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="uu">Невідомо</option>
+				<option value="uu">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5vv" -->
@@ -658,9 +658,9 @@
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6uu" -->
-				<option value="uu" SELECTED>Невідомо</option>
+				<option value="uu" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="uu">Невідомо</option>
+				<option value="uu">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6vv" -->
@@ -858,9 +858,9 @@
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7uu" -->
-				<option value="uu" SELECTED>Невідомо</option>
+				<option value="uu" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="uu">Невідомо</option>
+				<option value="uu">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7vv" -->
@@ -1053,9 +1053,9 @@
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8uu" -->
-				<option value="uu" SELECTED>Невідомо</option>
+				<option value="uu" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="uu">Невідомо</option>
+				<option value="uu">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8vv" -->
@@ -1248,9 +1248,9 @@
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9uu" -->
-				<option value="uu" SELECTED>Невідомо</option>
+				<option value="uu" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="uu">Невідомо</option>
+				<option value="uu">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9vv" -->
@@ -1443,9 +1443,9 @@
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10uu" -->
-				<option value="uu" SELECTED>Невідомо</option>
+				<option value="uu" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="uu">Невідомо</option>
+				<option value="uu">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f10vv" -->
@@ -1550,9 +1550,9 @@
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11uu" -->
-				<option value="uu" SELECTED>Невідомо</option>
+				<option value="uu" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="uu">Невідомо</option>
+				<option value="uu">Inconnu</option>
 
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f11vv" -->

Index: uk_UA/value_builder/unimarc_field_117.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_117.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_117.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_117.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 117</title>
+<title>UNIMARC Field 117 builder</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
@@ -195,9 +195,9 @@
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1uu" -->
-				<option value="uu" SELECTED>Невідомо</option>
+				<option value="uu" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="uu">Невідомо</option>
+				<option value="uu">Inconnu</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1vv" -->
@@ -368,9 +368,9 @@
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2uu" -->
-				<option value="uu" SELECTED>Невідомо</option>
+				<option value="uu" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="uu">Невідомо</option>
+				<option value="uu">Inconnu</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2vv" -->
@@ -542,9 +542,9 @@
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3uu" -->
-				<option value="uu" SELECTED>Невідомо</option>
+				<option value="uu" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="uu">Невідомо</option>
+				<option value="uu">Inconnu</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3vv" -->
@@ -715,9 +715,9 @@
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4uu" -->
-				<option value="uu" SELECTED>Невідомо</option>
+				<option value="uu" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="uu">Невідомо</option>
+				<option value="uu">Inconnu</option>
 	
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4vv" -->
@@ -770,9 +770,9 @@
 				<option value="d">Colorie a la main</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5v" -->
 				<option value="v" SELECTED>Composite</option>

Index: uk_UA/value_builder/unimarc_field_120.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_120.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_120.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_120.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 120</title>
+<title>UNIMARC constructeur champ 120</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
@@ -1025,9 +1025,9 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9uu" -->
-				<option value="uu" SELECTED>Невідомо</option>
+				<option value="uu" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="uu">Невідомо</option>
+				<option value="uu">Inconnu</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f9zz" -->
@@ -1300,9 +1300,9 @@
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10uu" -->
-				<option value="uu" SELECTED>Невідомо</option>
+				<option value="uu" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="uu">Невідомо</option>
+				<option value="uu">Inconnu</option>
 			<!-- /TMPL_IF -->
 
 			<!-- TMPL_IF name="f10zz" -->

Index: uk_UA/value_builder/unimarc_field_121a.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_121a.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_121a.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_121a.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 121a</title>
+<title>UNIMARC constructeur champ 121a</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
@@ -181,9 +181,9 @@
 				<option value="ap">Platre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4au" -->
-				<option value="au" SELECTED>Невідомо</option>
+				<option value="au" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="au">Невідомо</option>
+				<option value="au">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4az" -->
 				<option value="az" SELECTED>Autre
@@ -252,9 +252,9 @@
 				<option value="d">Microphotographie</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5y" -->
 				<option value="y" SELECTED>N'est pas

Index: uk_UA/value_builder/unimarc_field_121b.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_121b.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_121b.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_121b.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 121b</title>
+<title>UNIMARC constructeur champ 121b</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_122.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_122.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_122.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_122.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 122</title>
+<title>UNIMARC constructeur champ 122</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_123a.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_123a.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_123a.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_123a.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 123a</title>
+<title>UNIMARC constructeur champ 123a</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_123d.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_123d.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_123d.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_123d.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 123d</title>
+<title>UNIMARC constructeur champ 123d</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_123g.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_123g.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_123g.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_123g.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 123g</title>
+<title>UNIMARC constructeur champ 123g</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_124a.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_124a.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_124a.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_124a.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 124a</title>
+<title>UNIMARC constructeur champ 124a</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_124b.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_124b.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_124b.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_124b.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 124b</title>
+<title>UNIMARC constructeur champ 124b</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_124c.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_124c.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_124c.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_124c.tmpl	7 May 2007 13:55:51 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 124c</title>
+<title>UNIMARC constructeur champ 124c</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_124d.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_124d.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_124d.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_124d.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 124d</title>
+<title>UNIMARC constructeur champ 124d</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_124g.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_124g.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_124g.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_124g.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 124g</title>
+<title>UNIMARC constructeur champ 124g</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_125a.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_125a.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_125a.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_125a.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 125a</title>
+<title>UNIMARC constructeur champ 125a</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
@@ -50,9 +50,9 @@
 				<option value="m">Formes diverses</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1x" -->
 				<option value="x" SELECTED>Non applicable ce n'est pas une partition</option>
@@ -81,9 +81,9 @@
 				<option value="a">Parties existantes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2x" -->
 				<option value="x" SELECTED>Non applicable</option>

Index: uk_UA/value_builder/unimarc_field_125b.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_125b.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_125b.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_125b.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 125b</title>
+<title>UNIMARC constructeur champ 125b</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_126a.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_126a.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_126a.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_126a.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,12 +1,12 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 126a</title>
+<title>UNIMARC constructeur champ 126a</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
 <table>
 	<tr>
-		<td>Форма виготовлення: </td>
+		<td>Presentation materielle:</td>
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
@@ -71,9 +71,9 @@
 				<option value=" ">Немає</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2x" -->
 				<option value="x" SELECTED>Non applicable</option>
@@ -192,9 +192,9 @@
 				<option value="c">Quadriphonique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3z" -->
 				<option value="z" SELECTED>Autre</option>
@@ -223,9 +223,9 @@
 				<option value="b">Microsillon/fin</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4x" -->
 				<option value="x" SELECTED>Non applicable</option>
@@ -304,9 +304,9 @@
 				<option value="s">5.7 cm x 10 cm ou 2 pouces 1/4 x 4 pouces, cylindre</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f5x" -->
 				<option value="x" SELECTED>Non applicable</option>
@@ -360,9 +360,9 @@
 				<option value="f">1/3 de pouce (8 mm)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6x" -->
 				<option value="x" SELECTED>L'enregistrement n'est pas une bande</option>
@@ -426,9 +426,9 @@
 				<option value="h">6 pistes</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7x" -->
 				<option value="x" SELECTED>Non enregistre sur bande</option>
@@ -983,9 +983,9 @@
 				<option value="c">Numerique</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f14z" -->
 				<option value="z" SELECTED>Autre</option>
@@ -1049,9 +1049,9 @@
 				<option value="x">Non applicable</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f15z" -->
 				<option value="z" SELECTED>Autre</option>

Index: uk_UA/value_builder/unimarc_field_126b.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_126b.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_126b.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_126b.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 126b</title>
+<title>UNIMARC constructeur champ 126b</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
@@ -55,9 +55,9 @@
 				<option value="h">Pressage de test</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1z" -->
 				<option value="z" SELECTED>Autre</option>
@@ -76,9 +76,9 @@
 				<option value=" ">Немає</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2x" -->
 				<option value="x" SELECTED>Non applicable</option>

Index: uk_UA/value_builder/unimarc_field_127.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_127.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_127.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_127.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 127</title>
+<title>UNIMARC constructeur champ 127</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_128a.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_128a.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_128a.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_128a.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 128a</title>
+<title>UNIMARC constructeur champ 128a</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_128b.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_128b.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_128b.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_128b.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 128b</title>
+<title>UNIMARC constructeur champ 128b</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_128c.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_128c.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_128c.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_128c.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 128c</title>
+<title>UNIMARC constructeur champ 128c</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_130.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_130.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_130.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_130.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,12 +1,12 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 130</title>
+<title>UNIMARC constructeur champ 130</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
 <table>
 	<tr>
-		<td>Форма виготовлення: </td>
+		<td>Presentation materielle:</td>
 		<td>
 			<select name="f1" size="1">
 			<!-- TMPL_IF name="f1 " -->
@@ -81,9 +81,9 @@
 				<option value="b">Negatif</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2c" -->
-				<option value="c" SELECTED>Невідомо</option>
+				<option value="c" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="c">Невідомо</option>
+				<option value="c">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f2d" -->
 				<option value="d" SELECTED>Plusieurs polarites</option>
@@ -147,9 +147,9 @@
 				<option value="p">9 x 19 cm</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f3z" -->
 				<option value="z" SELECTED>Autre</option>
@@ -193,9 +193,9 @@
 				<option value="e">Ultra elevee (91x -)</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f4v" -->
 				<option value="v" SELECTED>Divers</option>
@@ -231,9 +231,9 @@
 				<option value="b">Couleur</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f6v" -->
 				<option value="v" SELECTED>Divers</option>
@@ -267,9 +267,9 @@
 				<option value="c">Vesiculaire</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7d" -->
-				<option value="d" SELECTED>Невідомо</option>
+				<option value="d" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="d">Невідомо</option>
+				<option value="d">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f7u" -->
 				<option value="u" SELECTED>Emulsions diverses</option>
@@ -313,9 +313,9 @@
 				<option value="c">Copie de service</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f8v" -->
 				<option value="v" SELECTED>Generations diverses</option>
@@ -344,9 +344,9 @@
 				<option value="b">Il ne s'agit pas d'un support de securite</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9x" -->
 				<option value="x" SELECTED>Non applicable</option>

Index: uk_UA/value_builder/unimarc_field_135a.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_135a.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_135a.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_135a.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 135a</title>
+<title>UNIMARC constructeur champ 135a</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
@@ -35,9 +35,9 @@
 				<option value="d">Texte</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f1v" -->
 				<option value="v" SELECTED>Combinaison de donnees</option>

Index: uk_UA/value_builder/unimarc_field_140.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_140.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_140.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_140.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 140</title>
+<title>UNIMARC constructeur champ 140</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
@@ -694,9 +694,9 @@
 				<option value="e">Gravure</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9u" -->
-				<option value="u" SELECTED>Невідомо</option>
+				<option value="u" SELECTED>Inconnu</option>
 			<!-- TMPL_ELSE -->
-				<option value="u">Невідомо</option>
+				<option value="u">Inconnu</option>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF name="f9v" -->
 				<option value="v" SELECTED>Techniques melangees</option>

Index: uk_UA/value_builder/unimarc_field_141.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_141.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_141.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_141.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 141</title>
+<title>UNIMARC constructeur champ 141</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">

Index: uk_UA/value_builder/unimarc_field_225a.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_225a.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_225a.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_225a.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,11 +1,11 @@
 <!-- TMPL_INCLUDE name="auth-search-top.inc" -->
-<title>Unimarc-конструктор поля 225a</title>
+<title>UNIMARC Field 225a builder</title>
 </head>
 <body>
 <div id="mainbloc">
 	<form name="f_pop" onSubmit="javascript:report()">
-		<h2 class="authority">Зібрання</h2>
-		<p><label>Вибір зібрання</label><!-- TMPL_VAR name="collection" --></p>
+		<h2 class="authority">Collection</h2>
+		<p><label>Select a collection</label><!-- TMPL_VAR name="collection" --></p>
 		<input type="submit" value="Гаразд" class="button authority"></p>
 	</form>
 </div>

Index: uk_UA/value_builder/unimarc_field_4XX.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_4XX.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_4XX.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_4XX.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -245,7 +245,7 @@
 			<p><input type="hidden" name="index" value="<!--TMPL_VAR Name="index" -->"></p>
 			<p>
 				<input type="submit" value="Почати пошук" class="button catalogue">
-				<input type="reset" value="Очистити усі поля" class="button catalogue">
+				<input type="reset"  value="Clear All Fields" class="button catalogue">
 			</p>
 	
 			<script language="javascript" type="text/javascript">

Index: uk_UA/value_builder/unimarc_field_60X.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_60X.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_60X.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_60X.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -24,14 +24,14 @@
 		<input type="hidden" name="plugin_name" value="unimarc_field_60X.pl">
 		<textarea name="result" rows=10 cols=50><!-- TMPL_VAR name="result" --></textarea>
 		<br/><input type="button" value="Гаразд" onclick="javascript:finish()">
-		<p><h2>Ретельний пошук</h2>
+		<p><h2>Recherche</h2>
 			<a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=A">A</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=B">B</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=C">C</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=D">D</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=E">E</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=F">F</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=G">G</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=H">H</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=I">I</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=J">J</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=K">K</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=L">L</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=M">M</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=N">N</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=O">O</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=P">P</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=Q">Q</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=R">R</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=S">S</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=T">T</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=U">U</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=V">V</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=W">W</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=X">X</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=Y">Y</a>  <a href="plugin_launcher.pl?plugin_name=unimarc_field_60X.pl&search_string=Z">Z</a>
 			<br/>
 			<input type="text" name="search_string" value="<!-- TMPL_VAR name="search_string" -->">
 			<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
 			<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
 			<input type="hidden" name="op" value="search">
-			<input type="submit" value="Шукати">
+			<input type="submit" value="Chercher">
 		</p>
 	</form>
 	<table>
@@ -72,13 +72,13 @@
 		</td>
 	</tr>
 	</table>
-<h2>Доповнення</h2>
+<h2>Adding</h2>
 <form name="f3_pop"  action="thesaurus_popup.pl" method="post">
 	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
 	<input type="hidden" name="op" value="add">
 	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
-	Створити нове авторитетне джерело/входження тезаурусу: <input type="text" name="insert" value="<!-- TMPL_VAR name="search_string" -->">
-	<input type="submit" name="NEW" value="Додати">
+	Create a new authority/thesaurus entry : <input type="text" name="insert" value="<!-- TMPL_VAR name="search_string" -->">
+	<input type="submit" name="NEW" value="Ajouter">
 	</form>
 </body>
 </html>

Index: uk_UA/value_builder/unimarc_field_700-4.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/uk_UA/value_builder/Attic/unimarc_field_700-4.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- uk_UA/value_builder/unimarc_field_700-4.tmpl	7 May 2007 09:06:03 -0000	1.1.2.1
+++ uk_UA/value_builder/unimarc_field_700-4.tmpl	7 May 2007 13:55:52 -0000	1.1.2.2
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>Unimarc-конструктор поля 700-4</title>
+<title>UNIMARC constructeur champ 700-4</title>
 </head>
 <body>
 <p>Sélectionnez la valeur pour le champ 700 $4. Elle sera automatiquement reportée dans la zone 700 $8 qui suit.</p>

Index: pl/about.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/about.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/about.tmpl	17 Apr 2004 16:26:25 -0000	1.2
+++ pl/about.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,100 +1,81 @@
-<!-- TMPL_INCLUDE name="about-top.inc" -->
+<!-- TMPL_INCLUDE NAME="about-top.inc" -->
 
-<!-- TMPL_VAR NAME=about -->
-
-<p>Dane o bieżącej wersji Koha dla zgłaszania błędów (lub ogólnego zainteresowania).
-
-<center>
-<table border=1>
-	<tr bgcolor="white">
-		<td width=25%>Wersja Koha:</td>
-		<td><!-- TMPL_VAR ESCAPE=HTML NAME=kohaVersion --></td>
-	</tr>
-	<tr bgcolor="white">
-		<td>Wersja SO (wynik z 'uname' -a):</td>
-		<td><!-- TMPL_VAR ESCAPE=HTML NAME=osVersion --></td>
-	</tr>
-	<tr bgcolor="white">
-		<td>Wersja Perla:</td>
-		<td><!-- TMPL_VAR ESCAPE=HTML NAME=perlVersion --></td>
-	</tr>
-	<tr bgcolor="white">
-		<td>Wersja MYSQL:</td>
-		<td><!-- TMPL_VAR ESCAPE=HTML NAME=mysqlVersion --></td>
-	</tr>
-	<tr bgcolor="white">
-		<td>Wersja Apache:</td>
-		<td><!-- TMPL_VAR ESCAPE=HTML NAME=apacheVersion --></td>
-	</tr>
-	<tr>
- 		<td valign="top">Uznanie</td>
-		<td>
-			<h3>Zasadnicza drużyna</h3>
-			<table width=100%>
-				<tr>
-					<td width="50%">
-						Pat Eyler, Kaitiaki<br/>
-						Paul Poulain, menedżer wersji 2.0 (programista MARC)<br/>
-						Joshua Ferraro & the Nelsonville Public Library (sponsorzy funkcji MARC))<br/>
-						Steve Tonnesen (wczesne prace MARC, pomysł Półek wirtualnych, KohaCD)<br/>
-						Nicholas Rosasco, (Skład dokumentacji)<br/>
-						Mike Hansen<br/>
-						MJ Ray and Turo Technology LLP, Anglia (kontrola jakości, instalator i aktualizacja)<br/>
-						Nicolas Morin, TÅ‚umaczenie francuskie<br/>
-					</td>
-					<td width="50%" valign="top">
-						<b>Horowhenua Library Trust</b><br/>
-						Rosalie Blake, Kierowniczka bibliotek<br/>
-						Jo Ransom<br/>
-						<b>Katipo Communications</b><br/>
-						Rachel Hamilton-Williams, Główny Menedżer (Webmasterka)<br/>
-						Chris Cormack, menedżer wersji 1.2<br/>
-						and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine<br/>
-					</td>
-				</tr>
-			</table>
-			<h3>Uznania dla</h3>
-			<table width=100%>
-				<tr>
-					<td width="33%">
-						Adam Thick<br/>
-						Andrew Hooper<br/>
-						Al Banks<br/>
-						Ambrose Li<br/>
-						Andrew Arensburger<br/>
-						Benedykt P. Barszcz (Polish for 2.0)<br/>
-						Brig C. McCoy<br/>
-						Daniel Holth<br/>
-						David Strainchamps<br/>
-						Dorian Meid<br/>
-					</td>
-					<td width="33%">
-						Ed Summers<br/>
-						Florian Bischof<br/>
-						Francisco M. Marzoa Alonso<br/>
-						Glen Stewart<br/>
-						Henri-Damien Laurent<br/>
-						Jérome Vizcaino (Esiee School)<br/>
-						Kip DeGraaf<br/>
-						Marco Gaiarin<br/>
-						Md. Aftabuddin<br/>
-						Michaes Herman<br/>
-					</td>
-					<td width="33%">
-						Michel Lerenard (Szkoła Esiee)<br/>
-						Mike Johnson<br/>
-						Mike Mylonas<br/>
-						Pierre Cauchois (Szkoła Esiee)<br/>
-						Pawel Skuza (Polski dla 1.2)<br/>
-						Regula Sebastiao<br/>
-						Roger Buck<br/>
-						Ron Wickersham<br/>
-						Sebastiaan Durand<br/>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-</center>
-<!-- TMPL_INCLUDE name="about-bottom.inc" -->
+<div id="mainbloc">
+	<!-- TMPL_VAR NAME="about" -->  <h1>Data about the current version of Koha for bug reports (or general interest).</h1>
+	<div id="bloc25">
+		<h2>Server information</h2>
+		<p><label class="label100">Koha version</label><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></p>
+		<p><label class="label100">OS version ('uname -a')</label><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></p>
+		<p><label class="label100">Perl version</label><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></p>
+		<p><label class="label100">MySQL version</label><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></p>
+		<p><label class="label100">Apache version</label><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></p>
+	</div>
+	<div id="bloc25">
+		<h2>Special thanks to the following libraries</h2>
+		<p><b>Horowhenua Library Trust</b>, New Zealand, and Rosalie Blake, Head of Libraries, (Koha 1.0)</p>
+		<p>The <b>Nelsonville Public Library</b>, USA, Ohio (MARC support funding)</p>
+		<p><b>EMN (Ecole des Mines de Nantes)</b>, France (Suggestion, stats modules and improved ldap support funding)</p>
+		<p><b>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</b>, France (biblio frameworks, MARC authorities, OPAC basket, Serials support funding)</p>
+	</div>
+	<div id="bloc25">
+		<h2>Core team for 2.2</h2>
+		<p><b>Rachel Hamilton-Williams</b>, Kaitiaki</p>
+		<p><b>Paul Poulain</b>, 2.2 release manager (MARC developer)</p>
+		<p>Stephen Hedges, Owen Leonard, Joshua Ferraro (<b>Nelsonville Public Library</b>)</p>
+		<p><b>Katipo Communications</b> (Koha 1.0 developers)</p>
+		<ul>
+			<p>Rachel Hamilton-Williams, Główny Menedżer (Webmasterka)</p>
+			<p>Chris Cormack, menedżer wersji 1.2</p>
+			<p>and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson,</p>
+			<p>Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</p>
+		</ul>
+		<p>Emiliano Marmonti, Matías Veleda & Sebastian Catañeda <b>La Plata University, Argentina</b> (barcode printing)</p>
+		<p>MJ Ray and <b>Turo Technology LLP</b>, (quality control, installer &amp; updater, 2.0 release maintainer)</p>
+		<p>Nicholas Rosasco, (Skład dokumentacji)</p>
+		<p>Mike Hansen</p>
+		<p><b>Pate Eyler</b> (Kaitiaki from 2002 to 2004)</p>
+	</div>
+	<div id="bloc25">
+	<h2>Uznania dla</h2>
+					<p>Adam Thick</p>
+					<p>Andrew Hooper</p>
+					<p>Al Banks</p>
+					<p>Ambrose Li (translation tool)</p>
+					<p>Andrew Arensburger (the small &amp; great C4::Context module)</p>
+					<p>Benedykt P. Barszcz (Polish for 2.0)</p>
+					<p>Brig C. McCoy</p>
+					<p>Daniel Holth</p>
+					<p>David Strainchamps</p>
+					<p>Dorian Meid (German translation)</p>
+					<p>doXulting (Matthieu Branlat) OPAC basket</p>
+					<p>Ed Summers (Some code and Perl packages like MARC::Record)</p>
+					<p>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</p>
+					<p>Florian Bischof</p>
+					<p>Francisco M. Marzoa Alonso</p>
+					<p>Glen Stewart</p>
+					<p>Henri-Damien Laurent</p>
+					<p>Jo Ransom</p>
+					<p>Kip DeGraaf</p>
+					<p>Marco Gaiarin</p>
+					<p>Md. Aftabuddin</p>
+					<p>Michaes Herman</p>
+					<p>Mike Johnson</p>
+					<p>Mike Mylonas</p>
+					<p>Nicolas Morin (French Translation in 2.0)</p>
+					<p>Pawel Skuza (Polski dla 1.2)</p>
+					<p>Regula Sebastiao</p>
+					<p>Roger Buck</p>
+					<p>Ron Wickersham</p>
+					<p>Sebastiaan Durand</p>
+					<p>Steve Tonnesen (wczesne prace MARC, pomysł Półek wirtualnych, KohaCD)</p>
+					<p>Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)</p>
+	</div>
+	<div id="bloc25">
+	<h2>Translation</h2>
+		<p><label>Francuski</label>Pascale Nalon (ENSMP) and Jean Yves Lemaire (Chatel Saint Germain)</p>
+		<p><label>Chinese</label>Ambrose Li</p>
+		<p><label>Spanish</label>Andres Tarallo</p>
+		<p><label>Italian</label>Giuseppe Angilella</p>
+	</div>
+</div>
+<!-- TMPL_INCLUDE NAME="about-bottom.inc" -->

Index: pl/auth.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/auth.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/auth.tmpl	17 Apr 2004 16:26:25 -0000	1.4
+++ pl/auth.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,4 +1,4 @@
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- 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 -->
 
 <!-- TMPL_IF NAME="nopermission" -->
 <!-- This is what is displayed if user doesn't have permission -->
@@ -24,13 +24,12 @@
 <!-- TMPL_IF NAME="loginprompt" -->
 <!-- login prompt time-->
 
-<center>
 
-<form action='<!-- TMPL_VAR NAME="url" -->' method="post">
+<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
 <!-- TMPL_LOOP NAME="INPUTS" -->
-  <input type="hidden" name='<!-- TMPL_VAR NAME="name" -->' value='<!-- TMPL_VAR NAME="value" -->'>
+  <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->">
 <!-- /TMPL_LOOP -->
-<table border="0" cellpadding="10" cellspacing="0" width="60%">
+<table border="0" cellpadding="10" cellspacing="0" width="60%" align="center">
     <tr><td align="center" valign="top">
 
     <table border="0" bgcolor="#dddddd" cellpadding="10" cellspacing="0">

Index: pl/bookcount.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/bookcount.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/bookcount.tmpl	17 Apr 2004 16:26:25 -0000	1.4
+++ pl/bookcount.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,40 +1,36 @@
 <!-- TMPL_INCLUDE Name="reports-top.inc" -->
-<CENTER>
-<br>
-<h1>
-<a href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="bib" -->&type="intra"> <!-- TMPL_VAR Name="title" --> (<!-- TMPL_VAR Name="author" -->)</a></h1><P>
-<p>
+<h1><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="bib" -->&amp;type=intra"> <!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)</a></h1><p>&nbsp;</p>
 
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 width=440 >
-	<TR VALIGN=TOP>
-		<TD  bgcolor="99cc33" background="/images/background-mem.gif">
-			<B>KOD PASKOWY <!-- TMPL_VAR Name="barcode" --></B>
-		</TD>
-	</TR>
-	<TR VALIGN=TOP  >
-		<TD width=440 >
+<table  cellspacing="0"  cellpadding="5" border="1" width="440">
+	<tr valign="top">
+		<td  bgcolor="#99cc33" background="/images/background-mem.gif">
+			<b>KOD PASKOWY <!-- TMPL_VAR NAME="barcode" --></b>
+		</td>
+	</tr>
+	<tr valign="top">
+		<td width="440">
 
-		<b>Oddział Właściwy: </b> <!-- TMPL_VAR Name="homebranch" --> <br>
-		<b>Obecny Oddział: </b> <!-- TMPL_VAR Name="holdingbranch" --><br>
-		<b>Data przybycia do obecnego oddziału: </b> <!-- TMPL_VAR Name="lastdate" --> <br>
-		<b>Liczba wypożyczeń od powyższej daty:</b> <!-- TMPL_VAR Name="count" --> <br>
+		<b>Oddział Właściwy: </b> <!-- TMPL_VAR NAME="homebranch" --> <br>
+		<b>Obecny Oddział: </b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
+		<b>Data przybycia do obecnego oddziału: </b> <!-- TMPL_VAR NAME="lastdate" --> <br>
+		<b>Liczba wypożyczeń od powyższej daty:</b> <!-- TMPL_VAR NAME="count" --> <br>
 
-		<table cellspacing =0 cellpadding=5 border=1 width = 440>
-			<TR>
-				<TD> <b>Oddział</b></td>
-				<TD> <b>Liczba Wypożyczeń</b></td>
-				<TD> <b>Ostatnio rejestrowana w oddziale</b></td>
-			</TR>
+		<table cellspacing="0" cellpadding="5" border="1" width="440">
+			<tr>
+				<th>Oddział</th>
+				<th>Liczba Wypożyczeń</th>
+				<th>Ostatnio rejestrowana w oddziale</th>
+			</tr>
 			<!-- TMPL_LOOP Name="branchloop" -->
-				<TR>
-					<TD> <b> <!-- TMPL_VAR Name="branchname" --> </b></td>
-					<TD> <b> <!-- TMPL_VAR Name="issues" --> </b></td>
-					<TD> <b> <!-- TMPL_VAR Name="seen" --> </b></td>
-				</TR>
+				<tr>
+					<td> <b> <!-- TMPL_VAR NAME="branchname" --> </b></td>
+					<td> <b> <!-- TMPL_VAR NAME="issues" --> </b></td>
+					<td> <b> <!-- TMPL_VAR NAME="seen" --> </b></td>
+				</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
-		</TD>
-	</TR>
+		</td>
+	</tr>
 </table>
 
 <!-- TMPL_INCLUDE Name="reports-bottom.inc" -->

Index: pl/boraccount.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/boraccount.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/boraccount.tmpl	17 Apr 2004 16:26:25 -0000	1.4
+++ pl/boraccount.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,45 +1,37 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
+<div id="mainbloc">
+	<!-- The manual invoice and credit buttons -->
 
-<!-- The manual invoice and credit buttons -->
-
-<h1>Rachunek dla <a href="moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->"><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></a></h1><P>
-<a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME=bornum -->">Utwórz Rachunek</a> &nbsp; <a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME=bornum -->">Utwórz Kredyt</a>
-<center>
-<p>
-
-<!-- The table with the account items -->
-
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-
-  <TR VALIGN=TOP>
-    <td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2><B>KARY & OPŁATY</TD>
-    <td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=1><B>KWOTA</TD>
-    <td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=1><B>DO ZAPŁATY</TD>
-  </TR>
-
-  <!-- TMPL_LOOP NAME=accounts -->
-
-    <tr VALIGN=TOP>
-      <td><!-- TMPL_VAR NAME=date --></td>
-      <td><!-- TMPL_VAR NAME=description --><!-- TMPL_IF NAME=printtitle --> <!-- TMPL_VAR NAME=title --><!-- /TMPL_IF --></td>
-      <td><!-- TMPL_VAR NAME=amount --></td>
-      <td><!-- TMPL_VAR NAME=amountoutstanding --></td>
+	<h1>Rachunek dla <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></h1><P>
+	<a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Utwórz Rachunek</a> &nbsp; <a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Utwórz Kredyt</a>
+	<!-- The table with the account items -->
+	
+	<table>
+	
+	<tr>
+		<th>FINES &amp; CHARGES</th>
+		<th>KWOTA</th>
+		<th>DO ZAPŁATY</th>
     </tr>
 
-  <!-- /TMPL_LOOP -->
+	<!-- TMPL_LOOP NAME="accounts" -->
 
-  <tr VALIGN=TOP  >
-    <td></td>
-    <td colspan=2><b>Do zapłaty</b></td>
-    <td><b><!-- TMPL_VAR NAME=total --></b></td>
+		<tr>
+		<td><!-- TMPL_VAR NAME="date" --> <!-- TMPL_VAR NAME="description" --><!-- TMPL_IF NAME="printtitle" --> <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
+		<td><!-- TMPL_VAR NAME="amount" --></td>
+		<td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
   </tr>
 
-</table>
+	<!-- /TMPL_LOOP -->
 
-<br clear=all>
-<p> &nbsp; </p>
+	<tr>
+		<th>Do zapłaty</th>
+		<th colspan="2"><!-- TMPL_VAR NAME="total" --></th>
+	</tr>
 
-<!-- endmenu (member) -->
+	</table>
 
+	<!-- endmenu (member) -->
+</div>
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
 

Index: pl/charges.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/charges.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/charges.tmpl	17 Apr 2004 16:26:25 -0000	1.2
+++ pl/charges.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,6 +1,6 @@
-<HTML>
+<html>
 
-<!-- TMPL_VAR NAME=startmenuissue -->
+<!-- TMPL_VAR NAME="startmenuissue" -->
 
 <p>
 Każda kratka musi być wypełniona karą, początkiem naliczania, cyklem naliczania<br>
@@ -8,25 +8,25 @@
 
 <table>
   <tr bgcolor="white">
-    <!-- TMPL_LOOP NAME=firstrowloop -->
-      <td><!-- TMPL_VAR NAME=description --></td>
+    <!-- TMPL_LOOP NAME="firstrowloop" -->
+      <td><!-- TMPL_VAR NAME="description" --></td>
     <!-- /TMPL_LOOP -->
   </tr>
-  <form action=/cgi-bin/koha/updatecharges.pl method=post>
-  <!-- TMPL_LOOP NAME=tablebodyloop -->
+  <form action="/cgi-bin/koha/updatecharges.pl" method="post">
+  <!-- TMPL_LOOP NAME="tablebodyloop" -->
     <tr bgcolor="whitw">
-      <td><!-- TMPL_VAR NAME=description --></td>
-      <!-- TMPL_LOOP NAME=rowloop -->
-        <td><input type=text name="<!-- TMPL_VAR NAME=name -->" value="<!-- TMPL_VAR NAME=value -->" size=6></td>
+      <td><!-- TMPL_VAR NAME="description" --></td>
+      <!-- TMPL_LOOP NAME="rowloop" -->
+        <td><input type="text" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->" size="6"></td>
       <!-- /TMPL_LOOP -->
     </tr>
   <!-- /TMPL_LOOP -->
 </table>
 
-<input type=submit>
+<input type="submit">
 </form>
 
-<!-- TMPL_VAR NAME=endmenuissue -->
+<!-- TMPL_VAR NAME="endmenuissue" -->
 
 </body>
-</HTML>
\ No newline at end of file
+</html>
\ No newline at end of file

Index: pl/default.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/default.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/default.tmpl	17 Apr 2004 16:26:25 -0000	1.2
+++ pl/default.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,23 +1,22 @@
-<!-- TMPL_INCLUDE NAME="/usr/share/koha/intranet/htdocs/includes/cat-top.inc" -->
-<center>
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 
-<table border=0 cellspacing=0 cellpadding=2>
-<tr bgcolor=#ccccff background="/images/background-mem.gif">
+<table border="0" cellspacing="0" cellpadding="2">
+<tr bgcolor="#ccccff" background="/images/background-mem.gif">
 <th>Tytuł</th><th>Autor</th><th>Ilość pozycji</th><th>Numeropisu</th></tr>
-<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
+<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
   <tr>
-  <td><a href="/cgi-bin/koha/detail.pl?type=intra&bib=<!-- TMPL_VAR NAME=biblionumber ESCAPE=HTML -->"><!-- TMPL_VAR NAME=title --></a></td>
-  <td> <!-- TMPL_VAR NAME=author --> </td>
-  <td align=center> <!-- TMPL_VAR NAME=itemcount --> </td>
-  <td> <!-- TMPL_VAR NAME=biblionumber --> </td>
+  <td><a href="/cgi-bin/koha/detail.pl?type=intra&amp;bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=HTML -->"><!-- TMPL_VAR NAME="title" --></a></td>
+  <td> <!-- TMPL_VAR NAME="author" --> </td>
+  <td align="center"> <!-- TMPL_VAR NAME="itemcount" --> </td>
+  <td> <!-- TMPL_VAR NAME="biblionumber" --> </td>
   </tr>
 <!-- /TMPL_LOOP -->
-<tr bgcolor=#ccccff backgound="/images/background-mem.gif"><td colspan=4>
-    <table border=0 cellpadding=0 cellspacing=0 width=100% background="/images/background-mem.gif">
-    <tr><td align=left>
-    <a href=search.pl?template=<!-- TMPL_VAR NAME="template" -->&startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->>Poprzednie rekordy</a>
-    </td><td align=right>
-    <a href=search.pl?template=<!-- TMPL_VAR NAME="template" -->&startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->>Następne Rekordy</a>
+<tr bgcolor="#ccccff" backgound="/images/background-mem.gif"><td colspan="4">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" background="/images/background-mem.gif">
+    <tr><td align="left">
+    <a href="search.pl?template=<!-- TMPL_VAR NAME="template" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Poprzednie rekordy</a>
+    </td><td align="right">
+    <a href="search.pl?template=<!-- TMPL_VAR NAME="template" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Następne Rekordy</a>
     </td></tr>
     </table>
 </td></tr>
@@ -25,4 +24,4 @@
 <br>
 Wyświetłono od <i><!-- TMPL_VAR NAME="startfrom" --></i> do <i><!-- TMPL_VAR NAME="endat" --></i> z <i><!-- TMPL_VAR NAME="numrecords" --></i> rekordów.
 <hr>
-<!-- TMPL_INCLUDE NAME="/usr/share/koha/intranet/htdocs/includes/cat-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: pl/intranet-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/intranet-main.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/intranet-main.tmpl	17 Apr 2004 16:26:25 -0000	1.4
+++ pl/intranet-main.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -2,8 +2,8 @@
 <html>
 <head>
 	<title>ZAPRASZAMY DO ADMINISTRACJI SYSTEMU </title>
-	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/intranet-main.css">
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/intranet-main.css">
+	<!-- 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 -->
 <!-- JAVASCRIPT SCRIPTS -->
 	<script language="JavaScript" type="text/javascript">
 		var IE = document.all?true:false;
@@ -32,7 +32,7 @@
 			if(!x && document.getElementById) x=document.getElementById(n); return x;
 		}
 		function SetOn(item) {
-			for(i=1;i<=6;i++) {
+			for(i=1;i<=7;i++) {
 				SetOff(i);
 			}
 			if (!(layer = MM_findObj('Hint' + item))) return;
@@ -42,8 +42,17 @@
 			if (!(layer = MM_findObj('Hint' + item))) return;
 			layer.style.visibility = 'hidden';
 		}
+		function addauthority() {
+			X = document.forms["f"].authtype.value;
+			window.location="/cgi-bin/koha/authorities/authorities.pl?authtypecode="+X;
+		}
+		function searchauthority() {
+			X = document.forms["f"].authtype2.value;
+			Y = document.forms["f"].value.value;
+			window.location="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode="+X+"&value="+Y+"&marclist=&and_or=and&excluding=&operator=contains";
+		}
 	</script>
-	<script>
+	<script language="javascript" type="text/javascript">
 	var blnOk=true;
 	function Load() {
 		if(document.body.style.backgroundColor!="") { blnOk=false; }
@@ -62,18 +71,24 @@
 <body onload="Load();">
 <div id="mainbloc">
 	<div class="image">
-		<img src="<!--TMPL_VAR name="themelang">/images/koha-front-koha.gif">
+		<p class="kohalogo">Koha</p>
+		<p class="kohalogo2">Open Source  Library System</p>
+		<p class="kohalogo2">Librarian interface</p>
+		<hr width="50%" />
+		<p class="kohalogo2">Koha : gift, donation or contribution</p>
 	</div>
 	<div id="menus">
 <!-- RIGHT (disappearing) BLOC -->
 		<div id="Hint1" class="hint">
 			<h1 class="catalogue">Katalog</h1>
-			<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet" class="catalogue">Wyszukaj w katalogu </a>
-				<p>Search a biblio. When these biblio is found, you can check it's status, reserve it, or see where it is</p>
-			<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="catalogue">Półki wirtualne</a>
-				<p>Wirtualne półki mogą być używane przez bibliotekarzy lub czytelników do wyodrębnienia wirtualnej biblioteki wewnątrz "realnej". Półki wirtualne mogą być np. użyte przez nauczyciela, by pomóc studentom w wyszukaniu informacji na poszczególny temat. Biblioteka może zdefiniować tutaj "najcenniejsze swoje zbiory dla &lt;niektórych kategorii czytelników&gt;"</p>
-			<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&type=intranet" class="catalogue">Dodaj opis</a>
+			<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="catalogue">Wyszukaj w katalogu </a>
+				<p>Szukaj opisu. Po odnalezieniu można sprawdzić jego status, zarezerwować lub zobaczyć gdzie się znajduje.</p>
+			<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="catalogue">Dodaj opis</a>
 				<p>Dodaj opis bezpośrednio do katalogu bibliotecznego</p>
+			<a class="catalogue" href="/cgi-bin/koha/bull-home.pl">Serials</a>
+				<p>Manage serial subscriptions and issues</p>
+			<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="catalogue">Półki wirtualne</a>
+				<p>Wirtualne półki mogą być używane przez bibliotekarzy lub czytelników do wyodrębnienia wirtualnej biblioteki wewnątrz "realnej". Półka wirtualna może być np. użyta przez nauczyciela, by pomóc studentom w wyszukaniu informacji na poszczególny temat. Biblioteka może zdefiniować tutaj "najcenniejsze swoje zbiory dla &lt;niektórych kategorii czytelników&gt;"</p>
 			<!-- TMPL_IF NAME="NOTMARC" -->
 				<form action="/cgi-bin/koha/loadmodules.pl" method="post">
 					<input type="hidden" name="module" value="search">
@@ -98,38 +113,133 @@
 			<a href="/cgi-bin/koha/members/members-home.pl" class="members">Strona Domowa</a>
 			<p>Idź do głównej strony czytelników</p>
 			<a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add" class="members">Dodaj Czytelnika</a>
-			<p>Dodaj czytelnika dla biblioteki. Czytelnik może zostać przypisany do któregokolwiek z oddziałów biblioteki. Może również posiadać podopiecznych.</p>
+			<p>Dodaj czytelnika w tej bibliotece. Czytelnik może zostać przypisany do któregokolwiek z oddziałów biblioteki. Może również posiadać podopiecznych.</p>
 			<a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add" class="members">Dodaj OrganizacjÄ™</a>
 			<p>Dodaj organizację do biblioteki. Ten czytelnik nie posiada niektórych informacji jakie posiada "fizyczny" członek.</p>
 		</div>
+		
 		<div id="Hint3" class="hint">
 			<h1 class="acquisition">Gromadzenie</h1>
-			Zamów pozycję, przyjmij zamówienie, ustaw budżet...
+			Zamów pozycje, przyjmij zamówienia, ustaw budżet...
+			<form action="/cgi-bin/koha/acqui/order.pl" method="post">
+			Supplier name : <input type="text"  size="25"   name="supplier">
+			<input type="submit" class="button acquisition" value="OK">
+			</form>
+			<p>or <a href="acqui/histsearch.pl" class="button acquisition">Search order history</a></p>
+			
 		</div>
 		<div id="Hint4" class="hint">
 			<h1 class="reports">Raporty</h1>
 			Wszystkie raporty systemowe
+			<div id="bloc25">
+			<h2 class="reports">Stats</h2>
+			<ul>
+			<li>on catalogue
+				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/inventory.pl">Inwentarz/Inwentaryzacja</a></p>
+				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Katalogowanie wg. typu dokumentu</a></p>
+			<li>on issues
+				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=yesterday">Till Reconcipation:</a> Daily Report (yesterday)</p>
+				<p class="little"><a class="reports little" href="/cgi-bin/koha/stats.pl?time=today">Till Reconcipation:</a> Daily Report (today)</p>
+				<p class="little"><a class="reports little" href="/cgi-bin/koha/overdue.pl">Pozycje zaległe</a></p>
+			</ul>
+			</div>
+			<div id="bloc25">
+			<h2 class="reports">Stat wizards</h2>
+			<table>
+			<tr>
+			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/acquisitions_stats.pl">Gromadzenie</a></td>
+			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/borrowers_stats.pl">Borrowers</a></td>
+			</tr>
+			<tr>
+			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/catalogue_stats.pl">Katalog</a></td>
+			<td class="little"><a class="reports little" href="/cgi-bin/koha/reports/issues_stats.pl">Cyrkulacja</a></td>
+			</tr>
+			</table>
+			</div>
+			<div id="bloc25">
+			<h2 class="reports">Top Lists</h2>
+				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/bor_issues_top.pl">Most issuing Borrowers</a></p>
+				<p class="little"><a class="reports little" href="/cgi-bin/koha/reports/cat_issues_top.pl">Most issued items</a></p>
+			</div>
 		</div>
+		
 		<div id="Hint5" class="hint">
-			<h1 class="parameters">Parametry</h1>
-			Zmień preferencje systemowe
+			<h1 class="authority">Authorities</h1>
+			Authorities management &amp; searches
+			<form name="f" >
+				<h2 >
+					<select name="authtype">
+					<!-- TMPL_LOOP NAME="authtypesloop" -->
+						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+							<!-- TMPL_VAR NAME="authtypetext" -->
+						</option>
+					<!-- /TMPL_LOOP -->
+					</select>
+					<a href="javascript:addauthority()" class="authority">Add Authority</a>
+				</h2>
+				<h2>Search  <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">  in
+					<select name="authtype2">
+					<!-- TMPL_LOOP NAME="authtypesloop" -->
+						<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+							<!-- TMPL_VAR NAME="authtypetext" -->
+						</option>
+					<!-- /TMPL_LOOP -->
+					</select>
+				</h2>
+				<input type="hidden" name="marclist" value="">
+				<input type="hidden" name="and_or" value="and">
+				<input type="hidden" name="excluding" value="">
+				<input type="hidden" name="operator" value="contains">
+				<input type="hidden" name="op" value="do_search">
+				<img src="<!-- TMPL_VAR NAME="themelang" -->/images/holder.gif" width="1" height="12" alt="" hspace="0" vspace="0">
+				<a href="javascript:searchauthority()" class="authority">
+					Szukaj
+				</a>
+			</form>
 		</div>
 		<div id="Hint6" class="hint">
+			<h1 class="parameters">Parametry</h1>
+			<h2 class="parameters"><a href="barcodes/barcodes.pl">Barcodes generator</a></h2>
+			<h2 class="parameters"><a href="admin/aqbookfund.pl">Fundusze książkowy</a></h2>
+			<h2 class="parameters"><a href="import/breeding.pl">Import in reservoir</a></h2>
+		</div>
+		<div id="Hint7" class="hint">
 			<h1 class="circulation">Cyrkulacja</h1>
 			Praca przy stanowisku wypozyczeń i zwrotów za pomocą czytnika kodów i myszki
+				<h2 class="circulation">
+					Wypożycz
+				</h2>
+				<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+					<p>Wprowadź kartę czytelnika lub część nazwiska <input name="findborrower">
+					<input type="submit" value="OK" class="button circulation"></p>
+				</form>
+				<h2 class="circulation">
+					Return
+				</h2>
+				<form method="post" action="/cgi-bin/koha/circ/returns.pl">
+				<p>Kod Paskowy Książki</p>
+				<label class="label20">Kod paskowy pozycji:</label><input name="barcode" size="10">
+				<input type="submit" value="OK" class="button circulation">
+				</form>
+
 		</div>
 <!-- MAIN MENU -->
+		<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions" class="acquisition" onMouseOver="SetOn(3);">Gromadzenie</a><br/>
+		
 		<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet" class="catalogue" onMouseOver="SetOn(1);">Katalog</a><br/>
 		
+		<a href="/cgi-bin/koha/circ/circulation.pl" class="circulation" onMouseOver="SetOn(7);">Cyrkulacja</a><br/>
+		
 		<a href="/cgi-bin/koha/members/members-home.pl" class="members" onMouseOver="SetOn(2);">Czytelnicy</a><br/>
 		
-		<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions" class="acquisition" onMouseOver="SetOn(3);">Gromadzenie</a><br/>
+		<a href="/cgi-bin/koha/authorities/authorities-home.pl" class="reports" onMouseOver="SetOn(5);">Authorities</a><br/>
 		
 		<a href="/cgi-bin/koha/reports-home.pl" class="reports" onMouseOver="SetOn(4);">Raporty</a><br/>
 		
-		<a href="/cgi-bin/koha/admin-home.pl" class="parameters" onMouseOver="SetOn(5);">Parametry</a><br/>
+		<a href="/cgi-bin/koha/admin-home.pl" class="parameters" onMouseOver="SetOn(6);">Parametry</a><br/>
+
+
 		
-		<a href="/cgi-bin/koha/circ/circulation.pl" class="circulation" onMouseOver="SetOn(6);">Cyrkulacja</a><br/>
 	</div>
 </div>
 </body>

Index: pl/mancredit.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/mancredit.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/mancredit.tmpl	17 Apr 2004 16:26:25 -0000	1.4
+++ pl/mancredit.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,22 +1,20 @@
 <!-- TMPL_INCLUDE Name="members-top.inc" -->
-
-<Center><h3>Kredyt</h3></center>
-<form action=/cgi-bin/koha/mancredit.pl method=post>
-<table cellpadding=2 cellspacing=0 border=0>
-<input type=hidden name="bornum" value="<!-- TMPL_VAR Name="bornum" -->">
-<tr><td><b>Numer Czytelnika<b></td><td><!-- TMPL_VAR Name="bornum" --></td></tr>
-<tr><td><b>Typ</b></td><Td>
-<select name=type>
-<option value=C>Kredyt</option>
-<option value=BAY>Baycorp Adjustment</option>
-<option value=WORK>Odpracowany</option>
-</select>
-</td></tr>
-<tr><td><b>Numer pozycji</b></td><td><input type=text name=itemnum></td></tr>
-<tr><td><b>Wyjaśnienie</b></td><td><input type=text name=desc size=50></td></tr>
-<tr><td><b>Kwota</b></td><td><input type=text name=amount></td></tr>
-<tr><td><input type=submit name=add value="Dodaj"></td></tr>
-</table>
-</form>
-
+<div id="mainbloc">
+	<h1 class="member">Kredyt</h1>
+	<form action="/cgi-bin/koha/mancredit.pl" method="post">
+		<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
+		<p><label class="label100">Numer Czytelnika</label><!-- TMPL_VAR NAME="bornum" --></p>
+		<p><label class="label100">Typ</label>
+			<select name="type">
+				<option value="C">Kredyt</option>
+				<option value="BAY">Baycorp Adjustment</option>
+				<option value="WORK">Odpracowany</option>
+			</select>
+		</p>
+		<p><label class="label100">Numer pozycji</label><input type="text" name="itemnum"></p>
+		<p><label class="label100">Wyjaśnienie</label><input type="text" name="desc" size="50"></p>
+		<p><label class="label100">Kwota</label><input type="text" name="amount"></p>
+		<p><input type="submit" name="add" value="Dodaj" class="button"></p>
+	</form>
+</div>
 <!-- TMPL_INCLUDE Name="members-bottom.inc" -->
\ No newline at end of file

Index: pl/maninvoice.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/maninvoice.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/maninvoice.tmpl	17 Apr 2004 16:26:25 -0000	1.3
+++ pl/maninvoice.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,25 +1,25 @@
 <!-- TMPL_INCLUDE Name="members-top.inc" -->
-
-<Center><h3>Faktura</h3></center>
-<form action=/cgi-bin/koha/maninvoice.pl method=post>
-<table cellpadding=2 cellspacing=0 border=0>
-<input type=hidden name=bornum value="<!-- TMPL_VAR Name="bornum" -->">
-<tr><td><b>Numer Czytelnika<b></td><td><!-- TMPL_VAR Name="bornum" --></td></tr>
-<tr><td><b>Typ</b></td><Td>
-<select name=type>
-<option value=L>Pozycja zagubiona</option>
-<option value=F>Kara</option>
-<option value=A>Opłata za prowadzenie rachunku</option>
-<option value=N>Nowa Karta</option>
-<option value=M>Różne</option>
-<option value=REF>Zwrot Gotówki</option>
-</select>
-</td></tr>
-<tr><td><b>Numer pozycji</b></td><td><input type=text name=itemnum></td></tr>
-<tr><td><b>Wyjaśnienie</b></td><td><input type=text name=desc size=50></td></tr>
-<tr><td><b>Kwota</b></td><td><input type=text name=amount></td></tr>
-<tr><td><input type=submit name=add value="Dodaj"></td></tr>
-</table>
-</form>
-
+<div id="mainbloc">
+	<h1 class="member">Faktura</h1>
+	<form action="/cgi-bin/koha/maninvoice.pl" method="post">
+	<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
+	<p><label class="label100">Numer Czytelnika </label><!-- TMPL_VAR NAME="bornum" --></p>
+	<p>
+		<label class="label100"><b>Typ</label>
+		<select name="type">
+			<option value="L">Pozycja zagubiona</option>
+			<option value="F">Kara</option>
+			<option value="A">Opłata za prowadzenie rachunku</option>
+			<option value="N">Nowa Karta</option>
+			<option value="M">Różne</option>
+			<option value="REF">Zwrot Gotówki</option>
+		</select>
+	</p>
+	<p><label class="label100">Numer pozycji</label><input type="text" name="itemnum"></p>
+	<p><label class="label100">Wyjaśnienie</label><input type="text" name="desc" size="50"></p>
+	<p><label class="label100">Kwota</label><input type="text" name="amount"></p>
+	<p><label class="label100"><input type="submit" class="button" name="add" value="Dodaj"></p>
+	</table>
+	</form>
+</div>
 <!-- TMPL_INCLUDE Name="members-bottom.inc" -->

Index: pl/modbib.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/modbib.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/modbib.tmpl	17 Apr 2004 16:26:25 -0000	1.3
+++ pl/modbib.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,60 +1,60 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
-<a href="modwebsites.pl?biblionumber=<!-- TMPL_VAR Name="biblionumber" -->">Zmieniaj link witryny</a>
+<a href="modwebsites.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Zmieniaj link witryny</a>
 <form action="updatebiblio.pl" method="post" name="f">
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->">
-<input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR Name="biblioitemnumber" -->">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+<input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
 <table border="0" cellspacing="0" cellpadding="5">
 <tr valign="top">
 <td>Autor</td>
-<td><input type="text" name="author" value="<!-- TMPL_VAR Name="author" ESCAPE=HTML -->"></td>
+<td><input type="text" name="author" value="<!-- TMPL_VAR NAME="author" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Tytuł</td>
-<td><input type="text" name="title" value="<!-- TMPL_VAR Name="title" ESCAPE=HTML -->"></td>
+<td><input type="text" name="title" value="<!-- TMPL_VAR NAME="title" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Streszczenie</td>
-<td><textarea name="abstract" cols="40" rows="4"><!-- TMPL_VAR Name="abstract" --></textarea></td>
+<td><textarea name="abstract" cols="40" rows="4"><!-- TMPL_VAR NAME="abstract" --></textarea></td>
 </tr>
 <tr valign="top">
 <td>Temat</td>
-<td><textarea name="subject" cols="40" rows="4"><!-- TMPL_VAR Name="subject" --></textarea>
+<td><textarea name="subject" cols="40" rows="4"><!-- TMPL_VAR NAME="subject" --></textarea>
 </td>
 </tr>
 <tr valign="top">
 <td>Data Copyright</td>
-<td><input type="text" name="copyrightdate" value="<!-- TMPL_VAR Name="copyrightdate" ESCAPE=HTML -->"></td>
+<td><input type="text" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Tytuł Serii</td>
-<td><input type="text" name="seriestitle" value="<!-- TMPL_VAR Name="seriestitle" ESCAPE=HTML -->"></td>
+<td><input type="text" name="seriestitle" value="<!-- TMPL_VAR NAME="seriestitle" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Dodatkowy Autor</td>
-<td><input type="text" name="additionalauthor" value="<!-- TMPL_VAR Name="additionalauthor" ESCAPE=HTML -->"></td>
+<td><input type="text" name="additionalauthor" value="<!-- TMPL_VAR NAME="additionalauthor" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Podtytuł</td>
-<td><input type="text" name="subtitle" value="<!-- TMPL_VAR Name="subtitle" ESCAPE=HTML -->"></td>
+<td><input type="text" name="subtitle" value="<!-- TMPL_VAR NAME="subtitle" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Ujednolicony</td>
-<td><input type="text" name="unititle" value="<!-- TMPL_VAR Name="unititle" ESCAPE=HTML -->"></td>
+<td><input type="text" name="unititle" value="<!-- TMPL_VAR NAME="unititle" ESCAPE=HTML -->"></td>
 </tr>
 <tr valign="top">
 <td>Uwagi</td>
-<td><textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR Name="notes" ESCAPE=HTML --></textarea></td>
+<td><textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR NAME="notes" ESCAPE=HTML --></textarea></td>
 </tr>
 <tr valign="top">
 <td>Wyd. ciągłe</td>
-<td><input type="text" name="serial" value="<!-- TMPL_VAR Name="serial" ESCAPE=HTML -->"></td>
+<td><input type="text" name="serial" value="<!-- TMPL_VAR NAME="serial" ESCAPE=HTML -->"></td>
 </tr>
 </table>
 <br>
 <input type="submit" name="submit" value="Zapisz Zmiany">
 </form>
-<script>
+<script language="javascript" type="text/javascript">
 function Dopop() {
         newin=window.open("thesaurus_popup.pl?subject="+document.f.subject.value,"thesaurus",'width=500,height=400,toolbar=false,scrollbars=yes');
 }

Index: pl/modbibitem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/modbibitem.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/modbibitem.tmpl	17 Apr 2004 16:26:25 -0000	1.4
+++ pl/modbibitem.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,77 +1,78 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
-<h1><a href=/cgi-bin/koha/detail.pl?bib="<!-- TMPL_VAR Name="biblionumber" -->"&type=intra><!-- TMPL_VAR Name="title" --> (<!-- TMPL_VAR Name="author" -->)</a><br>
-Zmieniaj GrupÄ™ - <!-- TMPL_VAR Name="description" --></h1><br>
+<h1><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)</a><br>
+Zmieniaj GrupÄ™ - <!-- TMPL_VAR NAME="description" --></h1><br>
 
-<form action=updatebibitem.pl method=post>
-	<table border=0 cellspacing=0 cellpadding=5 align=left>
+<form action="updatebibitem.pl" method="post">
+	<table border="0" cellspacing="0" cellpadding="5" align="left">
 
-		<TR VALIGN=TOP  bgcolor="99cc33">
-			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2 ><b><input type=radio name=existing value=YES > PRZYPISZ DO ISTNIEJÄ„CEJ GRUPY</b></td>
+		<tr valign="top"  bgcolor="#99cc33">
+			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="2" ><b><input type="radio" name="existing" value="YES" > PRZYPISZ DO ISTNIEJÄ„CEJ GRUPY</b></td>
 		</tr>
 
-		<tr valign=top>
-			<td colspan=3>
-				<select name=existinggroup><br>
+		<tr valign="top">
+			<td colspan="3">
+				<select name="existinggroup"><br>
 					<!-- TMPL_LOOP Name="bibitemloop" -->
-						<option value="<!-- TMPL_VAR Name="biblioitemnumber" -->"><!-- TMPL_VAR Name="description" --> - <!-- TMPL_VAR Name="isbn" --><br>
+						<option value="<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="description" --> - <!-- TMPL_VAR NAME="isbn" --><br>
 					<!-- /TMPL_LOOP -->
 				</select>
 			</td>
 		</tr>
 
-		<TR VALIGN=TOP  bgcolor="99cc33">
-			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=2 ><b><input type=radio name=existing value=NO checked >LUB EDYTUJ SZCZEGÓŁY</b></td>
+		<tr valign="top"  bgcolor="#99cc33">
+			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="2" ><b><input type="radio" name="existing" value="NO" checked >LUB EDYTUJ SZCZEGÓŁY</b></td>
 		</tr>
 
-		<tr valign=top bgcolor=white><td>Typ pozycji</td><td><input type=text name=Item Type value="<!-- TMPL_VAR Name="itemtype" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Typ pozycji</td><td><input type="text" name="Item" value="<!-- TMPL_VAR NAME="itemtype" -->" size="20"></td></tr>
 
 		<tr valign="top" bgcolor="white">
 			<td>URL</td>
-			<td><input type="text" name="url" value="<!-- TMPL_VAR Name="url" -->" size="20"></td>
+			<td><input type="text" name="url" value="<!-- TMPL_VAR NAME="url" -->" size="20"></td>
 		</tr>
 
-		<tr valign=top bgcolor=white><td>Typ pozycji</td><td><input type=text name=Class value="<!-- TMPL_VAR Name="classification" --><!-- TMPL_VAR Name="dewey" --><!-- TMPL_VAR Name="subclass" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Typ pozycji</td><td><input type="text" name="Class" value="<!-- TMPL_VAR NAME="classification" --><!-- TMPL_VAR NAME="dewey" --><!-- TMPL_VAR NAME="subclass" -->" size="20"></td></tr>
 
 
 
-		<tr valign=top bgcolor=white><td>Wydawca</td><td><input type=text name=Publisher value="<!-- TMPL_VAR Name="publishercode" -->" size=20></td></tr>
-		<tr valign=top bgcolor=white><td>Miejsce</td><td><input type=text name=Place value="<!-- TMPL_VAR Name="place" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Wydawca</td><td><input type="text" name="Publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="20"></td></tr>
+		<tr valign="top" bgcolor="white"><td>Miejsce</td><td><input type="text" name="Place" value="<!-- TMPL_VAR NAME="place" -->" size="20"></td></tr>
 
 
-		<tr valign=top bgcolor=white><td>ISBN</td><td><input type=text name=ISBN value="<!-- TMPL_VAR Name="isbn" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>ISBN</td><td><input type="text" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" size="20"></td></tr>
+		<tr valign="top" bgcolor="white"><td>ISSN</td><td><input type="text" name="ISSN" value="<!-- TMPL_VAR NAME="issn" -->" size="20"></td></tr>		
 
-		<tr valign=top bgcolor=white><td>Rok publikacji</td><td><input type=text name=Publication Year value="<!-- TMPL_VAR Name="publicationyear" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Rok publikacji</td><td><input type="text" name="Publication" Year value="<!-- TMPL_VAR NAME="publicationyear" -->" size="20"></td></tr>
 
-		<tr valign=top bgcolor=white><td>Strony</td><td><input type=text name=Pages value="<!-- TMPL_VAR Name="pages" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Strony</td><td><input type="text" name="Pages" value="<!-- TMPL_VAR NAME="pages" -->" size="20"></td></tr>
 
-		<tr valign=top bgcolor=white><td>Ilustracje</td><td><input type=text name=Illustrations value="<!-- TMPL_VAR Name="illustration" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Ilustracje</td><td><input type="text" name="Illustrations" value="<!-- TMPL_VAR NAME="illustration" -->" size="20"></td></tr>
 
-		<tr valign=top bgcolor=white><td>Tom</td>
-		<td><input type=text name=Volume value="<!-- TMPL_VAR Name="volumeddesc" -->" size=20></td></tr>
-		<tr valign=top bgcolor=white><td>Uwagi</td>
-		<td><input name="Notes" size="20" value="<!-- TMPL_VAR name="bnotes" -->"></td></tr>
-		<tr valign=top bgcolor=white><td>Rozmiar</td>
-		<td><input type=text name=Size value="<!-- TMPL_VAR Name="size" -->" size=20></td></tr>
+		<tr valign="top" bgcolor="white"><td>Tom</td>
+		<td><input type="text" name="Volume" value="<!-- TMPL_VAR NAME="volumeddesc" -->" size="20"></td></tr>
+		<tr valign="top" bgcolor="white"><td>Uwagi</td>
+		<td><input name="Notes" size="20" value="<!-- TMPL_VAR NAME="bnotes" -->"></td></tr>
+		<tr valign="top" bgcolor="white"><td>Rozmiar</td>
+		<td><input type="text" name="Size" value="<!-- TMPL_VAR NAME="size" -->" size="20"></td></tr>
 
-		<input type=hidden name=bibnum value="<!-- TMPL_VAR Name="biblionumber" -->">
+		<input type="hidden" name="bibnum" value="<!-- TMPL_VAR NAME="biblionumber" -->">
 
-		<input type=hidden name=bibitemnum value="<!-- TMPL_VAR Name="biblioitemnumber" -->">
+		<input type="hidden" name="bibitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
 
 	</table>
 
-	<img src="/images/holder.gif" width=16 height=500 align=left>
+	<img src="/images/holder.gif" width="16" height="500" align="left">
 
 
 
 
-	<TABLE  cellspacing=0 cellpadding=5 border=0 >
+	<table  cellspacing="0" cellpadding="5" border="0" >
 
-		<TR VALIGN=TOP  bgcolor="99cc33">
-			<TD  bgcolor="99cc33" background="/images/background-mem.gif" colspan=5 ><b>ZMIANY DOTYCZĄCE TYCH KODÓW<br>
+		<tr valign="top"  bgcolor="#99cc33">
+			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="5" ><b>ZMIANY DOTYCZĄCE TYCH KODÓW<br>
 			Zaznacz WSZYSTKIE kody kreskowe, do których mają się odnieść zmiany. Pozostałe utrzymają rekord oryginalnej grupy.</td>
 		</tr>
 
-		<tr valign=top bgcolor=99cc33>
+		<tr valign="top" bgcolor="#99CC33">
 			<td background="/images/background-mem.gif">&nbsp;</td>
 			<td background="/images/background-mem.gif">Kod Paskowy</td>
 			<td background="/images/background-mem.gif">Lokalizacja</td>
@@ -80,26 +81,27 @@
 		</tr>
 
 		<!-- TMPL_LOOP Name="itemloop" -->
-			<tr valign=top gcolor="#ffffcc">
-				<td><input type=checkbox name="check_group_<!-- TMPL_VAR Name="barcode" -->"></td>
-				<td><a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR Name="itemnumber" -->&bib=<!-- TMPL_VAR Name="biblionumber" -->&bi=<!-- TMPL_VAR Name="biblioitemnumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
-				<td><!-- TMPL_VAR Name="holdingbranch" --></td>
+			<tr valign="top" gcolor="#ffffcc">
+				<td><input type="checkbox" name="check_group_<!-- TMPL_VAR NAME="barcode" -->"></td>
+				<td><a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+				<td><!-- TMPL_VAR NAME="holdingbranch" --></td>
 				<td></td>
-				<td><!-- TMPL_VAR Name="datelastseen" --></td>
+				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
 	<p>
 
-	<input type=image  name=submit src=/images/save-changes.gif border=0 width=187 height=42>
+	<input type="image" name="submit" src="/images/save-changes.gif" border="0" width="187" height="42">
 
 
 </form>
 <p>
 
 
-<B>POMOC</B> <b>Należy</b> kliknąć na odpowiedni guzik (w zielonym prostokącie) i wybrać albo przypisanie do istniejącej grupy albo modyfikację rekordu. Jeśli zmiany mają dotyczyć tylko niektórych rekordów, należy zaznaczyć je odpowiednio; stworzy to automatycznie nowy grupowy rekord.
- <br clear=all>
+<b>HELP:</b> You <b>must</b> click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record.  IF your changes only apply to some
+ items, tick the appropriate ones and a new group record will be created automatically for them.
+ <br clear="all">
  <p> &nbsp; </p>
 
 <!-- TMPL_INCLUDE Name="cat-bottom.inc" -->

Index: pl/moditem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/moditem.tmpl,v
retrieving revision 1.5
retrieving revision 1.5.10.1
diff -u -b -r1.5 -r1.5.10.1
--- pl/moditem.tmpl	17 Apr 2004 16:26:25 -0000	1.5
+++ pl/moditem.tmpl	7 May 2007 13:55:52 -0000	1.5.10.1
@@ -1,37 +1,37 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
-<h1><!-- TMPL_VAR Name="title" --> (<!-- TMPL_VAR Name="author" -->)</h1><br>
-<table border=0 cellspacing=0 cellpadding=5>
-<tr valign=top bgcolor=white><td><form action=updateitem.pl method=post>
-<table border=0 cellspacing=0 cellpadding=5>
-<tr valign=top bgcolor=white><td>Kod Paskowy</td><td><input type=text name=Barcode value="<!-- TMPL_VAR Name="barcode" -->" size=40></td></tr>
-<input type=hidden name=Class value="<!-- TMPL_VAR Name="classification" -->">
-<input type=hidden name=Publisher value="<!-- TMPL_VAR Name="publisher" -->">
-<input type=hidden name=ISBN value="<!-- TMPL_VAR Name="isbn" -->">
-<input type=hidden name=Publication Year value="<!-- TMPL_VAR Name="publicationyear" -->">
-<input type=hidden name=Pages value="<!-- TMPL_VAR Name="pages" -->">
-<input type=hidden name=Illustrations value="<!-- TMPL_VAR Name="illustration" -->">
-<tr valign=top bgcolor=white><td>Uwagi Egzemplarza</td><td><textarea name=ItemNotes cols=40 rows=4><!-- TMPL_VAR Name="itemnotes" --></textarea></td></tr>
-<input type=hidden name=Volume value="<!-- TMPL_VAR Name="volumeddesc" -->">
-<tr valign=top bgcolor=white><td>Oddział Właściwy</td><td><input type=text name=Home Branch value="<!-- TMPL_VAR Name="homebranch" -->" size=40></td></tr>
-<tr valign=top bgcolor=white>
+<h1><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)</h1><br>
+<table border="0" cellspacing="0" cellpadding="5">
+<tr valign="top" bgcolor="white"><td><form action=updateitem.pl method="post">
+<table border="0" cellspacing="0" cellpadding="5">
+<tr valign="top" bgcolor="white"><td>Kod Paskowy</td><td><input type="text" name="Barcode" value="<!-- TMPL_VAR NAME="barcode" -->" size="40"></td></tr>
+<input type="hidden" name="Class" value="<!-- TMPL_VAR NAME="classification" -->">
+<input type="hidden" name="Publisher" value="<!-- TMPL_VAR NAME="publisher" -->">
+<input type="hidden" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
+<input type="hidden" name="Publication Year" value="<!-- TMPL_VAR NAME="publicationyear" -->">
+<input type="hidden" name="Pages" value="<!-- TMPL_VAR NAME="pages" -->">
+<input type="hidden" name="Illustrations" value="<!-- TMPL_VAR NAME="illustration" -->">
+<tr valign="top" bgcolor="white"><td>Uwagi Egzemplarza</td><td><textarea name="ItemNotes" cols="40" rows="4"><!-- TMPL_VAR NAME="itemnotes" --></textarea></td></tr>
+<input type="hidden" name="Volume" value="<!-- TMPL_VAR NAME="volumeddesc" -->">
+<tr valign="top" bgcolor="white"><td>Oddział Właściwy</td><td><input type="text" name="Home" Branch value="<!-- TMPL_VAR NAME="homebranch" -->" size="40"></td></tr>
+<tr valign="top" bgcolor="white">
 
 <td>Zgubiono</td>
 <td>
-<input type=radio name=Lost value=1 <!-- TMPL_IF Name="itemlost" -->  checked <!-- /TMPL_IF --> > Tak <input type=radio name=Lost value=0 <!-- TMPL_UNLESS Name="itemlost" --> checked <!-- /TMPL_UNLESS --> > Nie
+<input type="radio" name="Lost" value="1" <!-- TMPL_IF Name="itemlost" -->  checked <!-- /TMPL_IF --> > Tak <input type="radio" name="Lost" value="0" <!-- TMPL_UNLESS Name="itemlost" --> checked <!-- /TMPL_UNLESS --> > Nie
 </td>
 </tr>
-<tr valign=top bgcolor=white>
+<tr valign="top" bgcolor="white">
 <td>Anulowano</td>
-<td><input type=radio name=withdrawn value=1 <!-- TMPL_IF Name="itemwithdrawn" --> checked <!-- /TMPL_IF --> > Tak <input type=radio name=withdrawn value=0 <!-- TMPL_UNLESS Name="itemwithdrawn" --> checked <!-- /TMPL_UNLESS --> > Nie
+<td><input type="radio" name="withdrawn" value="1" <!-- TMPL_IF Name="itemwithdrawn" --> checked <!-- /TMPL_IF --> > Tak <input type="radio" name="withdrawn" value="0" <!-- TMPL_UNLESS Name="itemwithdrawn" --> checked <!-- /TMPL_UNLESS --> > Nie
 </td>
 </tr>
-<input type=hidden name=bibnum value="<!-- TMPL_VAR Name="biblionumber" -->">
-<input type=hidden name=bibitemnum value="<!-- TMPL_VAR Name="biblioitemnumber" -->">
-<input type=hidden name=itemnumber value="<!-- TMPL_VAR Name="itemnumber" -->">
-<tr valign=top bgcolor=white><td></td><td>
+<input type="hidden" name="bibnum" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+<input type="hidden" name="bibitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
+<tr valign="top" bgcolor="white"><td></td><td>
 
-<input type=image  name=submit src=<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filesave.png border=0></td></tr>
+<input type="image"  name="submit" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filesave.png" border="0"></td></tr>
 </table>
 </form></td></tr>
 </table>

Index: pl/modwebsites.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/modwebsites.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/modwebsites.tmpl	17 Apr 2004 16:26:25 -0000	1.3
+++ pl/modwebsites.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,25 +1,25 @@
 <!-- TMPL_INCLUDE Name="acquisitions-top.inc" -->
 <p>
-<a href="detail.pl?type=intra&bib=<!-- TMPL_VAR Name="biblionumber" -->">Powrót do strony szczegółów</a>
+<a href="detail.pl?type=intra&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->">Powrót do strony szczegółów</a>
 
 
 <!-- TMPL_LOOP Name="websitesloop" -->
 <p>
 <form action="updatewebsite.pl" method="post">
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->">
-<input type="hidden" name="websitenumber" value="<!-- TMPL_VAR Name="websitenumber" -->">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+<input type="hidden" name="websitenumber" value="<!-- TMPL_VAR NAME="websitenumber" -->">
 <table>
 <tr valign="top">
 <td>Tytuł</td>
-<td><input type="text" name="title" value="<!-- TMPL_VAR Name="title" -->"></td>
+<td><input type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->"></td>
 </tr>
 <tr valign="top">
 <td>Wyjaśnienie</td>
-<td><textarea name="description" cols="40" rows="4"><!-- TMPL_VAR Name="description" --></textarea></td>
+<td><textarea name="description" cols="40" rows="4"><!-- TMPL_VAR NAME="description" --></textarea></td>
 </tr>
 <tr valign="top">
 <td>URL</td>
-<td><input type="text" name="url" value="<!-- TMPL_VAR Name="url" -->"></td>
+<td><input type="text" name="url" value="<!-- TMPL_VAR NAME="url" -->"></td>
 </tr>
 </table>
 <input type="submit" value="Aktualizuj ten link witryny">   <input type="submit" name="delete" value="Wymaż link tej witryny">
@@ -29,7 +29,7 @@
 <p>
 <h2><b>Dodaj nowy link witryny</b></h2>
 <form action="addwebsite.pl" method="post">
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR Name="biblionumber" -->">
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
 <table>
 <tr valign="top">
 <td>Tytuł</td>

Index: pl/opac-main.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/opac-main.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/opac-main.tmpl	17 Apr 2004 16:26:25 -0000	1.4
+++ pl/opac-main.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -20,62 +20,62 @@
 	alink="#663366" 
 	leftmargin=0 
 	topmargin=0
-	marginheight=0
-	marginwidth=0 >
+	marginheight="0"
+	marginwidth="0" >
 
 <center>
-<table cellspacing=0 cellpadding=0 border=0 >
+<table cellspacing="0" cellpadding="0" border="0" >
 	
-  <tr valign=top >
+  <tr valign="top" >
 	<td background="/images/front-background-med.gif"><img src="/images/holder.gif" 
-	width=1 height=440 align=left alt=" " hspace=0 vspace=0><table
-cellspacing=0 cellpadding=0 border=0 >
+	width="1" height="440" align="left" alt="" hspace="0" vspace="0"><table
+cellspacing="0" cellpadding="0" border="0" >
 	
-  <tr valign=top >
-	<td background=" "><img src="/images/holder.gif" width=228 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=57 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=47 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=1 height=88 
-	alt=" " hspace=0 vspace=0></td>
-	<td background=" "><img src="/images/holder.gif" width=1 height=88 
-	alt=" " hspace=0 vspace=0></td>
+  <tr valign="top" >
+	<td><img src="/images/holder.gif" width="228" height="88" 
+	alt="" hspace="0" vspace="0"></td>
+	<td><img src="/images/holder.gif" width="57" height="88" 
+	alt="" hspace="0" vspace="0"></td>
+	<td><img src="/images/holder.gif" width="47" height="88" 
+	alt="" hspace="0" vspace="0"></td>
+	<td><img src="/images/holder.gif" width="1" height="88" 
+	alt="" hspace="0" vspace="0"></td>
+	<td><img src="/images/holder.gif" width="1" height="88" 
+	alt="" hspace="0" vspace="0"></td>
   </tr>
 
-  <tr valign=top >
-	<td background=" " rowspan=2 align="right" colspan=2><img src="/images/holder.gif"
- 	width=1 height=30
-	alt=" " hspace=0 vspace=0><br>
-	<img src="/images/koha.gif" width=200 height=128 alt="Koha: Wolne Oprogramowanie, Zintegrowany System Biblioteczny" hspace=0 vspace=0></td>
+  <tr valign="top" >
+	<td rowspan=2 align="right" colspan="2"><img src="/images/holder.gif"
+ 	width="1" height="30"
+	alt="" hspace="0" vspace="0"><br>
+	<img src="/images/koha.gif" width="200" height="128" alt="Koha: Wolne Oprogramowanie, Zintegrowany System Biblioteczny" hspace="0" vspace="0"></td>
 
-	<td background=" "  colspan=3><font size=+2><a href="/cgi-bin/koha/catalogue-home.pl"><img src="/images/heading-search.gif" width=272 height=38 alt="Wyszukaj w katalogu" hspace=0 vspace=0 border=0></a></font></td>
+	<td  colspan="3"><font size=+2><a href="/cgi-bin/koha/catalogue-home.pl"><img src="/images/heading-search.gif" width="272" height="38" alt="Wyszukaj w katalogu" hspace="0" vspace="0" border="0"></a></font></td>
 
   </tr>
 
 
-<tr valign=top >
+<tr valign="top" >
 	<td>&nbsp; &nbsp; </td>
-	<FORM ACTION="/cgi-bin/koha/search.pl" name=catsearch>
-	<input type=hidden name=type value=opac>
-	<td background=" " >
+	<form action="/cgi-bin/koha/search.pl" name="catsearch">
+	<input type="hidden" name="type" value="opac">
+	<td >
 
-	<input type=text size="27" name="keyword"><br>
+	<input type="text" size="27" name="keyword"><br>
 	</font>
 	<b>Wpisz szukane słowo i naciśnij klawisz enter.</b><br>
 	<a href="/cgi-bin/koha/catalogue-home.pl">
       
-	<img src="/images/front-arrow.gif" width=27 height=22
-	alt="-" hspace=0 vspace=0 border=0 align=middle >Szukanie Zaawansowane (Więcej Opcji)</a><br>
+	<img src="/images/front-arrow.gif" width="27" height="22"
+	alt="-" hspace="0" vspace="0" border="0" align=middle >Szukanie Zaawansowane (Więcej Opcji)</a><br>
 
-	<img src="/images/holder.gif" width=1 height=8
-	alt=" " hspace=0 vspace=0>
+	<img src="/images/holder.gif" width="1" height="8"
+	alt="" hspace="0" vspace="0">
 	<p>
 	<!-- TMPL_IF NAME="loggedinuser" -->
-	    <p align=left>Zalogowano jako: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/logout.pl>Wyloguj</a>]</p>
+	    <p align="left">Zalogowano jako: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/logout.pl>Wyloguj</a>]</p>
 	<!-- TMPL_ELSE -->
-	    <p align=left><a href=/cgi-bin/koha/userpage.pl>Zaloguj do</a> Systemu Koha</p>
+	    <p align="left"><a href=/cgi-bin/koha/userpage.pl>Zaloguj do</a> Systemu Koha</p>
 	<!-- /TMPL_IF -->
 	</td>
 	</form>
@@ -85,37 +85,37 @@
  
 
 <!--
-  <tr valign=top ><form action="/cgi-bin/member.pl" method=get >
-	<td background=" "  colspan=3><img src="/images/heading-login.gif" width=279 		height=38
-	alt="Member Login" hspace=0 vspace=0 border=0></td>
+  <tr valign="top" ><form action="/cgi-bin/member.pl" method="get" >
+	<td  colspan="3"><img src="/images/heading-login.gif" width="279" 		height="38"
+	alt="Member Login" hspace="0" vspace="0" border="0"></td>
 
   </tr>
-<tr valign=top >
+<tr valign="top" >
         <td></td>
-	<form action="/cgi-bin/member.pl" method=get >
-	<td background=" " >
-	<font size=3 face="arial narrow,arial,helvetica">Card number &nbsp;</font></td>
-	<td background=" " ><input type=text size="12" name="card"></td>
+	<form action="/cgi-bin/member.pl" method="get" >
+	<td >
+	<font size="3" face="arial narrow,arial,helvetica">Card number &nbsp;</font></td>
+	<td ><input type="text" size="12" name="card"></td>
 
   </tr>
 
-  <tr valign=top><td></td>
+  <tr valign="top"><td></td>
 	<td></td>
 	<td></td>
-	<td background=" " >
-	<font size=3 face="arial narrow,arial,helvetica">Password</font></td>
-	<td background=" " ><input type=password size="12" name="password"><br>
-	<input type=submit value="OK"><br>
+	<td >
+	<font size="3" face="arial narrow,arial,helvetica">Password</font></td>
+	<td ><input type=password size="12" name="password"><br>
+	<input type="submit" value="OK"><br>
 
-	<img src="/images/holder.gif" width=1 height=8
-	alt=" " hspace=0 vspace=0></td>
+	<img src="/images/holder.gif" width="1" height="8"
+	alt="" hspace="0" vspace="0"></td>
 	</font>
  </tr>
 
-  <tr valign=top >
+  <tr valign="top" >
 	<td></td>
-	<td background=" " colspan=4><A href="join.html"><img src="/images/heading-member.gif" width=331 		height=38
-	alt="Become a Website Member" hspace=0 vspace=0 border=0></a>
+	<td colspan="4"><A href="join.html"><img src="/images/heading-member.gif" width="331" 		height="38"
+	alt="Become a Website Member" hspace="0" vspace="0" border="0"></a>
 	</td>
 	<td>
 	</td>

Index: pl/overdue.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/overdue.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/overdue.tmpl	17 Apr 2004 16:26:25 -0000	1.3
+++ pl/overdue.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,32 +1,57 @@
 <!-- TMPL_INCLUDE NAME="reports-top.inc" -->
-<!-- the site -->
-
-<h1>Zaległe pozycje do dnia <!-- TMPL_VAR NAME="todaysdate" --></h1><br><P>
+<div id="mainbloc">
+	<h1 class="reports">Zaległe pozycje do dnia <!-- TMPL_VAR NAME="todaysdate" --></h1>
+	<form method="post" action="/cgi-bin/koha/overdue.pl">
+	<p>Filter on :<br />
+	 	<div class="label100">Name or cardnumber :</div> <input type="text" name="borname" value="<!--TMPL_VAR Name="borname"-->"><br />
+		<div class="label100">Borrower categorycode :</div><select name="borcat" id="borcat"><option value="">Any</option>
+			<!-- TMPL_LOOP name="borcatloop" -->
+				<option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="catname" --></option>
+			<!-- /TMPL_LOOP -->
+			</select><br />
+		<div class="label100">Borrower Flags :</div><!--TMPL_VAR Name="CGIflags" --><br />
+	  	<div class="label100">Itemtype :</div><select name="itemtype" id="itemtype"><option value="">Any</option>
+			<!-- TMPL_LOOP name="itemtypeloop" -->
+				<option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="itemtypename" --></option>
+			<!-- /TMPL_LOOP -->
+			</select><br />
+		<div class="label100">branch :</div><select name="branch" id="branch">
+				<option value="">Any</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>
+<br />
+		<div class="label100">Show any items currently issued:</div><input type="checkbox" name="showall" value="pokaż" checked="checked"><br /><br />
+		<div class="label100">Sort By</div><select name="order" tabindex="0" size="1" id="order">
+<option <!--TMPL_UNLESS name="order"-->selected<!-- /TMPL_UNLESS--> value="">Do Zwrotu</option>
+<option <!--TMPL_IF name="order"-->selected<!-- /TMPL_IF--> value="borrower">Czytelnik</option>
+</select><br />
+			<input TYPE="submit" value="Apply Filter" class="button reports">
+	</form>
+	</p>
 
-<TABLE  cellspacing=0 cellpadding=5 border=1 align=center>
-  <TR VALIGN=TOP>
-    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Do Zwrotu</b></td>
-    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Czytelnik</b></td>
-    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Telefon</b></td>
-    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Tytuł</b></td>
-    <TD  bgcolor="99cc33" background="/images/background-mem.gif"><b>Autor</b></td>
+	<table>
+	<tr>
+		<th class="reports">Do Zwrotu </th>
+		<th class="reports">Czytelnik </th>
+		<th class="reports">Telefon</th>
+		<th class="reports">Title / Author</th>
   </tr>
 
-  <!-- TMPL_LOOP NAME=overdueloop -->
+	<!-- TMPL_LOOP NAME="overdueloop" -->
     <tr>
       <td><!-- TMPL_VAR NAME="duedate" --></td>
-    <!-- TMPL_IF NAME=email -->
-      <td><a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="name" --></a></td>
+			<!-- TMPL_IF NAME="email" -->
+			<td><a href="members/moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->"><!-- TMPL_VAR NAME="name" --></a>  <a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" -->"><i>(email)</i></a>
+			</td>
     <!-- TMPL_ELSE -->
       <td><!-- TMPL_VAR NAME="name" --></td>
     <!-- /TMPL_IF -->
       <td><!-- TMPL_VAR NAME="phone" --></td>
-      <td><!-- TMPL_VAR NAME="title" --></td>
-      <td><!-- TMPL_VAR NAME="author" --></td>
+			<td><p><b><!-- TMPL_VAR NAME="title" --></b>, <!-- TMPL_VAR NAME="author" --></p></td>
     </tr>
   <!-- /TMPL_LOOP -->
-</table>
-
-
-<!-- endmenu -->
+	</table>
+</div>
 <!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->

Index: pl/reports.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/reports.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/reports.tmpl	17 Apr 2004 16:26:25 -0000	1.2
+++ pl/reports.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,8 +1,8 @@
 <!-- TMPL_INCLUDE Name="issues-top.inc" -->
 
-<H1> <!-- TMPL_VAR Name="type" --> raporty </H1>
+<h1> <!-- TMPL_VAR NAME="type" --> raporty </h1>
 
 <!-- TMPL_LOOP Name="dataloop" -->
-	<!-- TMPL_VAR Name="value" -->
+	<!-- TMPL_VAR NAME="value" -->
 <!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE Name="issues-bottom.inc" -->

Index: pl/request.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/request.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/request.tmpl	17 Apr 2004 16:26:25 -0000	1.2
+++ pl/request.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,148 +1,134 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
-
-<form action="placerequest.pl" method=post>
-<input type=hidden name=biblio value="<!-- TMPL_VAR Name="bib" -->">
-<input type=hidden name=type value=str8>
-<input type=hidden name=title value="<!-- TMPL_VAR Name="title" -->">
-<h1>Zamówienie: <a href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="bib" -->><!-- TMPL_VAR Name="title" --></a> <!-- TMPL_VAR Name="author" --></h1><P>
-<p>
-
-
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Ranga</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Numer Czytelnika</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Uwagi</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Data</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Odbiór</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Zamów</b></TD>
-	</TR>
-	<tr VALIGN=TOP  >
-		<td>
-			<select name=rank-request>
+<div id="mainbloc">
+	<form action="placerequest.pl" method="post">
+	<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="bib" -->">
+	<input type="hidden" name="type" value="str8">
+	<input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->">
+	<h1 class="catalogue">
+		Zamówienie: <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="bib" -->"><!-- TMPL_VAR NAME="title" --></a> <!-- TMPL_VAR NAME="author" -->
+	</h1>
+	<div id="bloc25">
+		<h2 class="catalogue">Zamów</h2>
+		<p>
+		<label class="label100">Ranga</label>
+			<select name="rank-request">
 			<!--$priorityoptions-->
 			<!-- TMPL_LOOP Name="optionloop" -->
-				<option value="<!-- TMPL_VAR Name="num" -->" <!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->>
-					<!-- TMPL_VAR Name="num" -->
+				<option value="<!-- TMPL_VAR NAME="num" -->" <!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->>
+					<!-- TMPL_VAR NAME="num" -->
 				</option>
 			<!-- /TMPL_LOOP -->
 			</select>
-		</td>
-		<td><input type=text size=10 name=member></td>
-		<td><input type=text size=20 name=notes></td>
-		<td><!-- TMPL_VAR Name=date --></td>
-		<td><!-- TMPL_VAR name="CGIbranch" --></td>
-		<td>
-			<input type=checkbox name=request value="jakikolwiek">Pierwszy dostępny, lub wybierz z poniższej listy
-		</td>
+		</p>
+		<p><label class="label100">Numer Czytelnika</label><input type="text" size="10" name="member"></p>
+		<p><label class="label100">Uwagi</label><input type="text" size="20" name="notes"></p>
+		<p><label class="label100">Data</label><!-- TMPL_VAR NAME="date" --></p>
+		<p><label class="label100">Odbiór</label><!-- TMPL_VAR NAME="CGIbranch" --></p>
+		<p>
+			<label class="label100">Zamów</label><input type="checkbox" name="request" value="jakikolwiek">Pierwszy dostępny, lub wybierz z poniższej listy
+		</p>
+		<table class="small">
+			<tr>
+				<th class="catalogue">Zamów</th>
+				<th class="catalogue">Typ pozycji</th>
+				<th class="catalogue">Klasyfikacja</th>
+				<th class="catalogue">Tom</th>
+				<th class="catalogue">Data pub.</th>
+				<th class="catalogue">Egzemplarze</th>
 	</tr>
-</table>
-<input type="submit" value="zamów" class="button">
-
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-<TR VALIGN=TOP>
-	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Zamów</b></TD>
-	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Typ pozycji</b></TD>
-	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Klasyfikacja</b></TD>
-	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Tom</b></TD>
-	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Data pub.</b></TD>
-	<td  bgcolor="#99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Egzemplarze</b></TD>
-</TR>
-<!--$bibitemrows-->
-<!-- TMPL_LOOP Name="bibitemloop" -->
-	<tr VALIGN=TOP>
-		<TD>
+			<!--$bibitemrows-->
+			<!-- TMPL_LOOP Name="bibitemloop" -->
+				<tr>
+					<td>
 			<!-- TMPL_IF Name="itemlost" -->
 				Nie może być wybrana
 			<!-- TMPL_ELSE -->
-				<input type=checkbox name=reqbib value=<!-- TMPL_VAR Name="biblioitemnumber" -->>
-				<input type=hidden name=biblioitem value=<!-- TMPL_VAR Name="biblioitemnumber" -->>
+							<input type="checkbox" name="reqbib" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+							<input type="hidden" name="biblioitem" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
 			<!-- /TMPL_IF -->
 		</td>
-		<TD>
-			<!-- TMPL_VAR Name="description" -->
+					<td>
+						<!-- TMPL_VAR NAME="description" -->
 		</td>
-		<TD>
-			<!-- TMPL_VAR Name="class" -->
+					<td>
+						<!-- TMPL_VAR NAME="class" -->
 		</td>
 		<td>
-			<!-- TMPL_VAR Name="volumeddesc" -->
+						<!-- TMPL_VAR NAME="volumeddesc" -->
 		</td>
 		<td>
-			<!-- TMPL_VAR Name="publicationyear" -->
+						<!-- TMPL_VAR NAME="publicationyear" -->
 		</td>
 		<td>
 			<!-- TMPL_LOOP Name="barcodeloop" -->
-				<!-- TMPL_VAR Name="barcode" --> <!-- TMPL_VAR Name="message" --><br>
+							<!-- TMPL_VAR NAME="barcode" --> <!-- TMPL_VAR NAME="message" --><br>
 			<!-- /TMPL_LOOP -->
 		</td>
 	</tr>
-<!-- /TMPL_LOOP -->
-
-</table>
-
-</form>
-<p>&nbsp;</p>
-
-
-<form name=T<!-- TMPL_VAR Name="time" --> action=modrequest.pl method=post>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=7><B>ZMIENIAJ ISTNIEJĄCE ZAMÓWIENIA </b></TD>
-	</TR>
-	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Ranga</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Czytelnik</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Uwagi</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Data</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Odbiór</b></TD>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>Zamów</b></TD>
-	</TR>
+			<!-- /TMPL_LOOP -->
+		</table>
+		<input type="submit" value="zamów" class="button catalogue">
+		</form>
+	</div>
+	<!-- TMPL_IF name="reserveloop" -->
+		<div id="bloc25">
+			<form name="T<!-- TMPL_VAR NAME="time" -->" action="modrequest.pl" method="post">
+			<h2 class="catalogue">ZMIENIAJ ISTNIEJĄCE ZAMÓWIENIA </h2>
+			<table class="small">
+				<tr>
+					<th class="catalogue">Ranga</th>
+					<th class="catalogue">Czytelnik</th>
+					<th class="catalogue">Uwagi</th>
+					<th class="catalogue">Data</th>
+					<th class="catalogue">Odbiór</th>
+					<th class="catalogue">Zamów</th>
+				</tr>
 	<!--$existingreserves-->
 	<!-- TMPL_LOOP Name="reserveloop" -->
-		<tr VALIGN=TOP>
-			<TD>
-			<input type=hidden name=borrowernumber value=<!-- TMPL_VAR Name="borrowernumber" -->>
-			<input type=hidden name=biblio value=<!-- TMPL_VAR Name="biblionumber" -->>
-			<select name=rank-request>
+					<tr>
+						<td>
+							<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+							<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+							<select name="rank-request">
 				<!-- TMPL_IF Name="wait" -->
-					<option value=W selected>Oczekuje</option>
+									<option value="W" selected>Oczekuje</option>
 				<!-- /TMPL_IF -->
 				<!-- TMPL_LOOP Name="optionloop" -->
-					<option value="<!-- TMPL_VAR Name="num" -->" <!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
-						<!-- TMPL_VAR Name="num" -->
+									<option value="<!-- TMPL_VAR NAME="num" -->" <!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+										<!-- TMPL_VAR NAME="num" -->
 					</option>
 				<!-- /TMPL_LOOP -->
-				<option value=del>Wymaż</option>
-			</select></td>
-			<TD>
-			<a href=/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="borrowernumber" -->><!-- TMPL_VAR Name="firstname" --> <!-- TMPL_VAR Name="surname" --></a>
-			</td>
-			<td><!-- TMPL_VAR Name="notes" --></td>
-			<TD><!-- TMPL_VAR Name="date" --></td>
-			<TD><!-- TMPL_IF Name="wait" -->
-				Egzemplarz czeka w <b><!-- TMPL_VAR Name="wbrname" --></b> <input type=hidden name=pickup value=<!-- TMPL_VAR Name="wbrcd" -->>
+								<option value="del">Wymaż</option>
+							</select>
+						</td>
+						<td>
+						<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>
+						</td>
+						<td><!-- TMPL_VAR NAME="notes" --></td>
+						<td><!-- TMPL_VAR NAME="date" --></td>
+						<td><!-- TMPL_IF Name="wait" -->
+							Egzemplarz czeka w <b><!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value=<!-- TMPL_VAR NAME="wbrcd" -->>
 				<!-- TMPL_ELSE -->
-					<select name=pickup>
+								<select name="pickup">
 						<!-- TMPL_LOOP Name="branchloop" -->
-							<option value="<!-- TMPL_VAR Name="branch" -->"<!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->>
-								<!-- TMPL_VAR Name="branchname" -->
+										<option value="<!-- TMPL_VAR NAME="branch" -->"<!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->>
+											<!-- TMPL_VAR NAME="branchname" -->
 							</option>
 						<!-- /TMPL_LOOP -->
 					</select>
 				<!-- /TMPL_IF -->
 			</td>
-			<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/detail.pl?bib=<!-- TMPL_VAR NAME=''biblionumber" -->&amp;type=intra" onClick="openWindow(this, 'Item', 480, 640); return false;">
+									<!-- TMPL_VAR NAME="barcode" -->
 					</a>
 				<!-- TMPL_ELSE -->
 					<!-- TMPL_IF Name="constrainttypea" -->
 						<i>Pierwszy Dostępny</i>
 					<!-- TMPL_ELSE -->
 						<!-- TMPL_IF Name="constrainttypeo" -->
-							Tylko ten rodzaj : <b><!-- TMPL_VAR Name="volumeddesc" --> <!-- TMPL_VAR Name="itemtype" --></b>
+										Tylko ten rodzaj : <b><!-- TMPL_VAR NAME="volumeddesc" --> <!-- TMPL_VAR NAME="itemtype" --></b>
 						<!-- /TMPL_IF -->
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_IF -->
@@ -150,15 +136,15 @@
 			</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
-	<tr VALIGN=TOP>
-	<TD colspan=6 align=right>
+				<tr>
+					<td colspan="6" align="right">
 		Wymaż rezerwację wybierając "Wymaż" z listy ranga
-		<input type="image" name="submit" value="zamów" border=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png">
+						<input type="image" name="submit" value="zamów" border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/2rightarrow.png">
 	</td>
 	</tr>
-</table>
-<P>
-<br>
-</form>
-
+			</table>
+			</form>
+		</div>
+	<!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE Name="cat-bottom.inc" -->

Index: pl/reservereport.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/reservereport.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/reservereport.tmpl	17 Apr 2004 16:26:25 -0000	1.2
+++ pl/reservereport.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,29 +1,28 @@
 <!-- TMPL_INCLUDE Name="reports-top.inc" -->
 
-<CENTER>
-<table border=0 cellspacing=0 cellpadding=5>
+<table border="0" cellspacing="0" cellpadding="5" align="center">
 	<!-- TMPL_LOOP Name="dataloop" -->
-		<tr valign=top bgcolor='white'>
+		<tr valign="top" bgcolor="white">
 			<td>
-				<!-- TMPL_VAR Name="name" -->
+				<!-- TMPL_VAR NAME="name" -->
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="reservedate" -->
+				<!-- TMPL_VAR NAME="reservedate" -->
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="title" -->
+				<!-- TMPL_VAR NAME="title" -->
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="classification" -->
+				<!-- TMPL_VAR NAME="classification" -->
 			</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 	<tr>
 		<td>
-			<!-- TMPL_VAR Name="count" -->
+			<!-- TMPL_VAR NAME="count" -->
 		</td>
 		<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
 	</tr>
-</TABLE>
+</table>
 
 <!-- TMPL_INCLUDE Name="reports-bottom.inc" -->

Index: pl/searchheader.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/searchheader.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/searchheader.tmpl	17 Apr 2004 16:26:25 -0000	1.2
+++ pl/searchheader.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,2 +1,2 @@
-<a href=search.pl?template=cmsdsearchresults.tmpl&startfrom=<!-- TMPL_VAR NAME="startfrom" -->>Wyniki z numerem dewey</a> | <a href=search.pl?template=searchresults.tmpl&startfrom=<!-- TMPL_VAR NAME="startfrom" -->>Wyniki z numerem opisu</a>
+<a href="search.pl?template=cmsdsearchresults.tmpl&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->">Wyniki z numerem dewey</a> | <a href="search.pl?template=searchresults.tmpl&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" -->">Wyniki z numerem opisu</a>
 <hr>

Index: pl/shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/shelves.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/shelves.tmpl	17 Apr 2004 16:26:25 -0000	1.2
+++ pl/shelves.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,43 +1,42 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
 <!-- TMPL_IF Name="viewshelf" -->
-<center>
 <form>
-    <table border=0 cellpadding=2 cellspacing=0>
+    <table border="0" cellpadding="2" cellspacing="0" align="center">
     		<tr>
-			<th colspan=4 bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-				<font color=white>Zawartość <!-- TMPL_VAR Name="shelfname" --></font>
+			<th colspan="4" bgcolor="<!-- TMPL_VAR NAME="headerbackgroundcolor" -->">
+				<font color="white">Zawartość <!-- TMPL_VAR NAME="shelfname" --></font>
 			</th>
 		</tr>
 		<!-- TMPL_LOOP Name="itemsloop" -->
 			<tr>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="barcode" --></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="title" --></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="author" --></td>
+				<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
+				<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
+				<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="title" --></td>
+				<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
 	<br>
 	<a href="shelves.pl" class="button">Lista półek</a>
-	<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=submit value="Usuń wybrane pozycje" class="button">
+	<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="submit" value="Usuń wybrane pozycje" class="button">
 </form>
 <form>
-	<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="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" -->">
 	<table>
 		<tr>
 			<td>
-				Dodaj książkę wg. kodu paskowego w <!-- TMPL_VAR name="shelfname" -->
+				Dodaj książkę wg. kodu paskowego w <!-- TMPL_VAR NAME="shelfname" -->
 			</td>
 			<td>
 				<input name="addbarcode">
-				<input type=hidden name=modifyshelfcontents value=1>
-				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
+				<input type="hidden" name="modifyshelfcontents" value="1">
+				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
 				<input type="submit" value="Zapisz" class="button">
 			</td>
 		</tr>
@@ -46,62 +45,61 @@
 <!-- TMPL_ELSE -->
 	<!-- TMPL_IF Name="shelves" -->
 		<!-- TMPL_IF Name="status1" -->
-			<font color=red><!-- TMPL_VAR Name="string1" --></font><p>
+			<font color="red"><!-- TMPL_VAR NAME="string1" --></font><p>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_LOOP Name="paramsloop" -->
 			<!-- TMPL_IF Name="status" -->
-				<font color=red><!-- TMPL_VAR Name="string" --></font><p>
+				<font color="red"><!-- TMPL_VAR NAME="string" --></font><p>
 			<!-- /TMPL_IF -->
 		<!-- /TMPL_LOOP -->
-		<center>
 		<h1>Półki</h1>
-		<table border=0 cellpadding=7>
+		<table border="0" cellpadding="7" align="center">
 			<tr>
-				<td align=center valign="bottom">
+				<td align="center" valign="bottom">
 					<form>
 						<p>
 							<a href="shelves.pl" class="button">Lista półek</a>
 						</p>
 					</form>
 				</td>
-				<td align=center valign="bottom">
-					<form method=post>
-					<input type="hidden" name="shelves" value=1>
-					<table border=0 cellpadding=0 cellspacing=0>
+				<td align="center" valign="bottom">
+					<form method="post">
+					<input type="hidden" name="shelves" value="1">
+					<table border="0" cellpadding="0" cellspacing="0">
 						<tr>
-							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-								<font color=white>Wybierz półki do wymazania</font>
+							<th bgcolor="<!-- TMPL_VAR NAME="headerbackgroundcolor" -->">
+								<font color="white">Wybierz półki do wymazania</font>
 							</th>
 						</tr>
 						<!-- TMPL_LOOP Name="shelvesloop" -->
 						<tr>
-							<td bgcolor="<!-- TMPL_VAR Name="color" -->">
-								<input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
-								<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> książek)
+							<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
+								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
+								<!-- TMPL_VAR NAME="shelfname" --> (<!-- TMPL_VAR NAME="shelfbookcount" --> książek)
 							</td>
 						</tr>
 						<!-- /TMPL_LOOP -->
 					</table>
 					<p>
-						<input type=submit value="Wymaż półki" class="button"></form>
+						<input type="submit" value="Wymaż półki" class="button"></form>
 					</p>
 				</td>
-				<td align=center valign=bottom>
-					<form method=post>
-					<input type=hidden name=shelves value=1>
-					<table border=0 cellpadding=0 cellspacing=0>
+				<td align="center" valign="bottom">
+					<form method="post">
+					<input type="hidden" name="shelves" value="1">
+					<table border="0" cellpadding="0" cellspacing="0">
 						<tr>
-							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-								<font color=white>Dodaj Półkę</font>
+							<th bgcolor="<!-- TMPL_VAR NAME="headerbackgroundcolor" -->">
+								<font color="white">Dodaj Półkę</font>
 							</th>
 						</tr>
 						<tr>
 							<td>
-								<p><input name=addshelf size=25></p>
+								<p><input name="addshelf" size="25"></p>
 							</td>
 						</tr>
 					</table>
-								<p><input type=submit value="Dodaj Nową Półkę" class="button"></p>
+								<p><input type="submit" value="Dodaj Nową Półkę" class="button"></p>
 					</form>
 				</td>
 			</tr>
@@ -109,13 +107,13 @@
 
 	<!-- TMPL_ELSE -->
 		<center>
-		<table border=0 cellpadding=4 cellspacing=0>
+		<table border="0" cellpadding="4" cellspacing="0">
 			<tr>
-				<td bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-					<table border=0 cellpadding=5 cellspacing=0 width=100%>
+				<td bgcolor="<!-- TMPL_VAR NAME="headerbackgroundcolor" -->">
+					<table border="0" cellpadding="5" cellspacing="0" width="100%">
 						<tr>
-							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-								<font color=white>Lista Półek</font>
+							<th bgcolor="<!-- TMPL_VAR NAME="headerbackgroundcolor" -->">
+								<font color="white">Lista Półek</font>
 							</th>
 						</tr>
 					</table>
@@ -123,9 +121,9 @@
 			</tr>
 			<!-- TMPL_LOOP Name="shelvesloop" -->
 			<tr>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->">
-					<a href="shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
-						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> ksiÄ…zek)
+				<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
+					<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
+						<!-- TMPL_VAR NAME="shelfname" -->(<!-- TMPL_VAR NAME="shelfbookcount" --> ksiÄ…zek)
 					</a>
 				</td>
 			</tr>

Index: pl/stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/stats.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/stats.tmpl	17 Apr 2004 16:26:25 -0000	1.2
+++ pl/stats.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,33 +1,34 @@
 <!-- TMPL_INCLUDE NAME="reports-top.inc" -->
 
-<CENTER>
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr bgcolor='#99cc33'>
-			<td background='/images/background-mem.gif'><b>Nazwa</b></td>
-			<td background='/images/background-mem.gif'><b>Typ</b></td>
-			<td background='/images/background-mem.gif'><b>Data/czas</b></td>
-			<td background='/images/background-mem.gif'><b>Kwota</b></td>
-			<td background='/images/background-mem.gif'><b>Oddział</b></td>
+<div id="mainbloc">
+	<table border="0" cellspacing="0" cellpadding="5" align="center">
+		<tr bgcolor="#99cc33">
+			<th>Nazwa</th>
+			<th>Wyjaśnienie</th>
+			<th>Typ</th>
+			<th>Data/czas</th>
+			<th>Kwota</th>
+			<th>Oddział</th>
+			
 		<tr>
-		<!-- TMPL_LOOP name=loop1 -->
+		<!-- TMPL_LOOP NAME=loop1 -->
 		<tr>
-			<td><!-- TMPL_VAR NAME=name --></td>
-			<td><!-- TMPL_VAR NAME=type --></td>
-			<td><!-- TMPL_VAR NAME=time --></td>
-			<td><!-- TMPL_VAR NAME=amount --></td>
-			<td><!-- TMPL_VAR NAME=branch --></td>
+			<td><!-- TMPL_VAR NAME="name" --></td>
+			<td><!-- TMPL_VAR NAME="description" --></td>
+			<td><!-- TMPL_VAR NAME="type" --></td>
+			<td><!-- TMPL_VAR NAME="time" --></td>
+			<td><!-- TMPL_VAR NAME="amount" --></td>
+			<td><!-- TMPL_VAR NAME="branch" --></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
-</CENTER>
 
 
 <p>
-	<b>Wpłacono w sumie: <!-- TMPL_VAR NAME=total --></b>
+	<b>Wpłacono w sumie: <!-- TMPL_VAR NAME="total" --></b>
 	<br>
-	<b>Odpisano w sumie: <!-- TMPL_VAR NAME=totalw --></b>
+	<b>Odpisano w sumie: <!-- TMPL_VAR NAME="totalw" --></b>
 </p>
 
+</div>
 <!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->
-</BODY>
-</HTML>

Index: pl/thesaurus_popup.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/thesaurus_popup.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/thesaurus_popup.tmpl	17 Apr 2004 16:26:25 -0000	1.4
+++ pl/thesaurus_popup.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,42 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-	<title>Tworzenie wartości tezaurusa dla kategorii <!-- TMPL_VAR name="category" --></title>
+	<title>Tworzenie wartości tezaurusa dla kategorii <!-- TMPL_VAR NAME="category" --></title>
 </head>
 <body>
 	<form name="f_pop" action="thesaurus_popup.pl" method="post">
-		<textarea name="result" rows=10 cols=60><!-- TMPL_VAR name="result" --></textarea></br>
+		<textarea name="result" rows="10" cols="60"><!-- TMPL_VAR NAME="result" --></textarea></br>
 		<br/><input type="button" value="OK" onClick="javascript:report()">
 		<p>
-			<input type="text" name="search_string" value="<!-- TMPL_VAR name="search_string" -->">
-			<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
-			<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
-			<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
+			<input type="text" name="search_string" value="<!-- TMPL_VAR NAME="search_string" -->">
+			<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
+			<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
+			<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
 			<input type="hidden" name="op" value="search">
 			<input type="submit" value="Szukaj">
 		</p>
 	</form>
-<!-- TMPL_IF name="search_string" -->
+<!-- TMPL_IF NAME="search_string" -->
 	<form name="f2_pop" action="thesaurus_popup.pl" method="post">
-	<!-- TMPL_VAR name="select_list" -->
-	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
-	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
-	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
+	<!-- TMPL_VAR NAME="select_list" -->
+	<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
+	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
+	<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
 	<input type="hidden" name="op" value="select">
-	<input type="hidden" name="result" value="<!-- TMPL_VAR name="result" -->">
+	<input type="hidden" name="result" value="<!-- TMPL_VAR NAME="result" -->">
 	<input type="submit" name="OK" value="OK">
 	</form>
 <!-- /TMPL_IF -->
 <form name="f3_pop"  action="thesaurus_popup.pl" method="post">
-	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
-	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
-	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR name="nohierarchy" -->">
+	<input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+	<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
+	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
 	<input type="hidden" name="op" value="add">
 	Wprowadź nowe HW : <input type="text" name="insert">
 	<input type="submit" name="NEW" value="NOWA">
 	</form>
-	<script>
+	<script language="javascript" type="text/javascript">
 		function report() {
-			opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.result.value;
+			opener.document.f.field_value[<!-- TMPL_VAR NAME="index" -->].value= document.f_pop.result.value;
 			self.close();
 			return false;
 		}

Index: pl/updatebiblio.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/Attic/updatebiblio.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/updatebiblio.tmpl	17 Apr 2004 16:26:25 -0000	1.4
+++ pl/updatebiblio.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,17 +1,17 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
 
-<!-- TMPL_VAR Name="error" -->
+<!-- TMPL_VAR NAME="error" -->
 <p> Naciśnij "prześlij", by wymusić temat
 <br>
-<form action="/cgi-bin/koha/updatebiblio.pl" method=post>
-<table border=0 cellspacing=0 cellpadding=5>
+<form action="/cgi-bin/koha/updatebiblio.pl" method="post">
+<table border="0" cellspacing="0" cellpadding="5">
 <!-- TMPL_LOOP Name="dataloop" -->
-	<input type=hidden name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->">
+	<input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->">
 <!-- /TMPL_LOOP -->
-	<input type=hidden name="Force" value="<!-- TMPL_VAR NAME="substring" -->">
-<TR><TD><input type=submit></TD></TR>
-</TABLE>
+	<input type="hidden" name="Force" value="<!-- TMPL_VAR NAME="substring" -->">
+<tr><td><input type="submit"></td></tr>
+</table>
 </form>
 
 

Index: pl/acqui/acqui-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/Attic/acqui-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/acqui/acqui-home.tmpl	17 Apr 2004 16:26:29 -0000	1.2
+++ pl/acqui/acqui-home.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,84 +1,94 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 <div id="mainbloc">
 
-<h1>Gromadzenie</h1>
+<h1 class="acquisition">Gromadzenie</h1>
 <div id="bloc25">
-	<div id="bloctitle">Rozpocznij, przyjmij, zmień zamówienie</div>
-	Nazwa Dostawcy: 
-		<form action="/cgi-bin/koha/acqui/order.pl" method=post>
-			<input type="text"  size="25"   name="supplier">
-			<input type="submit" class="button" value="OK">
-		</form>
-</div>
-<div id="bloc25">
-	<div id="bloctitle">Przyjmij lub zmień zamówienie okresowe</div>
-	Szukaj wg. Tytułu
-	<form action="/cgi-bin/koha/acqui/acquire.pl" method=post>
-		<input type="text"  size="25"   name="recieve">
-		<input type="submit" class="button" value="OK">
+	<h2 class="acquisition">Rozpocznij, przyjmij, zmień zamówienie</h2>
+	<!-- TMPL_IF name="nobudget" -->
+		<p class="problem">You must define a budget in parameters</p>
+	<!-- TMPL_ELSE -->
+		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
+			Supplier name : <input type="text"  size="25"   name="supplier">
+			<input type="submit" class="button acquisition" value="OK">
 	</form>
+	<p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
+	<!-- /TMPL_IF -->
 </div>
 
 <!-- currencies-->
 <div id="bloc25">
 	<form action="/cgi-bin/koha/currency.pl">
-	<input type=hidden name=type value=change>
-	<div id="bloctitle">kursy wymiany</div>
-	<table>
-	<!-- TMPL_LOOP name="loop_currency" -->
-		<tr>
-			<td>
-				<!-- TMPL_VAR name="currency" -->
-			</td>
-			<td>
-				<input type="text"  size="10"  name="<!-- TMPL_VAR name="currency" -->" value=<!-- TMPL_VAR name="rate" -->>
-			</td>
-		</tr>
+	<input type="hidden" name="type" value="change">
+	<h2 class="acquisition">kursy wymiany</h2>
+	<!-- TMPL_LOOP NAME="loop_currency" -->
+		<p>
+			<label><!-- TMPL_VAR NAME="currency" --></label>
+			<input type="text"  size="10"  name="<!-- TMPL_VAR NAME="currency" -->" value=<!-- TMPL_VAR NAME="rate" -->>
+		</p>
 	<!-- /TMPL_LOOP -->
-	</table>
-	<input type=submit value="Zapisz" class="button">
+	<input type="submit" value="Zapisz" class="button acquisition">
+</div>
+
+<!-- suggestions -->
+<div id="bloc25">
+	<h2 class="acquisition">Suggestions to check</h2>
+		<!-- TMPL_IF name="suggestion" -->
+			<!--TMPL_VAR NAME="suggestion" --> suggestions waiting <a href="/cgi-bin/koha/suggestion/acceptorreject.pl" class="button acquisition">Manage</a>
+		<!-- TMPL_ELSE -->
+			No suggestions waiting
+		<!-- /TMPL_IF -->
 </div>
 
 <!-- showbudget-->
 <div id="bloc25">
-	<form action="/cgi-bin/koha/search.pl">
-		<div id="bloctitle">budżety i fundusze książkowe</div>
-		<table>
+	<h2 class="acquisition">budżety i fundusze książkowe</h2>
+	<!-- TMPL_IF name="nobudget" -->
+		<p class="problem">You must define a budget in parameters</p>
+	<!-- TMPL_ELSE -->
+		<table class="noborder">
 			<tr>
-				<td><b>Budżety</B></td>
-				<td><b> Łącznie</B></td>
-				<td><b>Wydane</B></td>
-				<td><b>ZobowiÄ…zane</B></td>
-				<td><b>Dostępne</B></td>
+				<th class="acquisition">Budżety</th>
+				<th class="acquisition">Z</th>
+				<th class="acquisition">Do</th>
+				<th class="acquisition">Łącznie</th>
+				<th class="acquisition">Wydane</th>
+				<th class="acquisition">ZobowiÄ…zane</th>
+				<th class="acquisition">Dostępne</th>
 			</tr>
-			<!-- TMPL_LOOP name="loop_budget" -->
+			<!-- TMPL_LOOP NAME="loop_budget" -->
 				<tr>
-					<td><!-- TMPL_VAR name="bookfundname" --></td>
-					<td align=right><!-- TMPL_VAR name="budgetamount" --></td>
-					<td align=right><!-- TMPL_VAR name="spent" --></td>
-					<td align=right><!-- TMPL_VAR name="comtd" --></td>
-					<td align=right><!-- TMPL_VAR name="avail" --></td>
+					<td><!-- TMPL_VAR NAME="bookfundname" --></td>
+					<td align="right"><!-- TMPL_VAR NAME="startdate" --></td>
+					<td align="right"><!-- TMPL_VAR NAME="enddate" --></td>
+					<td align="right"><!-- TMPL_VAR NAME="budgetamount" --></td>
+					<td align="right"><!-- TMPL_VAR NAME="spent" --></td>
+					<td align="right"><!-- TMPL_VAR NAME="comtd" --></td>
+					<td align="right"><!-- TMPL_VAR NAME="avail" --></td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 			<tr>
-				<td><b> Łącznie</b></td>
-				<td align=right><b><!-- TMPL_VAR name="total" --></b></td>
-				<td align=right><b><!-- TMPL_VAR name="totspent" --></b></td>
-				<td align=right><b><!-- TMPL_VAR name="totcomtd" --></b></td>
-				<td align=right><b><!-- TMPL_VAR name="totavail" --></b></td>
+				<th class="acquisition" align="right" colspan="3">Łącznie</th>
+				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="total" --></th>
+				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totspent" --></th>
+				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totcomtd" --></th>
+				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totavail" --></th>
 			</tr>
 		</table>
 		<p>
 		Posłuż się przyciskiem odświerz, aby uzyskać aktualne liczby. Kwoty zobowiązane są podane tylko w przybliżeniu, gdyż ich wysokość zależeć będzie od kursu wymiany, z jaką dokonano transakcji.
 		</p>
-	</form>
+	<!-- /TMPL_IF -->
 </div>
 
-<div id="bloc100">
-	<div id="bloctitle">Zamówienia POMOC:</div>
-	<ul>Aby rozpocząć gromadzenie czy to zamówienie czy lokalny zakup albo donację najpierw wyszkukaj dostawcę, dodaj nowego jeśli potrzeba.</ul>
-	<ul>Potem wybierz poprzedni koszyk zakupów lub utwórz nowy. Uwaga, koszyk zostanie skojarzony z nazwą uzytkownika z jaką się zalogowałeś  </ul>
-	<ul>Aby dokonać zamówienia dokumentu trzeba najpierw ustalić czy istnieje już dla niego opis, oraz albo dodać egzemplarz albo utworzyć nowy dla niego opis i dodać egzemplarz.  </ul>
+<div id="bloc25">
+	<h2 class="acquisition">HELP Ordering</h2>
+	<ul>
+		<p>Aby rozpocząć gromadzenie czy to zamówienie czy lokalny zakup albo donację najpierw wyszkukaj dostawcę, dodaj nowego jeśli potrzeba.</p>
+		<p>Potem wybierz poprzedni koszyk zakupów lub utwórz nowy. Uwaga, koszyk zostanie skojarzony z nazwą uzytkownika z jaką się zalogowałeś  </p>
+		<p>Aby dokonać zamówienia dokumentu trzeba najpierw ustalić czy istnieje już dla niego opis, oraz albo dodać egzemplarz albo utworzyć nowy dla niego opis i dodać egzemplarz.</p>
 	<p>Aby dokończyć koszyk zakupów kliknij na "przejrzyj koszyk zakupów" lub szukaj powyżej, a potem naciśnij "potwierdź koszyk".</p>
-</DIV>
+	</ul>
+</div>
+
+</div>
 <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: pl/acqui/acquire.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/Attic/acquire.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/acqui/acquire.tmpl	17 Apr 2004 16:26:29 -0000	1.2
+++ pl/acqui/acquire.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,162 +1,118 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<div align=right>
-Faktura: <!-- TMPL_VAR name="invoice" --><br>
-Przyjęte przez: <!-- TMPL_VAR name="user" --><br>
-<!-- TMPL_VAR name="date" -->
-</div>
-<h1>Receipt Summary for: <i><!-- TMPL_VAR name="name" --></i> Faktura <i><!-- TMPL_VAR name="invoice" --></i></h1>
-<CENTER>
-
+<div id="mainbloc">
+<h1 class="acquisition">Receipt Summary for: <i><!-- TMPL_VAR NAME="name" --></i> Faktura <i><!-- TMPL_VAR NAME="invoice" --></i></h1>
 
-<!-- TMPL_IF name="count" -->
-	<script language="javascript" type="text/javascript">
-	<!--
-	function messenger(X,Y,etc){
-	win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
-	win.focus();
-	win.document.close();
-	win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size=2><p><br>");
-	win.document.write(etc);
-	win.document.write("<center><form><input type=button onclick='self.close()' value=Close></form></center>");
-	win.document.write("</font></body></html>");
-	}
-	//-->
-	</script>
-	<form action="/cgi-bin/koha/acqui/finishreceive.pl" method=post>
-	<h1><!-- TMPL_VAR name="ordernumber" --> - Przyjmij Zamówienie</h1><br>
-	Koszyk zakupów dla: <!-- TMPL_VAR name="name" -->
-	<br> Zamówienie złożone: <!-- TMPL_VAR name="date" -->
-	<P>
-	<CENTER>
-	<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
-		<tr valign=top bgcolor="#99cc33" >
-			<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2>
-				<B>SZCZEGÓŁY KATALOGU</B>
-			</td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD><b>Tytuł*</b></td>
-			<td><input type=text size=20 name=title value="<!-- TMPL_VAR name="title" -->" >
-			</td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Autor</td>
-			<td><input type=text size=20 name=author value="<!-- TMPL_VAR name="author" -->" >
-			</td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Data Copyright</td>
-			<td><input type=text size=20 name=copyright value="<!-- TMPL_VAR name="copyrightdate" -->" >
-			</td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Format</td>
-			<td><!-- TMPL_VAR name="CGIitemtype" --></td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>ISBN</td>
-			<td><input type=text size=20 name=ISBN value="<!-- TMPL_VAR name="isbn" -->"></td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Seria</td>
-			<td><input type=text size=20 name=Series value="<!-- TMPL_VAR name="seriestitle" -->"></td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Oddział</td>
-			<td><!-- TMPL_VAR name="CGIbranch" --></td>
-		</tr>
-		<TR VALIGN=TOP bgcolor="#ffffcc" >
-			<TD><B>Kod kreskowy pozycji *</B></td>
-			<td><input type=text size=20 name=barcode value="<!-- TMPL_VAR name="barcode" -->"></td>
-		</tr>
-		<TR VALIGN=TOP bgcolor="#ffffcc" >
-			<TD><B>Oznaczenie tomowe (dla serii) *</B></td>
-			<td><input type=text size=20 name=volinf></td>
-		</tr>
-		<TR VALIGN=TOP>
-			<td colspan=2 align="center">
-				<input type=hidden name=biblio value=<!-- TMPL_VAR name="biblionumber" -->>
-				<input type=hidden name=ordnum value=<!-- TMPL_VAR name="ordernumber" -->>
-				<input type=hidden name=biblioitemnum value=<!-- TMPL_VAR name="biblioitemnumber" -->>
-				<input type=hidden name=id value="<!-- TMPL_VAR name="booksellerid" -->">
-				<input type=hidden name=freight value="<!-- TMPL_VAR name="freight" -->">
-				<input type=hidden name=gst value="<!-- TMPL_VAR name="gst" -->">
-				<!-- TMPL_IF name="catview" -->
-					<input type="submit" class="button" value="Zapisz">
-				<!-- TMPL_ELSE -->
-					<a class="button" href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->>Edytuj</a>
-				<!-- /TMPL_IF -->
-			</td>
-		</tr>
-	</table>
-	<table border=1 cellspacing=0 cellpadding=5 width="40%">
-		<tr valign=top bgcolor="#99cc33">
-			<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>SZCZEGÓŁY RACHUNKU</B></td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD><B>Fundusz Książkowy *</B></td>
-			<td><!-- TMPL_VAR name="CGIbookfund" -->
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Zamówiona ilość</td>
-			<td><input type=text size=20 name=quantity value="<!-- TMPL_VAR name="quantity" -->">
-			</td>
-		</tr>
-		<TR VALIGN=TOP bgcolor="#ffffcc">
-			<TD><B>Otrzymana ilość *</B></td>
-			<td><input type=text size=20 name=quantityrec value="<!-- TMPL_VAR name="quantityreceived" -->">
-			</td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Koszt wymiany</td>
-			<td><input type=text size=20 name=rrp value="<!-- TMPL_VAR name="rrp" -->">
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Koszt zaplanowane </td>
-			<td><input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->"></td>
-		</tr>
-		<TR VALIGN=TOP bgcolor="#ffffcc">
-			<TD><B>Faktyczny Koszt*</B></td>
-			<td><input type=text size=20 name=cost value="<!-- TMPL_VAR name="unitprice" -->"></td>
-		</tr>
-		<TR VALIGN=TOP bgcolor="#ffffcc">
-			<TD>Numer Faktury</td>
-			<td>
-				<!-- TMPL_VAR name="invoice" -->
-				<input type=hidden name=invoice value="<!-- TMPL_VAR name="invoice" -->">
-			</td>
-		</tr>
-		<TR VALIGN=TOP>
-			<TD>Uwagi</td>
-			<td><input type=text size=20 name=notes value="<!-- TMPL_VAR name="notes" -->"></td>
-		</tr>
-	</table>
+	<!-- TMPL_IF name="count" -->
+		<form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post">
+		<h1 class="acquisition"><!-- TMPL_VAR NAME="ordernumber" --> - Przyjmij Zamówienie</h1>
+		Koszyk zakupów dla: <!-- TMPL_VAR NAME="name" -->
+		<br> Zamówienie złożone: <!-- TMPL_VAR NAME="date" -->
+		<div id="bloc25">
+				<h2 class="acquisition">catalogue details</h2>
+			<p>
+				<label class="label100">Tytuł </label>
+				<!-- TMPL_VAR NAME="title" -->
+			</p>
+			<p>
+				<label class="label100">Autor</label>
+				<!-- TMPL_VAR NAME="author" -->
+			</p>
+			<p>
+				<label class="label100">Data Copyright</label>
+				<!-- TMPL_VAR NAME="copyrightdate" -->
+			</p>
+			<p>
+				<label class="label100">Format</label>
+				<!-- TMPL_VAR NAME="itemtype" -->
+			</p>
+			<p>
+				<label class="label100">ISBN</label>
+				<!-- TMPL_VAR NAME="isbn" -->
+			</p>
+			<p>
+				<label class="label100">Seria</label>
+				<!-- TMPL_VAR NAME="seriestitle" -->
+			</p>
+			<p>Enter barcode(s) and branch if you want to add item(s) immediatly</p>
+			<p>
+				<label class="label100">Oddział</label>
+				<!-- TMPL_VAR NAME="CGIbranch" -->
+			</p>
+			<p>
+				<label class="label100">Kod kreskowy pozycji *</label>
+				<input type=text size=20 name=barcode value="<!-- TMPL_VAR name="barcode" -->">
+			</p>
+		</div>
+		<div id="bloc25">
+			<h2 class="acquisition">Accounting details</h2>
+			<p>
+				<label class="label100">Fundusz Książkowy</label>
+				<!-- TMPL_VAR NAME="bookfund" -->
+			</p>
+			<p>
+				<label class="label100">Zamówiona ilość</label>
+				<!-- TMPL_VAR NAME="quantity" -->
+				<input type="hidden" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->">
+			</p>
+			<p>
+				<label class="label100">Otrzymana ilość *</label>
+				<input type="text" size="20" name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->">
+			</p>
+			<p>
+				<label class="label100">Koszt wymiany</label>
+				<input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->">
+			</p>
+			<p>
+				<label class="label100">Koszt zaplanowane </label>
+				<!-- TMPL_VAR NAME="ecost" -->
+			</p>
+			<p>
+				<label class="label100">Faktyczny Koszt*</label>
+				<input type="text" size="20" name="cost" value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->">
+			</p>
+			<p>
+				<label class="label100">Numer Faktury</label>
+					<!-- TMPL_VAR NAME="invoice" -->
+                <input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->">
+                <input type="hidden" name="datereceived" value="<!-- TMPL_VAR NAME="datereceived" -->">
+                </p>
+			<p>
+				<label class="label100">Uwagi</label>
+				<!-- TMPL_VAR NAME="notes" -->
+			</p>
+			<p>
+				<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+				<input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordernumber" -->">
+				<input type="hidden" name="biblioitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+				<input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->">
+				<input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->">
+				<input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->">
+                <input type="submit" class="button acquisition" value="Zapisz"> (that all costs are for 1 item)
+			</p>
+		</div>
 	</form>
-	</center>
-	<br clear=all>
-	<p> &nbsp; </p>
-<!-- TMPL_ELSE -->
-	<br />
-	<center>
-	<table width="80%">
-	<tr valign=top bgcolor="#ffdf61">
-		<td><b>Koszyk</b></td>
-		<td><b>ISBN</b></td>
-		<td><b>TYTUŁ</b></td>
-		<td><b>AUTOR</b></td>
-		<td><b>Ilość</b></td>
-		<td><b>Otrzymane</b></td>
+	<!-- TMPL_ELSE -->
+		<table>
+		<tr>
+			<th class="acquisition">Koszyk</th>
+			<th class="acquisition">ISBN</th>
+			<th class="acquisition">TYTUŁ</th>
+			<th class="acquisition">AUTOR</th>
+			<th class="acquisition">Ilość</th>
+			<th class="acquisition">Otrzymane</th>
 	</tr>
-	<!-- TMPL_LOOP name="loop" -->
+		<!-- TMPL_LOOP NAME="loop" -->
 		<tr>
-			<TD><!-- TMPL_VAR name="basketno" --></td>
-			<TD><!-- TMPL_VAR name="isbn" --></td>
-			<td><a href=acquire.pl?recieve=<!-- TMPL_VAR name="ordernumber" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&invoice=<!-- TMPL_VAR name="invoice" -->&freight=<!-- TMPL_VAR name="freight" -->&gst=<!-- TMPL_VAR name="gst" -->&id=<!-- TMPL_VAR name="id" -->><!-- TMPL_VAR name="title" --></a></td>
-			<td><!-- TMPL_VAR name="author" --></td>
-			<td><!-- TMPL_VAR name="quantity" --></td>
-			<td><!-- TMPL_VAR name="quantityrecieved" --></td>
+				<td><!-- TMPL_VAR NAME="basketno" --></td>
+				<td><!-- TMPL_VAR NAME="isbn" --></td>
+				<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+				<td><!-- TMPL_VAR NAME="author" --></td>
+				<td><!-- TMPL_VAR NAME="quantity" --></td>
+				<td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 	</table>
-<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: pl/acqui/basket.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/Attic/basket.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/acqui/basket.tmpl	17 Apr 2004 16:26:29 -0000	1.2
+++ pl/acqui/basket.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,63 +1,158 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<h1>Koszyk Zakupów <b><!-- TMPL_VAR name="basket" --> </b>dla <a href=supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->></a> <!-- TMPL_VAR name="name" --></h1><br />
-Nasz odnośnik: <b><!-- TMPL_VAR name="entrydate" --></b>, #<b><!-- TMPL_VAR name="basket" --></b> zatwierdzone przez <b><!-- TMPL_VAR name="loggedinusername" --></b><br />
-<CENTER>
-<p>
-<table border=0 cellspacing=0 cellpadding=5>
-	<tr valign=top bgcolor="#ffdf61">
-		<td width="5%"><b>Zamów</b></td>
-		<td width="10%"><b> Wydawca</b></td>
-		<td width="10%"><b>Isbn</b></td>
-		<td width="30%"><b>Tytuł</b></td>
-		<td width="20%"><b>Autor</b></td>
-		<td width="5%"><b>Wymiana</b></td>
-		<td width="7%"><b>Nabycie</b></td>
-		<td width="7%"><b>Ilość</b></td>
-		<td width="7%"><b> Łącznie</b></td>
-	</tr>
-	<!-- TMPL_LOOP name="books_loop" -->
-		<tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
-			<td><!-- TMPL_VAR name="ordernumber" --></td>
-			<td><!-- TMPL_VAR name="publishercode" --></td>
-			<td><!-- TMPL_VAR name="isbn" --></td>
-			<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->&basket=<!-- TMPL_VAR name="basket" -->"><!-- TMPL_VAR name="title" --></a></td>
-			<td><!-- TMPL_VAR name="author" --></td>
-			<td><!-- TMPL_VAR name="rrp" --></td>
-			<td><!-- TMPL_VAR name="ecost" --></td>
-			<td><!-- TMPL_VAR name="quantity" --></td>
-			<td><!-- TMPL_VAR name="line_total" --></td>
+<div id="mainbloc">
+	<h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->shopping Basket <b><!-- TMPL_VAR NAME="basketno" --> </b>for <a href="supplier.pl?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
+	<!-- TMPL_UNLESS name="closedate" -->
+	<!-- TMPL_IF name="basketno" -->
+		<div id="bloc25">
+			<h2 class="acquisition doNotPrint">Basket info</h2>
+			<p class="doNotPrint"><label class="label100">Managed by<label><!-- TMPL_VAR NAME="authorisedbyname" --></p>
+			<p><label class="label100">Basket number<label> <!-- TMPL_VAR NAME="basketno" --></p>
+			<p><label class="label100">open on<label> <!-- TMPL_VAR NAME="creationdate" --></p>
+			<!-- TMPL_IF name="closedate" -->
+				Closed on <!-- TMPL_VAR name="closedate" -->
+			<!-- TMPL_ELSE -->
+			<p class="doNotPrint"><a href="/cgi-bin/koha/acqui/order.pl?op=close&amp;basket=<!-- TMPL_VAR NAME="basketno" -->&supplier=<!-- TMPL_VAR name="booksellerid" -->" class="button acquisition">Close basket</a></p>
+			<!-- /TMPL_IF -->
+		</div>
+    <!-- /TMPL_IF -->
+	<!-- /TMPL_UNLESS -->
+		<div id="bloc25">
+			<p><!-- TMPL_VAR name="name" --></p>
+			<p><!-- TMPL_VAR name="postal" --></p>
+			<p><!-- TMPL_VAR name="address2" --></p>
+			<p><!-- TMPL_VAR name="address3" --></p>
+			<p><!-- TMPL_VAR name="address4" --></p>
+		</div>
+		<div id="bloc25" style="float:right">
+		   <p><!-- TMPL_VAR name="branchname" --></p>
+		   <p><!-- TMPL_VAR name="branchaddress1" --></p>
+		   <p><!-- TMPL_VAR name="branchaddress2" --></p>
+		   <p><!-- TMPL_VAR name="branchaddress3" --></p>
+	     </div>
+	
+	<div id="bloc100">
+	<h2 class="acquisition">Zamów</h2>
+	<!-- TMPL_IF name="books_loop" -->
+		<table>
+			<tr valign="top" bgcolor="#ffdf61">
+				<th class="acquisition doNotPrint">Zamów</th>
+				<th class="acquisition">Wydawca<span class="doNotPrint"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition">[order]</a></span></th>
+				<th class="acquisition">Tytuł</th>
+				<th class="acquisition doNotPrint" title="Recommended Retail Price">RRP</th>
+				<th class="acquisition">est</th>
+				<th class="acquisition">Ilość</th>
+				<th class="acquisition">Łącznie</th>
+				<th class="acquisition doNotPrint">Fund <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[order]</a></th>
+				<!-- TMPL_IF name="active" -->
+		              <!-- TMPL_UNLESS name="closedate" -->
+                        <th class="acquisition doNotPrint">Usuń</th>
+                        <th class="acquisition doNotPrint">Edytuj</th>
+                    <!-- /TMPL_UNLESS -->
+				<!-- /TMPL_IF -->
+			</tr>
+			<!-- TMPL_LOOP NAME="books_loop" -->
+				<!-- TMPL_IF name="odd" -->
+				<tr class="hilighted">
+				<!-- TMPL_ELSE -->
+				<tr>
+				<!-- /TMPL_IF -->
+					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
+					<td><!-- TMPL_VAR NAME="publishercode" --></td>
+					<!-- TMPL_IF name="closedate" -->
+						<td>
+							<b><!-- TMPL_VAR NAME="title" --></b><br/>
+								<!-- TMPL_VAR NAME="author" -->
+								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
+								<!-- TMPL_IF name="notes" --><p class="doNotPrint"><i><!--TMPL_VAR name="notes" --></i></p><!-- /TMPL_IF -->
+						</td>
+					<!-- TMPL_ELSE -->
+						<td>
+							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
+								<!-- TMPL_VAR NAME="author" -->
+								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
+								<!-- TMPL_IF name="notes" --></p><p class="doNotPrint"><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
+						</td>
+					<!-- /TMPL_IF -->
+					<td class="doNotPrint number"><p><!-- TMPL_VAR NAME="rrp" --></p></td>
+					<td class="number"><p><!-- TMPL_VAR NAME="ecost" --></p></td>
+					<td class="number"><p><!-- TMPL_VAR NAME="quantity" --></p></td>
+					<td class="number"><p><!-- TMPL_VAR NAME="line_total" --></p></td>
+					<td class="doNotPrint"><p><!-- TMPL_VAR NAME="bookfundid" --></p></td>
+					<!-- TMPL_IF name="active" -->
+		              <!-- TMPL_UNLESS name="closedate" -->
+                        <td class="doNotPrint">
+                                <a href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&quantity=0&biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
+                                    <img src="/intranet-tmpl/default/images/edittrash.png" alt="Remove from basket" title="Remove from basket" width="32" hspace="0" vspace="0" border="0">
+                                </a>
+                            </td>
+                            <td class="doNotPrint">
+                                <a href="newbiblio.pl?sub=&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&ordnum=<!-- TMPL_VAR NAME="ordernumber" --><!--TMPL_IF name="closedate"-->&close=1<!--/TMPL_IF -->">
+                                    <img src="/intranet-tmpl/default/images/fileopen.png" alt="Edytuj" title="Remove from basket" width="32" hspace="0" vspace="0" border="0">
+                                </a>
+                            </td>
+                        <!-- /TMPL_UNLESS -->
+					<!-- /TMPL_IF -->
 		</tr>
 	<!-- /TMPL_LOOP -->
-	<input type=hidden name=number value=<!-- TMPL_VAR name="count" -->>
-	<input type=hidden name=basketno value="<!-- TMPL_VAR name="basket" -->">
-	<tr valign=top bgcolor=white>
-		<td colspan=6 rowspan=3  bgcolor="#ffdf61">
-  			<b>POMOC</b><br>
-			Aby zmienić dane katalogowe lub rachunkowe dołączone do zamówienia, kliknij na tytuł.<br>
+			<input type="hidden" name="number" value=<!-- TMPL_VAR NAME="count" -->>
+			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
+			<tr>
+				<td class="acquisition doNotPrint">
+					&nbsp;
 		</td>
-  		<td><b>Łącznie</b></td>
-  		<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="sub_total" --></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td><b>VAT</b></td>
-		<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="gist" --></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td><b>W SUMIE</b></td>
-		<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="grand_total" --></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td colspan=9>
-			<FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
-				<input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
-				<input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
-				<b> Dodaj zamówienie: wprowadź hasło lub tytuł: </b> <INPUT TYPE="text"  SIZE="25"   NAME="search">
-			</form>
+				<td class="acquisition">
+					&nbsp;
+				</td>
+				<td class="acquisition number">
+					<!-- TMPL_IF NAME="GST" --><p>Sub total</p>
+					<p>VAT</p><!-- /TMPL_IF -->
+					<p>TOTAL (<!-- TMPL_VAR NAME="currency" -->)</p>
+				</td>
+				<td class="acquisition number">
+					<!-- TMPL_IF NAME="GST" --><p><!-- TMPL_VAR NAME="sub_total_est" --></p>
+					<p><!-- TMPL_VAR NAME="gist_est" --></p><!-- /TMPL_IF -->
+					<p><!-- TMPL_VAR NAME="grand_total_est" --></p>
+				</td>
+				<td class="doNotPrint acquisition">
+					<!-- TMPL_IF NAME="GST" --><p>&nbsp;</p>
+					<p>&nbsp;</p><!-- /TMPL_IF -->
+					<p>&nbsp;</p>
+				</td>
+				<td class="acquisition number">
+					<!-- TMPL_IF NAME="GST" --><p><!-- TMPL_VAR name="qty_total" --></p>
+					<p>&nbsp;</p><!-- /TMPL_IF -->
+					<p>&nbsp;</p>
+				</td>
+				<td class="acquisition number">
+					<!-- TMPL_IF NAME="GST" --><p><!-- TMPL_VAR NAME="sub_total" --></p>
+					<p><!-- TMPL_VAR NAME="gist" --></p><!-- /TMPL_IF -->
+					<p><!-- TMPL_VAR NAME="grand_total" --></p>
+				</td>
+				<td colspan="3" class="acquisition">
+					<!-- TMPL_IF NAME="GST" --><p>&nbsp;</p>
+					<p>&nbsp;</p><!-- /TMPL_IF -->
+					<p>&nbsp;</p>
 		</td>
 	</tr>
-
-</table>
-</CENTER>
-
+		</table>
+	<!-- TMPL_ELSE -->
+		<p>Basket empty</p>
+	<!-- /TMPL_IF -->
+	</div>
+	<!-- TMPL_IF name="active" -->
+		<!-- TMPL_UNLESS name="closedate" -->
+		<div id="bloc25">
+			<h2 class="acquisition doNotPrint">Add order line</h2>
+			<form action="/cgi-bin/koha/acqui/newbasket2.pl" method="post">
+				<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->">
+				<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
+				<p class="doNotPrint" >from an existing biblio: </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Szukaj"></p>
+				<p class="doNotPrint">or  <a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">  from a suggestion  </a>  <a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">  New biblio  </a>
+				</p>
+			</form>
+		</div>
+		<!-- /TMPL_UNLESS -->
+	<!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: pl/acqui/newbasket2.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/Attic/newbasket2.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/acqui/newbasket2.tmpl	17 Apr 2004 16:26:29 -0000	1.3
+++ pl/acqui/newbasket2.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,108 +1,97 @@
 <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
-
- <H1>Koszyk zakupów dla: <!-- TMPL_VAR name="bookselname" --></H1>
-
-<!-- TMPL_IF name ="testdonation" -->
-	<a href="newbiblio.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">
-	<img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png" border=0 align=right alt="Dodaj Nowy Opis"></a>
-<!-- TMPL_ELSE -->
-	<a href="newdonation.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">
-	<img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png" border=0 align=right alt="Dodaj Nowy Opis"></a>
-<!-- /TMPL_IF -->
-
-<a href="basket.pl?basket=<!-- TMPL_VAR name="basket" -->">
-<img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1uparrow.png" border=0 align=right alt="Obejrzyj Koszyk"></a>
-<FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl">
-<input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
-<input type=hidden name=basket value=<!-- TMPL_VAR name="basket" -->>
-<b>Nowe Zapytanie: </b><INPUT TYPE="text"  SIZE="25"   NAME="search"></form>
-<br clear=all>
-
-<CENTER>
-
-Szukano
-<B>
-<!-- TMPL_LOOP name="loopsearch" -->
-	<!-- TMPL_VAR name="key" --> <!-- TMPL_VAR name="value" -->
-<!-- /TMPL_LOOP -->
-</B>
-<BR>
-<!-- TMPL_VAR name="count" --> znalezionych rekordów.
-
-<br> Wyświetlono od <i><!-- TMPL_VAR name="dispnum" --></i> do <i><!-- TMPL_VAR name="offset2" --></i> rekordu.
-
-<TABLE  CELLSPACING=0  CELLPADDING=6 border=0>
-	<TR  VALIGN=TOP bgcolor="#ffdf61">
-		<TD><b>TYTUŁ</b></TD>
-		<TD><b>AUTOR</b></TD>
-		<TD><b>&copy;</b></TD>
-		<TD><b>ILOŚĆ</b></TD>
-		<TD><b>LOKALIZACJA</b></TD>
-	</TR>
-
-<!-- TMPL_LOOP name="loopresult" -->
-	<TR VALIGN=TOP bgcolor="<!-- TMPL_VAR name="toggle" -->">
-		<TD>
-			<!-- TMPL_IF name="testdonation" -->
-				<A HREF="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR name="sub" -->&author=<!-- TMPL_VAR name="author2" -->&copyright=<!-- TMPL_VAR name="copyright" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&title=<!-- TMPL_VAR name="title2" -->">
-				<!-- TMPL_VAR name="title" -->
-				</A>
-			<!-- TMPL_ELSE -->
-				<A HREF="/cgi-bin/koha/acqui/newdonation.pl?author=<!-- TMPL_VAR name="author2" -->&copyright=<!-- TMPL_VAR name="copyright" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&title=<!-- TMPL_VAR name="title2" -->">
-				<!-- TMPL_VAR name="title" -->
-				</A>
-			<!-- /TMPL_IF -->
-		</TD>
-		<TD>
-			<A HREF="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR name="word" -->&type=<!-- TMPL_VAR name="type" -->">
-			<!-- TMPL_VAR name="author" -->
-			</A>
-		</TD>
-		<TD>
-			<!-- TMPL_VAR name="copyright" -->
-		</TD>
-		<TD>
-			<!-- TMPL_VAR name="itemcount" -->
-		</TD>
-		<TD>
+<div id="mainbloc">
+	<h1 class="acquisition">Shopping basket <!-- TMPL_VAR name="basketno" --> for: <!-- TMPL_VAR NAME="bookselname" --></h1>
+		<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;sub=<!-- TMPL_VAR NAME="parsub" -->">
+		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" border="0" alt="Dodaj Nowy Opis"></a>
+	<a href="basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">
+		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1uparrow.png" border="0" alt="Obejrzyj Koszyk">
+	</a>
+	<form action="/cgi-bin/koha/acqui/newbasket2.pl">
+	<input type="hidden" name="booksellerid" value=<!-- TMPL_VAR NAME="booksellerid" -->>
+	<input type="hidden" name="basketno" value=<!-- TMPL_VAR NAME="basketno" -->>
+	<b>New Search: </b><input="text"  size="25"   name="search">
+	<input type="submit" value="Szukaj" class="button acquisition">
+	</form>
+
+	Szukano
+	<b>
+	<!-- TMPL_LOOP NAME="loopsearch" -->
+		<!-- TMPL_VAR NAME="key" --> <!-- TMPL_VAR NAME="value" -->
+	<!-- /TMPL_LOOP -->
+	</b>
+	<br>
+	<!-- TMPL_VAR NAME="count" --> znalezionych rekordów.
+	
+	<br> Wyświetlono od <i><!-- TMPL_VAR NAME="dispnum" --></i> do <i><!-- TMPL_VAR NAME="offset2" --></i> rekordu.
+	
+	<table>
+		<tr>
+			<th class="acquisition">TYTUŁ</th>
+			<th class="acquisition">AUTOR</th>
+			<th class="acquisition">&copy;</th>
+			<th class="acquisition">ILOŚĆ</th>
+			<th class="acquisition">LOKALIZACJA</th>
+		</tr>
+	
+	<!-- TMPL_LOOP NAME="loopresult" -->
+		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+			<td>
+					<a href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR NAME="sub" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
+					<!-- TMPL_VAR NAME="title" -->
+					</a>
+			</td>
+			<td>
+				<!-- TMPL_VAR NAME="author" -->
+			</td>
+			<td>
+				<!-- TMPL_VAR NAME="copyright" -->
+			</td>
+			<td>
+				<!-- TMPL_VAR NAME="itemcount" -->
+			</td>
+			<td>
 			<!-- TMPL_IF name="use-location-flags-p" -->
-			<!-- TMPL_IF name="location-only" --><!-- TMPL_VAR name="location-only" --><br><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="location-only" --><!-- TMPL_VAR NAME="location-only" --><br><!-- /TMPL_IF -->
 			<!-- TMPL_IF name="on-loan-p" -->Wypożyczona<br><!-- /TMPL_IF -->
 			<!-- TMPL_IF name="lost-p" -->Zgubiono<br><!-- /TMPL_IF -->
 			<!-- TMPL_IF name="mending-p" -->Naprawa<br><!-- /TMPL_IF -->
 			<!-- TMPL_IF name="in-transit-p" -->W drodze<br><!-- /TMPL_IF -->
 			<!-- TMPL_ELSE -->
-			<!-- TMPL_VAR name="location" -->
+				<!-- TMPL_VAR NAME="location" -->
 			<!-- /TMPL_IF -->
-		</TD>
-	</TR>
+			</td>
+		</tr>
 
-<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->
 
-	<TR VALIGN=TOP bgcolor="#ffdf61">
-		<TD>
+		<tr bgcolor="#ffdf61">
+			<td>
 			&nbsp;
-		</TD>
-		<TD>
+			</td>
+			<td>
 			&nbsp;
-		</TD>
-		<TD>
+			</td>
+			<td>
 			&nbsp;
-		</TD>
-		<TD>
+			</td>
+			<td>
 			&nbsp;
-		</TD>
-		<TD>
+			</td>
+			<td>
 			&nbsp;
-		</TD>
-	</TR>
-</TABLE>
-
-<!-- TMPL_IF name="offsetover" -->
-<A HREF="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR name="num" -->&offset=<!-- TMPL_VAR name="offset" -->&type=<!-- TMPL_VAR name="type" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&search=<!-- TMPL_VAR name="title" -->&author=<!-- TMPL_VAR name="author" -->">
-Dalej
-</A>
-<!-- /TMPL_IF -->
-</CENTER>
-
+			</td>
+		</tr>
+	</table>
+	
+	<!-- TMPL_IF name="previous" -->
+	<a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR NAME="num" -->&amp;offset=<!-- TMPL_VAR NAME="previous" -->&amp;type=<!-- TMPL_VAR NAME="type" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;search=<!-- TMPL_VAR NAME="title" -->&amp;author=<!-- TMPL_VAR NAME="author" -->">
+	&lt; Previous
+	</a>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="offsetover" -->
+	<a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR NAME="num" -->&amp;offset=<!-- TMPL_VAR NAME="offset" -->&amp;type=<!-- TMPL_VAR NAME="type" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;search=<!-- TMPL_VAR NAME="title" -->&amp;author=<!-- TMPL_VAR NAME="author" -->">
+	Next &gt;
+	</a>
+	<!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->

Index: pl/acqui/newbiblio.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/Attic/newbiblio.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/acqui/newbiblio.tmpl	17 Apr 2004 16:26:29 -0000	1.2
+++ pl/acqui/newbiblio.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -5,6 +5,9 @@
 function update(f){
   //collect values
   quantity=f.quantity.value
+  if (quantity ==0) {
+  	alert("Quantity must be >0");
+  }
   discount=f.discount.value
   listinc=parseInt(f.listinc.value)
   currency=f.currency.value
@@ -22,8 +25,8 @@
   ecost=rrp*(100-discount)/100
   GST=0;
   if (gst_on){
-    rrp=rrp*(1+<!-- TMPL_VAR name="gstrate" -->);
-    GST=ecost*(<!-- TMPL_VAR name="gstrate" -->);
+    rrp=rrp*(1+<!-- TMPL_VAR NAME="gstrate" -->);
+    GST=ecost*(<!-- TMPL_VAR NAME="gstrate" -->);
   }
 
   total=(ecost+GST)*quantity
@@ -32,139 +35,218 @@
   f.ecost.value=ecost;
   f.GST.value=GST;
   f.total.value=total;
-
+  return true;
 }
 
 
 
 function messenger(X,Y,etc){
-win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
-win.focus();
-win.document.close();
-win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size=2><p><br>");
-win.document.write(etc);
-win.document.write("<center><form><input type=button onclick='self.close()' value=Close></form></center>");
-win.document.write("</font></body></html>");
+	win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
+	win.focus();
+	win.document.close();
+	win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size='2'><p><br>");
+	win.document.write(etc);
+	win.document.write("<center><form><input type=button onclick='self.close()' value='Close'></form></center>");
+	win.document.write("</font></body></html>");
 }
+
+function check(f) {
+  quantity=f.quantity.value
+  title=f.title.value
+  if (title == "") {
+  	alert("Title can't be empty");
+	return false;
+  }
+  if (quantity ==0) {
+  	alert("Quantity must be >0");
+	return false;
+  }
+	document.frusin.submit();
+}
+
 //-->
 
 </script>
-<form action=/cgi-bin/koha/acqui/addorder.pl method=post name=frusin>
-<!-- TMPL_UNLESS name="existing" --><input type=hidden name=existing value=no><!-- /TMPL_UNLESS -->
-<!-- <!-- TMPL_VAR name="title" --> -->
-<input type=hidden name=ordnum value="<!-- TMPL_VAR name="ordnum" -->">
-<input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
-<input type=hidden name=supplier value="<!-- TMPL_VAR name="id" -->">
-<input type=hidden name=biblio value="<!-- TMPL_VAR name="biblio" -->">
-<input type=hidden name=bibitemnum value="<!-- TMPL_VAR name="biblioitemnumber" -->">
-<input type=hidden name=oldtype value="<!-- TMPL_VAR name="itemtype" -->">
-<input type=hidden name=discount value="<!-- TMPL_VAR name="discount" -->">
-<input type=hidden name=listinc value="<!-- TMPL_VAR name="listincgst" -->">
-<input type=hidden name=currency value="<!-- TMPL_VAR name="currency" -->">
-<input type=hidden name=applygst value="<!-- TMPL_VAR name="gstreg" -->">
-<!-- TMPL_LOOP name="loop_currencies" -->
-	<input type=hidden name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->">
-<!-- /TMPL_LOOP -->
-<!-- TMPL_IF name="orderexists" --><input type=hidden name=orderexists value=yes><!-- /TMPL_IF -->
-<a href="basket.pl?basket=<!-- TMPL_VAR name=basket -->" class="button">Przejrzyj Koszyk</a> <h1><!-- TMPL_VAR name="ordnum" --> - Szczegóły Zamówienia </h1><br>
-Koszyk zakupów dla: <!-- TMPL_VAR name="name" -->
-<P>
-<CENTER>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
-	<tr valign=top bgcolor=#99cc33>
-		<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>SZCZEGÓŁY KATALOGU</B></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD><b>Tytuł*</b></td>
-		<td><input type=text size=20 name=title value="<!-- TMPL_VAR name="title" -->"></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Autor</td>
-		<td><input type=text size=20 name=author value="<!-- TMPL_VAR name="author" -->" ></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD> Wydawca</td>
-		<td><input type=text size=30 name=publishercode value="<!-- TMPL_VAR name="publishercode" -->" ></td>
-	</tr>
-	<TR VALIGN=TOP>
-	<TD>Data Copyright</td>
-	<td><input type=text size=20 name=copyrightdate value="<!-- TMPL_VAR name="copyrightdate" -->">
-	</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Format</td>
-		<td><!-- TMPL_VAR name="CGIitemtype" --></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>ISBN</td>
-		<td><input type=text size=20 name=ISBN value="<!-- TMPL_VAR name="isbn" -->"></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Seria</td>
-		<td><input type=text size=20 name=Series value="<!-- TMPL_VAR name="seriestitle" -->"></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Oddział</td>
-		<td><!-- TMPL_VAR name="CGIbranch" --></td>
-	</tr>
-</table>
-<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=32 height=250 align=left>
-<table border=1 cellspacing=0 cellpadding=5 width="40%">
-	<tr valign=top bgcolor=#99cc33><td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>SZCZEGÓŁY RACHUNKU</B></td></tr>
-	<TR VALIGN=TOP>
-		<TD>Ilość</td>
-		<td><input type=text size=20 name=quantity value="<!-- TMPL_VAR name="quantity" -->" onchange='update(this.form)' ></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Fundusz Książkowy</td>
-		<td><!-- TMPL_VAR name="CGIbookfund" --></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Cena Katalogowa Dostawcy</td>
-		<td><input type=text size=20 name=list_price value="<!-- TMPL_VAR name="listprice" -->" onchange='update(this.form)'></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Koszt wymiany <br><FONT SIZE=2></td>
-		<td><input type=text size=20 name=rrp value="<!-- TMPL_VAR name="rrp" -->" onchange='update(this.form)'>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Koszt zaplanowane<BR><FONT SIZE=2>(bez VAT, z rabatem)</FONT> </td>
-		<td><input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->" onchange='update(this.form)'></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>VAT zaplanowany</td>
-		<td><input type=text size=20 name=GST value="" onchange='update(this.form)'></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD><B>BUDŻETOWANE ŁĄCZNIE</B></td>
-		<td><input type=text size=20 name=total value="" onchange='update(this.form)'></td>
-	</tr>
-	<TR VALIGN=TOP  bgcolor=#ffffcc>
-		<TD>Faktyczny Koszt</td>
-		<td><input type=text size=20 name=cost></td>
-	</tr>
-	<TR VALIGN=TOP  bgcolor=#ffffcc>
-		<TD>Numer Faktury *</td>
-		<td><input type=text size=20 name=invoice ></td>
-	<TR VALIGN=TOP>
-		<TD>Uwagi</td>
-		<td><input type=text size=20 name=notes value="<!-- TMPL_VAR name="notes" -->"></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD colspan=2>
-		<input type="submit" value="OK" class="button">
-	</tr>
-</table>
-</form>
-</center>
-<table>
-<tr><td bgcolor=#cccc99  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>POMOC</B><br>
-<UL>
-<LI>Tłuste pola muszą być wypełnione, aby utworzyć nowy opis i egzemplarz.<p>
-<LI>Zacienione pola mogą być uzyte do "szybkiego" przyjęcia, gdy pozycje były nabyte lokalnie lub ofiarowane. W tym wypadku ilość "zamówiona" bedzie również wpisana do bazy jako ilość otrzymana.
-</UL>
-</td></tr></table>
-<p> &nbsp; </p>
+<div id="mainbloc">
+	<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" name="frusin">
+	<!-- TMPL_UNLESS name="existing" --><input type="hidden" name="existing" value="no"><!-- /TMPL_UNLESS -->
+	<!-- <!-- TMPL_VAR NAME="title" --> -->
+	<input type="hidden" name="ordnum" value="<!-- TMPL_VAR NAME="ordnum" -->">
+	<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
+	<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->">
+	<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblio" -->">
+	<input type="hidden" name="bibitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+	<input type="hidden" name="oldtype" value="<!-- TMPL_VAR NAME="itemtype" -->">
+	<input type="hidden" name="discount" value="<!-- TMPL_VAR NAME="discount" -->">
+	<input type="hidden" name="listinc" value="<!-- TMPL_VAR NAME="listincgst" -->">
+	<input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="currency" -->">
+	<input type="hidden" name="applygst" value="<!-- TMPL_VAR NAME="gstreg" -->">
+	<input type="hidden" name="suggestionid" value="<!-- TMPL_VAR NAME="suggestionid" -->">
+	<!-- TMPL_LOOP NAME="loop_currencies" -->
+		<input type="hidden" name="<!-- TMPL_VAR NAME="currency" -->" value="<!-- TMPL_VAR NAME="rate" -->">
+	<!-- /TMPL_LOOP -->
+	<a href="basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View Basket</a>  <h1 class="acquisition">
+		<!-- TMPL_IF name="ordnum" -->
+			Modify order details (line #<!-- TMPL_VAR NAME="ordnum" -->)
+		<!-- TMPL_ELSE -->
+			New order line
+		<!-- /TMPL_IF -->
+		 <!-- TMPL_IF name="suggestionid" -->(defined from suggestion #<!-- TMPL_VAR NAME="suggestionid" -->)<!-- /TMPL_IF -->
+	</h1>
+	Shopping Basket For <!-- TMPL_VAR NAME="name" -->
+	<div id="bloc25">
+		<h2 class="acquisition">Catalogue details</h2>
+		<p>
+			<label class="label100"><b>Tytuł*</b></label>
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="title" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->">
+			<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Autor</label>
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->"><!-- TMPL_VAR NAME="author" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->">
+			<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100"> Wydawca</label>
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->"><!-- TMPL_VAR NAME="publishercode" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->">
+			<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Data Copyright</label>
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->"><!-- TMPL_VAR NAME="copyrightdate" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->">
+			<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Format</label>
+			<!-- TMPL_VAR NAME="CGIitemtype" -->
+		</p>
+		<p>
+			<label class="label100">ISBN</label>
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->"><!-- TMPL_VAR NAME="isbn" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
+			<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Seria</label>
+			<!-- TMPL_IF name="biblio" -->
+				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->">
+			<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Oddział</label>
+			<!-- TMPL_VAR NAME="CGIbranch" -->
+		</p>
+	</div>
+	<div id="bloc25">
+		<h2 class="acquisition">Accounting details</h2>
+		<p>
+			<label class="label100">Ilość</label>
+			<!-- TMPL_IF name="close" -->
+				<input type="hidden" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->"><!-- TMPL_VAR NAME="quantity" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);">
+		  	<!--/TMPL_IF-->
+		</p>
+		<p>
+			<label class="label100">Fundusz Książkowy</label>
+			<!-- TMPL_IF name="close" -->
+				<input type="hidden" size="20" name="bookfund" value="<!-- TMPL_VAR NAME="bookfundid" -->"><!-- TMPL_VAR NAME="bookfundname" -->
+			<!-- TMPL_ELSE -->
+				<!-- TMPL_VAR NAME="CGIbookfund" -->
+		  	<!--/TMPL_IF-->
+		</p>
+		<p>
+			<label class="label100">Cena Katalogowa Dostawcy</label>
+			<!-- TMPL_IF name="close" -->
+				<input type="hidden" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->"><!-- TMPL_VAR NAME="listprice" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)">
+		  	<!--/TMPL_IF-->
+		</p>
+		<p>
+			<label class="label100">Koszt wymiany </label>
+			<!-- TMPL_IF name="close" -->
+				<input type="hidden" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->"><!-- TMPL_VAR NAME="rrp" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->">
+		  	<!--/TMPL_IF-->
+		</p>
+		<p>
+			<label class="label100">Koszt zaplanowane</label>
+			<!-- TMPL_IF name="close" -->
+                            <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly >
+			<!-- TMPL_ELSE -->
+                            <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->">
+			<!--/TMPL_IF-->
+		</p>
+<!-- TMPL_IF NAME="GST" -->		<p>
+			<label class="label100">VAT zaplanowany</label>
+			<!-- TMPL_IF name="close" -->
+                            <input type="text" size="20" name="GST" value="<!-- TMPL_VAR NAME="GST" -->" readonly >
+			<!-- TMPL_ELSE -->
+                            <input type="text" size="20" name="GST" value="<!-- TMPL_VAR NAME="GST" -->" >
+			<!--/TMPL_IF-->
+		</p><!-- TMPL_ELSE --><input type="hidden" name="GST" value="0"><!-- /TMPL_IF -->
+		<p>
+			<label class="label100"><b>BUDŻETOWANE ŁĄCZNIE</b></label>
+			<!-- TMPL_IF name="close" -->
+                            <input type="text" size="20" name="total" value="" readonly >
+                        <!-- TMPL_ELSE -->
+                            <input type="text" size="20" name="total" value="" readonly >
+			<!--/TMPL_IF-->
+		</p>
+		<p>
+			<label class="label100">Faktyczny Koszt</label>
+			<!-- TMPL_IF name="close" -->
+                            <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" readonly >
+			<!-- TMPL_ELSE -->
+                            <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" >
+			<!--/TMPL_IF-->
+		</p>
+		<p>
+			<label class="label100"><i>Parcel code</i></label>
+			<input type="text" size="20" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->">
+		<p>
+			<label class="label100">Uwagi</label>
+			<input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->">
+		</p>
+		<p>The 2 following fields are available for your own usage. They can be useful for stat purposes</p>
+		<p>
+			<label class="label100">Sort field 1</label>
+			<!-- TMPL_IF Name="CGIsort1" -->
+				<!-- TMPL_VAR Name="CGIsort1" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
+			<!--/TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Sort field 2</label>
+			<!-- TMPL_IF Name="CGIsort2" -->
+				<!-- TMPL_VAR Name="CGIsort2" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
+			<!--/TMPL_IF -->
+		</p>
+		<p>
+			<input type="button" value="OK" class="button acquisition" onClick="check(this.form)">
+		</p>
+	</form>
+	</div>
+</div>
 <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
-
-

Index: pl/acqui/order.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/Attic/order.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/acqui/order.tmpl	17 Apr 2004 16:26:29 -0000	1.2
+++ pl/acqui/order.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,53 +1,68 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 <div id="mainbloc">
-<h1>Wyniki Szukania Dostawców</h1>
+<h1 class="acquisition">Szukano <b>dostawcy <!-- TMPL_VAR name="supplier" -->,</b>Liczba wyszukanych <!-- TMPL_VAR name="count" --> </h1>
 <div id="bloc100">
-<div id="bloctitle">Szukano <b>dostawcy <!-- TMPL_VAR name="supplier" -->,</b>Liczba wyszukanych <!-- TMPL_VAR name="count" --> </div>
 <table>
 <tr>
-	<td><b>Zamów</b></td>
-	<td><b>Przyjmij<b></td>
-	<td><b>Firma</b></td>
-	<td>
-		<table>
-			<tr>
-				<td><b>Koszyk</b></td>
-				<td><b>Pozycje</b></td>
-				<td><b>Personel</b></td>
-				<td><b>Data</b></td>
-			</tr>
-		</table>
-	</td>
+	<th class="acquisition">Zamów</th>
+	<th class="acquisition">Przyjmij</th>
+	<th class="acquisition">Supplier</th>
+	<th class="acquisition">Koszyk</th>
 </tr>
 
 <!-- TMPL_LOOP name="loop_suppliers" -->
-	<tr valign=top bgcolor=<!-- TMPL_VAR name="color" -->>
+	<tr valign="top">
 		<td>
 			<!-- TMPL_IF name="active" -->
-				<a href="basket.pl?id=<!-- TMPL_VAR name=id -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_send.png" title="Dodaj zamówienie" alt="Dodaj" border=0></a>
+				<a href="basket.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_send.png" title="Dodaj zamówienie" alt="Dodaj" border=0></a>
 			<!-- TMPL_ELSE -->
 				Nieaktywny
 			<!-- /TMPL_IF -->
 		</td>
 		<td>
-			<a href="recieveorder.pl?id=<!-- TMPL_VAR name=id -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_get.png" title="odbiór" alt="Dodaj" border=0></a>
+			<a href="recieveorder.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_get.png" title="odbiór" alt="Dodaj" border=0></a>
 		</td>
-		<td><a href="supplier.pl?id=<!-- TMPL_VAR name=id -->"><!-- TMPL_VAR name="name" --></a></td>
+		<td><a href="supplier.pl?supplierid=<!-- TMPL_VAR name=supplierid -->&op=display"><!-- TMPL_VAR name="name" --></a></td>
 		<td>
-			<table width="100%" cellspacing=0 cellpadding=5 border=0>
-				<!-- TMPL_LOOP name="loop_basket" -->
+			<table>
+			     <!-- TMPL_IF name="loop_basket" -->
+					<tr>
+						<th class="acquisition">Koszyk</th>
+						<th class="acquisition">Pozycje</th>
+						<th class="acquisition">Created by</th>
+						<th class="acquisition">Data</th>
+						<th class="acquisition">&nbsp;</th>
+					</tr>
+				<!-- TMPL_ELSE -->
+				    </p>No pending basket</p>
+                <!-- /TMPL_IF -->
+					<!-- TMPL_LOOP NAME="loop_basket" -->
 					<tr>
-						<td width="15%"><a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR name="basketno" --></a></td>
-						<td width="15%"><TMPl_VAR name="total"></td>
-						<td width="40%"><!-- TMPL_VAR name="authorisedby" --></td>
-						<td width="30%"><!-- TMPL_VAR name="entrydate" --></td>
+							<td><!-- TMPL_VAR NAME="basketno" --></a></td>
+							<td><TMPL_VAR NAME="total"></td>
+							<td>
+								<!-- TMPL_VAR name="firstname" -->
+									<!-- TMPL_VAR name="surname" -->
+							</td>
+							<td><!-- TMPL_VAR NAME="creationdate" --></td>
+							<td>
+								<!-- TMPL_IF name="closedate" -->
+									closed on <!-- TMPL_VAR NAME="closedate" -->  <a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
+								<!-- TMPL_ELSE -->
+									<!-- TMPL_IF name="active" -->
+										<a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">zmień</a>
+									<!-- TMPL_ELSE -->
+										<a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
+									<!-- /TMPL_IF -->
+								<!-- /TMPL_IF -->
+							</td>
 					</tr>
 				<!-- /TMPL_LOOP -->
 			</table>
 	</tr>
-<!-- /TMPL_LOOP -->
-</table>
-</CENTER>
-<br>
-<a class="button" href="supplier.pl?id=0">Dodaj dostawcÄ™</a>
+	<!-- /TMPL_LOOP -->
+	</table>
+	</div>
+	<a class="button acquisition" href="supplier.pl?supplierid=0">Dodaj dostawcÄ™</a>
+</div>
 <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: pl/acqui/recieve.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/Attic/recieve.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/acqui/recieve.tmpl	17 Apr 2004 16:26:29 -0000	1.2
+++ pl/acqui/recieve.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,75 +1,94 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<div align=right>
-Faktura: <!-- TMPL_VAR name="invoice" --><br>
-Przyjęte przez: <!-- TMPL_VAR name="user" --><br>
-<!-- TMPL_VAR name="date" -->
-</div>
-<h1>Podsumowanie dla : <i><!-- TMPL_VAR name="name" --></i> Faktura <i><!-- TMPL_VAR name="invoice" --></i></h1>
-<CENTER>
-
-<FORM ACTION="/cgi-bin/koha/acqui/acquire.pl">
-<input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
-<input type=hidden name=gst value="<!-- TMPL_VAR name="gst" -->">
-<input type=hidden name=freight value="<!-- TMPL_VAR name="freight" -->">
-<input type=hidden name=invoice value="<!-- TMPL_VAR name="invoice" -->">
+<div id="mainbloc">
+	<h1 class="acquisition">
+			Receipt parcel for <i><!-- TMPL_VAR NAME="name" --></i>
+	</h1>
 
-<b>Szukaj wg. ISBN lub Tytułu: </b> <INPUT TYPE="text"  SIZE="25"   NAME="recieve">
-</form>
-<p>
-<FORM ACTION="" method=get name=orderform>
+	<div id="bloc25">
+		<p><label>Invoice</label><!-- TMPL_VAR NAME="invoice" --></p>
+        <p><label>Data</label> <!-- TMPL_VAR name="formatteddatereceived"--></p>
+	</div>
 
-<table border=0 cellspacing=0 cellpadding=5>
-	<tr valign=top bgcolor="#ffdf61">
-		<td><b>KOSZYK</b></td>
-		<td><b>ISBN</b></td>
-		<td><b>TYTUŁ</b></td>
-		<td><b>AUTOR</b></td>
-		<td><b>FAKTYCZNY</b></td>
-		<td><b>Manipulacyjne</b></td>
-		<td><b>ILOŚĆ</b></td>
-		<td><b>W SUMIE</b></td>
-	</tr>
-	<!-- TMPL_VAR name="count" -->
-	<!-- TMPL_LOOP name="loop_orders" -->
-		<tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
-			<td><!-- TMPL_VAR name="basketno" --></td>
-			<td><!-- TMPL_VAR name="isbn" --></td>
-			<td><a href="acquire.pl?recieve=<!-- TMPL_VAR name="ordernumber" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&invoice=<!-- TMPL_VAR name="invoice" -->&gst=<!-- TMPL_VAR name="gst" -->&freight=<!-- TMPL_VAR name="freight" -->&id=<!-- TMPL_VAR name="id" -->"><!-- TMPL_VAR name="title" --></a></td>
-			<td><!-- TMPL_VAR name="author" --></td>
-			<td>PLN<!-- TMPL_VAR name="unitprice" --></td>
+	<div id="bloc25">
+	<h2 class="acquisition"> Items in parcel</h2>
+	<p>
+	<!-- TMPL_VAR NAME="countreceived" --> biblio received
+	</p>
+	<table>
+		<tr>
+			<th class="acquisition">Koszyk</th>
+			<th class="acquisition">Tytuł</th>
+			<th class="acquisition">Est. cost</th>
+			<th class="acquisition">Qty ordered</th>
+			<th class="acquisition">P&amp;P</th>
+			<th class="acquisition">Actual</th>
+			<th class="acquisition">Ilość</th>
+			<th class="acquisition">Łącznie</th>
+		</tr>
+		<!-- TMPL_LOOP NAME="loop_received" -->
+			<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
+				<td class="number"><!-- TMPL_VAR NAME="basketno" --></td>
+				<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->&catview=yes&datereceived=<!-- TMPL_VAR name="datereceived" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+				<td class="number"><!-- TMPL_VAR NAME="ecost" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
 			<td></td>
-			<td><!-- TMPL_VAR name="quantityrecieved" --></td>
-			<td>PLN<!-- TMPL_VAR name="total" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="unitprice" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="quantityrecieved" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="total" --></td>
 		</tr>
 	<!-- /TMPL_LOOP -->
-	<tr valign=top bgcolor=white>
-		<td colspan=8><hr>
-		</td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td></td>
-		<td></td>
-		<td></td>
-		<td><b>ŁĄCZNIE</b></td>
-		<td>PLN<!-- TMPL_VAR name="totalprice" --></td>
-		<td><!-- TMPL_VAR name="totalfreight" --></td>
-		<td><!-- TMPL_VAR name="totalquantity" --></td>
-		<td>PLN<!-- TMPL_VAR name="tototal" --></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td colspan=5 rowspan=2  bgcolor="#ffdf61">
+		<tr>
+			<td colspan="5" rowspan=3  bgcolor="#ffdf61">
 		<b>POMOC</b>
-		<br>
-		Kwota łączna na dole strony powinna być różna o kilka groszy od kwoty łącznej na fakturze.<p>
-		Po skończeniu faktury zapisz zmiany.
+				<p>Kwota łączna na dole strony powinna być różna o kilka groszy od kwoty łącznej na fakturze.</p>
 		</td>
-		<td colspan=2 align=right><b>VAT</b></td>
-		<td>PLN<!-- TMPL_VAR name="gst" --></td>
+			<td colspan="2"  class="acquisition number"><b>VAT</b></td>
+			<td class="acquisition number"><!-- TMPL_VAR NAME="gst" --></td>
 	</tr>
-	<tr valign=top bgcolor=white>
-		<td colspan=2 align=right ><b>W SUMIE</b></td>
-		<td>PLN<!-- TMPL_VAR name="grandtot" --></td>
+		<tr>
+			<td colspan="2" class="acquisition number"><b>FREIGHT</b></td>
+			<td class="acquisition number"><!-- TMPL_VAR NAME="freight" --></td>
+		</tr>
+		<tr>
+			<td colspan="2" class="acquisition number"><b>W SUMIE</b></td>
+			<td class="acquisition number"><!-- TMPL_VAR NAME="grandtot" --></td>
 	</tr>
-</table>
-</CENTER>
+	</table>
+	</div>
+	
+	<div id="bloc25">
+	<h2 class="acquisition"> Pending orders </h2>
+		<form action="/cgi-bin/koha/acqui/acquire.pl">
+			<input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->">
+			<input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->">
+			<input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->">
+			<input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->">
+			
+			<b>Szukaj wg. ISBN lub Tytułu: </b> <input type="text" size="25" name="recieve">
+		</form>
+	<p>
+	<form action="" method="get" name="orderform">
+	
+	<table class="small">
+		<tr>
+			<th class="acquisition">Koszyk</th>
+			<th class="acquisition">Tytuł</th>
+			<th class="acquisition">Ordered</th>
+			<th class="acquisition">Otrzymane</th>
+			<th class="acquisition"></th>
+		</tr>
+		<!-- TMPL_VAR NAME="countpending" --> lines
+		<!-- TMPL_LOOP NAME="loop_orders" -->
+			<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
+				<td class="number"><!-- TMPL_VAR NAME="basketno" --></td>
+				<td><!-- TMPL_VAR NAME="title" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="quantity" --></td>
+				<td class="number"><!-- TMPL_VAR NAME="quantityrecieved" --></td>
+                <td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;datereceived=<!-- TMPL_VAR name="datereceived"-->&catview=yes" class="button acquisition">Recieve</td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+	</table>
+	</div>
+</div>
+<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: pl/acqui/recieveorder.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/Attic/recieveorder.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/acqui/recieveorder.tmpl	17 Apr 2004 16:26:29 -0000	1.2
+++ pl/acqui/recieveorder.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,33 +1,125 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
+<div id="mainbloc">
+	<h1 class="acquisition">Receive parcel from supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
 
-<h1>Przyjmij Zamówienia Od Dostawcy <a href="/cgi-bin/koha/acqui/supplier.pl?id=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR name="name" --></a></h1>
-<p>
-<CENTER>
-<form method=get action="receive.pl">
-<input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
-<p>
-<table border=1 cellspacing=0 cellpadding=5>
-<tr valign=top bgcolor="#ffdf61"><td  colspan=2><B>FAKTURA DOSTAWCY - INFORMACJE</B></td></tr>
-<TR VALIGN=TOP >
-<TD>Numer Faktury Dostawcy</td>
-<td><input type=text size=20 name=invoice>
-</td>
-</tr>
-<TR VALIGN=TOP bgcolor="#ffffcc">
-<TD>VAT</td>
-<td><input type=text size=20 name=gst>
-</td>
-</tr>
-<TR VALIGN=TOP>
-<TD>Transport</td>
-<td><input type=text size=20 name=freight>
-</td>
-</tr>
-<TR VALIGN=TOP>
-<td colspan=2 align="center"><input type="submit" class="button" value="Zapisz">
-</td>
-</tr>
-</table>
-</CENTER>
+<!-- TMPL_IF NAME="count" --><p> <!-- TMPL_VAR NAME="count" --> parcels found</p><!--/TMPL_IF-->
+<div id="resultnumber">
+<!-- Row of numbers corresponding to search result pages -->
+<!-- TMPL_IF NAME="displayprev" -->
+	<a href="recieveorder.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0"></a>
+<!-- TMPL_ELSE -->
+	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
+<!-- /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="recieveorder.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="startfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
+	<!-- /TMPL_IF -->
+<!-- /TMPL_LOOP -->
+<!-- TMPL_IF NAME="displaynext" -->
+	<a href="recieveorder.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" --><!--TMPL_IF Name="datefrom"-->&amp;datefrom=<!--TMPL_VAR Name="datefrom"--><!--/TMPL_IF--><!--TMPL_IF Name="dateto"-->&amp;dateto=<!--TMPL_VAR Name="dateto"--><!--/TMPL_IF--><!--TMPL_IF Name="code"-->&amp;filter=<!--TMPL_VAR Name="code"--><!--/TMPL_IF--><!--TMPL_IF Name="orderby"-->&amp;orderby=<!--TMPL_VAR Name="orderby"--><!--/TMPL_IF--><!--TMPL_IF Name="resultsperpage"-->&amp;resultsperpage=<!--TMPL_VAR Name="resultsperpage"--><!--/TMPL_IF-->&amp;type=intra"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
+<!-- TMPL_ELSE -->
+	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
+<!-- /TMPL_IF -->
+</div>
 
+<div id="resultlist">
+<!-- Search Results Table -->
+<!-- TMPL_IF NAME="count" -->
+<form method="post" action="recieveorder.pl">
+	<table class="small">
+		<tr>
+			<th class="acquisition">Line</th>
+			<th class="acquisition">Kod</th>
+			<th class="acquisition">Date Received</th>
+			<th class="acquisition">Ilość pozycji</th>
+			<th class="acquisition">Biblio count</th>
+			<th class="acquisition">Items expected</th>
+		</tr>
+		<tr>
+			<th class="acquisition">
+				&nbsp;
+				<input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
+			</th>
+			<th class="acquisition">
+				<input type="text" size="20" name="filter" value="<!-- TMPL_VAR NAME="filter" -->">
+			</th>
+			<th class="acquisition">
+				From :<input type="text" size="9" name="datefrom" value="<!-- TMPL_VAR NAME="datefrom" -->"> 
+				<p>To :<input type="text" size="9" name="dateto" value="<!-- TMPL_VAR NAME="dateto" -->">
+			</th>
+			<th class="acquisition">
+				&nbsp;
+			</th>
+			<th class="acquisition">
+				Sort by :<select name="orderby" size="1">
+				<option value="aqorders.booksellerinvoicenumber"> Kod</option>
+				<option value="datereceived"> Date Received</option>
+				<option value="datereceived desc"> Date Received reverse</option>
+				<option value="aqorders.booksellerinvoicenumber desc"> Code reverse</option>
+				</select><br />
+				Liczba wyświetleń na stronę:<select name="resultsperpage" value ="<!--TMPL_VAR Name="resultsperpage"-->" size="1">
+				<option value="20">20</option>
+				<option value="30">30</option>
+				<option value="50">50</option>
+				<option value="100">100</option>
+				</select>
+			</th>
+			<th class="acquisition">
+				<input type="submit" class="button acquisition" value="Filter">
+			</th>
+		</tr>
+<!-- Actual Search Results -->
+<!-- TMPL_LOOP NAME="searchresults" -->
+	<tr>
+		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+			<!-- TMPL_VAR NAME="number" -->
+		</td>
+		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+			<!--TMPL_IF Name="code"--><!--TMPL_VAR Name="code" --><!--/TMPL_IF-->
+		</td>
+		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
+		<!-- /TMPL_IF -->
+			<a href="/cgi-bin/koha/acqui/receive.pl?type=intra&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&amp;datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&amp;code=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
+				<!-- TMPL_VAR NAME="datereceived" -->
+			</a>
+		</td>
+		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
+		<!-- /TMPL_IF -->
+			<!-- TMPL_VAR NAME="reccount" --> 
+		</td>
+		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+			<!-- TMPL_VAR NAME="bibcount" -->
+		</td>
+		<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+			<!-- TMPL_VAR NAME="itemcount" -->
+		</td>
+	</tr>
+<!-- /TMPL_LOOP -->
+</table>
+</form>
+<!--/TMPL_IF-->
+	<div id="bloc25">
+	<h2 class="acquisition"> Receive a new Parcel </h2>
+		<form method="get" action="receive.pl">
+		<p>
+			<input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
+			<label>Parcel Code</label>
+			<input type="text" size="20" name="invoice">
+		</p>
+<!-- TMPL_IF NAME="GST" -->		<p>
+			<label>VAT</label>
+			<input type="text" size="20" name="gst">
+		</p><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0"><!-- /TMPL_IF -->
+		<p>
+			<label>Transport</label>
+			<input type="text" size="20" name="freight">
+		</p>
+		<p>
+			<input type="submit" class="button acquisition" value="Zapisz">
+		</p>
+		</form>
+	</div>
+</div>
 <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: pl/acqui/supplier.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui/Attic/supplier.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/acqui/supplier.tmpl	17 Apr 2004 16:26:29 -0000	1.2
+++ pl/acqui/supplier.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,159 +1,234 @@
 <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
 
-<form action=updatesupplier.pl method=post>
+<div id="mainbloc">
+<!--TMPL_IF Name="enter"-->
+	<form action=updatesupplier.pl method="post">
 
-<input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
+	<input type="hidden" name="id" value=<!-- TMPL_VAR NAME="id" -->>
 
-<!-- TMPL_IF NAME=id -->
-	<h1>Aktualizuj: <!-- TMPL_VAR name="name" --></h1>
-<!-- TMPL_ELSE -->
-	<h1><em>Dodaj dostawcÄ™</h1>
-<!-- /TMPL_IF -->
-
-<P>
-<CENTER>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
-	<tr valign=top bgcolor="#ffdf61">
-		<td colspan=2><B>DANE O FIRMIE</B></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD><b>Nazwa firmy</b></td>
-		<td><input type=text size=20 name=company value="<!-- TMPL_VAR name="name" -->">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Adres Pocztowy</td>
-		<td>
-			<textarea name="company_postal" cols=20 rows=3><!-- TMPL_VAR name="postal" --></textarea>
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Adres Zamieszkania</td>
-		<td><textarea name=physical cols=20 rows=4><!-- TMPL_VAR name="address1" --><!-- TMPL_VAR name="address2" --><!-- TMPL_VAR name="address3" --><!-- TMPL_VAR name="address4" --></textarea>
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Telefon</td>
-		<td><input type=text size=20 name=company_phone value="<!-- TMPL_VAR name="phone" -->">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Fax</td>
-		<td><input type=text size=20 name=company_fax value="<!-- TMPL_VAR name="fax" -->">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Witryna</td>
-		<td><input type=text size=20 name=website value="<!-- TMPL_VAR name="url" -->">
-		</td>
-	</tr>
-	<tr valign=top bgcolor="#ffdf61">
-		<td colspan=2><B>DANE KONTAKTOWE</B></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Osoba kontaktowa</td>
-		<td><input type=text size=20 name=company_contact_name value="<!-- TMPL_VAR name="contact" -->"></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Pozycja</td>
-		<td><input type=text size=20 name=company_contact_position value="<!-- TMPL_VAR name="contpos" -->">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Telefon</td>
-		<td><input type=text size=20 name=contact_phone value="<!-- TMPL_VAR name="contphone" -->">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Inny Telefon</td>
-		<td><input type=text size=20 name=contact_phone_2 value="<!-- TMPL_VAR name="contaltphone" -->">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Fax</td>
-		<td><input type=text size=20 name=contact_fax value="<!-- TMPL_VAR name="contfax" -->">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>E-mail</td>
-		<td><input type=text size=20 name=company_email value="<!-- TMPL_VAR name="contemail" -->">
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Uwagi</td>
-		<td><textarea name=notes cols=20 rows=4><!-- TMPL_VAR name="contnotes" --></textarea>
-		</td>
-	</tr>
-</table>
-
-<table border=1 cellspacing=0 cellpadding=5 width="40%">
-	<tr valign=top bgcolor="#ffdf61">
-		<td colspan=2><B>STATUS BIEŻĄCY</B></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Dostawca jest</td>
-		<td>
+	<!-- TMPL_IF name="id" -->
+		<h1 class="acquisition">Aktualizuj: <!-- TMPL_VAR NAME="name" --></h1>
+	<!-- TMPL_ELSE -->
+		<h1 class="acquisition">Dodaj dostawcÄ™</h1>
+	<!-- /TMPL_IF -->
+	<div id="bloc25">
+		<h2 class="acquisition">DANE O FIRMIE</h2>
+		<p>
+			<label>Nazwa firmy</label>
+			<input type="text" size="40" name="company" value="<!-- TMPL_VAR NAME="name" -->">
+		</p>
+		<p>
+			<label>Adres Pocztowy</label>
+				<textarea name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
+		</p>
+		<p>
+			<label>Adres Zamieszkania</label>
+			<textarea name="physical" cols="40" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
+		</p>
+		<p>
+			<label>Telefon</label>
+			<input type="text" size="20" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->">
+		</p>
+		<p>
+			<label>Fax</label>
+			<input type="text" size="20" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->">
+		</p>
+		<p>
+			<label>Witryna</label>
+			<input type="text" size="40" name="website" value="<!-- TMPL_VAR NAME="url" -->">
+		</p>
+		<h2 class="acquisition">DANE KONTAKTOWE</h2>
+		<p>
+			<label>Osoba kontaktowa</label>
+			<input type="text" size="40" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->">
+		</p>
+		<p>
+			<label>Pozycja</label>
+			<input type="text" size="40" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->">
+		</p>
+		<p>
+			<label>Telefon</label>
+			<input type="text" size="20" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->">
+		</p>
+		<p>
+			<label>Alternative phone</label>
+			<input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->">
+		</p>
+		<p>
+			<label>Fax</label>
+			<input type="text" size="20" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->">
+		</p>
+		<p>
+			<label>E-mail</label>
+			<input type="text" size="40" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->">
+		</p>
+		<p>
+			<label>Uwagi</label>
+			<textarea name="contact_notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
+		</p>
+	</div>
+	<div id="bloc25">
+		<h2 class="acquisition">STATUS BIEŻĄCY</h2>
+		<p>
+			<label>Dostawca jest</label>
 			 <!-- TMPL_IF name="active" -->
 				<input type="radio" name="status" value="1" checked>Aktywny <input type="radio" name="status" value="0">Nieaktywny</td>
 			<!-- TMPL_ELSE -->
 				<input type="radio" name="status" value="1">Aktywny <input type="radio" name="status" value="0" checked>Nieaktywny</td>
 			<!-- /TMPL_IF -->
-	</tr>
-	<tr valign=top bgcolor="#ffdf61">
-		<td colspan=2><B>DANE ZAMÓWIENIA</B></td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Wydawcy i druki</td>
-		<td><textarea name="publishers_imprints" cols=20 rows=4><!-- TMPL_VAR name="specialty" --></textarea>
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Cena katalogowa jest</td>
-		<td>
-			<select name=list_currency size=1>
-			<!-- TMPL_LOOP name="loop_pricescurrency" -->
-				<!-- TMPL_VAR name="currency" -->
+		</p>
+		<h2 class="acquisition">DANE ZAMÓWIENIA</h2>
+		</p>
+		<p>
+			<label>Wydawcy i druki</label>
+			<textarea name="publishers_imprints" cols="20" rows="4"><!-- TMPL_VAR NAME="specialty" --></textarea>
+		</p>
+		<p>
+			<label class="label100">Cena katalogowa jest</label>
+				<select name="list_currency" size="1">
+				<!-- TMPL_LOOP NAME="loop_pricescurrency" -->
+					<!-- TMPL_VAR NAME="currency" -->
 			<!-- /TMPL_LOOP -->
 			</select>
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Ceny z faktury sÄ…</td>
-		<td>
-			<select name=invoice_currency size=1>
-			<!-- TMPL_LOOP name="loop_invoicecurrency" -->
-				<!-- TMPL_VAR name="currency" -->
+		</p>
+		<p>
+			<label class="label100">Ceny z faktury sÄ…</label>
+				<select name="invoice_currency" size="1">
+				<!-- TMPL_LOOP NAME="loop_invoicecurrency" -->
+					<!-- TMPL_VAR NAME="currency" -->
 			<!-- /TMPL_LOOP -->
 			</select>
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>PÅ‚atnik VATu</td>
-		<td>
-			<input type=radio name=gst value=1 <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Tak <input type=radio name=gst value=0 <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>Nie
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Cena katalogowa pozycji zawiera VAT</td>
-		<td>
-			<input type=radio name=list_gst value=1 <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Tak <input type=radio name=list_gst value=0 <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Nie
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Cena pozycji na fakturze zawiera VAT</td>
-		<td>
-			<input type=radio name=invoice_gst value=1 <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>Tak <input type=radio name=invoice_gst value=0 <!-- TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>Nie
-		</td>
-	</tr>
-	<TR VALIGN=TOP>
-		<TD>Rabat</td>
-		<td><input type=text size=3 name=discount value=<!-- TMPL_VAR name="discount" -->> %
-	</tr>
-</table>
-<br/>
-<br/><input type=image name=submit src="/<!-- TMPL_VAR name="theme" -->/images/filesave.png" border=0 title="Zapisz" alt="Zapisz" class="button">
-</form>
-</center>
-
-
+		</p>
+		<!-- TMPL_IF NAME="GST" --><p>
+			<label class="label100">PÅ‚atnik VATu</label>
+				<input type="radio" name="gst" value="1" <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Tak <input type="radio" name="gst" value="0" <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>Nie
+		</p><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0"><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="GST" --><p>
+			<label class="label100">Cena katalogowa pozycji zawiera VAT</label>
+				<input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Tak <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Nie
+		</p><!-- TMPL_ELSE --><input type="hidden" name="list_gst" value="0"><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="GST" --><p>
+			<label class="label100">Cena pozycji na fakturze zawiera VAT</label>
+				<input type="radio" name="invoice_gst" value="1" <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>Tak <input type="radio" name="invoice_gst" value="0" <!-- TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>Nie
+		</p><!-- TMPL_ELSE --><input type="hidden" name="invoice_gst" value="0"><!-- /TMPL_IF -->
+		<p>
+			<label class="label100">Rabat</label>
+			<input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->"> %
+		</p>
+		<p>
+			<label class="label100">Uwagi</label>
+			<textarea cols="40" rows="4" name="notes" ><!-- TMPL_VAR NAME="notes" --></textarea>
+		</p>
+	<br/>
+	<br/><input type="image" name="submit" src="/<!-- TMPL_VAR NAME="theme" -->/images/filesave.png" border="0" title="Zapisz" alt="Zapisz" class="button acquisition">
+	</form>
+	</div>
+</div>
+<!--TMPL_ELSE-->
+	<h1 class="acquisition">Information for : <!-- TMPL_VAR NAME="name" --></h1>
+	<a href="supplier.pl?supplierid=<!--TMPL_VAR Name="id"-->" class="button acquisition">  Edit Supplier  </a>  <a href="order.pl?supplier=<!--TMPL_VAR Name="name"-->" class="button acquisition">  Manage Orders  </a>  <a href="recieveorder.pl?supplierid=<!--TMPL_VAR Name="id"-->" class="button acquisition">  Receive Parcel  </a>
+	<div id="bloc25">
+		<h2 class="acquisition">DANE O FIRMIE</h2>
+		<p>
+			<label>Nazwa firmy</label>
+			<!-- TMPL_VAR NAME="name" -->
+		</p>
+		<p>
+			<label class="label100">Adres Pocztowy</label>
+				<!-- TMPL_VAR NAME="postal" -->
+		</p>
+		<p>
+			<label class="label100">Adres Zamieszkania</label>
+			<!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" -->
+		</p>
+		<p>
+			<label>Telefon</label>
+			<!-- TMPL_VAR NAME="phone" -->
+		</p>
+		<p>
+			<label>Fax</label>
+			<!-- TMPL_VAR NAME="fax" -->
+		</p>
+		<p>
+			<label>Witryna</label>
+			<!-- TMPL_VAR NAME="url" -->
+		</p>
+		
+		<h2 class="acquisition">DANE KONTAKTOWE</h2>
+		<p>
+			<label>Osoba kontaktowa</label>
+			<!-- TMPL_VAR NAME="contact" -->
+		</p>
+		<p>
+			<label>Pozycja</label>
+			<!-- TMPL_VAR NAME="contpos" -->
+		</p>
+		<p>
+			<label>Telefon</label>
+			<!-- TMPL_VAR NAME="contphone" -->
+		</p>
+		<p>
+			<label>Alternative phone</label>
+			<!-- TMPL_VAR NAME="contaltphone" -->
+		</p>
+		<p>
+			<label>Fax</label>
+			<!-- TMPL_VAR NAME="contfax" -->
+		</p>
+		<p>
+			<label>E-mail</label>
+			<!-- TMPL_VAR NAME="contemail" -->
+		</p>
+		<p>
+			<label>Uwagi</label>
+			<!-- TMPL_VAR NAME="contnotes" -->
+		</p>
+	</div>
+	<div id="bloc25">
+		<h2 class="acquisition">STATUS BIEŻĄCY</h2>
+		<p>
+			<label>Dostawca jest</label>
+				<!-- TMPL_IF name="active" -->
+					Active
+				<!-- TMPL_ELSE -->
+					Nieaktywny
+				<!-- /TMPL_IF -->
+		</p>
+		<h2 class="acquisition">DANE ZAMÓWIENIA</h2>
+		</p>
+		<p>
+			<label>Wydawcy i druki</label>
+			<!-- TMPL_VAR NAME="specialty" -->
+		</p>
+		<p>
+			<label class="label100">Cena katalogowa jest</label><!--TMPL_VAR Name="listprice"-->
+		</p>
+		<p>
+			<label class="label100">Ceny z faktury sÄ…</label><!--TMPL_VAR Name="invoiceprice"-->
+		</p>
+		<p>
+			<label class="label100">PÅ‚atnik VATu</label>
+				<!-- TMPL_IF name="gstreg" -->Tak<!--TMPL_ELSE-->Nie<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Cena katalogowa pozycji zawiera VAT</label>
+				<!-- TMPL_IF name="listincgst" -->Tak<!--TMPL_ELSE-->Nie<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Cena pozycji na fakturze zawiera VAT</label>
+				<!-- TMPL_IF name= "invoiceincgst" -->Tak<!--TMPL_ELSE-->Nie<!-- /TMPL_IF -->
+		</p>
+		<p>
+			<label class="label100">Rabat</label>
+			<!-- TMPL_VAR NAME="discount" --> %
+		</p>
+		<p>
+			<label class="label100">Uwagi</label>
+			<!-- TMPL_VAR NAME="notes" -->
+		</p>
+	<br/>
+	<br/>
+	</div>
+</div>
+<!--/TMPL_IF-->
 <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: pl/acqui.simple/addbiblio-nomarc.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/Attic/addbiblio-nomarc.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/acqui.simple/addbiblio-nomarc.tmpl	17 Apr 2004 16:26:28 -0000	1.2
+++ pl/acqui.simple/addbiblio-nomarc.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,55 +1,36 @@
-<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 
-<FONT SIZE=6><em>Dodawanie nowego Opisu</em></FONT><br>
+<div id="mainbloc">
+	<h1 class="catalogue">Dodawanie nowego Opisu</h1>
 
-<table bgcolor="#ffcc00" width="80%" cellpadding="5">
-  <tr>
-  <td><FONT SIZE=5>Sekcja Pierwsza: Informacja Copyright </font></td>
-  </tr>
-</table>
+	<div id="bloc60">
+		<h2 class="catalogue">Sekcja Pierwsza: Informacja Copyright </h2>
 
-<!-- TMPL_IF NAME="ERROR" -->
-<p />
-<center>
-<font color="#FF0000">Proszę Podać Tytuł</font>
-</center>
-<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="ERROR" -->
+			<p class="problem">Proszę Podać Tytuł</p>
+		<!-- /TMPL_IF -->
 
-<FORM action="savebiblio.pl" method="post">
-<table align="center">
-<tr>
-<td>Tytuł: *</td>
-<td><INPUT name="title" size="40" /></td>
-</tr>
-<tr>
-<td>Podtytuł:</td>
-<td><INPUT name="subtitle" size="40" /></td>
-</tr>
-<tr>
-<td>Autor:</td>
-<td><INPUT name="author" size="40" /></td>
-</tr>
-<tr valign="top">
-<td>Tytuł Serii:<br />
-<i>(jeśli dotyczy)</i></td>
-<td><INPUT name="seriestitle" size="40" /></td>
-</tr>
-<tr>
-<td>Data Copyright</td>
-<td><INPUT name="copyrightdate" size="40" /></td>
-</tr>
-<tr valign="top">
-<td>Streszczenie:</td>
-<td><textarea cols="30" rows="6" name="abstract"></textarea></td>
-</tr>
-<tr valign="top">
-<td>Uwagi:</td>
-<td><textarea cols="30" rows="6" name="notes"></textarea></td>
-</tr>
-<tr valign="top">
-<td colspan="2"><center><input type="submit" value="Prześlij"></center></td>
-</tr>
-</table>
-</FORM>
-* Wymagane
+		<form action="savebiblio.pl" method="post">
+		<p><label class="label100">Tytuł: *</label><input name="title" size="40" /></p>
+		<p><label class="label100">Podtytuł:</label><input name="subtitle" size="40" /></p>
+		<p><label class="label100">Autor:</label><input name="author" size="40" /></p>
+		<p>Dodatkowi Autorzy: <i>Jeden Autor na wiersz</i></p>
+		<p><label class="label100">&nbsp;</label>
+			<textarea class="form-box-textarea2" name="additionalauthors" cols="30" rows="6"></textarea>
+		</p>
+		</p>
+		<p>Tytuł Serii: <i>(jeśli dotyczy)</i></p>
+		<p><label class="label100">&nbsp;</label><input name="seriestitle" size="40" /></p>
+		<p>Hasła Tematyczne: <i>Jedno hasło tematyczne na wiersz</i></p>
+		<p><label class="label100">&nbsp;</label>
+			<textarea class="form-box-textarea2" name="subjectheadings" cols="30" rows="6"></textarea>
+		</p>
+		<label class="label100">Data Copyright</label><input name="copyrightdate" size="40" /></p>
+		<label class="label100">Streszczenie:</label><textarea cols="30" rows="6" name="abstract"></textarea></p>
+		<label class="label100">Uwagi:</label><textarea cols="30" rows="6" name="notes"></textarea></p>
+		<p><input type="submit" value="Prześlij" class="button catalogue"></p>
+		</form>
+		* Wymagane
+	</div>
+</div>
 <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->

Index: pl/acqui.simple/addbiblio.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/Attic/addbiblio.tmpl,v
retrieving revision 1.5
retrieving revision 1.5.10.1
diff -u -b -r1.5 -r1.5.10.1
--- pl/acqui.simple/addbiblio.tmpl	17 Apr 2004 16:26:28 -0000	1.5
+++ pl/acqui.simple/addbiblio.tmpl	7 May 2007 13:55:52 -0000	1.5.10.1
@@ -1,397 +1,167 @@
-<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
+<!-- TMPL_INCLUDE NAME="marc-top.inc" -->
+	<form method="post" name="f" id="f" action="addbiblio.pl">
+<h1 class="catalogue"><!-- 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>
 
 <div class="tabbed">
-	<form method="post" name="f">
-	<h1 class="catalogue">Opis MARC : <!-- TMPL_VAR name="bibid" --></h1>
-	<p>
-		<input type="hidden" name="op" value="addbiblio">
-		<input type="hidden" name="addfield_field">
-		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="oldbiblionumber" -->">
+		<input type="hidden" name="op" value="addbiblio" />
+		<input type="hidden" name="addfield_field" />
+		<input type="hidden" name="repeat_field" />
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+		<input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->" />
 		<!-- TMPL_IF name="bibid" -->
-			<input type="button" value="Zapisz" onclick='Check(this.form)' accesskey="w" class="button catalogue">
+			<input type="button" value="Save Bibliographic Record and go to Items" onclick="Check(this.form);" accesskey="w" class="button catalogue" />
 		<!-- TMPL_ELSE -->
-			<input type="button" value="Dodaj opis" onclick='Check(this.form)' accesskey="w" class="button catalogue">
-		<!-- /TMPL_IF -->
-		<a href="javascript:PopupZ3950()" class="button catalogue">Wyszukiwanie z3950</a>
-	</p>
-	<div class="tabs">
-		<!-- TMPL_IF name="0XX" -->
-		<a href="#0XX">0</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="1XX" -->
-		<a href="#1XX">1</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="2XX" -->
-		<a href="#2XX">2</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="3XX" -->
-		<a href="#3XX">3</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="4XX" -->
-		<a href="#4XX">4</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="5XX" -->
-		<a href="#5XX">5</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="6XX" -->
-		<a href="#6XX">6</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="7XX" -->
-		<a href="#7XX">7</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="8XX" -->
-		<a href="#8XX">8</a>
-		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="9XX" -->
-			<a href="#9XX">9</a>
-		<!-- /TMPL_IF -->
-	</div>
-	<div name="0XX" id="0XX" class="tab">
-	<table>
-		<!-- TMPL_LOOP name="0XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- 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" -->">
-							<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-							<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-		</table>
-	</div>
-	
-		<div name="1XX" id="1XX" class="tab">
-	<table>
-		<!-- TMPL_LOOP name="1XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- 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" -->">
-							<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-							<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-			</table>
-			</div>
-	
-		<div name="2XX" id="2XX" class="tab">
-	<table>
-		<!-- TMPL_LOOP name="2XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
+			<input type="button" value="Add Bibliographic Record and go to Items" onclick="Check(this.form);" accesskey="w" class="button catalogue" />
 				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- 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" -->">
-							<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-							<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-			</table>
-			</div>
-	
-		<div name="3XX" id="3XX"class="tab">
-	<table>
-		<!-- TMPL_LOOP name="3XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- 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" -->">
-							<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-							<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-			</table>
-			</div>
+	<input type="button" value="z39.50 Search" class="button catalogue" onclick="PopupZ3950(); return false;" / ></div>
 	
-		<div name="4XX" id="4XX" class="tab">
-	<table>
-		<!-- TMPL_LOOP name="4XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- 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" -->">
-							<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-							<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-			</table>
-			</div>
 	
-		<div name="5XX" id="5XX" class="tab">
-	<table>
-		<!-- TMPL_LOOP name="5XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- 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" -->">
-							<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-							<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-			</table>
+	<div class="tabs">
+        <!-- TMPL_LOOP name="BIG_LOOP" -->
+            <a href="#" onclick="active(<!-- TMPL_VAR name="number"-->); return false;" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR name="number"--></a>
+        <!--  /TMPL_LOOP -->
 			</div>
 	
-		<div name="6XX" id="6XX"class="tab">
-	<table>
-		<!-- TMPL_LOOP name="6XX" -->
+<!-- RESET PAGINATION -->
+<!-- TMPL_LOOP name="BIG_LOOP" -->
+<!-- hide every tab except the 1st -->
+<!-- TMPL_IF name="number" -->
+    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility:hidden">
+<!-- TMPL_ELSE -->
+    <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR name="number" -->XX" class="tab" style="visibility: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="../MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicatebiblionumber" -->" onclick="openWindow('../MARCdetail.pl?bib=<!-- 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?bibid=<!-- TMPL_VAR name="duplicatebibid" -->">Edit Items</a> of the existing record.</li>
+                            <li>If not, click to <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" /> <a href="#" onclick="confirmnotdup(); return false;">Confirm it's not a duplicate</a></li>
+                        </ul>
+                    </div>
+        <!-- /TMPL_IF -->
+    <!-- /TMPL_UNLESS -->
+    <!-- TMPL_LOOP NAME="innerloop" -->
+		<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
 				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
+        <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="#<!-- TMPL_VAR NAME="tag" -->" onclick="javascript:this.nextSibling.type='text';this.nextSibling.focus()">+</a><input type="hidden"  value="" size="2" onchange="AddField('<!-- TMPL_VAR NAME="tag" -->',this.value)" ><!-- /TMPL_IF -->
+        </p>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- 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" -->">
-							<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-							<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-			</table>
-			</div>
-	
-		<div name="7XX" id="7XX" class="tab">
-	<table>
-		<!-- TMPL_LOOP name="7XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
+        <!-- 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" -->')" title="<!-- TMPL_VAR name="marc_lib_plain" -->">
+                    <!-- TMPL_VAR NAME="subfield" -->
+                </a>
 				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- 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" -->">
-							<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-							<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-			</table>
+            <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" 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" -->"/>
+                </p>
 			</div>
-	
-		<div name="8XX" id="8XX" class="tab">
-	<table>
-		<!-- TMPL_LOOP name="8XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- 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" -->">
-							<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-							<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
-			</table>
+        <!-- /TMPL_LOOP -->
 			</div>
-	
-		<div name="9XX" id="9XX" class="tab">
-	<table>
-		<!-- TMPL_LOOP name="9XX" -->
-				<!-- TMPL_IF name="tag" -->
-					<tr>
-						<td colspan="4" class="catalogue">
-						<!-- TMPL_VAR name="tag" -->
-						<input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-						<input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib"> <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
-						</td>
-					</tr>
-				<!-- /TMPL_IF -->
-				<!-- TMPL_LOOP name="subfield_loop" -->
-					<tr>
-						<td width="3%">&nbsp;</td>
-						<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-						<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-						<td width="40%">
-							<!-- 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" -->">
-							<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-							<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
-						</td>
-					</tr>
-				<!-- /tmpl_loop -->
-		<!-- /tmpl_loop -->
+    <!-- /TMPL_LOOP -->
 			</div>
-	
+<!-- /TMPL_LOOP -->
 		<div name="hidden" id="hidden" class="tab">
-		<table width=90% cellspacing=0 cellpadding=2  border=0>
-		<!-- TMPL_LOOP name="hidden_loop" -->
-		<tr>
-			<td width="3%">&nbsp;</td>
-			<td width="2%"><b><!-- TMPL_VAR name="subfield" --></b></td>
-			<td width="55%" align="right"><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR name="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></td>
-			<td width="40%">
-				<!-- 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" -->">
-				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
-			</td>
-		</tr>
+		<!-- TMPL_LOOP NAME="hidden_loop" -->
+				<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" -->">
+				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+				<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
 		<!-- /TMPL_LOOP -->
-		</table>
 		</div>
 		<!-- TMPL_IF name="oldbiblionumtagfield" -->
-			<input type="hidden" name="tag" value="<!-- TMPL_VAR name="oldbiblionumtagfield" -->">
-			<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="oldbiblionumtagsubfield" -->">
-			<input type="hidden" name="field_value" value="<!-- TMPL_VAR name="oldbiblionumber" -->">
+			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldbiblionumtagfield" -->">
+			<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldbiblionumtagsubfield" -->">
+			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->">
 			<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="oldbiblioitemnumtagfield" -->">
-			<input type="hidden" name="subfield" value="<!-- TMPL_VAR name="oldbiblioitemnumtagsubfield" -->">
-			<input type="hidden" name="field_value" value="<!-- TMPL_VAR name="oldbiblioitemnumber" -->">
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+			<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldbiblioitemnumtagfield" -->">
+			<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldbiblioitemnumtagsubfield" -->">
+			<input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="oldbiblioitemnumber" -->">
 			<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="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+			<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
 		<!-- /TMPL_IF -->
 	</form>
-<script LANGUAGE="JavaScript">
+<script language="JavaScript" type="text/javascript">
+function loading(){
+	document.getElementById("loading").style.display = "none";
+}
 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++ ) {
+		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++) {
@@ -405,31 +175,50 @@
 
 	// 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]) {
-			document.getElementById("error"+i).style.backgroundColor="#FF0000";
+				f.field_value[i].style.backgroundColor="#FF0000";
 			total_missing_mandatory_subfields++;
+			if (f.field_value[i].parentNode.tagName == "B")
+			{
+				missing_mandatory_subfields.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+			}
+			else
+			{
+				missing_mandatory_subfields.push(f.field_value[i].innerHTML + " (tab " +  f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
+			}
+
 		    }
 		} else {
-			document.getElementById("error"+i).style.backgroundColor="#FFFFFF";
+			f.field_value[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) + ")");
 		}
-		document.getElementById("error"+i).style.backgroundColor="#ffff00";
+		}
+		f.field_value[i].style.backgroundColor="#FFFF00";
 	    }
 	}
 
@@ -439,41 +228,143 @@
 		alertString2  = _("Formularz odrzucono z powodu następujących błędów(u)");
 		alertString2 += "\n------------------------------------------------------------------------------------\n";
 		alertString2 += "\n- "+ total_missing_mandatory_tags +_("puste obowiÄ…zkowe etykiety");
+		for (i=0; i<missing_mandatory_tags.length; i++)
+		{
+			alertString2 += "\n--->"+ missing_mandatory_tags[i];
+		}
 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_("puste obowiązkowe pola (zob. tłuste podpola)");
+		for (i=0; i<missing_mandatory_subfields.length; i++)
+		{
+			alertString2 += "\n--->"+ missing_mandatory_subfields[i];
+		}
 		alert(alertString2);
 	} else {
-		document.forms[0].submit();
+		document.forms['f'].submit();
 	}
 }
 function Dopop(link,i) {
-	defaultvalue=document.forms[0].field_value[i].value;
-	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=550,height=550,toolbar=false,scrollbars=yes');
+	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="";
-	for (i=0 ; i<document.forms[0].field_value.length ; i++) {
-		if (document.forms[0].kohafield[i].value == "biblioitems.isbn" && document.forms[0].field_value[i].value.length>0) {
-		    strQuery += "&isbn="+document.forms[0].field_value[i].value;
+	var error = 0;
+	for (i=0 ; i<document.forms['f'].field_value.length ; i++) {
+		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'].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'].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[0].kohafield[i].value == "biblio.title" && document.forms[0].field_value[i].value.length>0) {
-		    strQuery += "&title="+document.forms[0].field_value[i].value;
+		if (document.forms['f'].kohafield[i].value == "biblioitems.issn"){
+			if(document.forms['f'].field_value[i].value.length>0) {
+		    strQuery += "&issn="+document.forms['f'].field_value[i].value;
+		} else {
+			error++;
 		}
-		if (document.forms[0].kohafield[i].value == "biblio.author" &&document.forms[0].field_value[i].value.length>0) {
-		    strQuery += "&author="+document.forms[0].field_value[i].value;
 		}
-		if (document.forms[0].kohafield[i].value == "biblioitems.issn" && document.forms[0].field_value[i].value.length>0) {
-		    strQuery += "&issn="+document.forms[0].field_value[i].value;
 		}
+	if(error < 4){
+	newin=window.open("../z3950/search.pl?oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->"+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");
 	}
-	newin=window.open("../z3950/search.pl?bibid=<!-- TMPL_VAR name="bibid" -->"+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes');
 }
 
-function AddField(field) {
-	document.forms[0].op.value = "addfield";
-	document.forms[0].addfield_field.value=field;
+function Changefwk(FwkList) {
+  var fwk = FwkList.options[FwkList.selectedIndex].value;
+  window.location = "addbiblio.pl?oldbiblionumber=<!--TMPL_VAR Name="oldbiblionumber"-->&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,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); //original <div>
+    var clone = original.cloneNode(true);
+
+    // set the attribute for the new 'div' subfields
+    clone.setAttribute('id',index + index);//set another id.
+    var NumTabIndex;
+    NumTabIndex = parseInt(original.getAttribute('tabindex'));
+    if(isNaN(NumTabIndex)) NumTabIndex = 0;
+    clone.setAttribute('tabindex',NumTabIndex+1);
+    
+    var CloneButtonPlus;
+    try{
+        CloneButtonPlus = clone.getElementsByTagName('a')[0];
+        CloneButtonPlus.setAttribute('onclick',"cloneSubfield('" + index + index + "')");
+    }
+    catch(e){
+        // do nothig if ButtonPlus & CloneButtonPlus don't exist.
+    }
+
+    // insert this line on the page
+    original.parentNode.insertBefore(clone,original.nextSibling);
+}
+
+function upSubfield(index) {
+	try{
+		var line = document.getElementById(index); // get the line where the user has clicked.
+	} catch(e) {
+		return;
+	}
+	var tag = line.parentNode; // get the dad of this line. (should be "<div tag=XXX>")
+	
+	// getting all subfields for this tag
+	var subfields = tag.getElementsByTagName('div');
+	var subfieldsLength = subfields.length;
+	if(subfieldsLength<=1) return; // nothing to do if there is just one subfield.
+	// among all subfields 
+	for(var i=0;i<subfieldsLength;i++){ 
+		if(subfields[i].getAttribute('id') == index){ //looking for the subfield which is clicked :
+			if(i==0){ // if the clicked subfield is on the top
+				tag.appendChild(subfields[0]);
+				return;
+			}else{
+				var lineAbove = subfields[i-1];
+				tag.insertBefore(line,lineAbove);
+				return;
+			}
+		}
+	}
+}
+
+function unHideSubfield(index,labelindex) {
+	subfield = document.getElementById(index);
+	subfield.style.display = 'block';
+	label = document.getElementById(labelindex);
+	label.style.display='none';	
+}
 </script>
 </body>
 </html>

Index: pl/acqui.simple/addbooks.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/Attic/addbooks.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/acqui.simple/addbooks.tmpl	17 Apr 2004 16:26:28 -0000	1.4
+++ pl/acqui.simple/addbooks.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,6 +1,6 @@
-<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <div id="mainbloc">
-	<h1 class="acquisition">ZarzÄ…dzanie Opisem MARC</h1>
+	<h1 class="catalogue">ZarzÄ…dzanie Opisem MARC</h1>
 	<!-- TMPL_IF name="noitemsfound" -->
 		<font color="red" size="4">Nie znaleziono egzemplarzy</font>
 	<!-- /TMPL_IF -->
@@ -10,22 +10,48 @@
 	
 	<div id="bloc25">
 		<form action="isbnsearch.pl">
-			<h2 class="acquisition">Zeskanuj lub wpisz numer ISBN/ISSN, aby dodać nowy opis/egzemplarz</h2>
-				<p><label class="label20">ISBN</label> <input type="text" name="isbn" /></p>
-				<p><label class="label20">Tytuł</label> <input type="text" name="title" /></p>
-				<p><input type="submit" value="Idź" class="button acquisition"></p>
+			<h2 class="catalogue">Zeskanuj lub wpisz numer ISBN/ISSN, aby dodać nowy opis/egzemplarz</h2>
+			<p>
+				<label class="label100" for="title">Tytuł</label>
+				<input type="hidden" name="marclist" value="biblio.title">
+	
+				<input type="hidden" name="and_or" value="and">
+				<input type="hidden" name="excluding" value="">
+				<input type="hidden" name="operator" value="contains">
+				<input type="text" name="value" id="title" size="35">
+			</p>
+			<p>
+				<label class="label100" for="title">ISBN</label>
+				<input type="hidden" name="marclist" value="biblioitems.isbn">
+	
+				<input type="hidden" name="and_or" value="and">
+				<input type="hidden" name="excluding" value="">
+				<input type="hidden" name="operator" value="start">
+				<input type="text" name="value" id="title" size="35">
+			</p>
+			<p><input type="submit" value="Idź" class="button catalogue"></p>
+		</form>
 			<!-- TMPL_IF NAME="NOTMARC" -->
-				<p><a href="addbiblio-nomarc.pl" class="button acquisition">Wprowadź od podstaw</a></p>
+			<p><a href="addbiblio-nomarc.pl" class="button catalogue">Wprowadź od podstaw</a></p>
 			<!-- TMPL_ELSE -->
-				<p><a href="addbiblio.pl" class="button acquisition">Wprowadź od podstaw</a></p>
-			<!-- /TMPL_IF -->
+			<p>
+				<form action="addbiblio.pl" method="post">
+					<select name="frameworkcode">
+						<option value="">Default</option>
+						<!-- TMPL_LOOP NAME="frameworkcodeloop" -->
+							<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
+						<!-- /TMPL_LOOP -->
+					</select>
+					<input type="submit" value="Wprowadź od podstaw" class="button catalogue">
 		</form>
+			</p>
+		<!-- /TMPL_IF -->
 	</div>
 	<div id="bloc25">
-		<h2 class="acquisition">Podpowiedź</h2>
+		<h2 class="catalogue">Podpowiedź</h2>
 		<p>Po odnalezieniu i wyświetleniu numeru ISBN lub tytułu z bazy opisów, bedzie można dokonać modyfikacji.<br/>
-				Jeśli ISBN lub tytuł zostaną odnalezione w rezerwuarze opisów to zostanie on wyswietlony i opis zostanie dodany.<br/>
+				If the ISBN or title is found in the reservoir, it will be retrieved and a biblio will be added.<br/>
 				W przeciwnym razie, opis można dodać od podstaw.</p>
 	</div>
 </div>
-<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: pl/acqui.simple/additem-nomarc.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/Attic/additem-nomarc.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/acqui.simple/additem-nomarc.tmpl	17 Apr 2004 16:26:28 -0000	1.2
+++ pl/acqui.simple/additem-nomarc.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,202 +1,102 @@
-<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
-test
-<font size="6"><em><!-- TMPL_VAR NAME="TITLE" --></em></font>
-<p>
-<!-- TMPL_IF NAME="NOBARCODE" -->
-<font size="5" color="red">Należy nadać pozycji kod kreskowy</font>
-<p>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="NOBIBLIOITEM" -->
-<font size="5" color="red">Należy utworzyć nową grupę, by móc dodać ją do dokumentu</font>
-<p>
-<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="BARCODEINUSE" -->
-<font size="5" color="red">Niestety, ten kod kreskowy już jest w użyciu</font>
-<p>
-<!-- /TMPL_IF -->
-<table align="left" cellpadding="5" cellspacing="0" border="1" width="220">
-<tr valign="top" bgcolor="#CCCC99">
-<td background="/images/background-mem.gif"><b>WIERSZ OPISU <!-- TMPL_VAR NAME="BIBNUM" --></b></td>
-</tr>
-<tr valign="top">
-<td><b>Autor:</b> <!-- TMPL_VAR NAME="AUTHOR" --><br>
-<b>Copyright:</b> <!-- TMPL_VAR NAME="COPYRIGHT" --><br>
-<b>Tytuł Serii:</b> <!-- TMPL_VAR NAME="SERIES" --><br>
-<b>Uwagi:</b> <!-- TMPL_VAR NAME="NOTES" --></td>
-</tr>
-<!-- TMPL_LOOP NAME="BIBITEMS" -->
-<!-- TMPL_IF NAME="WEB" -->
-<tr valign="top" bgcolor="#CCCC99">
-<td
-background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="biblioitemnumber" --> GRUPA - <!-- TMPL_VAR NAME="itemtype" -->
-</b></td>
-</tr>
-<tr valign="top">
-<td><b>URL:</b> <!-- TMPL_VAR NAME="url" --><br>
-<b>Data:</b> <!-- TMPL_VAR NAME="publicationyear" --><br>
-<b>Uwagi:</b> <!-- TMPL_VAR NAME="notes" --></td>
-</tr>
-<!-- TMPL_ELSE -->
-<tr valign="top" bgcolor="#CCCC99">
-<td
-background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="biblioitemnumber" --> GRUPA - <!-- TMPL_VAR NAME="itemtype" --></b></td>
-</tr>
-<tr valign="top">
-<td><b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br>
-<b>Dewey:</b> <!-- TMPL_VAR NAME="dewey" --><br>
-<b>Wydawca:</b> <!-- TMPL_VAR NAME="publishercode" --><br>
-<b>Miejsce:</b> <!-- TMPL_VAR NAME="place" --><br>
-<b>Data:</b> <!-- TMPL_VAR NAME="publicationyear" --></td>
-</tr>
-<!-- TMPL_LOOP NAME="ITEMS -->
-<tr valign="top" bgcolor="#FFFFCC">
-<td><b>Egzemplarz:</b> <!-- TMPL_VAR NAME="barcode" --><br>
-<b>Oddział Właściwy:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
-<b>Uwagi:</b> <!-- TMPL_VAR NAME="itemnotes" --></td>
-</tr>
-<!-- /TMPL_LOOP -->
-<!-- /TMPL_IF -->
-<!-- /TMPL_LOOP -->
-</table>
-<img src="/images/holder.gif" width="16" height="650" align="left">
-
-<center>
-
-<form action="saveitem.pl" method="post">
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="BIBNUM" -->">
-<table border="1" cellspacing="0" cellpadding="5">
-<tr valign="top" bgcolor="#CCCC99">
-<td background="/images/background-mem.gif" colspan="2"><b>DODAJ NOWY EGZEMPLARZ:</b><br>
-<small><i>Dla witryny dodaj tylko grupÄ™</i></small></td>
-</tr>
-<tr valign="top">
-<td>Kod paskowy pozycji:</td>
-<td><input type="text" name="barcode" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Oddział:</td>
-<td><select name="homebranch">
-<!-- TMPL_LOOP NAME="BRANCHES" -->
-<option value="<!-- TMPL_VAR NAME="branchcode" -->"><!-- TMPL_VAR NAME="branchname" --></option>
-<!-- /TMPL_LOOP -->
-</select></td>
-</tr>
-<tr valign="top">
-<td>Cana Wymiany:</td>
-<td><input type="text" name="replacementprice" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Uwagi:</td>
-<td><textarea name="itemnotes" cols="30" rows="6"></textarea></td>
-</tr>
-<tr valign="top" bgcolor="#CCCC99">
-<td colspan="2" background="/images/background-mem.gif"><b>Dodaj do istniejÄ…cej grupy:</b></td>
-</tr>
-<tr valign="top">
-<td>Grupa:</td>
-<td><select name="biblioitemnumber">
-
-<!-- TMPL_LOOP NAME="BIBITEMS" -->
-<!-- TMPL_IF NAME="WEB" -->
-<!-- TMPL_ELSE -->
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<div id="mainbloc">
+		<h1 class="catalogue"><!-- TMPL_VAR NAME="TITLE" --></h1>
+	<div id="bloc25">
+		<p>
+		<!-- TMPL_IF NAME="NOBARCODE" -->
+			<p class="problem">Należy nadać pozycji kod kreskowy</p>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="NOBIBLIOITEM" -->
+			<p class="problem">Należy utworzyć nową grupę, by móc dodać ją do dokumentu</p>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="BARCODEINUSE" -->
+			<p class="problem">Niestety, ten kod kreskowy już jest w użyciu</p>
+		<!-- /TMPL_IF -->
+		<h2 class="catalogue">WIERSZ OPISU <!-- TMPL_VAR NAME="BIBNUM" --></h2>
+		<p><label class="label100">Autor:</label> <!-- TMPL_VAR NAME="AUTHOR" --></p>
+		<p><label class="label100">Copyright:</label> <!-- TMPL_VAR NAME="COPYRIGHT" --></p>
+		<p><label class="label100">Tytuł Serii:</label> <!-- TMPL_VAR NAME="SERIES" --></p>
+		<p><label class="label100">Uwagi:</label> <!-- TMPL_VAR NAME="NOTES" --></p>
+		<!-- TMPL_LOOP NAME="BIBITEMS" -->
+			<!-- TMPL_IF NAME="WEB" -->
+				<h2 class="catalogue"><!-- TMPL_VAR NAME="biblioitemnumber" --> GRUPA - <!-- TMPL_VAR NAME="itemtype" --></h2>
+				<p><label>URL:</label><!-- TMPL_VAR NAME="url" --></p>
+				<p><label>Date:</label> <!-- TMPL_VAR NAME="publicationyear" --></p>
+				<p><label>Uwagi:</label> <!-- TMPL_VAR NAME="notes" --></p>
+			<!-- TMPL_ELSE -->
+				<h2 class="catalogue"><!-- TMPL_VAR NAME="biblioitemnumber" --> GRUPA - <!-- TMPL_VAR NAME="itemtype" --></h2>
+				<p><label>ISBN:</label> <!-- TMPL_VAR NAME="isbn" --></p>
+				<p><label>Dewey:</label> <!-- TMPL_VAR NAME="dewey" --></p>
+				<p><label>Wydawca:</label> <!-- TMPL_VAR NAME="publishercode" --></p>
+				<p><label>Place:</label> <!-- TMPL_VAR NAME="place" --></p>
+				<p><label>Date:</label> <!-- TMPL_VAR NAME="publicationyear" --></p>
+				<!-- TMPL_LOOP NAME="ITEMS -->
+					<p><label class="label100">Item:</label> <!-- TMPL_VAR NAME="barcode" --></p>
+					<p><label class="label100">Oddział Właściwy</label> <!-- TMPL_VAR NAME="homebranch" --></p>
+					<p><label class="label100">Uwagi:</label> <!-- TMPL_VAR NAME="itemnotes" --></p>
+				<!-- /TMPL_LOOP -->
+			<!-- /TMPL_IF -->
+		<!-- /TMPL_LOOP -->
+	</div>
+	<div id="bloc25">
+		<form action="saveitem.pl" method="post">
+		<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="BIBNUM" -->">
+		<h2 class="catalogue">DODAJ NOWY EGZEMPLARZ:</h2>
+		<p><i>Dla witryny dodaj tylko grupÄ™</i></p>
+		<p><label>Kod paskowy pozycji:</label><input type="text" name="barcode" size="40"></p>
+		<p>
+			<label>Oddział:</label>
+			<select name="homebranch">
+			<!-- TMPL_LOOP NAME="BRANCHES" -->
+				<option value="<!-- TMPL_VAR NAME="branchcode" -->"><!-- TMPL_VAR NAME="branchname" --></option>
+			<!-- /TMPL_LOOP -->
+			</select>
+		</p>
+		<p><label>Cana Wymiany:</label><input type="text" name="replacementprice" size="40"></p>
+		<p><label>Uwagi:</label><textarea name="itemnotes" cols="30" rows="6"></textarea></p>
+	</div>
+	<div id="bloc25">
+		<h2 class="catalogue">Dodaj do istniejÄ…cej grupy:</h2>
+		<p>
+			<label>Grupa:</label><select name="biblioitemnumber">
+			<!-- TMPL_LOOP NAME="BIBITEMS" -->
+				<!-- TMPL_IF NAME="WEB" -->
+				<!-- TMPL_ELSE -->
     <option value="<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="itemtype" --></option>
-
-<!-- /TMPL_IF -->
-
-<!-- /TMPL_LOOP -->
-</select></td>
-</tr>
-<tr valign="top">
-<td colspan="2" align="center"><input type="submit" name="existinggroup" value="Dodaj NowÄ… PozycjÄ™ do IstniejÄ…cej Grupy"></td>
-</tr>
-<tr valign="top" bgcolor="#CCCC99">
-<td colspan="2" background="/images/background-mem.gif"><b>LUB Dodaj do nowej Grupy:</b></td>
-</tr>
-<tr valign="top">
-<td>Format:</td>
-<td><select name="itemtype">
-<!-- TMPL_LOOP NAME="ITEMTYPES" -->
-<option value="<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" --></option>
-<!-- /TMPL_LOOP -->
-</select></td>
-</tr>
-<tr valign="top">
-<td>ISBN:</td>
-<td><input name="isbn" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Wydawca:</td>
-<td><input name="publishercode" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Rok publikacji:</td>
-<td><input name="publicationyear" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Miejsce publikacji:</td>
-<td><input name="place" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Ilustrator:</td>
-<td><INPUT name="illus" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Dodatkowi Autorzy:<br><i>Jeden Autor na wiersz</i></td>
-<td><textarea name="additionalauthors" cols="30" rows="6"></textarea></td>
-</tr>
-<tr valign="top">
-<td>Hasła Tematyczne:<br><i>Jedno hasło tematyczne na wiersz</i></td>
-<td><textarea name="subjectheadings" cols="30" rows="6"></textarea></td>
-</tr>
-<tr valign="top">
-<td>URL Witryny</td>
-<td><INPUT name="url" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Dewey:</td>
-<td><INPUT name="dewey" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Podklasa Dewey:</td>
-<td><input name="subclass" size="40"></td>
-</tr>
-<tr valign="top">
-<td>ISSN:</td>
-<td><input name="issn" size="40"></td>
-</tr>
-<tr valign="top">
-<td>LCCN:</td>
-<td><input name="lccn" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Tom:</td>
-<td><input name="volume" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Numer:</td>
-<td><input name="number" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Opis Tomu:</td>
-<td><input name="volumeddesc" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Strony:</td>
-<td><input name="pages" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Rozmiar:</td>
-<td><input name="size" size="40"></td>
-</tr>
-<tr valign="top">
-<td>Uwagi:</td>
-<td><textarea name="notes" cols="30" rows="6"></textarea></td>
-</tr>
-<tr valign="top">
-<td colspan="2" align="center"><input type="submit" name="newgroup" value="Dodaj NowÄ… PozycjÄ™ do Nowej Grupy"></td>
-</tr>
-</table>
-
-</form>
-</center>
+				<!-- /TMPL_IF -->
+			<!-- /TMPL_LOOP -->
+			</select>
+		</p>
+		<p><input type="submit" name="existinggroup" value="Dodaj NowÄ… PozycjÄ™ do IstniejÄ…cej Grupy"></p>
+	</div>
+	<div id="bloc25">
+		<h2 class="catalogue">LUB Dodaj do nowej Grupy:</h2>
+		<p>
+			<label>Format:</label>
+			<select name="itemtype">
+				<!-- TMPL_LOOP NAME="ITEMTYPES" -->
+					<option value="<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" --></option>
+				<!-- /TMPL_LOOP -->
+			</select>
+		</p>
+		<p><label>ISBN:</label><input name="isbn" size="40"></p>
+		<p><label>Wydawca:</label><input name="publishercode" size="40"></p>
+		<p><label>Rok publikacji:</label><input name="publicationyear" size="40"></p>
+		<p><label>Miejsce publikacji:</label><input name="place" size="40"></p>
+		<p><label>Ilustrator:</label><input name="illus" size="40"></p>
+		<p><label>URL Witryny</label><input name="url" size="40"></p>
+		<p><label>Dewey:</label><input name="dewey" size="40"></p>
+		<p><label>Podklasa Dewey:</label><input name="subclass" size="40"></p>
+		<p><label>ISSN:</label><input name="issn" size="40"></p>
+		<p><label>LCCN:</label><input name="lccn" size="40"></p>
+		<p><label>Tom:</label><input name="volume" size="40"></p>
+		<p><label>Numer:</label><input name="number" size="40"></p>
+		<p><label>Opis Tomu:</label><input name="volumeddesc" size="40"></p>
+		<p><label>Strony:</label><input name="pages" size="40"></p>
+		<p><label>Rozmiar:</label><input name="size" size="40"></p>
+		<p><label>Uwagi:</label><textarea name="notes" cols="30" rows="6"></textarea></p>
+		<p><input type="submit" name="newgroup" value="Dodaj NowÄ… PozycjÄ™ do Nowej Grupy" class="button catalogue"></p>
+		</form>
+	</div>
+</div>
 <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->

Index: pl/acqui.simple/additem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/Attic/additem.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/acqui.simple/additem.tmpl	17 Apr 2004 16:26:28 -0000	1.3
+++ pl/acqui.simple/additem.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,62 +1,71 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <div id="mainbloc">
 	<form method="post" action="additem.pl" name="f">
-	<input type="hidden" name="op" value="<!-- TMPL_VAR name="op" -->">
-	<input type="hidden" name="bibid" value="<!-- TMPL_VAR name="bibid" -->">
-		<h2 class="catalogue">
-			Opis MARC : <!-- TMPL_VAR name="biblionumber" -->
-		</h2>
+	<input type="hidden" name="op" value="<!-- TMPL_VAR NAME="op" -->">
+	<input type="hidden" name="bibid" value="<!-- TMPL_VAR NAME="bibid" -->">
+	<div class="tabbed">
+		<h1 class="catalogue"><!-- TMPL_VAR name="title" --> (<!-- TMPL_VAR name="author" --> biblionumber #<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
+		<a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Edit biblio  </a>  <a href="../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  MARC  </a>  <a href="../detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normal  </a>  <a href="../ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>
+	</div>
+	<!-- TMPL_IF name="item_loop" -->
 	<div id="bloc25">
 		<div name="10XX" id="10XX">
 		<h2 class="catalogue">IstniejÄ…ce pozycje</h2>
 		<table>
 			<tr>
-				<!-- TMPL_LOOP name="item_header_loop" -->
+					<!-- TMPL_LOOP NAME="item_header_loop" -->
 					<th class="catalogue">
-						<tmpl_var name="header_value">
+							<TMPL_VAR NAME="header_value">
 					</th>
 				<!-- /TMPL_LOOP -->
-				<th colspan=2 class="catalogue">&nbsp;</th>
+					<th colspan="2" class="catalogue">&nbsp;</th>
 			</tr>
-				<!-- TMPL_LOOP name="item_loop" -->
+					<!-- TMPL_LOOP NAME="item_loop" -->
 				<tr>
-					<!-- TMPL_VAR name="item_value" -->
-					<td><a href="additem.pl?op=edititem&bibid=<!-- TMPL_VAR name="bibid" -->&itemnum=<!-- TMPL_VAR name="itemnum" -->"><img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" border=0></a></td>
-					<td><a href="javascript:confirm_deletion(<!-- TMPL_VAR name="bibid" -->,<!-- TMPL_VAR name="itemnum" -->)"><img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" border=0></a></td>
+						<!-- TMPL_VAR NAME="item_value" -->
+						<!-- TMPL_IF Name="nomod" -->
+							<td>&nbsp;</td>
+							<td>&nbsp;</td>
+						<!-- TMPL_ELSE -->
+							<td><a href="additem.pl?op=edititem&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->&amp;itemnum=<!-- TMPL_VAR NAME="itemnum" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" border="0"></a></td>
+							<td><a href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="bibid" -->,<!-- TMPL_VAR NAME="itemnum" -->)"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" border="0"></a></td>
+						<!-- /TMPL_IF -->
 				</tr>
 				<!-- /TMPL_LOOP -->
 		</table>
 		</div>
 	</div>
-	<div id="bloc100">
+	<!-- /TMPL_IF -->
+	<div id="bloc25">
 	<!-- TMPL_IF name="opisadd" -->
 		<h2 class="catalogue">Nowy Egzemplarz</h2>
 	<!-- TMPL_ELSE -->
 		<h2 class="catalogue">Zmieniaj pozycjÄ™</h2>
 	<!-- /TMPL_IF -->	
-		<!-- TMPL_LOOP name="item" -->
+		<!-- TMPL_LOOP NAME="item" -->
 			<p>
-				<label class="label100">
-				<!-- 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" -->">
+					<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="itemnum" value="<!-- TMPL_VAR name="itemnum" -->">
+	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
 	<!-- TMPL_IF name="barcode_not_unique" -->
 		<div id="problem"><b>BŁĄD : kod kreskowy już istnieje !<b></div>
 	<!-- /TMPL_IF -->
+	<!-- TMPL_IF name="book_on_loan" -->
+		<div id="problem"><b>ERROR : Item on loan : can't delete it !<b></div>
+	<!-- /TMPL_IF -->
 	<!-- TMPL_IF name="opisadd" -->
-	<input type="button" value="Dodaj pozycjÄ™" onclick='Check(this.form)' accesskey="w" class="button catalogue">
+	<input type="button" value="Dodaj pozycjÄ™" onclick="Check(this.form)" accesskey="w" class="button catalogue">
 	<!-- 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="itemnum" -->">
-	<input type="button" value="Zmieniaj pozycjÄ™" onclick='Check(this.form)' accesskey="w" class="button catalogue">
+	<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="itemnum" -->">
+	<input type="button" value="Zmieniaj pozycjÄ™" onclick="Check(this.form)" accesskey="w" class="button catalogue">
 	<!-- /TMPL_IF -->
-	</center>
 	</form>
 </div>
 <script LANGUAGE="JavaScript">
@@ -69,7 +78,7 @@
 		if (numlayer==i) {
 			document.getElementById(ong).style.visibility="visible";
 			document.getElementById(link).style.backgroundColor="#11AA11";
-			document.getElementById(link).style.backgroundImage="url(<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif)";
+			document.getElementById(link).style.backgroundImage="url(<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif)";
 		} else {
 			document.getElementById(ong).style.visibility="hidden";
 			document.getElementById(link).style.backgroundColor="#FFFFFF";
@@ -100,7 +109,7 @@
 	}
 }
 function Dopop(link,i) {
-	defaultvalue=document.forms[0].field_value[i].value;
+	defaultvalue=document.forms['f'].field_value[i].value;
 	newin=window.open(link+"&result="+defaultvalue,"value builder",'width=500,height=400,toolbar=false,scrollbars=yes');
 }
 function confirm_deletion(bibid,itemnum) {

Index: pl/acqui.simple/isbnsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/Attic/isbnsearch.tmpl,v
retrieving revision 1.5
retrieving revision 1.5.10.1
diff -u -b -r1.5 -r1.5.10.1
--- pl/acqui.simple/isbnsearch.tmpl	17 Apr 2004 16:26:28 -0000	1.5
+++ pl/acqui.simple/isbnsearch.tmpl	7 May 2007 13:55:52 -0000	1.5.10.1
@@ -1,101 +1,162 @@
-<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <div id="mainbloc">
-	<h1 class="acquisition">Wyniki Szukania Opisów</h1>
+	<h1 class="catalogue">Wyniki Szukania Opisów</h1>
 	<div id="bloc25">
-		<h2 class="acquisition">Szukano <b><!-- TMPL_IF name="isbn" -->ISBN <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF --><!-- TMPL_IF name="title" -->tytuł <!-- TMPL_VAR name="title" --><!-- /TMPL_IF --></b></h2>
-		<!-- TMPL_IF name="total" -->
-			<p><!-- TMPL_VAR NAME=total --> znalezionych rekordów</p>
-			<p>Wyświetlono od<i><!-- TMPL_VAR name="showoffset" --></i> do <i><!-- TMPL_VAR name="total" --></i> rekordu</p>
+		<h2 class="catalogue">Szukano </h2>
+		<!-- TMPL_IF name="isbn" -->
+			<p>ISBN <!-- TMPL_VAR NAME="isbn" --></p>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="title" -->
+			<p>tytuł <!-- TMPL_VAR NAME="title" --></p>
 		<!-- /TMPL_IF -->
 	</div>
-	<div id="bloc100">
-		<h2 class="acquisition">Opisy w koha</h2>
+	<div id="bloc25">
+		<h2 class="catalogue">Opisy w koha</h2>
+		<!-- TMPL_IF name="loop" -->
+			<div id="resultnumber">
+				<p>
+					<!-- TMPL_IF NAME="displayprev" --> 
+						<a class="resultnumber" href="isbnsearch.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+							&lt;&lt;Previous
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_LOOP NAME="numbers" -->
+						<!-- TMPL_IF NAME="highlight" -->
+							<span class="highlight"><!-- TMPL_VAR NAME="number" --></span>
+						<!-- TMPL_ELSE -->
+							<a class="resultnumber" href="isbnsearch.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+								<!-- TMPL_VAR NAME="number" -->
+							</a>
+						<!-- /TMPL_IF -->
+					<!-- /TMPL_LOOP -->
+					<!-- TMPL_IF NAME="displaynext" -->
+						<a class="resultnumber" href="isbnsearch.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+							Next&gt;&gt;
+						</a>
+					<!-- /TMPL_IF -->
+			</p>
+			<p class="resultcount">
+				<!-- TMPL_IF NAME="total" -->
+					Wyświetlono od <!-- TMPL_VAR NAME="from" --> do <!-- TMPL_VAR NAME="to" --> z <!-- TMPL_VAR NAME="total" -->
+				<!-- TMPL_ELSE -->
+					No results found.
+				<!-- /TMPL_IF -->
+			</p>
+		</div>
 		<table>
 			<tr>
-				<th class="acquisition">Tytuł</th>
-				<th class="acquisition">Autor</th>
-				<th class="acquisition">&copy;</th>
-				<th class="acquisition">&nbsp;</th>
+					<th class="catalogue">Tytuł</th>
+					<th class="catalogue">Autor</th>
+					<th class="catalogue">&copy;</th>
+					<th class="catalogue">&nbsp;</th>
+					<!-- TMPL_UNLESS NAME="NOTMARC" -->
+						<th class="catalogue">&nbsp;</th>
+					<!-- /TMPL_UNLESS -->
 			</tr>
-			<!-- TMPL_IF name="loop" -->
-			<!-- TMPL_LOOP name="loop" -->
-				<tr bgcolor="<!-- TMPL_VAR name="toggle" -->">
-					<td><!-- TMPL_VAR name="title" --></a>
-					<td><!-- TMPL_VAR name="author" --></td>
-					<td><!-- TMPL_VAR name="copyrightdate" --></td>
+				<!-- TMPL_LOOP NAME="loop" -->
+					<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
+						<td><!-- TMPL_VAR NAME="title" --></a>
+						<td><!-- TMPL_VAR NAME="author" --></td>
+						<td><!-- TMPL_VAR NAME="copyrightdate" --></td>
 					<!-- TMPL_IF NAME="NOTMARC" -->
-					<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Dodaj pozycje</a></td>
+						<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Dodaj pozycje</a></td>
 					<!-- TMPL_ELSE -->
-					<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Edytuj...</a></td>
+						<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Edytuj...</a></td>
 					<!-- /TMPL_IF -->
+						<!-- TMPL_UNLESS NAME="NOTMARC" -->
+						<td>
+							<a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">
+								Duplicate
+							</a>
+						</td>
+						<!-- /TMPL_UNLESS -->
 				</tr>
 			<!-- /TMPL_LOOP -->
-			<!-- TMPL_ELSE -->
-			<tr><td colspan=4>Nic nie znaleziono</td></tr>
-			<!-- /TMPL_IF -->
 		</table>
-		<p class="center">
-			<!-- Row of numbers corresponding to search result pages -->
-			<!-- TMPL_IF NAME=displayprev -->
-				<a href=isbnsearch.pl?offset=<!-- TMPL_VAR NAME="prevstartfrom" -->&<!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->>
-					<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/prev.gif border=0>
+			<div id="resultnumber">
+				<p>
+					<!-- TMPL_IF NAME="displayprev" --> 
+						<a class="resultnumber" href="isbnsearch.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+							&lt;&lt;Previous
 				</a>
-			<!-- TMPL_ELSE -->
-				<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/placeholder.gif border=0>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME=numbers -->
-				<!-- TMPL_IF NAME=highlight -->
-					<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif>
+					<!-- TMPL_LOOP NAME="numbers" -->
+						<!-- TMPL_IF NAME="highlight" -->
+							<span class="highlight"><!-- TMPL_VAR NAME="number" --></span>
 				<!-- TMPL_ELSE -->
-					<a href=isbnsearch.pl?offset=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->>
-						<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->.gif border=0>
+							<a class="resultnumber" href="isbnsearch.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+								<!-- TMPL_VAR NAME="number" -->
 					</a>
 				<!-- /TMPL_IF -->
 			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF NAME=displaynext -->
-				<a href=isbnsearch.pl?offset=<!-- TMPL_VAR NAME="nextstartfrom" -->&<!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->>
-					<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/next.gif border=0>
+					<!-- TMPL_IF NAME="displaynext" -->
+						<a class="resultnumber" href="isbnsearch.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+							Next&gt;&gt;
 				</a>
+					<!-- /TMPL_IF -->
+			</p>
+			<p class="resultcount">
+				<!-- TMPL_IF NAME="total" -->
+					Wyświetlono od <!-- TMPL_VAR NAME="from" --> do <!-- TMPL_VAR NAME="to" --> z <!-- TMPL_VAR NAME="total" -->
 			<!-- TMPL_ELSE -->
-				<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/placeholder.gif border=0>
+					No results found.
 			<!-- /TMPL_IF -->
 		</p>
-		<h2 class="acquisition">Opisy w rezerwuarze</h2>
+		</div>
+		<!-- TMPL_ELSE -->
+			<p>Brak</p>
+		<!-- /TMPL_IF -->
+	</div>
+	<div id="bloc25">
+		<h2 class="catalogue">Biblios in reservoir</h2>
 		<!-- TMPL_IF name="breeding_loop" -->
 			<table>
 				<tr>
-					<th>Tytuł</th>
-					<th>Autor</th>
-					<th>ISBN</th>
-					<th>Źródło opisu</th>
-					<th>&nbsp;</th>
-					<th>&nbsp;</th>
+					<th class="catalogue">Tytuł</th>
+					<th class="catalogue">Autor</th>
+					<th class="catalogue">ISBN</th>
+					<th class="catalogue">Źródło opisu</th>
+					<th class="catalogue">&nbsp;</th>
+					<th class="catalogue">&nbsp;</th>
 				</tr>
-					<!-- TMPL_LOOP name="breeding_loop" -->
-						<tr bgcolor="<!-- TMPL_VAR name="toggle" -->">
-							<td><!-- TMPL_VAR name="title" --></a>
-							<td><!-- TMPL_VAR name="author" --></td>
-							<td><!-- TMPL_VAR name="isbn" --></td>
-							<td><!-- TMPL_VAR name="file" --></td>
+					<!-- 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" -->">Dodaj opis</a></td>
+							<td><a href="addbiblio.pl?breedingid=<!-- TMPL_VAR NAME="id" -->" class="button catalogue">Dodaj opis</a></td>
 							<!-- /TMPL_IF -->
 						</tr>
 					<!-- /TMPL_LOOP -->
 			</table>
 		<!-- TMPL_ELSE -->
-			<p class="center">Nic nie znaleziono</p>
+			<p>Brak</p>
 		<!-- /TMPL_IF -->
+	</div>
+	<div id="bloc25">
+		<h2 class="catalogue">Dodaj opis</h2>
 		<p class="center">
 		<!-- TMPL_IF NAME="NOTMARC" -->
-			<a href="addbiblio-nomarc.pl?isbn=<!-- TMPL_VAR name="isbn" -->" class="button acquisition">Dodaj Nowy Opis</a>
+			<a href="addbiblio-nomarc.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button catalogue">Dodaj Nowy Opis</a>
 		<!-- TMPL_ELSE -->
-			<a href="addbiblio.pl?isbn=<!-- TMPL_VAR name="isbn" -->" class="button acquisition">Dodaj Nowy Opis</a>
+		<p>
+		<form action="addbiblio.pl" method="post">
+			<select name="frameworkcode">
+				<option value="">Default</option>
+				<!-- TMPL_LOOP NAME="frameworkcodeloop" -->
+					<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
+				<!-- /TMPL_LOOP -->
+			</select>
+			<input type="submit" value="Wprowadź od podstaw" class="button catalogue">
+		</form>
+		</p>
 		<!-- /TMPL_IF -->
 		</p>
 	</div>
 	
 </div>
-<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: pl/acqui.simple/marcimport.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/acqui.simple/Attic/marcimport.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/acqui.simple/marcimport.tmpl	17 Apr 2004 16:26:28 -0000	1.4
+++ pl/acqui.simple/marcimport.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -3,49 +3,49 @@
 
 <table bgcolor="#ffcc00" width="80%" cellpadding="3">
 	<tr valign="center">
-	<td><font size="4">Importuj do rezerwuaru opisów</font></td>
+	<td><font size="4">Import into the reservoir</font></td>
 	</tr>
 </table>
 
 <!-- TMPL_IF name="uploadmarc" -->
 <p>Importuj wyniki:</p>
 <ul>
-	<p><!-- TMPL_VAR name="imported" --> zaimportowanych rekordów</p>
-	<p><!-- TMPL_VAR name="alreadyindb" --> nie został zaimportowany, gdyż już jest w bazie</p>
-	<p><!-- TMPL_VAR name="alreadyinfarm" --> nie został zaimportowany, gdyż już jest w buforze</p>
-	<p><!-- TMPL_VAR name="notmarcrecord" --> nie zaimportowano, gdyż brakuje cech formatu MARC (albo brak ISBN/ISSN) !</p>
-	<p>przeanalizowano <!-- TMPL_VAR name="total" --> rekordów</p>
+	<p><!-- TMPL_VAR NAME="imported" --> zaimportowanych rekordów</p>
+	<p><!-- TMPL_VAR NAME="alreadyindb" --> nie został zaimportowany, gdyż już jest w bazie</p>
+	<p><!-- TMPL_VAR NAME="alreadyinfarm" --> nie został zaimportowany, gdyż już jest w buforze</p>
+	<p><!-- TMPL_VAR NAME="notmarcrecord" --> nie zaimportowano, gdyż brakuje cech formatu MARC (albo brak ISBN/ISSN) !</p>
+	<p>przeanalizowano <!-- TMPL_VAR NAME="total" --> rekordów</p>
 	<p><a href="addbooks.pl">Spowrotem do akwizycji</a>
 </ul>
 <!-- TMPL_ELSE -->
 <ul>
-	<li>Wybierz plik, by importować go do rezerwuaru opisów. Będzie poddany analizie, i dla każdego napotkanego ISBN powstanie w rezerwuarze nowy opis.</li>
-	<li>Jeśli ISBN istnieje już w rezerwuarze, możesz zdecydować czy zignorować nowy czy też nadpisać stary.</li>
+	<li>Select a file to import into the reservoir. It will be parsed, and for each ISBN found, a new baby will be created in the reservoir.</li>
+	<li>If an ISBN already exists in the reservoir, you can choose whether to ignore the new one or overwrite the old one.</li>
 	<li>Można nazwać ten import. Może się przydać przy tworzeniu opisu dla zapamiętania skąd pochodzą dane MARC !</li>
 	<li>Oczywiście, jesli ISBN juz istnieje w aktywnej bazie to opis będzie pominięty.</li>
 </ul>
-<form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->" enctype="multipart/form-data">
-<table cellpadding="3" border=0>
+<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" enctype="multipart/form-data">
+<table cellpadding="3" border="0">
 	<tr valign="top">
 		<td>Wybierz plik do importu:</td>
 		<td>
-			<input type="file" name="uploadmarc"/><br/>
+			<input type="file" name="uploadmarc" /><br/>
 		</td>
 	</tr>
 	<tr valign="top">
 		<td>Nazwa tego importu:</td>
 		<td>
-			<input type="text" name="filename"/><br/>
+			<input type="text" name="filename" /><br/>
 		</td>
 	</tr>
 	<tr valign="top">
 		<td>Kodowanie czcionek (MARC21 lub UNIMARC)</td>
 		<td>
-			<select name="syntax"/><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select><br/>
+			<select name="syntax" /><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select><br/>
 		</td>
 	</tr>
 	<tr valign="top">
-		<td>Jeśli ISBN jest już w rezerwuarze:  </td>
+		<td>If ISBN is already in the reservoir: </td>
 		<td><input type="radio" name="overwrite_biblio" value="0" checked>Ignoruj ten, zatrzymaj istniejÄ…cy<br/>
 			<input type="radio" name="overwrite_biblio" value="1">Nadpisz istniejÄ…cy</td>
 	</tr>

Index: pl/bookshelves/shelves.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/bookshelves/Attic/shelves.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -b -r1.1 -r1.1.10.1
--- pl/bookshelves/shelves.tmpl	17 Apr 2004 16:54:56 -0000	1.1
+++ pl/bookshelves/shelves.tmpl	7 May 2007 13:55:52 -0000	1.1.10.1
@@ -1,156 +1,193 @@
 <!-- TMPL_INCLUDE Name="cat-top.inc" -->
 
+<div id="mainbloc">
 <!-- TMPL_IF Name="viewshelf" -->
-<center>
-<form>
-    <table border=0 cellpadding=2 cellspacing=0>
-    		<tr>
-			<th colspan=4 bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-				<font color=white>Zawartość <!-- TMPL_VAR Name="shelfname" --></font>
-			</th>
+	<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="post">
+		<h1 class="catalogue"><!-- TMPL_VAR NAME="shelfname" --></h1>
+
+		<div id="bloc25">
+		<h2 class="catalogue">Shelf contents</h2>
+			<table class="small">
+				<tr colspan="4">
+					<th class="catalogue"><!-- TMPL_IF name="manageshelf" -->Wymaż<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></th>
+					<th class="catalogue">Kod Paskowy</th>
+					<th class="catalogue">Tytuł</th>
+					<th class="catalogue">Autor</th>
 		</tr>
 		<!-- TMPL_LOOP Name="itemsloop" -->
-			<tr>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="barcode" --></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="title" --></td>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="author" --></td>
+					<!-- TMPL_IF NAME="toggle" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+						<td><!-- TMPL_IF name="manageshelf" --><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
+						<td><!-- TMPL_VAR NAME="barcode" --></td>
+						<td><a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+						<td><!-- TMPL_VAR NAME="author" --></td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
-	<br>
-	<a href="shelves.pl" class="button">Lista półek</a>
-	<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="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="Usuń wybrane pozycje" class="button">
+				<input type="submit" value="Usuń wybrane pozycje" class="button catalogue">
 	<!-- /TMPL_IF -->
-</form>
-<!-- TMPL_IF name="manageshelf" -->
-<form>
-	<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" -->">
-	<table>
-		<tr>
-			<td>
-				Dodaj książkę wg. kodu paskowego w <!-- TMPL_VAR name="shelfname" -->
-			</td>
-			<td>
+		</div>
+	</form>
+
+	<!-- TMPL_IF name="manageshelf" -->
+	<div id="bloc25">
+		<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="post">
+		<h2 class="catalogue">Add a book by barcode</h2>
+			<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 name="addbarcode">
-				<input type=hidden name=modifyshelfcontents value=1>
-				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
-				<input type="submit" value="Zapisz" class="button">
-			</td>
-		</tr>
-	</table>
-</form>
-<!-- /TMPL_IF -->
+			<input type="hidden" name="modifyshelfcontents" value="1">
+			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
+			<input type="submit" value="Zapisz" class="button catalogue">
+		</form>
+	</div>
+	<!-- /TMPL_IF -->
+	<div id="bloc25">
+		<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="button catalogue">Lista półek</a>
+	</div>
 <!-- TMPL_ELSE -->
 	<!-- TMPL_IF Name="shelves" -->
+		<h1 class="catalogue">Półki</h1>
 		<!-- TMPL_IF Name="status1" -->
-			<font color=red><!-- TMPL_VAR Name="string1" --></font><p>
+			<p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_LOOP Name="paramsloop" -->
 			<!-- TMPL_IF Name="status" -->
-				<font color=red><!-- TMPL_VAR Name="string" --></font><p>
+				<p class="problem"><!-- TMPL_VAR NAME="string" --><p>
 			<!-- /TMPL_IF -->
 		<!-- /TMPL_LOOP -->
-		<center>
-		<h1>Półki</h1>
-		<table border=0 cellpadding=7>
-			<tr>
-				<td align=center valign="bottom">
-					<form>
-						<p>
-							<a href="shelves.pl" class="button">Lista półek</a>
-						</p>
-					</form>
-				</td>
-				<td align=center valign="bottom">
-					<form method=post>
-					<input type="hidden" name="shelves" value=1>
-					<table border=0 cellpadding=0 cellspacing=0>
-						<tr>
-							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-								<font color=white>Wybierz półki do wymazania</font>
-							</th>
-						</tr>
+		<div id="bloc25">
+					<h2 class="catalogue">Wybierz półki do wymazania</h2>
+					<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="post">
+					<input type="hidden" name="shelves" value="1">
 						<!-- TMPL_LOOP Name="shelvesloop" -->
 						<!-- TMPL_IF name="canmanage" -->
-						<tr>
-							<td bgcolor="<!-- TMPL_VAR Name="color" -->">
-								<input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
-								<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> książek)
-							</td>
-						</tr>
+						<p>
+							<label>
+								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
+							</label>
+								<a href="shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a> (<!-- TMPL_VAR NAME="shelfbookcount" --> item(s))
+						</p>
 						<!-- /TMPL_IF -->
 						<!-- /TMPL_LOOP -->
-					</table>
 					<p>
-						<input type=submit value="Wymaż półki" class="button"></form>
+						<input type="submit" value="Wymaż półki" class="button catalogue">
 					</p>
-				</td>
-				<td align=center valign=bottom>
-					<form method=post>
-					<input type=hidden name=shelves value=1>
-					<table border=0 cellpadding=0 cellspacing=0>
-						<tr>
-							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-								<font color=white>Dodaj Półkę</font>
-							</th>
-						</tr>
-						<tr>
-							<td>
-								<p>Nazwa: <input type="text" name="addshelf" size="25"></p>
-								<p>Właściciel: <input type="hidden" name="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></p>
-								<p>Kategoria : <select name="category">
+					</form>
+		</div>
+		<div id="bloc25">
+			<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="post">
+				<input type="hidden" name="shelves" value="1">
+				<h2 class="catalogue">Dodaj Półkę</h2>
+				<p><label>Nazwa</label><input type="text" name="addshelf" size="25"></p>
+				<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></p>
+				<p><label>Kategoria</label>
+					<select name="category">
 									<option value="1">Prywatna</option>
 									<option value="2">Publiczna</option>
 									<option value="3">Dowolna</option>
 									</select>
 								</p>
-								<p> <li>półka prywatna jest zarządzana i moze być oglądana tylko przez ciebie.</li>
+				<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
 									<li> publiczna może być oglądana przez wszystkich, lecz zarządzana tylko przez ciebie.</li>
 									<li> dowolna może być zarządzana przez kogokolwiek.</li>
 								</p>
-							</td>
-						</tr>
-					</table>
-								<p><input type=submit value="Dodaj Nową Półkę" class="button"></p>
-					</form>
-				</td>
-			</tr>
-		</table>
+				<p>
+					<input type="submit" value="Dodaj Nową Półkę" class="button catalogue">
+					<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="button catalogue">back to shelf list</a>
+				</p>
 
+			</form>
+		</div>
 	<!-- TMPL_ELSE -->
-		<center>
-		<table border=0 cellpadding=4 cellspacing=0>
-			<tr>
-				<td bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-					<table border=0 cellpadding=5 cellspacing=0 width=100%>
-						<tr>
-							<th bgcolor="<!-- TMPL_VAR Name="headerbackgroundcolor" -->">
-								<font color=white>Lista Półek</font>
-							</th>
-						</tr>
-					</table>
-				</td>
+		<div id="bloc25">
+			<h2 class="catalogue">Lista półek</h2>
+			<table class="small">
+				<tr>
+					<th class="catalogue">Shelf name</th>
+					<th class="catalogue">Kategoria</th>
+					<th class="catalogue">Content size</th>
+					<th class="catalogue">Zmień</th>
 			</tr>
 			<!-- TMPL_LOOP Name="shelvesloop" -->
-			<tr>
-				<td bgcolor="<!-- TMPL_VAR Name="color" -->">
-					<a href="shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
-						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> ksiÄ…zek)
+				<!-- TMPL_IF NAME="toggle" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /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" -->
+							Prywatna
+						<!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="category2" -->
+							Publiczna
+						<!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="category3" -->
+							Dowolna
+						<!-- /TMPL_IF -->
+					</td>
+					<td>
+						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
+					</td>
+					<!-- TMPL_IF name="mine" -->
+						<td>
+							<a href="/cgi-bin/koha/bookshelves/shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button catalogue">Modify</a>  <!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
+						</td>
+						<!-- TMPL_ELSE -->
+						<td>&nbsp;</td>
+					<!-- /TMPL_IF -->
 			</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
-		<P>
-			<a href="shelves.pl?shelves=1" class="button">Dodaj lub Usuń Półki Wirtualne</a>
-		</p>
+		</div>
+		<div id="bloc25">
+			<a href="/cgi-bin/koha/bookshelves/shelves.pl?shelves=1" class="button catalogue">Dodaj lub Usuń Półki Wirtualne</a>
+		</div>
+	<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="edit" -->
+	<div id="bloc25">
+		<form method="post" action="/cgi-bin/koha/bookshelves/shelves.pl">
+			<input type="hidden" name="op" value="modifsave">
+			<h2 class="catalogue">Modify shelf</h2>
+			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
+			<p><label>Nazwa</label><input type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->"></p>
+			<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></p>
+			<p><label>Kategoria</label>
+				<select name="category">
+					<!-- TMPL_IF name="category1" -->
+						<option value="1" selected>Prywatna</option>
+					<!-- TMPL_ELSE -->
+						<option value="1">Prywatna</option>
 	<!-- /TMPL_IF -->
+					<!-- TMPL_IF name="category2" -->
+						<option value="2" selected>Publiczna</option>
+					<!-- TMPL_ELSE -->
+						<option value="2">Publiczna</option>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF name="category3" -->
+						<option value="3" selected>Dowolna</option>
+					<!-- TMPL_ELSE -->
+						<option value="3">Dowolna</option>
+					<!-- /TMPL_IF -->
+				</select>
+			</p>
+			<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
+				<li> publiczna może być oglądana przez wszystkich, lecz zarządzana tylko przez ciebie.</li>
+				<li> dowolna może być zarządzana przez kogokolwiek.</li>
+			</p>
+			<p>
+				<input type="submit" value="Zapisz" class="button catalogue">
+			</p>
+
+		</form>
+	</div>
 <!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE Name="cat-bottom.inc" -->

Index: pl/catalogue/MARCdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/Attic/MARCdetail.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/catalogue/MARCdetail.tmpl	17 Apr 2004 16:26:28 -0000	1.4
+++ pl/catalogue/MARCdetail.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,267 +1,394 @@
-<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+<!-- TMPL_INCLUDE NAME="marc-top.inc" -->
 
-<STYLE TYPE="text/css" MEDIA=screen>
-	table {	font-family:Arial;
-	font-weight:normal;
-	text-decoration:none;
-	font-size:10pt;}
-</STYLE>
-
-<table width="100%" cellspacing="0" cellpadding="5">
-<tr>
-	<td width="80%">
-		<table width="100%" cellspacing="0" cellpadding="5" border="1">
-		<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-			<td>
-			<table width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr>
-					<td width="8%"><a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR name="biblionumber" -->"><img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"></td>
-					<td width="8%"><a href="javascript:confirm_deletion()"><img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png"></td>
-					<td width="8%"><a href="detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->">Zwykłe</a></td>
-					<td width="8%"><a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')">Drukuj</a></td>
-					<td align="center"><b>Opis MARC : <!-- TMPL_VAR name="bibid" --></b></td>
-				</tr>
-			</table>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="3">
-			<table width="100%" border="0" colspacing=0 cellpadding="0">
-			<tr>
-				<td width="9%" align="center"><a href="javascript:active(0)"><div id="link0">0</div></a></td>
-				<td width="9%" align="center"><a href="javascript:active(1)" ><div id="link1">1</div></a></td>
-				<td width="9%" align="center"><a href="javascript:active(2)"><div  id="link2">2</div></a></td>
-				<td width="9%" align="center"><a href="javascript:active(3)"><div  id="link3">3</div></a></td>
-				<td width="9%" align="center"><a href="javascript:active(4)"><div  id="link4">4</div></a></td>
-				<td width="9%" align="center"><a href="javascript:active(5)"><div  id="link5">5</div></a></td>
-				<td width="9%" align="center"><a href="javascript:active(6)"><div  id="link6">6</div></a></td>
-				<td width="9%" align="center"><a href="javascript:active(7)"><div  id="link7">7</div></a></td>
-				<td width="9%" align="center"><a href="javascript:active(8)"><div  id="link8">8</div></a></td>
-				<td width="9%" align="center"><a href="javascript:active(9)"><div  id="link9">9</div></a></td>
-				<td width="10%" align="center"><a href="javascript:active(10)"><div  id="link10">Egzemplarz</div></a></td>
-			</tr>
-			</table>
-			</td>
-		</tr>
-		</table>
-	</td>
-	<td>
+
+<!-- TMPL_UNLESS name="popup" -->
+	<div class="tabbed">
+	<form Name="f">
+		<h1 class="catalogue">Biblionumber : <!-- TMPL_VAR NAME="biblionumber" --> <b>With Framework :<!--TMPL_VAR Name="framework" --></b>
+</h1>
+	</form>
+		<a href="javascript:Addbiblio('')" class="button catalogue">  Edit biblio  </a>  <a href="javascript:Addbiblio('duplicate')" class="button catalogue">  Duplicate  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Edit item  </a>
+	
+		<!--TMPL_IF Name="candelete" --><a href="javascript:confirm_deletion()" class="button catalogue">
+			wymaż
+		</a>
+		<!--/TMPL_IF -->
+        <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Complete  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normal  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Add to shelf  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Print  </a>
+		<!-- TMPL_IF name="subscriptionsnumber" -->
+		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
+			Subscription(s)
+		</a>
+		<!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="norequests" -->
 		<!-- TMPL_ELSE -->
-			<a href=request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" --> class="button">Zamów</a>
+			<a href="request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Zamów</a>
 		<!-- /TMPL_IF -->
-	</td>
-</tr>
-</table>
-
-   <DIV name="0XX" id="0XX" style="position:absolute;visibility:visible;width:90%">
-    <table width="100%"  cellspacing="0" cellpadding="5" border="0">
-	<!-- TMPL_LOOP name="0XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
-		<td width="55%" align="right"><!-- TMPL_VAR name="marc_lib" --></td>
-		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></td>
-	</tr>
-	</tmpl_loop>
-	</tmpl_loop>
-     </table>
-     </DIV>
 
-    <DIV name="1XX" id="1XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width="100%"  cellspacing="0" cellpadding="5" border="0">
-	<!-- TMPL_LOOP name="1XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
-		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
-		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></td>
-       </tr>
+
+	</div>
+<!-- /TMPL_UNLESS -->
+	<div class="tabs">
+		<!-- TMPL_IF NAME="0XX" -->
+			<div id="link0"><a href="javascript:active(0)">0</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="1XX" -->
+			<div id="link1"><a href="javascript:active(1)">1</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="2XX" -->
+			<div id="link2"><a href="javascript:active(2)">2</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="3XX" -->
+			<div id="link3"><a href="javascript:active(3)">3</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="4XX" -->
+			<div id="link4"><a href="javascript:active(4)">4</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="5XX" -->
+			<div id="link5"><a href="javascript:active(5)">5</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="6XX" -->
+			<div id="link6"><a href="javascript:active(6)">6</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="7XX" -->
+			<div id="link7"><a href="javascript:active(7)">7</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="8XX" -->
+			<div id="link8"><a href="javascript:active(8)">8</a></div>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="9XX" -->
+			<div id="link9"><a href="javascript:active(9)">9</a></div>
+		<!-- /TMPL_IF -->
+		<a href="javascript:active(10)">I<br>t<br>e<br>m<br>s</a>
+	</div>
+
+	<div name="0XX" id="0XX" class="tab" style="visibility:visible">
+		<!-- TMPL_LOOP NAME="0XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+					<!-- /TMPL_IF -->
+				</p>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
-     </table>
-     </DIV>
+	</div>
 
-    <DIV name="2XX" id="2XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width="100%" cellspacing="0" cellpadding="5"  border="0">
-	<!-- TMPL_LOOP name="2XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
-		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
-		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></td>
-       </tr>
+	<div id="1XX" class="tab">
+		<!-- TMPL_LOOP NAME="1XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+					<!-- /TMPL_IF -->
+				</p>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
-     </table>
-     </DIV>
+	</div>
 
-    <DIV name="3XX" id="3XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width="100%" cellspacing="0" cellpadding="5"  border="0">
-	<!-- TMPL_LOOP name="3XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
-		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
-		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></td>
-       </tr>
+	<div id="2XX" class="tab">
+		<!-- TMPL_LOOP NAME="2XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+					<!-- /TMPL_IF -->
+				</p>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
-     </table>
-     </DIV>
+	</div>
 
-    <DIV name="4XX" id="4XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width="100%"  cellspacing="0" cellpadding="5" border="0">
-	<!-- TMPL_LOOP name="4XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
-		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
-		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></td>
-       </tr>
+	<div id="3XX" class="tab">
+		<!-- TMPL_LOOP NAME="3XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+					<!-- /TMPL_IF -->
+				</p>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
-     </table>
-     </DIV>
+	</div>
 
-    <DIV name="5XX" id="5XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width="100%" cellspacing="0" cellpadding="5"  border="0">
-	<!-- TMPL_LOOP name="5XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
-		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
-		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></td>
-       </tr>
+	<div id="4XX" class="tab">
+		<!-- TMPL_LOOP NAME="4XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+					<!-- /TMPL_IF -->
+				</p>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
-     </table>
-     </DIV>
+	</div>
 
-	<DIV name="6XX" id="6XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width="90%" cellspacing="0" cellpadding="5"  border="0">
-	<!-- TMPL_LOOP name="6XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
-		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
-		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></td>
-       </tr>
+	<div  id="5XX" class="tab">
+		<!-- TMPL_LOOP NAME="5XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+					<!-- /TMPL_IF -->
+				</p>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
-     </table>
-     </DIV>
+	</div>
 
-    <DIV name="7XX" id="7XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width="100%"  cellspacing="0" cellpadding="5" border="0">
-	<!-- TMPL_LOOP name="7XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
-		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
-		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></td>
-       </tr>
+	<div id="6XX" class="tab">
+		<!-- TMPL_LOOP NAME="6XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+					<!-- /TMPL_IF -->
+				</p>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
-     </table>
-     </DIV>
+	</div>
 
-    <DIV name="8XX" id="8XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width="100%" cellspacing="0" cellpadding="5"  border="0">
-	<!-- TMPL_LOOP name="8XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
-		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
-		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></td>
-       </tr>
+	<div  id="7XX" class="tab">
+		<!-- TMPL_LOOP NAME="7XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+					<!-- /TMPL_IF -->
+				</p>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
-     </table>
-     </DIV>
+	</div>
 
-    <DIV name="9XX" id="9XX" style="position:absolute;visibility:hidden;width:90%">
-    <table width="90%" cellspacing="0" cellpadding="5"  border="0">
-	<!-- TMPL_LOOP name="9XX" -->
-	<tr background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><td colspan="5"><b><tmpl_var name="tag"></td></tr>
-	<!-- TMPL_LOOP name="subfield" -->
-	<tr>
-         <td width="3%">&nbsp;</td>
-	    <td width="2%"><b><!-- TMPL_VAR name="marc_subfield" --></b></td>
-		<td width="55%"><!-- TMPL_VAR name="marc_lib" --></td>
-		<td width="40%"><!-- TMPL_VAR name="marc_value" --></td>
-		<td width="20"><a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&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></td>
-       </tr>
+	<div id="8XX" class="tab">
+		<!-- TMPL_LOOP NAME="8XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+					<!-- /TMPL_IF -->
+				</p>
 	<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
-     </table>
-     </DIV>
+	</div>
+	
+	<div id="9XX" class="tab">
+		<!-- TMPL_LOOP NAME="9XX" -->
+				<!-- TMPL_IF name="tag" -->
+					<p class="MARCtag">
+						<!-- TMPL_VAR NAME="tag" -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<br />
+				<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="subfield" -->
+				<p>
+					<label class="labelsubfield">&nbsp;
+					<!-- TMPL_UNLESS name="hide_marc" --><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+					<!-- TMPL_VAR NAME="marc_lib" --></label>
+					<!-- TMPL_VAR NAME="marc_value" ESCAPE=HTML -->
+					<!-- TMPL_IF name="link" -->
+						<a href="search.marc/search.pl?op=do_search&amp;marclist='<!-- TMPL_VAR NAME="link" -->'&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+							<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" title="Search on <!-- TMPL_VAR name="marc_value" -->">
+						</a>
+					<!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="authority" -->
+						<a href="authorities/detail.pl?authid=<!-- TMPL_VAR name="authority" -->" class="button catalogue">Auth</a>
+					<!-- /TMPL_IF -->
+				</p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_LOOP -->
+	</div>
 
-    <DIV name="10XX" id="10XX" style="position:absolute;visibility:hidden;width:90%">
-    <table border="1" cellspacing="0" cellpadding="5">
-		<tr  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-			<!-- TMPL_LOOP name="item_header_loop" --><th><tmpl_var name="header_value"></th><!-- /TMPL_LOOP -->
+	<div id="10XX" class="tab">
+		<p class="MARCtag">Pozycje</p>
+		<br/>
+		<table class="noborder">
+				<tr>
+					<!-- TMPL_LOOP NAME="item_header_loop" -->
+						<th class="noborder">
+							<!-- TMPL_VAR NAME="header_value" -->
+						</th>
+					<!-- /TMPL_LOOP -->
 		</tr>
-		<!-- TMPL_LOOP name="item_loop" -->
+				<!-- TMPL_LOOP NAME="item_loop" -->
 			<tr>
-					<!-- TMPL_VAR name="item_value" -->
+						<!-- TMPL_VAR NAME="item_value" -->
 			</tr>
 		<!-- /TMPL_LOOP -->
      </table>
-     </DIV>
-
+	</div>
 <script language="JavaScript" type="text/javascript">
 function active(numlayer)
 {
-for (i=0; i <= 10 ; i++ ) {
+	for (i=0; i <= 10 ; i++ ) {
     ong = i+"XX";
 	link = "link"+i;
     if (numlayer==i) {
 	document.getElementById(ong).style.visibility="visible";
-	document.getElementById(link).style.backgroundColor="#11AA11";
-	document.getElementById(link).style.backgroundImage="url(<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif)";
-} else {
+		} else {
 	document.getElementById(ong).style.visibility="hidden";
-	document.getElementById(link).style.backgroundColor="#FFFFFF";
-	document.getElementById(link).style.backgroundImage="";
-}
-}
+		}
+	}
 }
+
 function confirm_deletion() {
 	var is_confirmed = confirm('Are you sure you want to delete this biblio?');
 	if (is_confirmed) {
-		window.location="acqui.simple/addbiblio.pl?op=delete&bibid=<!-- TMPL_VAR name="bibid" -->";
+		window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
 	}
 }
 function Dopop(link) {
-	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
+	newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
+}
+function Changefwk(FwkList) {
+  var fwk = FwkList.options[FwkList.selectedIndex].value;
+  window.location = "MARCdetail.pl?bib=<!--TMPL_VAR Name="biblionumber"-->&frameworkcode="+fwk;
+}
+function Addbiblio(op) {
+  var fwk = document.forms['f'].Frameworks.options[document.forms['f'].Frameworks.selectedIndex].value;
+  window.location = "acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&frameworkcode="+fwk+"&op="+op; 
 }
 </script>
 </body>

Index: pl/catalogue/catalogue-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/Attic/catalogue-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/catalogue/catalogue-home.tmpl	17 Apr 2004 16:26:28 -0000	1.3
+++ pl/catalogue/catalogue-home.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,108 +1,50 @@
-<!-- TMPL_IF name="opac" -->
+<!-- TMPL_IF NAME="opac" -->
 	<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
 <!-- TMPL_ELSE -->
 	<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <!-- /TMPL_IF -->
 
-<!------------------------ MAIN BODY OF PAGE ---------------------------->
-<FORM ACTION="/cgi-bin/koha/search.pl" method=post>
+<div id="mainbloc">
+<form action="/cgi-bin/koha/search.pl" method="post">
 
-<h1>Szukaj w katalogu</h1>
+<h1 class="catalogue">Szukaj w katalogu</h1>
 
-<CENTER>
 
-<TABLE align="left" width="40%" cellspacing=0 cellpadding=5 border=0 >
-	<TR VALIGN=TOP>
-		<TD>Kod Paskowy</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="itemnumber"></td>
-		<td><b> &nbsp; &nbsp; LUB</b></TD></TR>
-	<!-- <TR VALIGN=TOP>
-	<TD>ISBN</TD> <TD><INPUT TYPE="text"  SIZE="25"   NAME="isbn"></TD></TR>
-	-->
-	<TR VALIGN=TOP>
-		<TD colspan=2 > &nbsp;</td>
-	</TR>
-	<TR VALIGN=TOP>
-		<TD  bgcolor="#ad11ad" colspan=2>
-			<span style="color:#FFFFFF;">
-				<b>POMOC</b><br>
-				<b>Szukaj :</b>Stosowanie wielu pól w zapytaniu spowalnia wyszukiwanie.<p>
-			</span>
-		</td>
-	</TR>
-</table>
-
-
-
-<TABLE border=0>
-	<TR VALIGN=TOP>
-		<TD>SÅ‚owa kluczowe</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="keyword"></TD>
-	</TR>
-	<TR VALIGN=TOP>
-		<TD>Tytuł</TD>
-		<TD><INPUT TYPE="text"  SIZE="25" NAME="title"></TD>
-		<td>
-			<input type=radio name=ttype value=normal checked>Zwykłe <input type=radio name=ttype value=exact>Dokładne
-		</td>
-	</TR>
-	<TR VALIGN=TOP>
-		<TD>Autor</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="author"></TD>
-	</TR>
-	<TR VALIGN=TOP>
-		<TD>Ilustrator</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="illustrator"></TD>
-	</TR>
-		<TR VALIGN=TOP>
-		<TD>Dewey</TD><TD><INPUT TYPE="text"  SIZE="25"   NAME="dewey"></TD>
-	</TR>
-
-	<TR VALIGN=TOP>
-	<TD>Typ pozycji</TD>
-		<td>
-			<select name="class" size="1">
-			<option value=""> Każdy <!-- TMPL_VAR name="classlist" -->
-			</select>
-		</td>
-	</tr>
-	<!-- <TR VALIGN=TOP>
-	<td>Branch</td><td><select name=branch>
-	<option value="F">Foxton
-	</select>
-	</td></tr> -->
-
-	<!-- <TD>Pub Date (before)</TD> <TD><INPUT TYPE="text"  SIZE="8"   NAME="date-before"> &nbsp; &nbsp; (after) <INPUT TYPE="text"  SIZE="8"   NAME="date-after"></TD></TR>
-	-->
-	<TR VALIGN=TOP>
-	<TD><b>LUB</b></TD>
-	</TR>
-
-	<TR VALIGN=TOP>
-		<TD>Temat</TD>
-		<TD><INPUT TYPE="text"  SIZE="25"   NAME="subject"></TD>
-	</TR>
-	<tr>
-		<TD colspan=3>
-			<table width="100%" cellpadding=0 cellspacing=0>
-				<tr align="center">
-					<td>
-						<input type="hidden" name="type" value="intra">
-						<input type="submit" class="button" value="Szukaj">
-					</td>
-					<td>
-						<input type="reset" value="Wyczyść" class="button">
-					</td>
-					<td>
-						<a href="/cgi-bin/koha/shelves.pl" class="button">Półki Wirtualne</a>
-					</td>
-				</tr>
-			</table>
-		</TD>
-	</TR>
-</TABLE>
-	</FORM>
+<div id="bloc25">
+<h2 class="catalogue">Szukaj </h2>
+		<p><label class="label100" for="keyword">Keywords:</label><input type="text"  size="25" id="keyword"  name="keyword"></p>
+
+		<p><label class="label100" for="title">Title:</label><input type="text" id="title"  size="25" name="title"></p>
+
+		<p><label class="label100" for="author">Autor:</label><input type="text"  size="25" id="author"  name="author"></p>
+
+		<p><label class="label100" for="illustrator">Ilustrator:</label><input type="text"  size="25" id="illustrator"  name="illustrator"></p>
+		
+		<p><label class="label100" for="dewey">Dewey:</label></td><td><input type="text"  size="25" id="dewey"  name="dewey"></p>
+
+<p>		<label class="label100" for="class">Class:</label><select name="class" id="class" size="1">
+			<option value=""> Każdy <!-- TMPL_VAR NAME="classlist" -->
+			</select></p>
+			
+					<p><label class="label100">Search Style:</label><input type="radio" name="ttype" id=" ttype" value="normal" checked>Zwykłe <input type="radio" name="ttype" value="exact">Dokładne</p>
+			</div>
+			
+	<div id="bloc25">
+		<h2 class="catalogue">Barcode Search</h2>
 	<p>
-	</CENTER>
-<!--#include virtual="/includes/cat-bottom.inc" -->
+		<label class="label100" for="itemnumber">Barcode:</label><input type="text"  size="25" id="itemnumber" name="itemnumber"></p>
+</div>
+
+<div id="bloc25">
+<h2 class="catalogue">Subject Search</h2>
+<p><label class="label100" for="subject">Subject:</label><input type="text"  size="25"  id="subject" name="subject"><input type="hidden" name="type" value="intra"></p></div>
+
+<div id="block25"><p><input type="submit" class="button catalogue" value="Szukaj">
+						<input type="reset" value="Wyczyść" class="button catalogue">
+						<a href="/cgi-bin/koha/shelves.pl" class="button catalogue">Półki Wirtualne</a></p></div>
+
+	</form>
+
+	</div>
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
 

Index: pl/catalogue/cmsdsearchresults.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/Attic/cmsdsearchresults.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/catalogue/cmsdsearchresults.tmpl	17 Apr 2004 16:26:28 -0000	1.2
+++ pl/catalogue/cmsdsearchresults.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -3,21 +3,21 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="searchheader.tmpl" -->
-<table border=0 cellspacing=0 cellpadding=0>
-<tr bgcolor=#ccccff><th>Tytuł</th><th>Autor</th><th>Dewey</th></tr>
-<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
+<table border="0" cellspacing="0" cellpadding="0">
+<tr bgcolor="#ccccff"><th>Tytuł</th><th>Autor</th><th>Dewey</th></tr>
+<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
   <tr>
-  <td><!-- TMPL_VAR NAME=title --></td>
-  <td><!-- TMPL_VAR NAME=author --></td>
-  <td align=right><!-- TMPL_VAR NAME=dewey --></td>
+  <td><!-- TMPL_VAR NAME="title" --></td>
+  <td><!-- TMPL_VAR NAME="author" --></td>
+  <td align="right"><!-- TMPL_VAR NAME="dewey" --></td>
   </tr>
 <!-- /TMPL_LOOP -->
-<tr><td colspan=3 bgcolor=#ccccff>
-    <table border=0 cellpadding=0 cellspacing=0 width=100%>
-    <tr><td align=left>
-    <a href=search.pl?template=<!-- TMPL_VAR NAME="template" -->&startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->>Poprzednie rekordy</a>
-    </td><td align=right>
-    <a href=search.pl?template=<!-- TMPL_VAR NAME="template" -->&startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->>Następne Rekordy</a>
+<tr><td colspan="3" bgcolor="#ccccff">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tr><td align="left">
+    <a href="search.pl?template=<!-- TMPL_VAR NAME="template" -->&amp;startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Poprzednie rekordy</a>
+    </td><td align="right">
+    <a href="search.pl?template=<!-- TMPL_VAR NAME="template" -->&amp;startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Następne Rekordy</a>
     </td></tr>
     </table>
 </td></tr>

Index: pl/catalogue/detail-opac.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/Attic/detail-opac.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/catalogue/detail-opac.tmpl	17 Apr 2004 16:26:28 -0000	1.3
+++ pl/catalogue/detail-opac.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -2,10 +2,10 @@
 
 
 <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-<font SIZE=6><em><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></em></font><p>
+<font size="6"><em><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></em></font><p>
 <!-- FIXME - "callpadding" should be "cellpadding", right? -->
 <table cellspacing="0" callpadding="5" border="1" align="left" width="220">
-<!-----------------BIBLIO RECORD TABLE--------->
+<!-- ---------------BIBLIO RECORD TABLE------- -->
 <tr valign="top">
 
 <td bgcolor="#99cccc">
@@ -15,7 +15,7 @@
 <tr valign="top">
 <td>
 <br>
-<FONT SIZE=2  face="arial, helvetica">
+<font size="2"  face="arial, helvetica">
 <b>Podtytuł:</b> <!-- TMPL_VAR NAME="subtitle" --><br>
 <b>Autor:</b> <!-- TMPL_VAR NAME="author" --><br>
 <b>Dodatkowy Autor:</b> <!-- TMPL_VAR NAME="additional" --><br>
@@ -32,7 +32,7 @@
 </table>
 <!-- /TMPL_LOOP -->
 <center>
-<table border=0 cellspacing=0 cellpadding=2>
+<table border="0" cellspacing="0" cellpadding="2">
 <tr bgcolor="#99cccc">
 <td>Typ pozycji</td>
 <td>Typ pozycji</td>
@@ -57,14 +57,14 @@
 <td>Dostępna</td>
 <td></td>
 <td><a href="/cgi-bin/koha/moredetail.pl?item=<TMPL_VAR
-NAME="itemnumber">&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<TMPL_VAR
-NAME="biblioitemnumber">">http://<!-- TMPL_VAR NAME="url" --></a></td>
+name="itemnumber">&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<TMPL_VAR
+name="biblioitemnumber">">http://<!-- TMPL_VAR NAME="url" --></a></td>
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
 <p>
 </center>
-<br clear=all>
+<br clear="all">
 <p />
 <p />
 

Index: pl/catalogue/detail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/Attic/detail.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/catalogue/detail.tmpl	17 Apr 2004 16:26:28 -0000	1.4
+++ pl/catalogue/detail.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,132 +1,163 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 
+<div id="mainbloc">
 <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+	<h1 class="catalogue"><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></h1>
+	<div class="bibliomenu">
+		<a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Edit biblio  </a>  <a href="acqui.simple/addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&op=duplicate" class="button catalogue">  Duplicate  </a>  <a href="acqui.simple/additem.pl?bibid=<!-- TMPL_VAR name="bibid"-->" class="button catalogue">  Edit item  </a>
+	
+		<!--TMPL_IF Name="candelete" --><a href="javascript:confirm_deletion()" class="button catalogue">
+			wymaż
+		</a>
+		<!--/TMPL_IF -->
+		<a href="MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Complete  </a>  <a href="detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  Normal  </a>  <a href="ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">  ISBD  </a>  <a href="javascript:Dopop('bookshelves/addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Add to shelf  </a>  <a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">  Print  </a>
+		<!-- TMPL_IF name="subscriptionsnumber" -->
+		<a href="bull-home.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">
+			Subscription(s)
+		</a>
+		<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="norequests" -->
 	<!-- TMPL_ELSE -->
-		<table border=0 cellpadding=10 align=right>
-		<tr>
-			<td>
-				<a class="button" href=request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->>Zamówienia</a>
-			</td>
-		</tr>
-		</table>
+			<a href="request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Zamów</a>
 	<!-- /TMPL_IF -->
-	<font SIZE=6><em><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></em></font><p>
-	<table cellspacing="0" cellpadding="5" border="1" align="left" width="220">
-	<!--------------BIBLIO RECORD TABLE-------------->
-	<tr valign="top">
-		<td bgcolor="#cccc99" background="/images/background-mem.gif">
-			<b>WIERSZ OPISU <!-- TMPL_VAR NAME="biblionumber" --></b>
-		</td>
+	</div>
+	<div id="bloc25">
+	<table class="small">
+		<!-- BIBLIO RECORD TABLE -->
+		<tr>
+			<th class="catalogue">
+				<!-- TMPL_VAR NAME="title" --> (record <!-- TMPL_VAR NAME="biblionumber" -->)
+			</th>
 	</tr>
-	<tr valign="top">
+		<tr>
 		<td>
-			<br/><a href="MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">MARC</a><br/><br/>
-			<FONT SIZE=2  face="arial, helvetica">
-			<!-- TMPL_IF name="isbn" --><b>ISBN:</b><a href="/cgi-bin/koha/opac-searchresults.pl?isbn=<!-- TMPL_VAR NAME="isbn" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="ISBN" --></a><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="subtitle" --><b>Podtytuł:</b><!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="author" --><b>Autor:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?author=<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="additional" --><b>Dodatkowy Autor:</b><!-- TMPL_VAR NAME="additional" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="publishercode" --><b>Wydana przez :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="publicationyear" --><b>w </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
-			<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br>
-			<!-- TMPL_IF name="collection" --><b>Kolekcja:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="subject" --><b>Temat:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="copyrightdate" --><b>Rok :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="notes" --><b>Uwagi:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="unititle" --><b>Tytuł Ujednolicony:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
-			<!-- TMPL_IF name="serial" --><b>Seria:</b><!-- TMPL_VAR NAME="serial" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR name="dewey" --></a><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="classification" --><b>Klasyfikacja:</b> <!-- TMPL_VAR name="classification" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="lccn" --><b>LCCN:</b> <!-- TMPL_VAR name="lccn" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
-			<b>Egzemplarzy w sumie:</b> <!-- TMPL_VAR NAME="count" -->
-			</font>
+				<!-- TMPL_IF name="subtitles" -->
+					<p><label class="label100"><b>Subtitle(s):</b> </label>
+					<!-- TMPL_LOOP name="subtitles" -->
+						<!-- TMPL_VAR NAME="subtitle" --> ; 
+					<!-- /TMPL_LOOP -->
+					</p>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="author" --><p><label class="label100"><b>Autor:</b> </label><!-- TMPL_VAR NAME="author" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="additional" --><p><label class="label100"><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="illus" --><p><label class="label100"><b>Illus:</b></label><!-- TMPL_VAR name="illus" --></p><!-- /TMPL_IF -->
+				<p>
+					<!-- TMPL_IF name="publishercode" --><label class="label100"><b>Published by :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
+				</p>
+				<!-- TMPL_IF name="publicationyear" --><p><label class="label100"><b>in </b></label><!-- TMPL_VAR NAME="publicationyear" --></p><!-- /TMPL_IF -->
+				<p>
+					<label class="label100">&nbsp;</label><!-- TMPL_IF name="pages" --> <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+					<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" -->
+				</p>
+				<!-- TMPL_IF name="isbn" --><p><label class="label100"><b>ISBN:</b> </label><!-- TMPL_VAR NAME="isbn" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="issn" --><p><label class="label100"><b>ISSN:</b> </label><!-- TMPL_VAR NAME="issn" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="seriestitle" --><p><label class="label100"><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" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="MARCSUBJCTS" -->
+					<p><label class="label100"><b>Subjects:</b></label></p>
+					<p>
+						<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
+							<label class="label100">-</label><a href="/cgi-bin/koha/search.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">
+								<!-- TMPL_VAR NAME="marcsubjct" -->
+							</a><br>
+						<!-- /TMPL_LOOP -->
+					</p>
+				<!-- TMPL_ELSE -->
+					<!-- TMPL_IF name="subjects" --><p><label class="label100"><b>Subject(s):</b> </label></p>
+						<!-- TMPL_LOOP name="subjects" -->
+							<p><a href="/cgi-bin/koha/search.marc/search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->&type=intranet"><!-- TMPL_VAR NAME="subject" --></a>, </p> <!-- /TMPL_LOOP -->
+					<!-- /TMPL_IF -->
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="copyrightdate" --><p><label class="label100"><b>Year :</b> </label><!-- TMPL_VAR NAME="copyrightdate" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="MARCNOTES" -->
+					<p><label class="label100"><b>Uwagi:</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 class="label100"><b>Uwagi:</b> </label><!-- TMPL_VAR NAME="notes" --></p><!-- /TMPL_IF -->
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF name="unititle" --><p><label class="label100"><b>Alt title:</b> </label><!-- TMPL_VAR NAME="unititle" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="classification" --><p><label class="label100"><b>classification:</b></label><!-- TMPL_VAR name="subclass" --><!-- TMPL_VAR name="classification" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="dewey" --><p><label class="label100"><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --></p><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="URLS" -->
+					<p><label class="label100"><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 class="label100"><b>Item type : </b></label>
+					<!-- TMPL_IF name="description" -->
+						<!-- TMPL_VAR name="description" -->
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_VAR NAME="itemtype" -->
+					<!-- /TMPL_IF -->
+				</p>
+				<!-- TMPL_IF name="count" -->
+					<p><b>Egzemplarzy w sumie:</b> <!-- TMPL_VAR NAME="count" --></p>
+				<!-- /TMPL_IF -->
 		</td>
 	</tr>
 	</table>
+	</div>
 <!-- /TMPL_LOOP -->
-<!-- FIXME - The help box overflows on the right. I think this is
-     because it is specified as "width=70%", which the browser
-     interprets as 70% of the width of the browser window. However,
-     leaving out the "width=70%" makes the help box abut the "biblio
-     record" box. I think the fix is to put all three boxes in a
-     table, for layout, and make the help box as wide as it wants to
-     be. -->
-
-<center>
-<table border=0 cellspacing=0 cellpadding=2>
-	<tr bgcolor="#cccc99" background="/images/background-mem.gif">
-		<th>Typ pozycji</th>
-		<th>Lokalizacja</th>
-		<th>Do zwrotu</th>
-		<th>Ostatnio rejestrowana</th>
-		<th>Kod Paskowy</th>
-		<td>Tom</td>
+<div id="bloc25">
+	<h2 class="catalogue">Pozycje</h2>
+	<table>
+		<tr>
+			<th class="catalogue">Typ pozycji</th>
+			<th class="catalogue">Lokalizacja</th>
+			<th class="catalogue">Status</th>
+			<th class="catalogue">Do zwrotu</th>
+			<th class="catalogue">Ostatnio rejestrowana</th>
+			<th class="catalogue">Kod Paskowy</th>
+			<th class="catalogue">Tom</th>
 	</tr>
 	<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 		<tr>
 			<td><!-- TMPL_VAR NAME="description" --></td>
-			<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF name="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --></td>
-			<td><!-- TMPL_VAR NAME="datedue" --></td>
+				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- /TMPL_IF --></td>
+				<td>
+					<!-- TMPL_IF name="borrowernumber" -->
+						On issue to <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a>
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_IF name="notforloantext" -->
+							<!-- TMPL_VAR name="notforloantext" -->
+						<!-- TMPL_ELSE -->
+						    <!-- TMPL_IF name="itemlost"-->
+						        Item lost
+						    <!-- TMPL_ELSE -->
+							<!-- TMPL_IF NAME="wthdrawn" -->Pozycja Anulowana<!-- TMPL_ELSE -->Dostępna<!-- /TMPL_IF -->
+						    <!-- /TMPL_IF -->
+						<!-- /TMPL_IF -->
+					<!-- /TMPL_IF -->
+				</td>
+				<td><!-- TMPL_VAR NAME="datedue" -->
+				<!-- TMPL_IF name="reservestatus" -->Reserve <!-- TMPL_VAR name="reservestatus" --><!-- /TMPL_IF --></td>
 			<td><!-- TMPL_VAR NAME="datelastseen" --></td>
-			<td><a href="/cgi-bin/koha/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
+				<td><a href="/cgi-bin/koha/moredetail.pl?type=<!-- TMPL_VAR NAME="type" -->&item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="barcode" --></a></td>
 			<td><!-- TMPL_VAR NAME="volumeddesc" --></td>
 			<!-- TMPL_IF NAME="type" -->
 				<td>
-					<a href=/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&item=<!-- TMPL_VAR NAME="itemtype" -->>Fix Itemtype</a>
+						<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_LOOP NAME="WEB_RESULTS" -->
-		<tr>
-			<td><!-- TMPL_VAR NAME="itemtype" --></td>
-			<td>Witryna</td>
-			<td>Online</td>
-			<td>Dostępna</td>
-			<td></td>
-			<td>
-				<a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">http://<!-- TMPL_VAR NAME="url" --></a>
-			</td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-</table>
-<p>
-</center>
-<br clear=all>
-<p />
-
-<!--
-<table border="1" cellspacing="0" cellpadding="5" width="90%">
-<tr valign="top">
-<td bgcolor="$main"
-background="/images/background-mem.gif"><b>Abstract</b></td>
-</tr>
-<tr valign="top">
-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
-<td><!-- TMPL_VAR NAME="abstract" --></td>
-<!-- /TMPL_LOOP -->
-</tr>
-</table>
-<p />
-<table border="1" cellspacing="0" cellpadding="5" width="90%">
-<tr valign="top">
-<td bgcolor="$main" background="/images/background-mem.gif"><b>Links to
-Associated Websites<b></td>
-</tr>
-<!-- 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>
-
--->
+	</table>
+</div>
+<script language="javascript" type="text/javascript">
+function Dopop(link) {
+	newin=window.open(link,'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="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
+	}
+}
+</script>
 
 <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: pl/catalogue/detailprint.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/Attic/detailprint.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/catalogue/detailprint.tmpl	17 Apr 2004 16:57:07 -0000	1.2
+++ pl/catalogue/detailprint.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -12,19 +12,19 @@
 			<!-- TMPL_VAR NAME="author" --><br>
 			<b><!-- TMPL_VAR NAME="title" --></b><!-- TMPL_VAR NAME="subtitle" --><br>
 			<!-- TMPL_VAR NAME="additional" --><br>
-			<!-- TMPL_IF name="publishercode" --><b>Wydana przez :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="publicationyear" --><b>w </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
-			<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
-			<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br>
-			<!-- TMPL_IF name="collection" --><b>Kolekcja:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="subject" --><b>Temat:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="copyrightdate" --><b>Rok :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="notes" --><b>Uwagi:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="unititle" --><b>Tytuł Ujednolicony:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
-			<!-- TMPL_IF name="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR name="dewey" --></a><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="classification" --><b>Klasyfikacja:</b> <!-- TMPL_VAR name="classification" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="lccn" --><b>LCCN:</b> <!-- TMPL_VAR name="lccn" --><!-- /TMPL_IF --><br>
-			<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="publishercode" --><b>Wydana przez :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="publicationyear" --><b>w </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR NAME="pages" -->
+			<!-- TMPL_IF NAME="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR NAME="size" --><br>
+			<!-- TMPL_IF NAME="collection" --><b>Kolekcja:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="subject" --><b>Temat:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="copyrightdate" --><b>Rok :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="notes" --><b>Uwagi:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="unititle" --><b>Tytuł Ujednolicony:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
+			<!-- TMPL_IF NAME="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&amp;dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="dewey" --></a><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="classification" --><b>Klasyfikacja:</b> <!-- TMPL_VAR NAME="classification" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="lccn" --><b>LCCN:</b> <!-- TMPL_VAR NAME="lccn" --><!-- /TMPL_IF --><br>
+			<!-- TMPL_IF NAME="url" --><b>URL:</b> <a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
 			<b>ISBN:</b><!-- TMPL_VAR NAME="ISBN" --><br>
 			</font>
 		</td>
@@ -32,7 +32,7 @@
 	</table>
 <!-- /TMPL_LOOP -->
 
-<table border=0 cellspacing=0 cellpadding=2>
+<table border="0" cellspacing="0" cellpadding="2">
 	<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 		<tr>
 			<td><!-- TMPL_VAR NAME="description" --></td>
@@ -42,11 +42,11 @@
 		</tr>
 	<!-- /TMPL_LOOP -->
 </table>
-<SCRIPT>
+<script language="javascript" type="text/javascript">
 function docprint() {
 	window.print();
 	window.close();
 }
-</SCRIPT>
+</script>
 </body>
 </html>
\ No newline at end of file

Index: pl/catalogue/moredetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/Attic/moredetail.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/catalogue/moredetail.tmpl	17 Apr 2004 16:26:28 -0000	1.2
+++ pl/catalogue/moredetail.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,98 +1,71 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 
-<center>
-<br>
-<!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
-<table border=0 cellpadding=10 align=right>
-<tr>
-	<td>
-		<a class="button" href=/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->>Zamówienia</a>
-	</td>
-</tr>
-</table>
-<h1><a
-href=/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&type=intra><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)</a></h1><P>
-<p>
-<form action=/cgi-bin/koha/modbibitem.pl>
-<input type=hidden name=bibitem value=<!-- TMPL_VAR NAME="biblioitemnumber" -->>
-<input type=hidden name=biblio value=<!-- TMPL_VAR NAME="biblionumber" -->>
-<!------------------BIBLIO ITEM------------------>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left>
-<TR VALIGN=TOP>
-<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"
-><B><!-- TMPL_VAR NAME="biblioitemnumber" --> GRUPA - <!-- TMPL_VAR NAME="description" --> </b> </TD>
-</TR>
-<tr VALIGN=TOP  >
-<TD width=210 >
-<input type="image" name="submit" value="zmień" border=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png">
-<input type="image" name="delete" value="wymaż" border=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png">
-<br>
-<FONT SIZE=2  face="arial, helvetica">
-<b>Numeropisu:</b> <!-- TMPL_VAR NAME="biblionumber" --><br>
-<b>Typ materiału:</b> <!-- TMPL_VAR NAME="itemtype" --><br>
-<b>URL:</b> <!-- TMPL_VAR NAME="url" --><br>
-<b>Okres wypożyczenia:</b> <!-- TMPL_VAR NAME="loanlength" --><br>
-<b>Opłata wynajmu:</b> <!-- TMPL_VAR NAME="rentalcharge" --><br>
-<b>Klasyfikacja:</b> <!-- TMPL_VAR NAME="classification" --><!-- TMPL_VAR NAME="dewey" --><!-- TMPL_VAR NAME="subclass" --><br>
-<b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br>
-<b>Wydawca:</b> <!-- TMPL_VAR NAME="publishercode" --> <br>
-<b>Miejsce:</b> <!-- TMPL_VAR NAME="place" --><br>
-<b>Data:</b> <!-- TMPL_VAR NAME="publicationyear" --><br>
-<b>Tom:</b> <!-- TMPL_VAR NAME="volumeddesc" --><br>
-<b>Strony:</b> <!-- TMPL_VAR NAME="pages" --><br>
-<b>Ilus:</b> <!-- TMPL_VAR NAME="illus" --><br>
-<b>Rozmiar:</b> <!-- TMPL_VAR NAME="size" --><br>
-<b>Uwagi:</b> <!-- TMPL_VAR NAME="bnotes" --><br>
-<b>Liczba Egzemplarzy:</b> <!-- TMPL_VAR NAME="count" -->
-</font>
-</TD>
-</tr>
-</table>
-</form>
-<!-- /TMPL_LOOP -->
+<div id="mainbloc">
+	<div id="bloc25">
+	<!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
+		<h2 class="catalogue">
+			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra">
+				<!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)
+			</a>
+		</h2>
+		<p>
+		<form action="/cgi-bin/koha/modbibitem.pl" method="post">
+			<input type="hidden" name="bibitem" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+			<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+			<p><!-- TMPL_VAR NAME="biblioitemnumber" --> GRUPA - <!-- TMPL_VAR NAME="description" --> </p>
+			<p><b>Numeropisu:</b> <!-- TMPL_VAR NAME="biblionumber" --></p>
+			<p><b>Typ materiału:</b> <!-- TMPL_VAR NAME="itemtype" --></p>
+			<p><b>URL:</b> <!-- TMPL_VAR NAME="url" --></p>
+			<p><b>Okres wypożyczenia:</b> <!-- TMPL_VAR NAME="loanlength" --></p>
+			<p><b>Opłata wynajmu:</b> <!-- TMPL_VAR NAME="rentalcharge" --></p>
+			<p><b>Klasyfikacja:</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>Wydawca:</b> <!-- TMPL_VAR NAME="publishercode" --> </p>
+			<p><b>Miejsce:</b> <!-- TMPL_VAR NAME="place" --></p>
+			<p><b>Data:</b> <!-- TMPL_VAR NAME="publicationyear" --></p>
+			<p><b>Tom:</b> <!-- TMPL_VAR NAME="volumeddesc" --></p>
+			<p><b>Strony:</b> <!-- TMPL_VAR NAME="pages" --></p>
+			<p><b>Ilus:</b> <!-- TMPL_VAR NAME="illus" --></p>
+			<p><b>Rozmiar:</b> <!-- TMPL_VAR NAME="size" --></p>
+			<p><b>Uwagi:</b> <!-- TMPL_VAR NAME="bnotes" --></p>
+			<p><b>Liczba Egzemplarzy:</b> <!-- TMPL_VAR NAME="count" --></p>
+		</form>
+		<input type="image" name="submit" value="zmień" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
+		<input type="image" name="delete" value="wymaż" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
+		<a class="button" href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Zamówienia</a>
+	<!-- /TMPL_LOOP -->
+	</div>
 <!-- TMPL_LOOP NAME="ITEM_DATA" -->
-<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=16 height=300 align=left>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width=220 >
-<TR VALIGN=TOP>
-<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>KOD PASKOWY <!-- TMPL_VAR NAME="barcode" --></b></TD>
-</TR>
-<tr VALIGN=TOP>
-<TD width=220>
-<form action=/cgi-bin/koha/moditem.pl method=post>
-<input type=hidden name=bibitem value=<!-- TMPL_VAR NAME="biblioitemnumber" -->>
-<input type=hidden name=item value=<!-- TMPL_VAR NAME="itemnumber" -->>
-<input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
-<input type="image" name="submit" value="zmień" border=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png">
-<input type="image" name="delete" value="wymaż" border=0 src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png">
-<br>
-<FONT SIZE=2  face="arial, helvetica">
-<b>Oddział Właściwy:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
-<b>Ostatnio rejestrowana:</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
-<b>Ostatnio pozyczono:</b> <!-- TMPL_VAR NAME="timestamp0" --><br>
-<!-- on issue bit -->
-<!-- TMPL_VAR NAME="issue" -->
-<!-- after -->
-<b>Ostatni Czytelnik 1:</b> <!-- TMPL_VAR NAME="card0" --><br>
-<b>Ostatni Czytelnik 2:</b> <!-- TMPL_VAR NAME="card1" --><br>
-<b>Obecny Oddział:</b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
-<b>Cena Wymiany:</b> <!-- TMPL_VAR NAME="replacementprice" --><br>
-<b>Egzemplarz zgubiony:</b> <!-- TMPL_VAR NAME="itemlost" --><br>
-<b>Opłacono przez:</b> <!-- TMPL_VAR NAME="paidfor" --><br>
-<b>Uwagi:</b> <!-- TMPL_VAR NAME="itemnotes" --><br>
-<b>Przedłużenia:</b> <!-- TMPL_VAR NAME="renewals" --><br>
-<b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&invoice=<!-- TMPL_VAR NAME="booksellerinvoicenumber" -->&catview=yes"> Nabyto</a> Dnia:<!-- TMPL_VAR NAME="dateaccessioned" --><br>
-<b>Anulowano: <!-- TMPL_VAR NAME="wthdrawn" --><br>
-<b><a
-href=/cgi-bin/koha/bookcount.pl?&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&itm=<!-- TMPL_VAR NAME="itemnumber" -->>Wypożyczeń w sumie:</a></b> <!-- TMPL_VAR NAME="issues" --><br>
-<b>Numer Grupy:</b> <!-- TMPL_VAR NAME="biblioitemnumber" --> <br>
-<b>Numer Opisu:</b> <!-- TMPL_VAR NAME="biblionumber" --> <br>
-
-
-
-</font>
-</TD>
-</tr>
-</table>
+<div id="bloc25">
+	<h2 class="catalogue">KOD PASKOWY <!-- TMPL_VAR NAME="barcode" --></h2>
+	<form action="/cgi-bin/koha/moditem.pl" method="post">
+	<input type="hidden" name="bibitem" value=<!-- TMPL_VAR NAME="biblioitemnumber" -->>
+	<input type="hidden" name="item" value=<!-- TMPL_VAR NAME="itemnumber" -->>
+	<input type="hidden" name="type" value=<!-- TMPL_VAR NAME="type" -->>
+	<input type="image" name="submit" value="zmień" border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
+	<input type="image" name="delete" value="wymaż" border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
+	<br>
+	<b>Oddział Właściwy:</b> <!-- TMPL_VAR NAME="homebranch" --><br>
+	<b>Obecny Oddział:</b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
+	<b>Ostatnio rejestrowana:</b> <!-- TMPL_VAR NAME="datelastseen" --><br>
+	<b>Ostatnio pozyczono:</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?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="cardnumber" --></a><!-- TMPL_ELSE -->Dostępna <!-- /TMPL_IF --><br>
+	<!-- TMPL_IF NAME="issue" --><b>Date Due:</b> <!-- TMPL_VAR NAME="date_due" --><br><!-- /TMPL_IF -->
+	<b>Ostatni Czytelnik 1:</b> <!-- TMPL_VAR NAME="card0" --><br>
+	<b>Ostatni Czytelnik 2:</b> <!-- TMPL_VAR NAME="card1" --><br>
+	<b>Cena Wymiany:</b> <!-- TMPL_VAR NAME="replacementprice" --><br>
+	<b>Item lost:</b> <!-- TMPL_IF NAME="itemlost" -->Tak<!-- TMPL_ELSE -->Nie<!-- /TMPL_IF --><br>
+	<b>Opłacono przez:</b> <!-- TMPL_VAR NAME="paidfor" --><br>
+	<b>Uwagi:</b> <!-- TMPL_VAR NAME="itemnotes" --><br>
+	<b>Przedłużenia:</b> <!-- TMPL_VAR NAME="renewals" --><br>
+	<b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- 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" -->Tak<!-- TMPL_ELSE -->Nie<!-- /TMPL_IF --><br>
+	<b><a
+	href="/cgi-bin/koha/bookcount.pl?&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->&amp;itm=<!-- TMPL_VAR NAME="itemnumber" -->">Wypożyczeń w sumie:</a></b> <!-- TMPL_VAR NAME="issues" --><br>
+	<b>Numer Grupy:</b> <!-- TMPL_VAR NAME="biblioitemnumber" --> <br>
+	<b>Numer Opisu:</b> <!-- TMPL_VAR NAME="biblionumber" --> <br>
+	</h2>
+</div>
 </form>
 <!-- /TMPL_LOOP -->
 

Index: pl/catalogue/searchresults.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/Attic/searchresults.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/catalogue/searchresults.tmpl	17 Apr 2004 16:26:28 -0000	1.3
+++ pl/catalogue/searchresults.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -3,55 +3,61 @@
 <!-- TMPL_ELSE -->
 	<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <!-- /TMPL_IF -->
-<center>
+<div id="mainbloc">
 
-
-<!-- TMPL_IF NAME=searchdesc -->
-	Szukano <b><!-- TMPL_VAR NAME=searchdesc --></b>
+<h1 class="catalogue">Search results</h1>
+<p><!-- TMPL_IF NAME="searchdesc" -->
+	Szukano <b><!-- TMPL_VAR NAME="searchdesc" --></b>
 <!-- TMPL_ELSE -->
-	Nie podałeś kryteriów wyszukiwania<br>
-<!-- /TMPL_IF -->
+	You did not specify any search criteria<br>
+<!-- /TMPL_IF --></p>
 
-<!-- TMPL_VAR NAME=numrecords --> znalezionych rekordów
-<p>
+<p><!-- TMPL_VAR NAME="numrecords" --> znalezionych rekordów</p>
+<div id="resultnumber">
 <!-- Row of numbers corresponding to search result pages -->
-<!-- TMPL_IF NAME=displayprev -->
-	<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->><img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/prev.gif border=0></a>
+<!-- TMPL_IF NAME="displayprev" -->
+	<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/prev.gif" border="0"></a>
 <!-- TMPL_ELSE -->
-	<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/placeholder.gif border=0>
+	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
 <!-- /TMPL_IF -->
-<!-- TMPL_LOOP NAME=numbers -->
-	<!-- TMPL_IF NAME=highlight -->
-	<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif>
+<!-- TMPL_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=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME=opac -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->><img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/<!-- TMPL_VAR NAME=number -->.gif border=0></a>
+	<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->"><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=search.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->><img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/next.gif border=0></a>
+<!-- TMPL_IF NAME="displaynext" -->
+	<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/next.gif" border="0"></a>
 <!-- TMPL_ELSE -->
-	<img src=<!-- TMPL_VAR name="themelang" -->/images/numbers/placeholder.gif border=0>
+	<img src="<!-- TMPL_VAR NAME="themelang" -->/images/numbers/placeholder.gif" border="0">
 <!-- /TMPL_IF -->
+</div>
 
-<p>
+<div id="resultlist">
 <!-- Search Results Table -->
-<!-- TMPL_IF NAME=numrecords -->
-<table border=0 cellspacing=0 cellpadding=2 width=90%>
-<tr <!-- TMPL_IF NAME="opac" -->bgcolor=#99cccc background=<!-- TMPL_VAR name="themelang" -->/images/background-opac.gif<!-- TMPL_ELSE --> background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"<!-- /TMPL_IF -->>
-	<th align=left>Tytuł</th><th align=left>Autor</th><th>&copy;</th><th>Ilość pozycji</th><th>Lokalizacja</th>
-	<!-- TMPL_IF NAME="opac" -->
-	<!-- TMPL_ELSE -->
-	<th>&nbsp;</th>
+<!-- TMPL_IF NAME="numrecords" -->
+<table>
+		<tr>
+	<th class="catalogue">Tytuł</th><th class="catalogue">Autor</th><th class="catalogue">&copy;</th><th class="catalogue">Ilość pozycji</th><th class="catalogue">Lokalizacja</th><th class="catalogue">&nbsp;</th>
 	<!-- /TMPL_IF -->
 </tr>
 <!-- Actual Search Results -->
-<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
+<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
 	<tr>
-		<td><a href=/cgi-bin/koha/<!-- TMPL_VAR name="script" -->?type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&bib=<!-- TMPL_VAR NAME=biblionumber ESCAPE=URL -->><!-- TMPL_VAR NAME=title --></a></td>
-		<td><a href=/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME=authorhtmlescaped -->&type=<!-- TMPL_IF NAME=opac -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->><!-- TMPL_VAR NAME=author --></a></td>
-		<td align=center> <!-- TMPL_VAR NAME=copyrightdate --> </td>
-		<td align=center> <!-- TMPL_VAR NAME=itemcount --> </td>
-		<td>
+			<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
+				<a href="/cgi-bin/koha/<!-- TMPL_VAR NAME="script" -->?type=intra&amp;bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
+					<!-- TMPL_VAR NAME="title" -->
+				</a>
+			</td>
+			<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
+				<a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR NAME="authorhtmlescaped" -->&amp;type=intra">
+					<!-- TMPL_VAR NAME="author" -->
+				</a>
+			</td>
+		<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->> <!-- TMPL_VAR NAME="copyrightdate" --> </td>
+		<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->> <!-- TMPL_VAR NAME="itemcount" --> </td>
+		<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
 		<!-- TMPL_IF NAME=use-location-flags-p -->
 		<!-- TMPL_IF NAME=location-only --><!-- TMPL_VAR NAME=location-only --><br><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME=not-available-p -->Nie dostępna<!-- TMPL_IF NAME=not-available-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
@@ -59,57 +65,42 @@
 		<!-- TMPL_IF NAME=withdrawn-p -->Wycofana<!-- TMPL_IF NAME=withdrawn-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME=on-loan-p -->Wypożyczona<!-- TMPL_IF NAME=on-loan-plural-p --> (<!-- TMPL_VAR NAME=not-available-p -->)<!-- /TMPL_IF --><br><!-- /TMPL_IF -->
 		<!-- TMPL_ELSE -->
-		<!-- TMPL_VAR NAME=location -->
+		<!-- TMPL_VAR NAME="location" -->
 		<!-- /TMPL_IF -->
 		</td>
 		<!-- TMPL_IF NAME="opac" -->
 		<!-- TMPL_ELSE -->
-			<!-- TMPL_UNLESS NAME="norequests" -->
-				<td> <a href=/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->>Zamów</a></td>
+			<!-- TMPL_UNLESS name="norequests" -->
+				<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->> <a class="button catalogue" href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Zamów</a></td>
 			<!-- TMPL_ELSE -->
-				<td>Nie rezerwowalne</td>
+				<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>Nie rezerwowalne</td>
 			<!-- /TMPL_UNLESS -->
 		<!-- /TMPL_IF -->
 	</tr>
 <!-- /TMPL_LOOP -->
+</table>
+
 
-<tr <!-- TMPL_IF NAME="opac" -->bgcolor=#99cccc background=<!-- TMPL_VAR name="themelang" -->/images/background-opac.gif<!-- TMPL_ELSE -->bgcolor=#ccccff background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"<!-- /TMPL_IF -->>
-	<td colspan=6>
-		<table border=0 cellpadding=0 cellspacing=0 width="100%">
-			<tr <!-- TMPL_IF NAME="opac" -->bgcolor=#99cccc background=<!-- TMPL_VAR name="themelang" -->/images/background-opac.gif<!-- TMPL_ELSE -->bgcolor=#ccccff background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"<!-- /TMPL_IF -->>
-			<td align=left>
-				<!-- TMPL_IF NAME=displayprev -->
-				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->>Poprzednie rekordy</a>
+<p>				<!-- TMPL_IF NAME="displayprev" -->
+				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->">Poprzednie rekordy</a>
 				<!-- TMPL_ELSE -->
 				&nbsp;
 				<!-- /TMPL_IF -->
-			</td>
-			<td align=right>
-				<!-- TMPL_IF NAME=displaynext -->
-				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->&<!-- TMPL_LOOP NAME=FORMINPUTS --><!-- TMPL_VAR NAME=term -->=<!-- TMPL_VAR name="value" ESCAPE=URL -->&<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->>Następne Rekordy</a>
+
+				<!-- TMPL_IF NAME="displaynext" -->
+				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->&amp;<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="value" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->">Następne Rekordy</a>
 				<!-- TMPL_ELSE -->
 				&nbsp;
-				<!-- /TMPL_IF -->
-			</td>
-			</tr>
-		</table>
-	</td>
-</tr>
-</table>
+				<!-- /TMPL_IF --></p>
 
-<br>
-Wyświetlono od <b><!-- TMPL_VAR NAME="startfrom" --></b> do <b><!-- TMPL_VAR NAME="endat" --></b> z <b><!-- TMPL_VAR NAME="numrecords" --></b> rekordów.
-<hr>
 
-Spróbuj innej <a href=/cgi-bin/koha/catalogue-home.pl>kwerendy</a>
 
-<!-- TMPL_ELSE -->
-    Spróbuj innej <a href=/cgi-bin/koha/catalogue-home.pl>kwerendy</a>
-<!-- /TMPL_IF -->
+<p>Wyświetlono od <b><!-- TMPL_VAR NAME="startfrom" --></b> do <b><!-- TMPL_VAR NAME="endat" --></b> z <b><!-- TMPL_VAR NAME="numrecords" --></b> rekordów.</p>
 
 
-<!-- TMPL_IF NAME="opac" -->
-    <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
-<!-- TMPL_ELSE -->
+<p>Spróbuj innej <a href="/cgi-bin/koha/catalogue-home.pl">kwerendy</a></p>
+
+
+</div>
+
     <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
-<!-- /TMPL_IF -->

Index: pl/catalogue/subject.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/catalogue/Attic/subject.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/catalogue/subject.tmpl	17 Apr 2004 16:26:28 -0000	1.3
+++ pl/catalogue/subject.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,51 +1,25 @@
-<!-- TMPL_IF NAME="opac" -->
-	<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
-<!-- TMPL_ELSE -->
-	<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
-<!-- /TMPL_IF -->
-
-<center>
-
-<table border=0 cellspacing=0 cellpadding=2>
-<!-- TMPL_IF NAME="opac" -->
-	<tr bgcolor="#99cccc" background="/images/background-opac.gif">
-<!-- TMPL_ELSE -->
-	<tr background="/images/background-mem.gif">
-<!-- /TMPL_IF -->
-		<th>Temat</th>
+<!-- TMPL_INCLUDE NAME="cat-top.inc" -->
+
+<div id="mainbloc">
+
+<h1 class="catalogue">Subject search results</h1>
+
+<div id="resultnumber"><p>Wyświetlono  od<b><!-- TMPL_VAR NAME="startfrom" --></b> do <b><!-- TMPL_VAR NAME="endat" --> z <!-- TMPL_VAR NAME="numrecords" --></b> rekordów.<br></p></div>
+
+<table>
+<tr>
+		<th class="catalogue">Subject headings</th>
 	</tr>
-<!-- TMPL_LOOP NAME=SEARCH_RESULTS -->
+<!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
 	<tr>
-		<td>
-			<a href="/cgi-bin/koha/search.pl?type=<!-- TMPL_IF NAME=opac -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=HTML -->"><!-- TMPL_VAR NAME=subject --></a>
+		<td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
+			<a href="/cgi-bin/koha/search.pl?type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&amp;subjectitems=<!-- TMPL_VAR NAME=subject2 ESCAPE=HTML -->"><!-- TMPL_VAR NAME="subject" --></a>
 		</td>
 	</tr>
 <!-- /TMPL_LOOP -->
-<!-- TMPL_IF NAME="opac" -->
-	<tr bgcolor="#99cccc" background="/images/background-opac.gif">
-<!-- TMPL_ELSE -->
-	<tr background="/images/background-mem.gif">
-<!-- /TMPL_IF -->
-		<td colspan=4>
-			<table border=0 cellpadding=0 cellspacing=0 width=100%>
-			<tr>
-				<td align=left>
-					<a href="search.pl?<!-- TMPL_LOOP name=FORMINPUTS --><!-- TMPL_VAR NAME=line -->&<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Poprzednie rekordy</a>
-				</td>
-				<td align=right>
-					<a href="search.pl?<!-- TMPL_LOOP name=FORMINPUTS --><!-- TMPL_VAR NAME=line -->&<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Następne Rekordy</a>
-				</td>
-			</tr>
-			</table>
-		</td>
-	</tr>
 </table>
-<br>
-Wyświetlono  od<b><!-- TMPL_VAR NAME="startfrom" --></b> do <b><!-- TMPL_VAR NAME="endat" --> z <!-- TMPL_VAR NAME="numrecords" --></b> rekordów.
-<hr>
-
-<!-- TMPL_IF NAME="opac" -->
-    <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
-<!-- TMPL_ELSE -->
-    <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
-<!-- /TMPL_IF -->
+<p><a  class="button catalogue" href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="prevstartfrom" -->">Previous Records</a> <a class="button catalogue" href="search.pl?<!-- TMPL_LOOP NAME="FORMINPUTS" --><!-- TMPL_VAR NAME="line" -->&amp;<!-- /TMPL_LOOP -->startfrom=<!-- TMPL_VAR NAME="nextstartfrom" -->">Next Records</a></p>
+
+</div>
+<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
+

Index: pl/circ/branchtransfers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ/Attic/branchtransfers.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/circ/branchtransfers.tmpl	17 Apr 2004 16:26:27 -0000	1.2
+++ pl/circ/branchtransfers.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,156 +1,139 @@
 <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
+<div id="mainbloc">
 
-<table align=right cellpadding=10><tr><td>
-<a class="button" href=circulation.pl> Następny Czytelnik</a> <a class="button" href=returns.pl> Zwroty</a>
-</td></tr></table>
-
-<h1>Cyrkulacja: Transfery</h1><br>
-<b>Oddział:</b> <!-- TMPL_VAR Name="genbrname" --> &nbsp; <b>Drukarka:</b> <!-- TMPL_VAR Name="genprname" --><br>
-<a href=selectbranchprinter.pl class="button">Zmień Ustawienia</a>
-<input type=hidden name=branch value=<!-- TMPL_VAR Name="branch" -->>
-<input type=hidden name=printer value=<!-- TMPL_VAR Name="printer" -->>
+<h1 class="circulation">Cyrkulacja: Transfery</h1>
+<b>Branch:</b> <!-- TMPL_VAR NAME="genbrname" --> &nbsp; <b>Printer:</b> <!-- TMPL_VAR NAME="genprname" --> <a href="selectbranchprinter.pl" class="button circulation">Change Settings</a>
+<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
+<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
 
 <!-- TMPL_IF Name="found" -->
-	<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-	<tr><th background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><font>Znaleziono RezerwacjÄ™</font></th></tr>
-	<tr><td> <font color='red' size='+2'>
-		<!-- TMPL_IF Name="reserved" -->Zarezerwowano:</font> znaleziono rezerwacjÄ™ dla <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onClick="openWindow(this,'Member', 480, 640); return false;"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
-		<!-- TMPL_IF Name="waiting" --> Oznaczona jako OczekujÄ…ca</font><br>
-    Egzemplarz oznaczono jako czekajÄ…cy w <!-- TMPL_VAR Name="branchname" --> na <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onClick="openWindow(this,'Member', 480, 640); return false;"><!-- TMPL_VAR Name="borcnum" --></a>).<br><!-- /TMPL_IF -->
-		<table border=1 cellpadding=5 cellspacing=0>
+	<table>
+	<tr><th class="circulation">Znaleziono RezerwacjÄ™</th></tr>
 		<tr><td>
-			<!-- TMPL_IF Name="reserved" -->Ustaw rezerwację na oczekującą i transferuj książkę do <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
-			<!-- TMPL_IF Name="waiting" -->Anuluj rezerwację a następnie spróbuj transferu: <!-- /TMPL_IF -->
-		</td>
-		<td>
-			<form method=post action='branchtransfers.pl'>
-				<!-- TMPL_LOOP Name="trsfitemloop" -->
-					<input type=hidden name=bc-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
-					<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=hidden name=itemnumber value=<!-- TMPL_VAR Name="itemnumber" -->>
-				<input type=hidden name=borrowernumber value=<!-- TMPL_VAR Name="bornum" -->>
-				<!-- 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="Anuluj">
+	<!-- TMPL_IF Name="reserved" -->
+			Reserved: reserve found for <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow(this,'Member', 480, 640); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
 				<!-- /TMPL_IF -->
-				<!-- TMPL_IF Name="reserved" --><input type=hidden name=request value='SetWaiting'>
-					<input type=submit value="Oczekuje"><!-- /TMPL_IF -->
-			</form>
-		</td></tr>
-		<!-- TMPL_IF Name="reserved" --><tr><td>Anuluj rezerwację a następnie spróbuj transferu:</td>
-			<td>
-			<form method=post action='branchtransfers.pl'>
+		<!-- TMPL_IF Name="waiting" --> Oznaczona jako OczekujÄ…ca<br>
+    Egzemplarz oznaczono jako czekajÄ…cy w <!-- TMPL_VAR NAME="branchname" --> na <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow(this,'Member', 480, 640); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).<br><!-- /TMPL_IF -->
 
-			<!-- TMPL_LOOP Name="trsfitemloop" -->
-				<input type=hidden name=bc-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
-				<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 -->
+<p>			
 
-			<input type=hidden name=biblionumber value=<!-- TMPL_VAR Name="biblionumber" -->>
-			<input type=hidden name=borrowernumber value=<!-- TMPL_VAR Name="bornum" -->>
-			<input type=hidden name=tobranchcd value=<!-- TMPL_VAR Name="tobranchcd" -->>
-			<input type=hidden name=barcode value=<!-- TMPL_VAR Name="barcode" -->>
-			<input type=hidden name=request value='KillReserved'>
-			<input type=submit value="Anuluj">
-			</form>
-		<!-- /TMPL_IF -->
-		</td></tr>
-		<tr><td>Ignoruj i wróć do transferów: </td>
-			<td>
-			<form method=post action='branchtransfers.pl'>
-			<input type=hidden name=tobranchcd value=<!-- TMPL_VAR Name="tobranchcd" -->>
-			<input type=hidden name=barcode value=0>
+			<form method="post" action="branchtransfers.pl"><!-- TMPL_IF Name="reserved" -->Ustaw rezerwację na oczekującą i transferuj książkę do <b><!-- TMPL_VAR NAME="branchname" --> </b>: <!-- /TMPL_IF -->
+			<!-- TMPL_IF Name="waiting" --><strong>Anuluj rezerwację a następnie spróbuj transferu:</strong> <!-- /TMPL_IF -->
+				<!-- TMPL_LOOP Name="trsfitemloop" -->
+					<input type="hidden" name="bc-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+					<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="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
+				<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->">
+				<!-- 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="Anuluj" class="button circulation">
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF Name="reserved" --><input type="hidden" name="request" value="SetWaiting">
+					<input type="submit" value="Oczekuje" class="button circulation"><!-- /TMPL_IF -->
+			</form></p>
+
+		<!-- TMPL_IF Name="reserved" --><p>
+			<form method="post" action="branchtransfers.pl">
+<strong>Anuluj rezerwację a następnie spróbuj transferu:</strong>
+			<!-- TMPL_LOOP Name="trsfitemloop" -->
+				<input type="hidden" name="bc-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+				<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="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+			<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->">
+			<input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR NAME="tobranchcd" -->">
+			<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
+			<input type="hidden" name="request" value="KillReserved">
+			<input type="submit" value="Anuluj" class="button circulation">
+			</form></p>
+		<!-- /TMPL_IF -->
+<p>
+			<form method="post" action="branchtransfers.pl"><strong>Ignoruj i wróć do transferów:</strong> 
+			<input type="hidden" name="tobranchcd" value="<!-- TMPL_VAR NAME="tobranchcd" -->">
+			<input type="hidden" name="barcode" value="0">
 			<!-- TMPL_LOOP Name="trsfitemloop" -->
-				<input type=hidden name=bc-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
-				<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" -->>
+				<input type="hidden" name="bc-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+				<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="Ignoruj">
-			</form>
-			</td>
-		</tr></table>
+			<input type="submit" value="Ignoruj" class="button circulation">
+			</form></p>
+
 	</td></tr></table>
 
 <!-- TMPL_ELSE -->
-	<table border=1 cellpadding=5 cellspacing=0 bgcolor='#dddddd'>
-	<tr><th background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><font>Komunikaty</font></th></tr>
+		<!-- TMPL_IF NAME="allmessages" -->
+	<table>
+	<tr><th class="circulation">Komunikaty</th></tr>
 	<tr><td>
 	<!-- TMPL_IF Name="reqmessage" -->
 		<!-- TMPL_IF Name="cancelled" -->
 			Rezerwacja anulowana<br>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF Name="setwaiting" -->
-			Egzemplarz powinien już czekać w oddziale: <!-- TMPL_VAR Name="reqbrchname" --><br>
+			Egzemplarz powinien już czekać w oddziale: <!-- TMPL_VAR NAME="reqbrchname" --><br>
 		<!-- /TMPL_IF -->
 	<!-- /TMPL_IF -->
 	<!-- TMPL_LOOP Name="errmsgloop" -->
-		<font color='red' size='+2'>
 		<!-- TMPL_IF Name="errbadcode" -->
-			Brak egzemplarza o kodzie: <!-- TMPL_VAR Name="msg" -->
+			Brak egzemplarza o kodzie: <!-- TMPL_VAR NAME="msg" -->
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF Name="errispermanent" -->
-			Proszę zwrócić pozycję to oddziału właściwego: <!-- TMPL_VAR Name="msg" -->
+			Proszę zwrócić pozycję to oddziału właściwego: <!-- TMPL_VAR NAME="msg" -->
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF Name="errdesteqholding" -->
 			Egzemplarz już jest w docelowym oddziale.
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF Name="errwasreturned" -->
-			Pozycja była wypożyczona dla <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"
-onClick="openWindow(this,'Member', 480, 640); return false;"><!-- TMPL_VAR Name="borcnum" --></a> <!-- TMPL_VAR Name="name" --> i została zwrócona.
+			Pozycja była wypożyczona dla <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"
+onclick="openWindow(this,'Member', 480, 640); return false;"><!-- TMPL_VAR NAME="borcnum" --></a> <!-- TMPL_VAR NAME="name" --> i została zwrócona.
 		<!-- /TMPL_IF -->
-		</font>
-		<BR>
-	<!-- /TMPL_LOOP -->
+	<!-- /TMPL_LOOP -->&nbsp;
 	</td></tr></table>
-	<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=24 height=24>
-	<form method=post action=/cgi-bin/koha/circ/branchtransfers.pl>
-	<table border=1 cellpadding=5 cellspacing=0 align=left>
-	<tr><td colspan=2 align=center background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-	<font color=black><b>Wybierz Oddział</b></font></td></tr>
-	<tr><td>Oddział Docelowy:</td>
-		<td><select name=tobranchcd>
+<!-- /TMPL_IF -->
+	<form method="post" action="/cgi-bin/koha/circ/branchtransfers.pl">
+	<p><b>Select Destination Branch: </b><select name="tobranchcd">
 			<!-- TMPL_LOOP Name="branchoptionloop" -->
-				<option value=<!-- TMPL_VAR Name="code" --> <!-- TMPL_VAR Name="selected" -->><!-- TMPL_VAR Name="name" --> <br>
+				<option value="<!-- TMPL_VAR NAME="code" -->" <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="name" --></option>
 			<!-- /TMPL_LOOP -->
-		</select></td></tr></table>
+		</select></p>
 
-	<img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=24 height=50 align=left>
-
-	<table border=1 cellpadding=5 cellspacing=0 ><tr>
-	<td colspan=2 align=center background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-	<font color=black><b>Kod Paskowy Książki</b></font></td></tr>
-	<tr><td>Kod paskowy pozycji:</td><td><input name=barcode size=10></td></tr>
-	</table>
-	<input type=hidden name=tobranchcd value=<!-- TMPL_VAR Name="tobrancd" -->>
+	<p><b>Enter Item Barcode:</b> Item Barcode: <input name="barcode" size="10">
+	<input type="hidden" name="tobranchcd" value=<!-- TMPL_VAR NAME="tobrancd" -->>
 
 	<!-- TMPL_LOOP Name="trsfitemloop" -->
-		<input type=hidden name=bc-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
-		<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="hidden" name="bc-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+		<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 --></p>
 
 	</form>
-	<!-- TMPL_IF Name="transferred" -->
+	<!-- TMPL_IF Name="trsfitemloop" -->
 		<p>
-		<table border=1 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
-		<tr><th colspan=6  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><font color=black>Materiały transferowane</font></th></tr>
-		<tr><th>Kod Paskowy</th><th>Tytuł</th><th>Autor</th><th>Typ</th><th>Z</th><th>Do</th></tr>
+		<table border="1" cellpadding="5" cellspacing="0">
+		<tr><th colspan="6" class="circulation">Materiały transferowane</th></tr>
+		<tr><th class="circulation">Kod Paskowy</th><th class="circulation">Tytuł</th><th class="circulation">Autor</th><th class="circulation">Typ</th><th class="circulation">Z</th><th class="circulation">Do</th></tr>
 		<!-- TMPL_LOOP Name="trsfitemloop" -->
-			<tr><td align=center bgcolor=<!-- TMPL_VAR Name="color" -->>
-			<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></td>
-			<td bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="title" --></td>
-			<td bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="author" --></td>
-			<td align=center bgcolor=<!-- TMPL_VAR Name="color" --> ><!-- TMPL_VAR Name="itemtype" --></td>
-			<td align=center bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="frbrname" --></td>
-			<td align=center bgcolor=<!-- TMPL_VAR Name="color" -->><!-- TMPL_VAR Name="tobrname" --></td>
+			<!-- TMPL_IF NAME="color" --><tr class="hilighted"><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --><td align="center">
+			<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></td>
+			<td><!-- TMPL_VAR NAME="title" --></td>
+			<td><!-- TMPL_VAR NAME="author" --></td>
+			<td align="center"><!-- TMPL_VAR NAME="itemtype" --></td>
+			<td align="center"><!-- TMPL_VAR NAME="frbrname" --></td>
+			<td align="center"><!-- TMPL_VAR NAME="tobrname" --></td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 		</table>
 	<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
+<div class="bloc25">
+<a class="button circulation" href="circulation.pl"> Następny Czytelnik</a> <a class="button circulation" href="returns.pl"> Zwroty</a>
+</div>
 
-
+</div>
 <!-- TMPL_INCLUDE Name="circulation-bottom.inc" -->

Index: pl/circ/circulation.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ/Attic/circulation.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/circ/circulation.tmpl	17 Apr 2004 16:26:27 -0000	1.3
+++ pl/circ/circulation.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,257 +1,320 @@
 <!-- TMPL_INCLUDE NAME="circulation-top.inc" -->
-<div id="mainbloc">
+ <div id="mainbloc">
 	<h1 class="circulation">Cyrkulacja: Wypożyczenia</h1>
-	<p>
-		<b>Oddział:</b> <!-- TMPL_VAR name="branchname" -->, <b>Drukarka:</b> <!-- TMPL_VAR name="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Zmień Ustawienia</a>
-	</p>
 
-<!-- TMPL_IF name="question" -->
-	<table>
-		<tr>
-			<th>
-				Pytanie Wypożyczenia
-			</th>
-		</tr>
-		<tr>
-			<td>
-				Próba wypożyczenia <!-- TMPL_VAR name="title" --> przez <!-- TMPL_VAR name="author" --> dla <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->.
-				<p><!-- TMPL_VAR name="question" --></p>
-			</td>
-		</tr>
-		<tr>
-			<td align="center">
-				<table border="0">
-					<tr>
-						<td>
-							<form method="get">
-							<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR name="borrowernumber" -->">
-							<input type="hidden" name="barcode" value="<!-- TMPL_VAR name="barcode" -->">
-							<input type="hidden" name="questionnumber" value="<!-- TMPL_VAR name="questionnumber" -->">
-							<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="stickyduedate" value="<!-- TMPL_VAR name="stickyduedate" -->">
-							<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
-							<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
-							<!-- TMPL_LOOP NAME="responseloop" -->
-							<input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->">
-							<!-- /TMPL_LOOP -->
-							<input type="hidden" name="answer" value="Y">
-							<input type="submit" value="Tak">
-							</form>
-						</td>
-						<td>
-							<form method="get">
-							<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR name="borrowernumber" -->">
-							<input type="hidden" name="barcode" value="<!-- TMPL_VAR name="barcode" -->">
-							<input type="hidden" name="questionnumber" value="<!-- TMPL_VAR name="questionnumber" -->">
-							<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="stickyduedate" value="<!-- TMPL_VAR name="stickyduedate" -->">
-							<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
-							<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
-							<!-- TMPL_LOOP NAME="responseloop" -->
-							<input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->">
-							<!-- /TMPL_LOOP -->
-							<input type="hidden" name="answer" value="N">
-							<input type="submit" value="Nie">
-							</form>
-						</td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-	</table>
-	</td>
-<!-- /TMPL_IF -->
+<!--
 
-<!-- TMPL_IF name="rejected" -->
-	<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
-		<tr><th><font color="black" size="5">Błąd Wypożyczenia Książki</font></th></tr>
-		<tr><td><font color="red" size="5"><!-- TMPL_VAR name="rejected" --></font></td></tr>
-	</table>
-	<br>
-<!-- /TMPL_IF -->
+ INITIAL BLOC : PARAMETERS & BORROWER INFO
 
-<!-- TMPL_IF name="message" -->
-	<table>
-		<tr><th>Komunikaty</th></tr>
-		<tr><td>Nie znaleziono czytelnika <!-- TMPL_VAR name="message" --></td></tr>
-	</table>
-<!-- /TMPL_IF -->
+-->
+	<div id="bloc25">
+		<h2 class="circulation">Parametry</h2>
+		<p>
+			<b>Oddział:</b> <!-- TMPL_VAR NAME="branchname" -->, <b>Drukarka:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Zmień Ustawienia</a>
+		</p>
 
-<!-- TMPL_IF name="CGIselectborrower" -->
+	<!-- TMPL_IF NAME="message" -->
+		<h2 class="circulation">Komunikaty</h2>
+			<p>Nie znaleziono czytelnika <!-- TMPL_VAR NAME="message" --></p>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="CGIselectborrower" -->
 	<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
-	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
-	<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
-	<table border="1" cellspacing="0" cellpadding="5" bgcolor="#dddddd">
-		<tr>
-			<th background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<font color="black"><b>Wybierz czytelnika</b></font>
-			</th>
-		</tr>
-		<tr>
-			<td align="center">
-				<!-- TMPL_VAR name="CGIselectborrower" -->
-				<br>
+		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
+		<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
+		<h2 class="circulation">Wybierz czytelnika</h2>
+		<!-- TMPL_VAR NAME="CGIselectborrower" -->
 				<input type="submit" value="OK" class="button circulation">
-			</td>
-		</tr>
-	</table>
-<!-- TMPL_ELSE -->
+	<!-- TMPL_ELSE -->
     <!-- TMPL_IF NAME="borrowernumber" -->
-    
+			<h2 class="circulation">O czytelniku</h2>
+			<!--TMPL_IF Name="warndeparture"--><p class="problem"><!--TMPL_ELSE--><p><!--/TMPL_IF--><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR name="cardnumber" -->)  <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" --> " class="button circulation">  detail  </a>  <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ" class="button circulation">edit</a>
+			<!--TMPL_IF Name="warndeparture"--><br /> Borrower will leave soon<br /><!--/TMPL_IF-->
+			<!-- TMPL_IF NAME="patronimages" -->
+				<div class="bloc25">
+					<img src="/patronimages/<!-- TMPL_VAR NAME="cardnumber" -->.<!-- TMPL_VAR NAME="patronimages" -->" alt="NO IMAGE" border="0" />
+				</div>
+			<!-- /TMPL_IF -->
+			</p>
+			<p>
+				<!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" -->
+			</p>
+			<p>
+				<!-- TMPL_VAR NAME="phone" -->
+			</p>
+			<p>Kategoria: <!-- TMPL_VAR NAME="categorycode" --></p>
+			<p><!-- TMPL_VAR NAME="issuecount" --> Issues<!-- TMPL_IF NAME="overduecount" -->, <!-- TMPL_VAR NAME="overduecount" --> Overdue<!-- /TMPL_IF --></p>
+			<p><b><!-- TMPL_VAR NAME="borrowernotes" --></b></p>
+  			<!-- TMPL_IF NAME="dbarred" -->
+				<span class="error">Debarred:</span> Patron is debarred 
+				<form 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="button circulation" value="Lift Debarment" />
+				</form>
+			<!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->
-	<table>
-		<tr>
-			<th class="circulation">
+				<h2 class="circulation">
 				Wprowadź kartę czytelnika lub część nazwiska
-			</th>
-		</tr>
-		<tr>
-			<td>
-				<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+				</h2>
+				<form method="post" name="f" action="/cgi-bin/koha/circ/circulation.pl">
 					<input name="findborrower">
-					<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
-					<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
+					<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
+					<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
 					<input type="submit" value="OK" class="button circulation">
 				</form>
-			</td>
-		</tr>
-	</table>
      <!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
+	</div>
+
+<!--
+	BARCODE ENTRY
+-->
 
-<!-- TMPL_IF name="borrowernumber" -->
+<!-- TMPL_IF NAME="borrowernumber" -->
 	<div id="bloc25">
-	<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+	<form method="post" name="f" action="/cgi-bin/koha/circ/circulation.pl">
 		<h2 class="circulation">Kod Paskowy Książki</h2>
 		<p>Kod paskowy pozycji:<input name="barcode" size="10"> <input type="submit" value="Wypożycz" class="button circulation"></p>
 		<p>
-			<select name="day"><option value="0">Dzień<!-- TMPL_VAR name="dayoptions" --></select>
-			<select name="month"><option value="0">MiesiÄ…c<!-- TMPL_VAR name="monthoptions" --></select>
-			<select name="year"><option value="0">Rok<!-- TMPL_VAR name="yearoptions" --></select>
+			<select name="day">
+				<option value="0">Day</option>
+				<option value="01"<!-- TMPL_IF NAME="day1" --> selected="selected"<!-- /TMPL_IF -->>1</option>
+				<option value="02"<!-- TMPL_IF NAME="day2" --> selected="selected"<!-- /TMPL_IF -->>2</option>
+				<option value="03"<!-- TMPL_IF NAME="day3" --> selected="selected"<!-- /TMPL_IF -->>3</option>
+				<option value="04"<!-- TMPL_IF NAME="day4" --> selected="selected"<!-- /TMPL_IF -->>4</option>
+				<option value="05"<!-- TMPL_IF NAME="day5" --> selected="selected"<!-- /TMPL_IF -->>5</option>
+				<option value="06"<!-- TMPL_IF NAME="day6" --> selected="selected"<!-- /TMPL_IF -->>6</option>
+				<option value="07"<!-- TMPL_IF NAME="day7" --> selected="selected"<!-- /TMPL_IF -->>7</option>
+				<option value="08"<!-- TMPL_IF NAME="day8" --> selected="selected"<!-- /TMPL_IF -->>8</option>
+				<option value="09"<!-- TMPL_IF NAME="day9" --> selected="selected"<!-- /TMPL_IF -->>9</option>
+				<option value="10"<!-- TMPL_IF NAME="day10" --> selected="selected"<!-- /TMPL_IF -->>10</option>
+				<option value="11"<!-- TMPL_IF NAME="day11" --> selected="selected"<!-- /TMPL_IF -->>11</option>
+				<option value="12"<!-- TMPL_IF NAME="day12" --> selected="selected"<!-- /TMPL_IF -->>12</option>
+				<option value="13"<!-- TMPL_IF NAME="day13" --> selected="selected"<!-- /TMPL_IF -->>13</option>
+				<option value="14"<!-- TMPL_IF NAME="day14" --> selected="selected"<!-- /TMPL_IF -->>14</option>
+				<option value="15"<!-- TMPL_IF NAME="day15" --> selected="selected"<!-- /TMPL_IF -->>15</option>
+				<option value="16"<!-- TMPL_IF NAME="day16" --> selected="selected"<!-- /TMPL_IF -->>16</option>
+				<option value="17"<!-- TMPL_IF NAME="day17" --> selected="selected"<!-- /TMPL_IF -->>17</option>
+				<option value="18"<!-- TMPL_IF NAME="day18" --> selected="selected"<!-- /TMPL_IF -->>18</option>
+				<option value="19"<!-- TMPL_IF NAME="day19" --> selected="selected"<!-- /TMPL_IF -->>19</option>
+				<option value="20"<!-- TMPL_IF NAME="day20" --> selected="selected"<!-- /TMPL_IF -->>20</option>
+				<option value="21"<!-- TMPL_IF NAME="day21" --> selected="selected"<!-- /TMPL_IF -->>21</option>
+				<option value="22"<!-- TMPL_IF NAME="day22" --> selected="selected"<!-- /TMPL_IF -->>22</option>
+				<option value="23"<!-- TMPL_IF NAME="day23" --> selected="selected"<!-- /TMPL_IF -->>23</option>
+				<option value="24"<!-- TMPL_IF NAME="day24" --> selected="selected"<!-- /TMPL_IF -->>24</option>
+				<option value="25"<!-- TMPL_IF NAME="day25" --> selected="selected"<!-- /TMPL_IF -->>25</option>
+				<option value="26"<!-- TMPL_IF NAME="day26" --> selected="selected"<!-- /TMPL_IF -->>26</option>
+				<option value="27"<!-- TMPL_IF NAME="day27" --> selected="selected"<!-- /TMPL_IF -->>27</option>
+				<option value="28"<!-- TMPL_IF NAME="day28" --> selected="selected"<!-- /TMPL_IF -->>28</option>
+				<option value="29"<!-- TMPL_IF NAME="day29" --> selected="selected"<!-- /TMPL_IF -->>29</option>
+				<option value="30"<!-- TMPL_IF NAME="day30" --> selected="selected"<!-- /TMPL_IF -->>30</option>
+				<option value="31"<!-- TMPL_IF NAME="day31" --> selected="selected"<!-- /TMPL_IF -->>31</option>
+			</select>
+			<select name="month">
+				<option value="0">Month</option>
+				<option value="01"<!-- TMPL_IF NAME="month1" --> selected="selected"<!-- /TMPL_IF -->>Jan</option>
+				<option value="02"<!-- TMPL_IF NAME="month2" --> selected="selected"<!-- /TMPL_IF -->>Feb</option>
+				<option value="03"<!-- TMPL_IF NAME="month3" --> selected="selected"<!-- /TMPL_IF -->>Mar</option>
+				<option value="04"<!-- TMPL_IF NAME="month4" --> selected="selected"<!-- /TMPL_IF -->>Apr</option>
+				<option value="05"<!-- TMPL_IF NAME="month5" --> selected="selected"<!-- /TMPL_IF -->>May</option>
+				<option value="06"<!-- TMPL_IF NAME="month6" --> selected="selected"<!-- /TMPL_IF -->>Jun</option>
+				<option value="07"<!-- TMPL_IF NAME="month7" --> selected="selected"<!-- /TMPL_IF -->>Jul</option>
+				<option value="08"<!-- TMPL_IF NAME="month8" --> selected="selected"<!-- /TMPL_IF -->>Aug</option>
+				<option value="09"<!-- TMPL_IF NAME="month9" --> selected="selected"<!-- /TMPL_IF -->>Sep</option>
+				<option value="10"<!-- TMPL_IF NAME="month10" --> selected="selected"<!-- /TMPL_IF -->>Oct</option>
+				<option value="11"<!-- TMPL_IF NAME="month11" --> selected="selected"<!-- /TMPL_IF -->>Nov</option>
+				<option value="12"<!-- TMPL_IF NAME="month12" --> selected="selected"<!-- /TMPL_IF -->>Dec</option>
+			</select>
+			<select name="year">
+				<option value="0">Year</option>
+				<option value="2004"<!-- TMPL_IF NAME="year2004" --> selected="selected"<!-- /TMPL_IF -->>2004</option>
+				<option value="2005"<!-- TMPL_IF NAME="year2005" --> selected="selected"<!-- /TMPL_IF -->>2005</option>
+				<option value="2006"<!-- TMPL_IF NAME="year2006" --> selected="selected"<!-- /TMPL_IF -->>2006</option>
+				<option value="2007"<!-- TMPL_IF NAME="year2007" --> selected="selected"<!-- /TMPL_IF -->>2007</option>
+				<option value="2008"<!-- TMPL_IF NAME="year2008" --> selected="selected"<!-- /TMPL_IF -->>2008</option>
+			</select>
 		</p>
 		<p>
-		<input type="checkbox" name="stickyduedate" <!-- TMPL_VAR name="selected" -->> Przyczepna data zwrotu
-		<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR name="borrowernumber" -->">
-		<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
-		<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->">
+		<input type="checkbox" name="stickyduedate" <!-- TMPL_VAR NAME="selected" -->> Przyczepna data zwrotu
+		<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+		<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
+		<input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
 		<input type="hidden" name="print" value="maybe">
-		<!-- TMPL_IF name="CHARGES" -->
+		<!-- TMPL_IF NAME="CHARGES" -->
 			<input type="hidden" name="charges" value="yes">
-			<input type="hidden" name="oldamount" value="<!-- TMPL_VAR name="amountold" -->">
+			<input type="hidden" name="oldamount" value="<!-- TMPL_VAR NAME="amountold" -->">
 		<!-- /TMPL_IF -->
 		</p>
 	</form>
 	</div>
+
+
+
+<!--
+	RESULT OF ISSUING REQUEST
+-->
 	<div id="bloc25">
-	<h2 class="circulation">O czytelniku</h2>
-		<p><a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->" onClick="openWindow(this,'Member', 480, 640)">
-			<!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></a></p>
-		<p>Kategoria: <!-- TMPL_VAR name="categorycode" --></p>
-	
-	<!-- TMPL_IF name="noissues" -->
-		<!-- TMPL_IF NAME="gna" -->
-			<p class="problem">ZBA : Czytelnik zniknÄ…Å‚ bez adresu</p>
+		<!-- TMPL_IF NAME="IMPOSSIBLE" -->
+		<h2 class="problem">Issuing impossible</h2>
+			<!-- TMPL_IF NAME="NOTSAMEBRANCH" -->
+				<p class="problem">You are trying to issue a book which is not in your branch.</p>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="lost" -->
-		<p class="problem">ZAGUBIONA: Karta czytelnika zaginęła</p>
+			<!-- TMPL_IF NAME="INVALID_DATE" -->
+				<p class="problem">The due date is invalid</p>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="dbarred" -->
-		<p class="problem">ZABLOKOWANY : Czytelnik jest zablokowany</p>
+			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
+				<p class="problem">The barcode is unknown</p>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="charges" -->
-				<p class="problem">OPŁATY : <a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->" onClick="openWindow(this, 'Payment', 480,640)">Płatność</a></p>
-		<!-- TMPL_ELSE -->
-				<p class="problem"><!-- TMPL_VAR name="flag" --> : <!-- TMPL_VAR name="message" --></p>
+			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
+				<p class="problem">Item not for loan</p>
 		<!-- /TMPL_IF -->
-	<!-- TMPL_ELSE -->
-			<!-- TMPL_IF name="charges" -->
-				<p class="problem">OPŁATY : <a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->" onClick="openWindow(this, 'Payment', 480,640)">Płatność</a></p>
+			<!-- TMPL_IF NAME="WTHDRAWN" -->
+				<p class="problem">Item withdrawn</p>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="waiting" -->
-				<p class="problem">OCZEKUJÄ„CE:
-					<!-- TMPL_LOOP name="itemswaiting" -->
-						<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->&amp;type=intra" onClick="openWindow(this, 'Item', 480, 640)"><!-- TMPL_VAR name="barcode" --></a> <!-- TMPL_VAR name="title" --> (<!-- TMPL_VAR name="branchname" -->)<br>
-					<!-- /TMPL_LOOP -->
-				</p>
+			<!-- TMPL_IF NAME="GNA" -->
+				<p class="problem">Borrower is gone with no address</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="CARD_LOST" -->
+				<p class="problem">Borrower's card is lost</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="DEBARRED" -->
+				<p class="problem">Borrower is debarred</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="NO_MORE_RENEWALS" -->
+				<p class="problem">No more renewals possible</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="EXPIRED" -->
+				<p class="problem">Borrower card expired</p>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="odues" -->
-				<!-- TMPL_IF name="nonreturns" -->
-					<p class="problem">ZALEGŁOŚCI: Tak, zob. poniżej</p>
+			<br/>
 				<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="NEEDSCONFIRMATION" -->
+		<h2 class="problem">I need confirmation before issuing</h2>
+			<!-- TMPL_IF NAME="DEBT" -->
+				<p>The borrower has a debt of <!-- TMPL_VAR name="DEBT" --></p>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="notes" -->
-					<p class="problem">UWAGI: <!-- TMPL_VAR name="notesmsg" --></p>
+			<!-- TMPL_IF NAME="RENEW_ISSUE" -->
+				<p>Not an issue but a renewal</p>
 			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
+				<p>Reserve waiting for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="RESERVED" -->
+				<p>Reserved by <!-- TMPL_VAR NAME="RESERVED" --></p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
+				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return &amp; issue?</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="TOO_MANY" -->
+				<p class="problem">Too many issues (already issued / max : <!-- TMPL_VAR name="TOO_MANY" -->)</p>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
+			<form method="post">
+				<!-- TMPL_IF NAME="RESERVED" -->
+					<p><input type="checkbox" checked name="cancelreserve" value="1">Cancel Reserve</p>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="RESERVE_WAITING" -->
+					<p><input type="checkbox" checked name="cancelreserve" value="1">Cancel Reserve</p>
+				<!-- /TMPL_IF -->
+				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
+				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber">">
+				<input type="hidden" name="issueconfirmed" value="1">
+				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->">
+				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->">
+				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->">
+				<input type="submit" value="Confirm issue" class="button circulation">
+				<a href="circulation.pl?borrnumber=<!-- TMPL_VAR NAME="borrowernumber" -->" class="button circulation">Don't issue</a>
+			</form>
+			<!-- /TMPL_UNLESS -->
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="issued" -->
+			<p>Item issued</p>
 	<!-- /TMPL_IF -->
 	</div>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="todayissues" -->
+
+
+
+<!--
+SUMMARY : TODAY & PREVIOUS ISSUES
+-->
+
 <div id="bloc25">
-	<h2 class="circulation">Dzisiejsze Wypożyczenia</h2>
+	<h2 class="circulation">Wypożyczenia</h2>
+	<form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post">
+	<input type="hidden" value="circ" name="destination" />
+	<input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
+	<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
 	<table>
 		<tr>
-			<th>Do Zwrotu</th><th>Kod Paskowy</th><th>Tytuł</th><th>Autor</th><th>Typ pozycji</th>
+			<th class="circulation">Do Zwrotu</th>
+			<th class="circulation">Kod Paskowy</th>
+			<th class="circulation">Tytuł</th>
+			<th class="circulation">Renew?</th>
+			<th class="circulation">Return?</th>
 		</tr>
-		<!-- TMPL_LOOP name="todayissues" -->
-		<tr>
+		<!-- TMPL_LOOP NAME="todayissues" -->
+		<!-- TMPL_IF NAME="togglecolor" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
 			<td><!-- TMPL_VAR NAME="dd" --></td>
 			<td>
-				<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>
+				<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>
 			</td>
 			<td>
-				<!-- TMPL_VAR NAME="title" -->
-			</td>
-			<td>
-				<!-- TMPL_VAR NAME="author" -->
-			</td>
-			<td>
-				<!-- TMPL_VAR NAME="dewey" --> <!-- TMPL_VAR NAME="subclass" -->
+				<p><!-- TMPL_VAR NAME="title" --></p>
+				<p><!-- TMPL_VAR NAME="author" -->, <!-- TMPL_VAR NAME="itemcallnumber" --></p>
+				<p><i><!-- TMPL_VAR name="itemnotes" --></i></p>
 			</td>
+			<td><input type="checkbox" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> checked="checked"<!-- /TMPL_IF --> /></td>
+			<td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR name="barcode" -->">Return</a></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
-	</table>
-</div>
-<!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="previssues" -->
-<div id="bloc25">
-	<h2 class="circulation">Poprzednie Wypożyczenia</h2>
-	<table>
-		<tr>
-			<th>Do Zwrotu</th><th>Kod Paskowy</th><th>Tytuł</th><th>Autor</th><th>Typ pozycji</th>
-		</tr>
-		<!-- TMPL_LOOP name="previssues" -->
-			<tr>
+        <!-- TMPL_LOOP NAME="previssues" -->
+		<!-- TMPL_IF NAME="togglecolor" --><tr class="hilighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
 				<!-- TMPL_IF NAME="od" -->
 					<td class="problem">
 						<!-- TMPL_VAR NAME="dd" -->
 					</td>
 					<td class="problem">
-						<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>
+						<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>
 					</td>
-					<td class="problem"><!-- TMPL_VAR NAME="title" --></td>
-					<td class="problem"><!-- TMPL_VAR NAME="author" --></td>
-					<td class="problem"><!-- TMPL_VAR NAME="dewey" --> <!-- TMPL_VAR NAME="subclass" --></td>
+					<td class="problem">
+					   <p><!-- TMPL_VAR NAME="title" --></p>
+					   <p><!-- TMPL_VAR NAME="author" -->, <!-- TMPL_VAR NAME="itemcallnumber" --></p>
+					</td>
+                    <td><input type="checkbox" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> checked="checked"<!-- /TMPL_IF --> /></td>
+                    <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR name="barcode" -->" class="button circulation">Return</a></td>
 				<!-- TMPL_ELSE -->
 					<td>
 						<!-- TMPL_VAR NAME="dd" -->
 					</td>
 					<td>
-						<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>
+						<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>
+					</td>
+					<td>
+					   <p><!-- TMPL_VAR NAME="title" --></p>
+					   <p><!-- TMPL_VAR NAME="author" -->, <!-- TMPL_VAR NAME="itemcallnumber" --></p>
 					</td>
-					<td><!-- TMPL_VAR NAME="title" --></td>
-					<td><!-- TMPL_VAR NAME="author" --></td>
-					<td><!-- TMPL_VAR NAME="dewey" --> <!-- TMPL_VAR NAME="subclass" --></td>
+                    <td><input type="checkbox" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF NAME="od" --> checked="checked"<!-- /TMPL_IF --> /></td>
+                    <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR name="barcode" -->" class="button circulation">Return</a></td>
 				<!-- /TMPL_IF -->
 			</tr>
 		<!-- /TMPL_LOOP -->
+	
+        <tr>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td><input type="submit" value="Przedłuż" class="button circulation"></td>
+        <td>
+        </tr>
 	</table>
+    </form>
 </div>
-<!-- /TMPL_IF -->
+
 </div>
-<!-- TMPL_INCLUDE name="circulation-bottom.inc" -->
+<!-- TMPL_INCLUDE NAME="circulation-bottom.inc" -->
 

Index: pl/circ/returns.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ/Attic/returns.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/circ/returns.tmpl	17 Apr 2004 16:26:27 -0000	1.2
+++ pl/circ/returns.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -3,94 +3,93 @@
 <div id="mainbloc">
 	<h1 class="circulation">Cyrkulacja: Zwroty</h1>
 	<p>
-		<b>Oddział:</b> <!-- TMPL_VAR name="branchname" -->, <b>Drukarka:</b> <!-- TMPL_VAR name="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Zmień Ustawienia</a>
+		<b>Oddział:</b> <!-- TMPL_VAR NAME="genbrname" -->, <b>Drukarka:</b> <!-- TMPL_VAR NAME="genprname" --> <a href="selectbranchprinter.pl" class="button circulation">Zmień Ustawienia</a>
 	</p>
 	
 	<!-- TMPL_IF Name="found" -->
 		<div id="bloc25">
-			<h2 class="circulation">Znaleziono RezerwacjÄ™</h2>
 			<!-- TMPL_IF Name="waiting" -->
 				<h2 class="circulation">Oznaczona jako OczekujÄ…ca</h2>
-			<p>Pozycja <!-- TMPL_VAR Name="itemtitle" --> (<!-- TMPL_VAR Name="itemauthor" -->) oznaczona jako oczekujÄ…ca w <b><!-- TMPL_VAR Name="branchname" --></b> dla <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR Name="borcnum" --></a>).
-					<form method=post action='returns.pl'>
+			<p>Pozycja <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) oznaczona jako oczekujÄ…ca w <b><!-- TMPL_VAR NAME="tobranchname" --></b> dla <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
+					<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="bornum" -->>
+						<input type="hidden" name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+						<input type="hidden" name="dd-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="duedate" -->">
+						<input type="hidden" name="bn-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
 					<!-- /TMPL_LOOP -->
-					<input type=hidden name=barcode value=0>
-					<input type=submit value="OK" class="button circulation">
+					<input type="hidden" name="barcode" value="0">
+					<input type="submit" value="OK" class="button circulation">
 					</form>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF Name="diffbranch" -->
 				<h2 class="circulation">Oznaczona jako OczekujÄ…ca</h2>
 				<p>
-					Pozycja: <!-- TMPL_VAR Name="itemtitle" --> (<!-- TMPL_VAR Name="itemauthor" -->) powinna być przetransferowana do <b><!-- TMPL_VAR Name="branchname" --></b> do odebrania przez <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->', 'Member'); return false;"> <!-- TMPL_VAR Name="borcnum" --></a>).
+					Pozycja: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) powinna być przetransferowana do <b><!-- TMPL_VAR NAME="tobranchname" --></b> do odebrania przez <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"> <!-- TMPL_VAR NAME="borcnum" --></a>).
 				</p>
 				<center>
-				<form method=post action='returns.pl'>
+				<form name="f" method="post" action="returns.pl">
 				<!-- 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="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+						<input type="hidden" name="dd-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="duedate" -->">
+						<input type="hidden" name="bn-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
 					<!-- /TMPL_UNLESS -->
 				<!-- /TMPL_LOOP -->
-				<input type=hidden name=barcode value=0>
-				<input type=submit value="OK" class="button circulation">
+				<input type="hidden" name="barcode" value="0">
+				<input type="submit" value="OK" class="button circulation">
 				</form>
 				</center>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_IF Name="reserved" -->
-				<h2 class="circulation">Znaleziono rezerwacjÄ™:</h2>
-				<p>Pozycja: <!-- TMPL_VAR Name="itemtitle" --> (<!-- TMPL_VAR Name="itemauthor" -->) <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra', 'Item'); return false;"> <!-- TMPL_VAR Name="itembarcode" --> </a> dla <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->', 'Member'); return false"><!-- TMPL_VAR Name="borcnum" --></a>) do odebrania w <b><!-- TMPL_VAR Name="branchname" --></b>.
+				<h2 class="circulation">Reserve found</h2>
+				<p>Pozycja: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra', 'Item'); return false;"> <!-- TMPL_VAR NAME="itembarcode" --> </a> dla <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false"><!-- TMPL_VAR NAME="borcnum" --></a>) do odebrania w <b><!-- TMPL_VAR NAME="tobranchname" --></b>.
 				</p>
 				<p>
-				Zmień status na oczekujący i drukuj <a href="" onClick='alert(document.forms[0].resslip.value); return false'>fiszkę</a1>? </p>
+				Change status to waiting and print <a href="" class="circulation" onclick="alert(document.forms['f'].resslip.value); return false">slip</a>? </p>
 				<p>
-				<form method=post action='returns.pl'>
+				<form method="post" action="returns.pl" name="f">
 				<!-- TMPL_LOOP Name="inputloop" -->
-					<input type=hidden name=ri-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="barcode" -->>
-					<input type=hidden name=dd-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="duedate" -->>
-					<input type=hidden name=bn-<!-- TMPL_VAR Name="counter" --> value=<!-- TMPL_VAR Name="bornum" -->>
-				<!-- /TMPL_LOOP -->
-				<input type=hidden name=itemnumber value=<!-- TMPL_VAR Name="itemnumber" -->>
-				<input type=hidden name=borrowernumber value=<!-- TMPL_VAR Name="bornum" -->>
-				<input type=hidden name=resbarcode value=<!-- TMPL_VAR Name="barcode" -->>
-				<input type=hidden name=resslip value="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	Date: <!-- TMPL_VAR Name="today" -->
+					<input type="hidden" name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+					<input type="hidden" name="dd-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="duedate" -->">
+					<input type="hidden" name="bn-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
+				<!-- /TMPL_LOOP -->
+				<input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->">
+				<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->">
+				<input type="hidden" name="resbarcode" value="<!-- TMPL_VAR NAME="barcode" -->">
+				<input type="hidden" name="resslip" value="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	Date: <!-- TMPL_VAR NAME="today" -->
 	
-	ITEM RESERVED:<!-- TMPL_VAR Name="itemtitle" --> (<!-- TMPL_VAR Name="itemauthor" -->)
-	barcode: <!-- TMPL_VAR Name="itembarcode" -->
-	itemtype: <!-- TMPL_VAR Name="itemtype" -->
-	COLLECT AT: <!-- TMPL_VAR Name="branchname" -->
+	ITEM RESERVED:<!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->)
+	barcode: <!-- TMPL_VAR NAME="itembarcode" -->
+	itemtype: <!-- TMPL_VAR NAME="itemtype" -->
+	COLLECT AT: <!-- TMPL_VAR NAME="tobranchname" -->
 	
 	BORROWER:
-	<!-- TMPL_VAR Name="bortitle" --> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
-	card number: <!-- TMPL_VAR Name="borcnum" -->
-	Phone: <!-- TMPL_VAR Name="borphone" -->
-	<!-- TMPL_VAR Name="borstraddress" -->
-	<!-- TMPL_VAR Name="borsub" -->
-	<!-- TMPL_VAR Name="bortown" -->
-	<!-- TMPL_VAR Name="boremail" -->
+	<!-- TMPL_VAR NAME="bortitle" --> <!-- TMPL_VAR NAME="borfirstname" --> <!-- TMPL_VAR NAME="borsurname" -->
+	card number: <!-- TMPL_VAR NAME="borcnum" -->
+	Phone: <!-- TMPL_VAR NAME="borphone" -->
+	<!-- TMPL_VAR NAME="borstraddress" -->
+	<!-- TMPL_VAR NAME="borsub" -->
+	<!-- TMPL_VAR NAME="bortown" -->
+	<!-- TMPL_VAR NAME="boremail" -->
 	
 	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	
 	">
-				<input type=submit value="Drukuj" class="button circulation">
+				<input type="submit" value="Tak" class="button circulation">
 				</form>
 			<!-- /TMPL_IF -->
 		</div>
 	<!-- TMPL_ELSE -->
 		<div id="bloc25">
-			<form method=post action=/cgi-bin/koha/circ/returns.pl>
+			<form name="f" method="post" action="/cgi-bin/koha/circ/returns.pl">
 				<h2 class="circulation">Kod Paskowy Książki</h2>
-				<label class="label20">Kod paskowy pozycji:</label><input name=barcode size=10>
+				<label class="label20">Kod paskowy pozycji:</label><input name="barcode" size="10">
 				</table>
 				<!-- 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="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" -->">
+					<input type="hidden" name="dd-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="duedate" -->">
+					<input type="hidden" name="bn-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
 				<!-- /TMPL_LOOP -->
 			</form>
 		</div>
@@ -100,10 +99,10 @@
 				<!-- TMPL_LOOP Name="errmsgloop" -->
 					<span id="problem">
 					<!-- TMPL_IF Name="badbarcode" -->
-						Brak egzemplarza o kodzie: <!-- TMPL_VAR Name="msg" -->
+						Brak egzemplarza o kodzie: <!-- TMPL_VAR NAME="msg" -->
 					<!-- /TMPL_IF -->
 					<!-- TMPL_IF Name="ispermanent" -->
-						Zwrócić do <!-- TMPL_VAR Name="msg" -->
+						Zwrócić do <!-- TMPL_VAR NAME="msg" -->
 					<!-- /TMPL_IF -->
 					<!-- TMPL_IF Name="notissued" -->
 						Nie jest wypożyczona.
@@ -120,41 +119,45 @@
 	<!-- TMPL_IF Name="returned" -->
 		<div id="bloc25">
 			<h2 class="circulation">Informacja o zwróconym egzemplarzu</h2>
-			<p>Tytuł: <!-- TMPL_VAR Name="itemtitle" --></p>
+			<p>Tytuł: <!-- TMPL_VAR NAME="itemtitle" --></p>
 			<h2 class="circulation">Informacja o czytelniku</h2>
 			<p>
-			<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="ribornum" -->" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="ribornum" -->','Member'); return false;"> <!-- TMPL_VAR Name="riborcnum" --> </a> <!-- TMPL_VAR Name="riborsurname" -->, <!-- TMPL_VAR Name="ribortitle" --> <!-- TMPL_VAR Name="riborfirstname" --></p>
+			<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="ribornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="ribornum" -->','Member'); return false;">
+				<!-- TMPL_VAR NAME="riborcnum" -->
+			</a> 
+			<!-- TMPL_IF NAME="boremail" -->(<a href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!-- TMPL_VAR Name="boremail" --></a>)<!-- /TMPL_IF -->
+			<!-- TMPL_VAR NAME="riborsurname" -->, <!-- TMPL_VAR NAME="ribortitle" --> <!-- TMPL_VAR NAME="riborfirstname" --></p>
 			<!-- TMPL_IF Name="flagset" -->
 				<h2 class="circulation">Flagi</h2>
 				<!-- TMPL_LOOP Name="flagloop" -->
 					<p>
 						<!-- TMPL_IF Name="redfont" --><div class="problem"><!-- /TMPL_IF -->
-						<!-- TMPL_VAR Name="flag" --><!-- TMPL_IF Name="redfont" --></div><!-- /TMPL_IF -->
+						<!-- TMPL_VAR NAME="flag" --><!-- TMPL_IF Name="redfont" --></div><!-- /TMPL_IF -->
 					</p>
 					<!-- TMPL_IF Name="charges" -->
 					<p>
-						<a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow('/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR Name="bornum" -->', 'Payment'); return false;">Płatność</a>
+						<a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Payment'); return false;">Płatność</a>
 					</p>
 					<!-- /TMPL_IF -->
 					<!-- TMPL_IF Name="waiting" -->
 						<!-- TMPL_LOOP Name="itemloop" -->
 							<p>
-								<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionum" -->&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionum" -->&type=intra','Item'); return false;"> <!-- TMPL_VAR Name="barcode" --> </a> <!-- TMPL_VAR Name="title" -->(<!-- TMPL_VAR Name="brname" -->)
+								<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionum" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionum" -->&amp;type=intra','Item'); return false;"> <!-- TMPL_VAR NAME="barcode" --> </a> <!-- TMPL_VAR NAME="title" -->(<!-- TMPL_VAR NAME="brname" -->)
 							</p>
 						<!-- /TMPL_LOOP -->
 					<!-- /TMPL_IF -->
 					<!-- TMPL_IF Name="overdue" -->
 						<!-- TMPL_LOOP Name="itemloop" -->
-						<p><!-- TMPL_VAR Name="duedate" -->
-							<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionum" -->&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionum" -->&type=intra', 'Item'); return false;">
-								<!-- TMPL_VAR Name="barcode" -->
+						<p><!-- TMPL_VAR NAME="duedate" -->
+							<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionum" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionum" -->&amp;type=intra', 'Item'); return false;">
+								<!-- TMPL_VAR NAME="barcode" -->
 							</a>
-							<!-- TMPL_VAR Name="title" -->
+							<!-- TMPL_VAR NAME="title" -->
 						</p>
 						<!-- /TMPL_LOOP -->
 					<!-- /TMPL_IF -->
 					<!-- TMPL_IF Name="other" -->
-						<p><b><!-- TMPL_VAR Name="msg" --></b></p>
+						<p><b><!-- TMPL_VAR NAME="msg" --></b></p>
 					<!-- /TMPL_IF -->
 				<!-- /TMPL_LOOP -->
 			<!-- /TMPL_IF -->
@@ -173,13 +176,13 @@
 				<th class="circulation">Czytelnik</th>
 			</tr>
 			<!-- TMPL_LOOP Name="riloop" -->
-				<tr>
-					<td bgcolor=<!-- TMPL_VAR Name="color" -->>
+				<!-- TMPL_IF NAME="color" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
+					<td >
 						<!-- TMPL_IF Name="duedate" -->
 							<!-- TMPL_IF Name="early" -->
-								<font color=red>
+								<font color="red">
 							<!-- /TMPL_IF -->
-								<!-- TMPL_VAR Name="year" -->/<!-- TMPL_VAR Name="month" -->/<!-- TMPL_VAR Name="day" -->
+								<!-- TMPL_VAR NAME="duedate" -->
 							<!-- TMPL_IF Name="early" -->
 								</font>
 							<!-- /TMPL_IF -->
@@ -188,26 +191,26 @@
 						<!-- /TMPL_IF -->
 					</td>
 					<td>
-						<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="itembiblionumber" -->&type=intra', 'Item'); return false;">
-							<!-- TMPL_VAR Name="barcode" -->
+						<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra', 'Item'); return false;">
+							<!-- TMPL_VAR NAME="barcode" -->
 						</a>
 					</td>
-					<td><!-- TMPL_VAR Name="itemtitle" --></td>
-					<td><!-- TMPL_VAR Name="itemauthor" --></td>
-					<td><!-- TMPL_VAR Name="itemtype" --></td>
+					<td><!-- TMPL_VAR NAME="itemtitle" --></td>
+					<td><!-- TMPL_VAR NAME="itemauthor" --></td>
+					<td><!-- TMPL_VAR NAME="itemtype" --></td>
 					<td>
 					<!-- TMPL_IF Name="duedate" -->
-						<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow('/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->','Member'); return false;">
-							<!-- TMPL_VAR Name="borcnum" -->
-						</a> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
+						<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->','Member'); return false;">
+							<!-- TMPL_VAR NAME="borcnum" -->
+						</a> <!-- TMPL_VAR NAME="borfirstname" --> <!-- TMPL_VAR NAME="borsurname" -->
 					<!-- TMPL_ELSE -->
-						<!-- TMPL_VAR Name="bornum" -->
+						<!-- TMPL_VAR NAME="bornum" -->
 					<!-- /TMPL_IF -->
 					</td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 			</table>
-		</div id="bloc25">
+		</div>
 	<!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE Name="circulation-bottom.inc" -->

Index: pl/circ/selectbranchprinter.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/circ/Attic/selectbranchprinter.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/circ/selectbranchprinter.tmpl	17 Apr 2004 16:26:27 -0000	1.2
+++ pl/circ/selectbranchprinter.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,42 +1,37 @@
 <!-- TMPL_INCLUDE Name="circulation-top.inc" -->
 
-<h1>Cyrkulacja: Wybierz Ustawienia Drukarki i Oddziału</h1><br>
+<div id="mainbloc">
+<h1 class="circulation">Cyrkulacja: Wybierz Ustawienia Drukarki i Oddziału</h1>
 
-<center>
-<form method=post action=/cgi-bin/koha/circ/circulation.pl>
-<table border=1 cellpadding=5 cellspacing=0>
-<tr><td colspan=2 bgcolor=<!-- TMPL_VAR Name="headerbackgroundcolor" --> align=center background=<!-- TMPL_VAR Name="backgroundimage" -->>
-<font color=black><b>Prosimy Ustawić Oddział i Drukarkę</b></font></td></tr>
-<tr><td>
+<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+<p>
 <!--branchselection-->
 <!-- TMPL_IF Name="onebranch" -->
-Oddział: <!-- TMPL_VAR Name="branchname" --><br>
+<b>Oddział:</b> <!-- TMPL_VAR NAME="branchname" -->
 <!-- TMPL_ELSE -->
-	<select name=branch>
+<b>Please Set Branch:</b>
+	<select name="branch">
 	<!-- TMPL_LOOP Name="branchloop" -->
-		<option value=<!-- TMPL_VAR Name="value" --><!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->><!-- TMPL_VAR Name="name" -->
+		<option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="name" --></option>
 	<!-- /TMPL_LOOP -->
 	</select>
-<!-- /TMPL_IF -->
-</td>
-<td>
-<!--printerselection-->
+<!-- /TMPL_IF --></p>
+
+<p><!-- printerselection -->
 <!-- TMPL_IF Name="oneprinter" -->
-Drukarka: <!-- TMPL_VAR Name="printername" --><br>
+<b>Drukarka:</b> <!-- TMPL_VAR NAME="printername" -->
 <!-- TMPL_ELSE -->
-	<select name=printer>
+<b>Please Set Printer:</b>
+	<select name="printer">
 	<!-- TMPL_LOOP Name="printerloop" -->
-		<option value=<!-- TMPL_VAR Name="value" --><!-- TMPL_IF Name="selected" --> selected<!-- /TMPL_IF -->><!-- TMPL_VAR Name="name" -->
+		<option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="name" --></option>
 	<!-- /TMPL_LOOP -->
 	</select>
-<!-- /TMPL_IF -->
-</td></tr>
-</table>
-<input type="hidden" name="setcookies" value=1>
-<input value="Prześlij" type="changesettings">
+<!-- /TMPL_IF --></p>
+<p><input type="hidden" name="setcookies" value="1">
+<input type="submit" value="Prześlij" class="button circulation"></p>
 </form>
-</center>
-
 
+</div>
 <!-- TMPL_INCLUDE Name="circulation-bottom.inc" -->
 

Index: pl/export/marc.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/export/Attic/marc.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/export/marc.tmpl	17 Apr 2004 16:26:27 -0000	1.3
+++ pl/export/marc.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,14 +1,26 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<center>
-<h1>Export Opisu MARC</h1><br /><br /><br />
-Eksportuj następujące opisy w formacie MARC:
-<form method="post">
-<p>od opisu numer : <input type="text" name="start_bib"> do opisu numer : <input type="text" name="end_bib"></p>
-<input type="hidden" name="op" value="export">
-<input type="submit" value="Eksport">
-</form>
-
-<p>(pozostaw puste, by eksportować wszystkie)</p>
-<p>Uwaga: egzemplarze NIE są eksportowane tym narzędziem</p>
+<div id="mainbloc">
+<h1>Export Opisu MARC</h1>
+	<div id="bloc25">
+		<h2 class="parameters">Select biblios to export</h2>
+		<form method="post">
+			<p>od opisu numer : <input type="text" name="start_bib"> do opisu numer : <input type="text" name="end_bib"></p>
+			<p>Document type : <!--TMPL_VAR Name="CGIitemtype"--></p>
+			<p>Branch :  <select name="branch">
+			<option value="">Default</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>from itemcallnumber : <input type="text" name="start_callnumber">  to itemcallnumber : <input type="text" name="end_callnumber"></p>
+			<p>Limit to <input type="text" name="limit"> first biblio</p>
+			<p>Note : the items are exported by this tool</p>
+			<input type="hidden" name="op" value="export">
+			<input type="submit" value="Eksport" class="button">
+		</form>
+	</div>
+</div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: pl/import/breeding.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/import/Attic/breeding.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/import/breeding.tmpl	17 Apr 2004 16:26:27 -0000	1.2
+++ pl/import/breeding.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,60 +1,34 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
-<h1>Mechanizm gromadzenia MARC</h1>
-
-<table bgcolor="#ffcc00" width="80%" cellpadding="3">
-	<tr valign="center">
-	<td><font size="4">Importuj do rezerwuaru opisów</font></td>
-	</tr>
-</table>
-
-<!-- TMPL_IF name="uploadmarc" -->
-<p>Importuj wyniki:</p>
-<ul>
-	<p><!-- TMPL_VAR name="imported" --> zaimportowanych rekordów</p>
-	<p><!-- TMPL_VAR name="alreadyindb" --> nie został zaimportowany, gdyż już jest w bazie</p>
-	<p><!-- TMPL_VAR name="alreadyinfarm" --> nie został zaimportowany, gdyż już jest w buforze</p>
-	<p><!-- TMPL_VAR name="notmarcrecord" --> nie zaimportowano, gdyż brakuje cech formatu MARC (albo brak ISBN/ISSN) !</p>
-	<p>przeanalizowano <!-- TMPL_VAR name="total" --> rekordów</p>
+<div id="mainbloc">
+	<h1 class="parameters">Import into the reservoir</h2>
+	<!-- TMPL_IF NAME="uploadmarc" -->
+	<p>Importuj wyniki:</p>
+	<ul>
+		<p><!-- TMPL_VAR NAME="imported" --> zaimportowanych rekordów</p>
+		<p><!-- TMPL_VAR NAME="alreadyindb" --> nie został zaimportowany, gdyż już jest w bazie</p>
+		<p><!-- TMPL_VAR NAME="alreadyinfarm" --> nie został zaimportowany, gdyż już jest w buforze</p>
+		<p><!-- TMPL_VAR NAME="notmarcrecord" --> nie zaimportowano, gdyż brakuje cech formatu MARC (albo brak ISBN/ISSN) !</p>
+		<p>przeanalizowano <!-- TMPL_VAR NAME="total" --> rekordów</p>
 	<p><a href="/cgi-bin/koha/admin-home.pl">Wstecz</a>
-</ul>
-<!-- TMPL_ELSE -->
-<ul>
-	<li>Wybierz plik, by importować go do rezerwuaru opisów. Będzie poddany analizie, i dla każdego napotkanego ISBN powstanie w rezerwuarze nowy opis.</li>
-	<li>Jeśli ISBN istnieje już w rezerwuarze, możesz zdecydować czy zignorować nowy czy też nadpisać stary.</li>
+	</ul>
+	<!-- TMPL_ELSE -->
+	<ul>
+		<li>Select a file to import into the reservoir. It will be parsed, and for each ISBN found, a new baby will be created in the reservoir.</li>
+		<li>If an ISBN already exists in the reservoir, you can choose whether to ignore the new one or overwrite the old one.</li>
 	<li>Można nazwać ten import. Może się przydać przy tworzeniu opisu dla zapamiętania skąd pochodzą dane MARC !</li>
 	<li>Oczywiście, jesli ISBN juz istnieje w aktywnej bazie to opis będzie pominięty.</li>
-</ul>
-<form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->" enctype="multipart/form-data">
-<table cellpadding="3" border=0>
-	<tr valign="top">
-		<td>Wybierz plik do importu:</td>
-		<td>
-			<input type="file" name="uploadmarc"/><br/>
-		</td>
-	</tr>
-	<tr valign="top">
-		<td>Nazwa tego importu:</td>
-		<td>
-			<input type="text" name="filename"/><br/>
-		</td>
-	</tr>
-	<tr valign="top">
-		<td>Kodowanie czcionek (MARC21 lub UNIMARC)</td>
-		<td>
-			<select name="syntax"><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select><br/>
-		</td>
-	</tr>
-	<tr valign="top">
-		<td>Jeśli ISBN jest już w rezerwuarze:  </td>
-		<td><input type="radio" name="overwrite_biblio" value="0" checked>Ignoruj ten, zatrzymaj istniejÄ…cy<br/>
-			<input type="radio" name="overwrite_biblio" value="1">Nadpisz istniejÄ…cy</td>
-	</tr>
-	<tr valign="top">
-		<td>&nbsp; </td>
-		<td><input type="submit" value="Import"></td>
-	</tr>
-
-</table>
-</form>
-<!-- /TMPL_IF -->
+	</ul>
+	<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" enctype="multipart/form-data">
+		<p><label class="label100">Wybierz plik do importu:</label><input type="file" name="uploadmarc" /></p>
+		<p><label class="label100">Nazwa tego importu:</label><input type="text" name="filename" /></p>
+		<p><label class="label100">Character encoding</label>
+			<select name="syntax"><option value="MARC21">MARC21</option><option value="UNIMARC">UNIMARC</option></select>
+		</p>
+		<p>If ISBN already in reservoir</p>
+				<p><label class="label100">&nbsp; </label><input type="radio" name="overwrite_biblio" value="0" checked>Ignoruj ten, zatrzymaj istniejÄ…cy</p>
+				<p><label class="label100">&nbsp; </label><input type="radio" name="overwrite_biblio" value="1">Nadpisz istniejÄ…cy</p>
+		<p><label class="label100">&nbsp; </label><input type="submit" value="Import" class="button parameters"></p>
+	</form>
+	<!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->

Index: pl/includes/about-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/about-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/includes/about-bottom.inc	17 Apr 2004 16:26:27 -0000	1.2
+++ pl/includes/about-bottom.inc	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,22 +1,17 @@
-<br clear=all>
+<br clear="all">
 <p> &nbsp; </p>
 
-
-</BLOCKQUOTE>
-
-<CENTER>
-<FONT SIZE=2  face="arial, helvetica">
-<A HREF="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Katalog</a> ||
-<A HREF="/cgi-bin/koha/members-home.pl">Czytelnicy</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
-<A HREF="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
-<A HREF="/cgi-bin/koha/about.pl">O nas</a> || 
+<div class="center">
+<a href="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> ||
+<a href="/cgi-bin/koha/members/members-home.pl">Czytelnicy</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
+<a href="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
+<a href="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
+<a href="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
+<a href="/cgi-bin/koha/about.pl">O nas</a> || 
 Pomoc
-</FONT>
-</CENTER>
-</BODY>
+</div>
 
-</HTML>
+</body>
+</html>

Index: pl/includes/about-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/about-top.inc,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/includes/about-top.inc	17 Apr 2004 16:26:27 -0000	1.2
+++ pl/includes/about-top.inc	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,76 +1,36 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html>
 <head>
-<title>KOHA: INTRANET: Parametry</title>
+<title>KOHA: INTRANET: About</title>
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- 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 -->
+<script language="JavaScript" type="text/javascript">
+function Help() {
+	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
+}
+</script>
 
-</head>
-<body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" Alink="#cc3300"
-marginheight=0 marginwidth=0 leftmargin=0 topmargin=0>
-
-<style>
+<style type="text/css">
 
 .about {
 	background-color: #86c268;
 	color: #FFFFFF;
 	text-decoration: normal;
-	font-weight: bold;
 	}
 a.about:hover {
 	background-color: #86c268;
 	color: #FFFFFF;
 	text-decoration: normal;
-	font-weight: bold;
 	}
 </style>
+</head>
+<body>
+
 
-<!------------------------MENUS-------------------------------->
-<table cellpadding=0 cellspacing=0 width="100%" border=0>
-<tr height="45">
-	<td valign="bottom" align="left">
-		<table bgcolor="#dddddd" width="100%" cellpadding=0 cellspacing=0>
-		<tr>
-			<td>
-			<div id="menubar">
-			<table cellpadding=0 cellspacing=0  border=0 height=29 width=70%>
-				<tr>
-					<td class="koha"><b>KOHA</b></td>
-					<td>
-						<a class="home" href="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a>
-					</td>
-					<td>
-						<a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Katalog</a>
-					</td>
-					<td>
-						<a class="members" href="/cgi-bin/koha/members-home.pl">Czytelnicy</a>
-					</td>
-					<td>
-						<a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a>
-					</td>
-					<td>
-						<a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a>
-					</td>
-					<td>
-						<a class="reports" href="/cgi-bin/koha/reports-home.pl">Raporty</a>
-					</td>
-					<td>
-						<a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parametry</a>
-					</td>
-					<td>
-						<a class="about" href="/cgi-bin/koha/about.pl">O nas</a>
-					</td>
-				</TR>
-			</TABLE>
-			</div>
-		</td></tr></table>
-	</TD>
-</tr>
-</table>
-<BLOCKQUOTE>
+<!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align=left>Zalogowano jako: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Wyloguj</a>]</p>
+    <p class="user">Zalogowano jako: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Wyloguj</a>]</p>
 <!-- TMPL_ELSE -->
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Zaloguj do</a> Systemu Koha</p>
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Zaloguj do</a> Systemu Koha</p>
 <!-- /TMPL_IF -->

Index: pl/includes/acquisitions-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/acquisitions-bottom.inc,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/includes/acquisitions-bottom.inc	17 Apr 2004 16:26:27 -0000	1.3
+++ pl/includes/acquisitions-bottom.inc	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,22 +1,17 @@
-<br clear=all>
+<br clear="all">
 <p> &nbsp; </p>
 
-
-</BLOCKQUOTE>
-
-<CENTER>
-<FONT SIZE=2  face="arial, helvetica">
-<A HREF="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Katalog</a> ||
-<A HREF="/cgi-bin/koha/members-home.pl">Czytelnicy</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
-<A HREF="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
-<A HREF="/cgi-bin/koha/about.pl">O nas</a> || 
+<div class="center">
+<a href="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> ||
+<a href="/cgi-bin/koha/members/members-home.pl">Czytelnicy</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
+<a href="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
+<a href="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
+<a href="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
+<a href="/cgi-bin/koha/about.pl">O nas</a> || 
 Pomoc
-</FONT>
-</CENTER>
-</BODY>
+</div>
 
-</HTML>
+</body>
+</html>

Index: pl/includes/acquisitions-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/acquisitions-top.inc,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/includes/acquisitions-top.inc	17 Apr 2004 16:26:27 -0000	1.4
+++ pl/includes/acquisitions-top.inc	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,36 +1,47 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html>
 <head>
 <title>KOHA: INTRANET: Gromadzenie</title>
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-</head>
-<body>
+<link rel="stylesheet" type="text/css" media="print" href="<!-- TMPL_VAR name="themelang" -->/includes/common-print.css">
+<link rel="stylesheet" type="text/css" media="screen" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
+<!-- Additions for Calendar-system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar.js">
+</script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-en.js">
+</script>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-setup.js">
+</script>
+<!-- /Additions for Calendar-system -->
+
+<!-- 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 -->
+<script language="JavaScript" type="text/javascript">
+function Help() {
+	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
+}
+</script>
 
-<style>
+<style type="text/css">
 .acquisition {
 	background-color: #ffdf61;
 	color:#000000;
 	background-image:none;
-	text-decoration: normal;
-	font-weight: bold;
+	text-decoration: none;
 	}
 a.acquisition:hover {
 	background-color: #ffdf61;
 	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
+	text-decoration: none;
 	}
 </style>
+</head>
+<body>
+
 
-<!------------------------MENUS-------------------------------->
-<div id="menubar">
-	<span class="koha">KOHA</span>
-	<a class="home" href="/cgi-bin/koha/mainpage.pl">Początek</a> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Katalog</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Członkowie</a> <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Wypożyczalnia</a> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Raporty</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parametry</a> <a class="about" href="/cgi-bin/koha/about.pl">O nas</a>
-</div>
+<!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align=left>Zalogowano jako: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Wyloguj</a>]</p>
+    <p class="user">Zalogowano jako: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Wyloguj</a>]</p>
 <!-- TMPL_ELSE -->
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Zaloguj do</a> Systemu Koha</p>
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Zaloguj do</a> Systemu Koha</p>
 <!-- /TMPL_IF -->

Index: pl/includes/cat-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/cat-bottom.inc,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/includes/cat-bottom.inc	17 Apr 2004 16:26:27 -0000	1.3
+++ pl/includes/cat-bottom.inc	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,22 +1,17 @@
-<br clear=all>
+<br clear="all">
 <p> &nbsp; </p>
 
-
-</BLOCKQUOTE>
-
-<CENTER>
-<FONT SIZE=2  face="arial, helvetica">
-<A HREF="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Katalog</a> ||
-<A HREF="/cgi-bin/koha/members-home.pl">Czytelnicy</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
-<A HREF="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
-<A HREF="/cgi-bin/koha/about.pl">O nas</a> || 
+<div class="center">
+<a href="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> ||
+<a href="/cgi-bin/koha/members/members-home.pl">Czytelnicy</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
+<a href="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
+<a href="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
+<a href="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
+<a href="/cgi-bin/koha/about.pl">O nas</a> || 
 Pomoc
-</FONT>
-</CENTER>
-</BODY>
+</div>
 
-</HTML>
+</body>
+</html>

Index: pl/includes/cat-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/cat-top.inc,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/includes/cat-top.inc	17 Apr 2004 16:26:27 -0000	1.4
+++ pl/includes/cat-top.inc	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,49 +1,43 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <title>KOHA: INTRANET: Katalog</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- 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 -->
 
-<script language="JavaScript">
+<script language="JavaScript" type="text/javascript">
 <!-- Hide from old browsers
 function openWindow(targeturl, windowname) {
-newwin =
+	newwin =
 window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
 }
+function Help() {
+	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
+}
 // end hiding -->
 </script>
 
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<style>
+<style type="text/css">
 .catalogue {
 	background-color:#ad11ad;
 	color:#FFFFFF;
 	background-image:none;
 	text-decoration: normal;
-	font-weight: bold;
 	}
 a.catalogue:hover {
 	background-color: #ad11ad;
 	color: #FFFFFF;
 	text-decoration: none;
-	font-weight: normal;
-	font-weight: bold;
 	}
 </style>
 </head>
+
 <body>
-<!------------------------MENUS-------------------------------->
-<div id="menubar">
-	<span class="koha">KOHA</span>
-	<a class="home" href="/cgi-bin/koha/mainpage.pl">Początek</a> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Katalog</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Członkowie</a> <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Wypożyczalnia</a> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Raporty</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parametry</a> <a class="about" href="/cgi-bin/koha/about.pl">O nas</a>
-</div>
-<div id="submenu">
-	<span class="koha">opcje &gt;&gt;&nbsp;&nbsp;</span>
-	<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=0&type=intranet" class="submenu">Szybkie wyszukiwanie</a> <a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet" class="submenu2">Wyszukiwanie MARC</a> <a href="/cgi-bin/koha/bookshelves/shelves.pl" class="submenu">Półki wirtualne</a> <a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&type=intranet" class="submenu2">Dodaj opis</a> <a href="/cgi-bin/koha/maint/catmaintain.pl" class="submenu">Porzątkowanie katalogu</a>
-</div>
+
+<!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align=left>Zalogowano jako: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Wyloguj</a>]</p>
+    <p class="user">Zalogowano jako: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Wyloguj</a>]</p>
 <!-- TMPL_ELSE -->
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Zaloguj do</a> Systemu Koha</p>
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Zaloguj do</a> Systemu Koha</p>
 <!-- /TMPL_IF -->
+

Index: pl/includes/circulation-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/circulation-bottom.inc,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/includes/circulation-bottom.inc	17 Apr 2004 16:26:27 -0000	1.3
+++ pl/includes/circulation-bottom.inc	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,22 +1,17 @@
-<br clear=all>
+<br clear="all">
 <p> &nbsp; </p>
 
-
-</BLOCKQUOTE>
-
-<CENTER>
-<FONT SIZE=2  face="arial, helvetica">
-<A HREF="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Katalog</a> ||
-<A HREF="/cgi-bin/koha/members-home.pl">Czytelnicy</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
-<A HREF="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
-<A HREF="/cgi-bin/koha/about.pl">O nas</a> || 
+<div class="center">
+<a href="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> ||
+<a href="/cgi-bin/koha/members/members-home.pl">Czytelnicy</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
+<a href="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
+<a href="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
+<a href="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
+<a href="/cgi-bin/koha/about.pl">O nas</a> || 
 Pomoc
-</FONT>
-</CENTER>
-</BODY>
+</div>
 
-</HTML>
+</body>
+</html>

Index: pl/includes/circulation-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/circulation-top.inc,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/includes/circulation-top.inc	17 Apr 2004 16:26:27 -0000	1.4
+++ pl/includes/circulation-top.inc	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,9 +1,9 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html>
 <head>
 <title>KOHA: INTRANET: Cyrkulacja</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- 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 -->
 
 <script language="JavaScript">
 <!-- Hide from old browsers
@@ -12,42 +12,39 @@
 window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
 }
 function focusOnFirst (){
-document.forms[0].elements[0].focus();
+document.forms['f'].elements[0].focus();
 }
 // end hiding -->
 </script>
 
+<script language="JavaScript" type="text/javascript">
+function Help() {
+	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
+}
+</script>
+
+
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<style>
+<style type="text/css">
 .circulation {
 	background-color: #be6170;
 	color:#FFFFFF;
 	background-image:none;
 	text-decoration: normal;
-	font-weight: bold;
 	}
 a.circulation:hover {
 	background-color: #be6170;
 	color: #FFFFFF;
 	text-decoration: normal;
-	font-weight: bold;
 	}
 </style>
 </head>
-<body onLoad="javascript:focusOnFirst()">
 
-<!------------------------MENUS-------------------------------->
-<div id="menubar">
-	<span class="koha">KOHA</span>
-	<a class="home" href="/cgi-bin/koha/mainpage.pl">Początek</a> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Katalog</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Członkowie</a> <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Wypożyczalnia</a> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Raporty</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parametry</a> <a class="about" href="/cgi-bin/koha/about.pl">O nas</a>
-</div>
-<div id="submenu">
-	<span class="koha">opcje &gt;&gt;&nbsp;&nbsp;</span>
-	<a href="/cgi-bin/koha/circ/circulation.pl" class="submenu">Wypożyczenia</a> <a href="/cgi-bin/koha/circ/returns.pl" class="submenu2">Zwroty</a> <a href="/cgi-bin/koha/circ/branchtransfers.pl" class="submenu">Transfery oddziałowe</a>
-</div>
+<body onload="focusOnFirst()">
 
+<!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align=left>Zalogowano jako: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Wyloguj</a>]</p>
+    <p class="user">Zalogowano jako: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Wyloguj</a>]</p>
 <!-- TMPL_ELSE -->
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Zaloguj do</a> Systemu Koha</p>
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Zaloguj do</a> Systemu Koha</p>
 <!-- /TMPL_IF -->

Index: pl/includes/common-style.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/common-style.css,v
retrieving revision 1.1
retrieving revision 1.1.12.1
diff -u -b -r1.1 -r1.1.12.1
--- pl/includes/common-style.css	27 Oct 2003 14:33:43 -0000	1.1
+++ pl/includes/common-style.css	7 May 2007 13:55:52 -0000	1.1.12.1
@@ -1,176 +1,464 @@
+body {
+	font-family:arial,helvetica,sans-serif;
+	font-size:10pt;
+	margin:0px;
+	padding:0px;
+	background-color:#99CC33;
+}
+
+input {
+	display:inline;
+}
+input.flat {
+	border:0px;
+	font-size:90%;
+}
+
+ul {
+	margin-top:0px;
+	margin-bottom:0px;
+}
+
+p {
+	margin-bottom:0px;
+	margin-top:0px;
+	margin-left:10px;
+	margin-right:10px;
+	padding:0px;
+	clear:left;
+}
+
+.center {
+	text-align:center;
+}
+
+label {
+	float:left;
+	width: 6em;
+	display:inline;
+}
+.label20 {
+	float:left;
+	width: 4em;
+	display:inline;
+}
+.label100 {
+	float:left;
+	width: 12em;
+	display:inline;
+}
+
+
 .button {
 	text-align: center;
-	font: 1.2em sans-serif;
-	padding: 10px 15px;
-	border-style: solid;
-	border-width: 2px;
-	border-color: black;
+	font-family: Arial;
+	font-size:12px;
+	padding: 2px 5px 2px 5px;
+	margin-top:5px;
+	margin-bottom:5px;
+	display:inline;
+	position:static;
+	border : 1px solid black;
 	text-decoration: none;
-	color: black;
-	border-radius: 6px;
-	-moz-border-radius: 6px;
+	cursor:pointer;
+	vertical-align:middle;
 	background-color:#FFFFFF;
-	background-image:url("/intranet-tmpl/default/en/images/background-mem.gif");
+	background-image:url("/intranet-tmpl/default/images/background-mem.gif");
+}
+
+.button:hover {
+	background-image:url("/intranet-tmpl/default/images/background-mem.gif");
+}
+
+/* TABLES */
+table {
+	border:1px solid #000000;
+	border-collapse:collapse;
+	width:100%;
+}
+
+table.noborder {
+	border:0px;
+	border-collapse:collapse;
+	font-size:10pt;
+	margin : auto;
+}
+table.small {
+	width:auto;
+}
+
+/* header */
+th {
+	background-color: #99cccc;
+	background-image:url("/intranet-tmpl/default/images/background-mem.gif");
+	font-weight:bold;
+	text-align:center;
+	border:1px solid #000000;
+	padding:3px 0px 3px 0px;
+}
+th.noborder {
+	background-color: #FFFFFF;
+	background-image:none;
+	font-weight:bold;
+	text-align:center;
+	border:1px solid #ad11ad;
+/* 	border-left:1px solid #ad11ad; */
+	padding:3px 0px 3px 0px;
+}
+
+/* standard cell */
+td {
+	border-left:0px;
+}
+/* hilighted cell */
+td.hilighted, tr.hilighted {
+	border-left:0px;
+	background-color:#ffffcc;
+}
+/* cells that are numbers => aligned right */
+td.number {
+	border-left:0px;
+	text-align:right;
+}
+/* hilighted cell */
+td.numberhilighted {
+	border-left:0px;
+	background-color:#ffffcc;
+	text-align:right;
+}
+
+#resultlist table {
+	margin : auto;
+}
+
+#resultlist table td {
+	border-right : 1px solid #CCCCCC;
+}
+
+#resultlist table td:last-child {
+	border-right : 1px solid Black;
+}
+
+
+h1 {
+	color:#000000;
+	background-color:#DDDDDD;
+	background-image:url("/intranet-tmpl/default/images/background-mem.gif");
+	font-size: 150%;
+	text-align:center;
+	padding: 4px;
+/* 	border: 1px solid #666666; */
 }
 
+h2 {
+	margin-top:0px;
+	margin-bottom:4px;
+	text-align:center;
+	padding:0px;
+	font-size:125%;
+	padding-left:10px;
+	padding-right:10px;
+	padding-bottom:3px;
+	padding-top:3px;
+}
+
+h2.help {
+	text-align : left;
+	margin-top : 10px;
+	}
+
+h3 {
+	margin-top:0px;
+	margin-bottom:4px;
+	padding:0px;
+	font-size:100%;
+	font-weight:bold;
+}
+
+#bloctitle, .bloctitle {
+	background-image:url("/intranet-tmpl/default/images/background-mem.gif");
+	color:#000000;
+	font-size: 125%;
+	text-align:center;
+	padding:5px;
+	margin-bottom:10px;
+	border-bottom: 1px solid #666666;
+}
 #problem {
-	color: red;
+	color: white;
+	font-weight:bold;
+	background-color:red;
+}
+.problem {
+	color: white;
 	font-weight:bold;
+	background-color:red;
+}
+
+tr.hilighted td.problem {
+	background-color : #ff9999;
+}
+
+#mainbloc {
+	float:left;
+	width:90%;
+	border-top:1px solid #000000;
+	border-left:1px solid #000000;
+	border-right:3px solid #000000;
+	border-bottom:3px solid #000000;
+	background-color:#FFFFFF;
+	margin-top:10px;
+	margin-left:10px;
+	margin-right:10px;
+	padding-bottom:100px;
+	padding-left:10px;
+	padding-top:10px;
+	padding-right:10px;
 }
+#main {
+	position:absolute;
+}
+
+#bloc25, .bloc25 {
+	float:left;
+	border:1px solid #000000;
+	margin:10px;
+	padding:0px;
+}
+#bloc100, .bloc100 {
+	float:left;
+	position:relative;
+	width:100%;
+	border:1px solid #000000;
+	margin:10px;
+}
+
+#resultnumber {
+	margin-top : 5px;
+	text-align : center;
+}
+
+a.resultnumber {
+	margin-bottom : 5px;
+	padding : 2px 4px;
+	background-color : White;
+	border : 1px solid #339900;
+	font-weight : bold;
+}
+
+#resultnumber .highlight {
+	margin-bottom : 5px;
+	padding : 2px 4px;
+	background-color : #EEEEEE;
+	border : 1px solid Black;
+	font-weight : bold;
+}
+
+a.resultnumber:hover {
+	background-color : #ffffcc;
+}
+
+.resultcount {
+	border-top : 1px solid white;
+	font-weight : bold;
+	padding : 3px;
+}
+
+#resultlist {
+	width:95%;
+	margin : auto;
+/*	margin-left:5%;
+	margin-right:5%;*/
+}
+
+#resultlist p {
+	font-size : .8em;
+}
+
+a.resultlist {
+	font-weight : bold;
+/*	display : block;*/
+	padding-left : 5px;
+}
+
+a {
+	text-decoration: none;
+}
+
+a:hover {
+	text-decoration: none;
+}
+
 #menubar {
+	z-index:2;
+	position:absolute;
+	top:0px;
+	left:0px;
 	border-top:1px solid #666666;
-	font: 1.2em sans-serif;
+	font-size: 14px;
 	background-color:#DDDDDD;
+	padding-bottom:5px;
 }
-#submenu {
-	font: 0.5em sans-serif;
-	background-color:#EEEEEE;
-	border-left:1px solid #000000;
+html>body #menubar {
+position: fixed;
 }
+
+#menubar a {
+	padding:5px;
+}
+
 a.submenu {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	background-color:#EEEEEE;
-	padding:4px;
-	font-weight: bold;
-	margin:0;
+	padding:0px 10px 0px 10px;
+	display:block;
+	background-color:#FFFFFF;
+	color:#000000;
 }
-a.submenu2 {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
-	color:#777777;
-	background-color:#CCCCCC;
-	padding:4px;
-	font-weight: bold;
-	margin:0;
+a.submenu:hover {
+	padding:0px 10px 0px 10px;
+	display:block;
+	background-color:#DDDDDD;
+	color:#000000;
+}
+#Subm1 {
+	z-index: 11; left: 75px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black;
+}
+html>body #Subm1 {
+position: fixed;
+}
+#Subm2 {
+	z-index: 12; left: 150px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black;
+}
+html>body #Subm2 {
+position: fixed;
+}
+#Subm3 {
+	z-index: 12; left: 250px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black;
+}
+html>body #Subm3 {
+position: fixed;
+}
+#Subm4 {
+	z-index: 12; left: 320px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black;
+}
+html>body #Subm4 {
+position: fixed;
+}
+#Subm5 {
+	z-index: 12; left: 400px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black;
 }
+html>body #Subm5 {
+position: fixed;
+}
+#Subm6 {
+	z-index: 12; left: 480px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black;
+}
+html>body #Subm6 {
+position: fixed;
+}
+
+#Subm7 {
+	z-index: 12; left: 550px; visibility: hidden; position: absolute; top: 24px; background-color:white; border:1px solid black;
+}
+html>body #Subm7 {
+position: fixed;
+}
+
+.user {
+	padding-top: 30px;
+	padding-bottom:0px;
+	text-align:right;
+}
+
 .koha {
 	text-align:center;
-	background-image:url("/intranet-tmpl/default/en/images/background-mem.gif");
-	}
+	background-image:url("/intranet-tmpl/default/images/background-mem.gif");
+	font-size:130%;
+	font-weight:bold;
+	padding-left:10px;
+	padding-right:10px;
+	padding-bottom:5px;
+}
 
-a.home {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
+.home {
 	color:#777777;
-	padding:4px;
-	font-weight: bold;
 	}
 a.home:hover {
 	background-color: #339933;
 	color: #000000;
-	text-decoration: none;
-	font-weight: normal;
-	font-weight: bold;
 	}
 
-a.catalogue {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
+.catalogue {
 	color:#777777;
-	padding:4px;
-	font-weight: bold;
-	margin:0;
 	}
 a.catalogue:hover {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
 	background-color:#ad11ad;
 	color:#FFFFFF;
-	font-weight: bold;
 	}
 
-a.members {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
+.members {
 	color:#777777;
-	padding:4px;
-	font-weight: bold;
 	}
 a.members:hover {
 	background-color: #86c268;
 	color: #000000;
-	text-decoration: none;
-	font-weight: bold;
 	}
 
-a.acquisition {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
+.acquisition {
 	color:#777777;
-	padding:4px;
-	font-weight: bold;
 	}
 a.acquisition:hover {
 	background-color: #ffdf61;
 	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
 	}
 
-a.reports {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
+.authority {
+	color:#777777;
+	}
+a.authority:hover {
+	background-color: #6b7cbe;
+	color: #000000;
+	}
+
+.reports {
 	color:#777777;
-	padding:4px;
-	font-weight: bold;
 	}
 a.reports:hover {
 	background-color: #6b7cbe;
 	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
 	}
 
-a.circulation {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
+.circulation {
 	color:#777777;
-	padding:4px;
-	font-weight: bold;
 	}
 a.circulation:hover {
 	background-color: #be6170;
 	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
 	}
 
-a.parameters {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
+.parameters {
 	color:#777777;
-	padding:4px;
-	font-weight: bold;
 	}
 a.parameters:hover {
 	background-color: #86c268;
 	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
 	}
-a.about {
-	font-weight: normal;
-	text-decoration: none;
-	cursor: hand;
+.bull {
+	color:#777777;
+	}
+a.bull:hover {
+	background-color: #803010;
+	color: #000000;
+	}
+.about {
 	color:#777777;
-	padding:4px;
-	font-weight: bold;
 	}
 a.about:hover {
 	background-color: #86c268;
 	color: #000000;
-	text-decoration: normal;
-	font-weight: bold;
+	}
+.help {
+	color:#777777;
+	}
+a.help:hover {
+	color: #FFFFFF;
 	}

Index: pl/includes/issues-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/issues-bottom.inc,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/includes/issues-bottom.inc	17 Apr 2004 16:26:27 -0000	1.3
+++ pl/includes/issues-bottom.inc	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,22 +1,17 @@
-<br clear=all>
+<br clear="all">
 <p> &nbsp; </p>
 
-
-</BLOCKQUOTE>
-
-<CENTER>
-<FONT SIZE=2  face="arial, helvetica">
-<A HREF="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Katalog</a> ||
-<A HREF="/cgi-bin/koha/members-home.pl">Czytelnicy</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
-<A HREF="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
-<A HREF="/cgi-bin/koha/about.pl">O nas</a> || 
+<div class="center">
+<a href="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> ||
+<a href="/cgi-bin/koha/members/members-home.pl">Czytelnicy</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
+<a href="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
+<a href="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
+<a href="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
+<a href="/cgi-bin/koha/about.pl">O nas</a> || 
 Pomoc
-</FONT>
-</CENTER>
-</BODY>
+</div>
 
-</HTML>
+</body>
+</html>

Index: pl/includes/members-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/members-bottom.inc,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/includes/members-bottom.inc	17 Apr 2004 16:26:27 -0000	1.3
+++ pl/includes/members-bottom.inc	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,22 +1,17 @@
-<br clear=all>
+<br clear="all">
 <p> &nbsp; </p>
 
-
-</BLOCKQUOTE>
-
-<CENTER>
-<FONT SIZE=2  face="arial, helvetica">
-<A HREF="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Katalog</a> ||
-<A HREF="/cgi-bin/koha/members-home.pl">Czytelnicy</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
-<A HREF="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
-<A HREF="/cgi-bin/koha/about.pl">O nas</a> || 
+<div class="center">
+<a href="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> ||
+<a href="/cgi-bin/koha/members/members-home.pl">Czytelnicy</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
+<a href="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
+<a href="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
+<a href="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
+<a href="/cgi-bin/koha/about.pl">O nas</a> || 
 Pomoc
-</FONT>
-</CENTER>
-</BODY>
+</div>
 
-</HTML>
+</body>
+</html>

Index: pl/includes/members-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/members-top.inc,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/includes/members-top.inc	17 Apr 2004 16:26:27 -0000	1.4
+++ pl/includes/members-top.inc	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,39 +1,36 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html>
 <head>
 <title>KOHA: INTRANET: Czytelnicy</title>
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-</head>
-<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 -->
+<script language="JavaScript" type="text/javascript">
+function Help() {
+	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
+}
+</script>
 
-<style>
+<style type="text/css">
 .members {
 	background-color: #86c268;
 	color:#FFFFFF;
 	text-decoration: normal;
-	font-weight: bold;
 	}
 a.members:hover {
 	background-color: #86c268;
 	color: #FFFFFF;
 	text-decoration: normal;
-	font-weight: bold;
 	}
 </style>
+</head>
+
+<body>
 
-<!------------------------MENUS-------------------------------->
-<div id="menubar">
-	<span class="koha">KOHA</span>
-	<a class="home" href="/cgi-bin/koha/mainpage.pl">Początek</a> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Katalog</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Członkowie</a> <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Wypożyczalnia</a> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Raporty</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parametry</a> <a class="about" href="/cgi-bin/koha/about.pl">O nas</a>
-</div>
-<div id="submenu">
-	<span class="koha">opcje &gt;&gt;&nbsp;&nbsp;</b></span>
-	<a href="/cgi-bin/koha/members/members-home.pl" class="submenu">Członkowie - początek</a> <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add" class="submenu2">Dodaj czytelnika</a> <a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add" class="submenu">Dodaj organizację</a>
-</div>
+<!-- MENUS -->
+<!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align=left>Zalogowano jako: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Wyloguj</a>]</p>
+    <p class="user">Zalogowano jako: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Wyloguj</a>]</p>
 <!-- TMPL_ELSE -->
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Zaloguj do</a> Systemu Koha</p>
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Zaloguj do</a> Systemu Koha</p>
 <!-- /TMPL_IF -->

Index: pl/includes/opac-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/opac-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/includes/opac-bottom.inc	17 Apr 2004 16:26:27 -0000	1.2
+++ pl/includes/opac-bottom.inc	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -6,7 +6,7 @@
 
 <font size=2  face="arial, helvetica">
 
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Szukaj w katalogu</a> ||
+<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Szukaj w katalogu</a> ||
 <!--<A HREF="/cgi-bin/koha/members-home.pl">Members Area</a> || -->
 <A HREF="/join.html">Zostań Czytelnikiem</a> ||
 <A HREF="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a>

Index: pl/includes/opac-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/opac-top.inc,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/includes/opac-top.inc	17 Apr 2004 16:26:27 -0000	1.3
+++ pl/includes/opac-top.inc	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -4,7 +4,7 @@
 <html>
 <head>
 <title>KOHA: OPAC Szukaj w katalogu</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- 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 -->
 
 </head>
 <body text="black" bgcolor="white" link="#0000ff" vlink="#3366cc" Alink="#cc3300"
@@ -46,7 +46,6 @@
 	    onMouseOver="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/mouseover-join.gif'" 		onMouseOut="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/holder.gif'">
 	    <img src="<!-- TMPL_VAR name="themelang" -->/images/menu-join.gif" width=54 height=30 alt="Zapisy" hspace=0 vspace=0 border=0 name="menu-join"></a>
 	<!-- /TMPL_IF -->
-
 	<a href="/cgi-bin/koha/mainpage.pl"
 	onMouseOver="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/mouseover-home.gif'" 		onMouseOut="document.mouseover.src='<!-- TMPL_VAR name="themelang" -->/images/holder.gif'"><img src="<!-- TMPL_VAR name="themelang" -->/images/menu-home.gif" width=60 height=30 alt="PoczÄ…tek" hspace=0 vspace=0 border=0 name="menu-home"></a></td>
 

Index: pl/includes/parameters-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/parameters-bottom.inc,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/includes/parameters-bottom.inc	17 Apr 2004 16:26:27 -0000	1.2
+++ pl/includes/parameters-bottom.inc	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,22 +1,17 @@
-<br clear=all>
+<br clear="all">
 <p> &nbsp; </p>
 
-
-</BLOCKQUOTE>
-
-<CENTER>
-<FONT SIZE=2  face="arial, helvetica">
-<A HREF="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Katalog</a> ||
-<A HREF="/cgi-bin/koha/members-home.pl">Czytelnicy</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
-<A HREF="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
-<A HREF="/cgi-bin/koha/about.pl">O nas</a> || 
+<div class="center">
+<a href="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> ||
+<a href="/cgi-bin/koha/members/members-home.pl">Czytelnicy</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
+<a href="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
+<a href="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
+<a href="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
+<a href="/cgi-bin/koha/about.pl">O nas</a> || 
 Pomoc
-</FONT>
-</CENTER>
-</BODY>
+</div>
 
-</HTML>
+</body>
+</html>

Index: pl/includes/parameters-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/parameters-top.inc,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/includes/parameters-top.inc	17 Apr 2004 16:26:27 -0000	1.3
+++ pl/includes/parameters-top.inc	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,39 +1,46 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html>
 <head>
 <title>KOHA: INTRANET: Parametry</title>
+<!-- Additions to enable Calendar system -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/calendar/calendar-system.css">
+<!-- End of additions -->
+
+<!-- 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 -->
+<!-- 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 -->
+
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 
-<style>
+<style type="text/css">
 .parameters {
 	background-color: #86c268;
 	color: #FFFFFF;
 	text-decoration: normal;
-	font-weight: bold;
+	background-image:none;
 	}
 a.parameters:hover {
 	background-color: #86c268;
 	color: #FFFFFF;
 	text-decoration: normal;
-	font-weight: bold;
 	}
 </style>
 </head>
 <body>
 
-<!------------------------MENUS-------------------------------->
-<div id="menubar">
-		<span class="koha">KOHA</span>
-			<a class="home" href="/cgi-bin/koha/mainpage.pl">Początek</a> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Katalog</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Członkowie</a> <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Wypożyczalnia</a> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Raporty</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parametry</a> <a class="about" href="/cgi-bin/koha/about.pl">O nas</a>
-</div>
-<div id="submenu">
-	<span class="koha">opcje &gt;&gt;&nbsp;&nbsp;</span>
-	<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Fundusze</a> <a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2">Wartość autoryz</a> <a href="/cgi-bin/koha/admin/thesaurus.pl" class="submenu">Tezaurus</a> <a href="/cgi-bin/koha/admin/currency.pl" class="submenu2">Waluty</a> <a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Drukarki</a>
-</div>
+<script language="JavaScript" type="text/javascript">
+function Help() {
+	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
+}
+</script>
+
+<!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align=left>Zalogowano jako: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Wyloguj</a>]</p>
+    <p class="user">Zalogowano jako: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Wyloguj</a>]</p>
 <!-- TMPL_ELSE -->
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Zaloguj do</a> Systemu Koha</p>
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Zaloguj do</a> Systemu Koha</p>
 <!-- /TMPL_IF -->

Index: pl/includes/reports-bottom.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/reports-bottom.inc,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/includes/reports-bottom.inc	17 Apr 2004 16:26:27 -0000	1.3
+++ pl/includes/reports-bottom.inc	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,22 +1,17 @@
-<br clear=all>
+<br clear="all">
 <p> &nbsp; </p>
 
-
-</BLOCKQUOTE>
-
-<CENTER>
-<FONT SIZE=2  face="arial, helvetica">
-<A HREF="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Katalog</a> ||
-<A HREF="/cgi-bin/koha/members-home.pl">Czytelnicy</a> ||
-<A HREF="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
-<A HREF="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
-<A HREF="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
-<A HREF="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
-<A HREF="/cgi-bin/koha/about.pl">O nas</a> || 
+<div class="center">
+<a href="/cgi-bin/koha/mainpage.pl">PoczÄ…tek</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Katalog</a> ||
+<a href="/cgi-bin/koha/members/members-home.pl">Czytelnicy</a> ||
+<a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> ||
+<a href="/cgi-bin/koha/circ/circulation.pl">Cyrkulacja</a> ||
+<a href="/cgi-bin/koha/reports-home.pl">Raporty</a> ||
+<a href="/cgi-bin/koha/admin-home.pl">Parametry</a> ||
+<a href="/cgi-bin/koha/about.pl">O nas</a> || 
 Pomoc
-</FONT>
-</CENTER>
-</BODY>
+</div>
 
-</HTML>
+</body>
+</html>

Index: pl/includes/reports-top.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/includes/Attic/reports-top.inc,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/includes/reports-top.inc	17 Apr 2004 16:26:27 -0000	1.4
+++ pl/includes/reports-top.inc	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,40 +1,35 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 
 <html>
 <head>
 <title>KOHA: INTRANET: Reporty</title>
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-</head>
-<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 -->
+<script language="JavaScript" type="text/javascript">
+function Help() {
+	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
+}
+</script>
 
-<style>
+<style type="text/css">
 .reports {
 	background-color: #6b7cbe;
 	color:#FFFFFF;
 	text-decoration: normal;
-	font-weight: bold;
+	background-image:none;
 	}
 a.reports:hover {
 	background-color: #6b7cbe;
 	color: #FFFFFF;
 	text-decoration: normal;
-	font-weight: bold;
 	}
 </style>
+</head>
+<body>
 
-<!------------------------MENUS-------------------------------->
-<div id="menubar">
-	<span class="koha">KOHA</span>
-	<a class="home" href="/cgi-bin/koha/mainpage.pl">Początek</a> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">Katalog</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Członkowie</a> <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Gromadzenie</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Wypożyczalnia</a> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Raporty</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parametry</a> <a class="about" href="/cgi-bin/koha/about.pl">O nas</a>
-</div>
-<div id="submenu">
-	<span class="koha">opcje &gt;&gt;&nbsp;&nbsp;</span>
-	<a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes" class="submenu">Typy zasobów </a>
-</div>
-<BLOCKQUOTE>
+<!-- TMPL_INCLUDE name="menus.inc" -->
 <!-- TMPL_IF NAME="loggedinusername" -->
-    <p align=left>Zalogowano jako: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href=/cgi-bin/koha/mainpage.pl?logout.x=1>Wyloguj</a>]</p>
+    <p class="user">Zalogowano jako: <!-- TMPL_VAR NAME="loggedinusername" --> [<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Wyloguj</a>]</p>
 <!-- TMPL_ELSE -->
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Zaloguj do</a> Systemu Koha</p>
+    <p class="user"><a href="/cgi-bin/koha/opac-user.pl">Zaloguj do</a> Systemu Koha</p>
 <!-- /TMPL_IF -->

Index: pl/maint/catmaintain.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/maint/Attic/catmaintain.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/maint/catmaintain.tmpl	17 Apr 2004 16:58:58 -0000	1.2
+++ pl/maint/catmaintain.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,26 +1,26 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 
 
-<!-- TMPL_IF name=allsub-p -->
-<!-- TMPL_LOOP name=loop -->
-"<a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&sub=<!-- TMPL_VAR name=sub escape=url -->" onclick='messenger("/cgi-bin/koha/maint/catmaintain.pl?type=modsub&sub=<!-- TMPL_VAR name=sub2 escape=url -->");window1.focus()'><!-- TMPL_VAR name=subject escape=html -->"</a><br>
+<!-- TMPL_IF NAME=allsub-p -->
+<!-- TMPL_LOOP NAME="loop" -->
+"<a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="openWindow('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html -->"</a><br>
 <!-- /TMPL_LOOP -->
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF name=modsub-p -->
-<form action="/cgi-bin/koha/maint/catmaintain.pl">
-Temat: <input type=text value="<!-- TMPL_VAR name=sub escape=html -->" name=sub size=40><br>
-<input type=hidden name=type value=upsub>
-<input type=hidden name=oldsub value="<!-- TMPL_VAR name=sub escape=html -->">
-<input type=submit value="zmień">
+<!-- TMPL_IF NAME=modsub-p -->
+<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
+Temat: <input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" size="40"><br>
+<input type="hidden" name="type" value="upsub">
+<input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->">
+<input type="submit" value="zmień">
 </form>
 <p>Nastąpi zmiana haseł tematycznych na wszystkich opisach, do których odnosi się ten temat.
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF name=upsub-p -->
-Udana zmiana <!-- TMPL_VAR name=oldsub escape=html --> jest teraz <!-- TMPL_VAR name=sub escape=html -->
+<!-- TMPL_IF NAME=upsub-p -->
+Udana zmiana <!-- TMPL_VAR NAME="oldsub" escape=html --> jest teraz <!-- TMPL_VAR NAME="sub" escape=html -->
 <!-- <![ IGNORE [
 <p><a href="/cgi-bin/koha/maint/catmaintain.pl" onclick="window0.focus()">Back to catalogue maintenance</a><br>
 <a href=nowhere onclick="self.close()">Close this window</a>
@@ -28,65 +28,65 @@
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF name=undel-p -->
-<table border=0>
+<!-- TMPL_IF NAME=undel-p -->
+<table border="0">
 <thead>
 <tr><th>Tytuł</th><th>Autor</th><th>Przywróć</th></tr>
 <tbody>
-<!-- TMPL_LOOP name=loop -->
+<!-- TMPL_LOOP NAME="loop" -->
 <tr>
-<td><!-- TMPL_VAR name=title escape=html --></td>
-<td><!-- TMPL_VAR name=author escape=html --></td>
-<td><a href="/cgi-bin/koha/maint/catmaintain.pl?<!-- TMPL_VAR name=undelete escape=url -->">Przywróć</a></td>
+<td><!-- TMPL_VAR NAME="title" escape=html --></td>
+<td><!-- TMPL_VAR NAME="author" escape=html --></td>
+<td><a href="/cgi-bin/koha/maint/catmaintain.pl?<!-- TMPL_VAR NAME="undelete" escape=url -->">Przywróć</a></td>
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF name=finun-p -->
+<!-- TMPL_IF NAME=finun-p -->
 wymazano z powodzeniem
 <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Powrót do Porządkowania katalogu</a>
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF name=fixitemtype-p -->
-<form method=post action="/cgi-bin/koha/maint/catmaintain.pl">
-<input type=hidden name=bi value="<!-- TMPL_VAR name=bi escape=html>">
-<input type=hidden name=type value=updatetype>
-Rodzaj pozycji: <input type=text name=itemtype value="<!-- TMPL_VAR name=item escape=html>"><br>
-<input type=submit value="Zmień">
+<!-- TMPL_IF NAME=fixitemtype-p -->
+<form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
+<input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>">
+<input type="hidden" name="type" value="updatetype">
+Rodzaj pozycji: <input type="text" name="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>"><br>
+<input type="submit" value="Zmień">
 </form>
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF name=updatetype-p -->
+<!-- TMPL_IF NAME=updatetype-p -->
 Aktualizowano z powodzeniem
 <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Powrót do Porządkowania katalogu</a>
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF name=mainmenu-p -->
-<B>Hasło tematyczne - Zarządzanie</b><br>
-<form action="/cgi-bin/koha/maint/catmaintain.pl" method=post>
-<input type=hidden name=type value=allsub>
-Pokaż hasła  tematyczne zaczynajace się na <input type=text name=sub><br>
-<input type=submit value="Pokaż">
+<!-- TMPL_IF NAME=mainmenu-p -->
+<b>Hasło tematyczne - Zarządzanie</b><br>
+<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
+<input type="hidden" name="type" value="allsub">
+Pokaż hasła  tematyczne zaczynajace się na <input type="text" name="sub"><br>
+<input type="submit" value="Pokaż">
 </form>
 <p>
-<B>ZarzÄ…dzanie GrupÄ…</b></br>
-<form action="/cgi-bin/koha/search.pl" method=post>
-<input type=hidden name=type value=catmain>
-Pokaż tytuły zaczynające się na <input type=text name=title><br>
-Numer pozycji <INPUT TYPE="text" SIZE="25" NAME="item"><br>
-<input type=submit value="Pokaż">
+<b>ZarzÄ…dzanie GrupÄ…</b></br>
+<form action="/cgi-bin/koha/search.pl" method="post">
+<input type="hidden" name="type" value="catmain">
+Pokaż tytuły zaczynające się na <input type="text" name="title"><br>
+Numer pozycji <input type="text" size="25" name="item"><br>
+<input type="submit" value="Pokaż">
 </form>
 <p>
-<B>Przywróć Opis</b></br>
-<form action="/cgi-bin/koha/maint/catmaintain.pl" method=post>
-<input type=hidden name=type value=undel>
-Pokaż tytuły zaczynające się na <input type=text name=title><br>
-<input type=submit value="Pokaż">
+<b>Przywróć Opis</b></br>
+<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
+<input type="hidden" name="type" value="undel">
+Pokaż tytuły zaczynające się na <input type="text" name="title"><br>
+<input type="submit" value="Pokaż">
 </form>
 <!-- /TMPL_IF -->
 

Index: pl/marcimport/AcceptBiblioitem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/Attic/AcceptBiblioitem.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/marcimport/AcceptBiblioitem.tmpl	17 Apr 2004 16:26:26 -0000	1.3
+++ pl/marcimport/AcceptBiblioitem.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -3,54 +3,54 @@
 <!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
      was in Perl.
   -->
-<a href=$ENV{'SCRIPT_NAME'}?file=$file>Nowy Rekord</a> | <a href=marcimport.pl>Nowy Plik</a><br>
-<!-- TMPL_IF name="BIBLIO_EXISTS" -->
-	<table border=0 width=50% cellpadding=10 cellspacing=0>
+<a href="$ENV{'SCRIPT_NAME'}?file=$file">Nowy Rekord</a> | <a href="marcimport.pl">Nowy Plik</a><br>
+<!-- TMPL_IF NAME="BIBLIO_EXISTS" -->
+	<table border="0" width="50%" cellpadding="10" cellspacing="0">
 		<tr>
-			<th background=/images/background-acq.gif>Rekord jest już w bazie
+			<th background="/images/background-acq.gif">Rekord jest już w bazie
 			</th>
 		</tr>
 		<tr>
 			<td bgcolor="#dddddd">
-				<!-- TMPL_VAR name="title" --> znajduje się już w bazie z biblionumber <!-- TMPL_VAR name="biblionumber" --> oraz biblioitemnumber <!-- TMPL_VAR name="biblioitemnumber" -->
+				<!-- TMPL_VAR NAME="title" --> znajduje się już w bazie z biblionumber <!-- TMPL_VAR NAME="biblionumber" --> oraz biblioitemnumber <!-- TMPL_VAR NAME="biblioitemnumber" -->
 			  </td>
 		</tr>
 	</table>
 	<p>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="BIBLIO_CREATE" -->
-    <table cellpadding=10 cellspacing=0 border=0 width=50%>
+<!-- TMPL_IF NAME="BIBLIO_CREATE" -->
+    <table cellpadding="10" cellspacing="0" border="0" width="50%">
 		<tr>
-			<th background=/images/background-acq.gif>Rekord wprowadzony do bazy</th>
+			<th background="/images/background-acq.gif">Rekord wprowadzony do bazy</th>
 		</tr>
 		<tr>
-			<td bgcolor=#dddddd>
-				<!-- TMPL_VAR name="title" --> wprowadzone do bazy danych z polem biblionember <!-- TMPL_VAR name="biblionumber" --> oraz polem biblioitemnumber <!-- TMPL_VAR name="biblioitemnumber" --></td>
+			<td bgcolor="#dddddd">
+				<!-- TMPL_VAR NAME="title" --> wprowadzone do bazy danych z polem biblionember <!-- TMPL_VAR NAME="biblionumber" --> oraz polem biblioitemnumber <!-- TMPL_VAR NAME="biblioitemnumber" --></td>
 		</tr>
 	  </table>
 <!-- /TMPL_IF -->
-    <table border=0 cellpadding=10 cellspacing=0>
-      <tr><th background=/images/background-acq.gif>
-	Dodaj Nowy Egzemplarz dla <!-- TMPL_VAR name="title" -->
+    <table border="0" cellpadding="10" cellspacing="0">
+      <tr><th background="/images/background-acq.gif">
+	Dodaj Nowy Egzemplarz dla <!-- TMPL_VAR NAME="title" -->
       </th></tr>
-      <tr><td bgcolor=#dddddd>
+      <tr><td bgcolor="#dddddd">
       <form>
-        <input type=hidden name=newitem value=1>
-        <input type=hidden name=biblionumber value="<!-- TMPL_VAR name="biblionumber" -->">
-        <input type=hidden name=biblioitemnumber value="<!-- TMPL_VAR name="biblioitemnumber" -->">
-        <input type=hidden name=file value="<!-- TMPL_VAR name="file" -->">
-        <table border=0>
-          <tr><td>KOD PASKOWY</td><td><input name=barcode size=10 value="<!-- TMPL_VAR name="barcode" -->">
-          Oddział Właściwy <select name=homebranch><!-- TMPL_VAR name="branchselect" --></select>
+        <input type="hidden" name="newitem" value="1">
+        <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+        <input type="hidden" name="biblioitemnumber" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+        <input type="hidden" name="file" value="<!-- TMPL_VAR NAME="file" -->">
+        <table border="0">
+          <tr><td>KOD PASKOWY</td><td><input name="barcode" size="10" value="<!-- TMPL_VAR NAME="barcode" -->">
+          Oddział Właściwy <select name="homebranch"><!-- TMPL_VAR NAME="branchselect" --></select>
 	  </td></tr>
           <tr><td>Cana Wymiany:</td>
-	  <td><input name=replacementprice size=10></td></tr>
+	  <td><input name="replacementprice" size="10"></td></tr>
           <tr><td>Uwagi</td>
-	  <td><textarea name=notes rows=4 cols=40 wrap=physical></textarea>
+	  <td><textarea name="notes" rows="4" cols="40" wrap="physical"></textarea>
 	  </td></tr>
         </table>
         <p>
-        <input type=submit value="Dodaj Egzemplarz">
+        <input type="submit" value="Dodaj Egzemplarz">
       </form>
       </td></tr>
     </table>

Index: pl/marcimport/AcceptItemCopy.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/Attic/AcceptItemCopy.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/marcimport/AcceptItemCopy.tmpl	17 Apr 2004 16:26:26 -0000	1.2
+++ pl/marcimport/AcceptItemCopy.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,15 +1,15 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <center>
-<!-- TMPL_IF name="BARCODE_EXISTS" -->
-	<font color=red>Kod paskowy <b><!-- TMPL_VAR name="barcode" --></b> został już przydzielony.</font><p>
+<!-- TMPL_IF NAME="BARCODE_EXISTS" -->
+	<font color="red">Kod paskowy <b><!-- TMPL_VAR NAME="barcode" --></b> został już przydzielony.</font><p>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="ITEM_ERROR" -->
-	<font color=red>BÅ‚Ä…d: <!-- TMPL_VAR name="error" --></font><p>
+<!-- TMPL_IF NAME="ITEM_ERROR" -->
+	<font color="red">BÅ‚Ä…d: <!-- TMPL_VAR NAME="error" --></font><p>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="ITEM_CREATED" -->
-	<table border=1 align=center cellpadding=10>
-		<tr><td bgcolor=yellow>
-			Egzemplarz dodano z kodem <!-- TMPL_VAR name="barcode" -->
+<!-- TMPL_IF NAME="ITEM_CREATED" -->
+	<table border="1" align="center" cellpadding="10">
+		<tr><td bgcolor="yellow">
+			Egzemplarz dodano z kodem <!-- TMPL_VAR NAME="barcode" -->
 		</td></tr>
 	</table>
 <!-- /TMPL_IF -->
@@ -18,10 +18,10 @@
 <!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
      was in Perl.
   -->
-<li><a href=$ENV{'SCRIPT_NAME'}?menu=z3950>Wyszukiwanie Z39.50</a>
+<li><a href="$ENV{'SCRIPT_NAME'}?menu=z3950">Wyszukiwanie Z39.50</a>
 <!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
      was in Perl.
   -->
-<li><a href=$ENV{'SCRIPT_NAME'}?menu=uploadmarc>Wgraj rekordy MARC</a>
+<li><a href="$ENV{'SCRIPT_NAME'}?menu=uploadmarc">Wgraj rekordy MARC</a>
 </ul>
 <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: pl/marcimport/AcceptMarcUpload.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/Attic/AcceptMarcUpload.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/marcimport/AcceptMarcUpload.tmpl	17 Apr 2004 16:26:26 -0000	1.3
+++ pl/marcimport/AcceptMarcUpload.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,38 +1,38 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
-<h1><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->>Menu główne</a></h1>
+<h1><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->">Menu główne</a></h1>
 <h2>Wybierz zestaw rekordów MARC</h2>
 <ul>
-<!-- TMPL_LOOP name="marc" -->
-	<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?file=<!-- TMPL_VAR name="id" -->&menu=<!-- TMPL_VAR name="menu" -->><!-- TMPL_VAR name="name" --></a></li>
+<!-- TMPL_LOOP NAME="marc" -->
+	<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?file=<!-- TMPL_VAR NAME="id" -->&amp;menu=<!-- TMPL_VAR NAME="menu" -->"><!-- TMPL_VAR NAME="name" --></a></li>
 <!-- /TMPL_LOOP -->
-<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=z3950>Wyszukiwanie Z39.50</a>
-<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=uploadmarc>Wgraj rekordy MARC</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=z3950">Wyszukiwanie Z39.50</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=uploadmarc">Wgraj rekordy MARC</a>
 </ul>
 </ul>
 <p>
-<table border=1 bgcolor=#dddddd>
-	<tr><th bgcolor=#bbbbbb colspan=2>
+<table border="1" bgcolor="#dddddd">
+	<tr><th bgcolor="#bbbbbb" colspan="2">
 		Upload zestaw rekordów MARC</th>
 	</tr>
 	<tr>
 		<td>Upload zestaw rekordów MARC:</td>
 		<td>
-			<form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=<!-- TMPL_VAR name="menu" -->" enctype="multipart/form-data">
-			<input type="file" name="uploadmarc"/>
+			<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=<!-- TMPL_VAR NAME="menu" -->" enctype="multipart/form-data">
+			<input type="file" name="uploadmarc" />
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<input type=hidden name=menu value="<!-- TMPL_VAR name="menu" -->">
+			<input type="hidden" name="menu" value="<!-- TMPL_VAR NAME="menu" -->">
 			Nazwij ten zestaw rekordów MARC:
 		</td>
 		<td>
-			<input type=text name=name>
+			<input type="text" name="name">
 		</td>
 	</tr>
 	<tr>
-		<td colspan=2 align=center>
-			<input type=submit>
+		<td colspan="2" align="center">
+			<input type="submit">
 		</td>
 	</tr>
 </table>

Index: pl/marcimport/ListFileRecords.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/Attic/ListFileRecords.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/marcimport/ListFileRecords.tmpl	17 Apr 2004 16:26:27 -0000	1.3
+++ pl/marcimport/ListFileRecords.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,50 +1,50 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <h1>Menu główne</h1>
 <ul>
-<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=z3950>Wyszukiwanie Z39.50</a>
-<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=uploadmarc>Wgraj rekordy MARC</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=z3950">Wyszukiwanie Z39.50</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=uploadmarc">Wgraj rekordy MARC</a>
 </ul>
 <center>
 <p>
 <!-- FIXME - The "$ENV{SCRIPT_NAME}" is evidently left over from when this
      was in Perl.
   -->
-<a href=$ENV{'SCRIPT_NAME'}?menu=$menu>Wybierz nowy plik</a>
+<a href="$ENV{'SCRIPT_NAME'}?menu=$menu">Wybierz nowy plik</a>
 <p>
-<!-- TMPL_IF name="IS_MARC" -->
-	<table border=0 cellpadding=10 cellspacing=0>
+<!-- TMPL_IF NAME="IS_MARC" -->
+	<table border="0" cellpadding="10" cellspacing="0">
 	<tr>
-		<th background=/images/background-acq.gif>
-		 	Z którego rekordu importować <!-- TMPL_VAR name="recordsource" -->
+		<th background="/images/background-acq.gif">
+		 	Z którego rekordu importować <!-- TMPL_VAR NAME="recordsource" -->
 		</th>
 	</tr>
 	<tr>
-		<td bgcolor=#dddddd>
+		<td bgcolor="#dddddd">
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="IS_Z3950" -->
-<table border=0 cellpadding=10 cellspacing=0>
+<!-- TMPL_IF NAME="IS_Z3950" -->
+<table border="0" cellpadding="10" cellspacing="0">
 <tr>
-		<td bgcolor=#dddddd>
-		<!-- TMPL_IF name="HAS_NUMRECORDS" -->
-	            <a name=SERVER-<!-- TMPL_VAR name="srvid" -->></a> " <!-- TMPL_VAR name="srvname" -->
-		<font size=-1>{Przeglądanie od <!-- TMPL_VAR name="startrecord" --> do <!-- TMPL_VAR name="highest" --> z <!-- TMPL_VAR name="numrecords" --> rekordów] <!-- TMPL_VAR name="previous" --> | <!-- TMPL_VAR name="next" --> </font><br>
+		<td bgcolor="#dddddd">
+		<!-- TMPL_IF NAME="HAS_NUMRECORDS" -->
+	            <a name="SERVER-<!-- TMPL_VAR NAME="srvid" -->"></a> " <!-- TMPL_VAR NAME="srvname" -->
+		<font size="-1">{Przeglądanie od <!-- TMPL_VAR NAME="startrecord" --> do <!-- TMPL_VAR NAME="highest" --> z <!-- TMPL_VAR NAME="numrecords" --> rekordów] <!-- TMPL_VAR NAME="previous" --> | <!-- TMPL_VAR NAME="next" --> </font><br>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="PENDING" -->
-			<font color=red>Szukanie nadal w toku...</font>
+		<!-- TMPL_IF NAME="PENDING" -->
+			<font color="red">Szukanie nadal w toku...</font>
 		<!-- TMPL_ELSE -->
-			<font color=red>przetwarzanie... <!-- TMPL_VAR name="elapsedtime" --></font>
+			<font color="red">przetwarzanie... <!-- TMPL_VAR NAME="elapsedtime" --></font>
 		<!-- /TMPL_IF -->
-		<!-- TMPL_IF name="NO_RECORDS" -->
-			<b>Nic nie znaleziono dla zapytania <!-- TMPL_VAR name="id" --></b>
+		<!-- TMPL_IF NAME="NO_RECORDS" -->
+			<b>Nic nie znaleziono dla zapytania <!-- TMPL_VAR NAME="id" --></b>
 		<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
-	<!-- TMPL_LOOP name="LINES" -->
-<!--		<a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?file=<!-- TMPL_VAR name="file" -->&resultsid=<!-- TMPL_VAR name="resultsid" -->&<!-- TMPL_VAR name="searchfield" -->=<!-- TMPL_VAR name="searchvalue" -->&searchfield=<!-- TMPL_VAR name="searchfield" -->&searchvalue=<!-- TMPL_VAR name="searchvalue" -->> -->
-		<a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?file=<!-- TMPL_VAR name="file" -->&numrecord=<!-- TMPL_VAR name="numrecord" -->>
-				<!-- TMPL_VAR name="title" -->
-				<!-- TMPL_VAR name="author" -->
+	<!-- TMPL_LOOP NAME="LINES" -->
+<!--		<a href=<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?file=<!-- TMPL_VAR NAME="file" -->&amp;resultsid=<!-- TMPL_VAR NAME="resultsid" -->&amp;<!-- TMPL_VAR NAME="searchfield" -->=<!-- TMPL_VAR NAME="searchvalue" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;searchvalue=<!-- TMPL_VAR NAME="searchvalue" -->> -->
+		<a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?file=<!-- TMPL_VAR NAME="file" -->&amp;numrecord=<!-- TMPL_VAR NAME="numrecord" -->">
+				<!-- TMPL_VAR NAME="title" -->
+				<!-- TMPL_VAR NAME="author" -->
 		</a>
-		<!-- TMPL_VAR name="donetext" --><br>
+		<!-- TMPL_VAR NAME="donetext" --><br>
 	<!-- /TMPL_LOOP -->
 </td>
 </tr>

Index: pl/marcimport/mainmenu.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/Attic/mainmenu.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/marcimport/mainmenu.tmpl	17 Apr 2004 16:26:27 -0000	1.2
+++ pl/marcimport/mainmenu.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <h1>Menu główne</h1>
 <ul>
-<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=z3950>Wyszukiwanie Z39.50</a>
-<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=uploadmarc>Wgraj rekordy MARC</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=z3950">Wyszukiwanie Z39.50</a>
+<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=uploadmarc">Wgraj rekordy MARC</a>
 </ul>
 <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: pl/marcimport/marcimportdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/Attic/marcimportdetail.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/marcimport/marcimportdetail.tmpl	17 Apr 2004 16:26:27 -0000	1.2
+++ pl/marcimport/marcimportdetail.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,59 +1,59 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
-<a href=request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->>
-<img height=42  WIDTH=120 BORDER="0" src="/images/requests.gif" align="right" border="0"></a>
-<font SIZE=6><em><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></em></font><p>
+<a href="request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">
+<img height="42"  width="120" border="0" src="/images/requests.gif" align="right" border="0"></a>
+<font size="6"><em><!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->) <!-- TMPL_VAR NAME="class" --></em></font><p>
 <!-- FIXME - "callpadding" should be "cellpadding", right? -->
 <table cellspacing="0" callpadding="5" border="1" align="left" width="220">
-<!-----------------old style RECORD TABLE--------->
+<!-- ---------------old style RECORD TABLE------- -->
 <center>
 <h1>Nowy Rekord</h1>
 Na dole dostępny pełen rekord MARC
-<form method=post>
-<table border=1>
-	<tr bgcolor="#dddddd"><td>Tytuł</td><td><input type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Podtytuł</td><td><input type="text" name="subtitle" value="<!-- TMPL_VAR NAME="subtitle" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#dddddd"><td>Autor</td><td><input type="text" name="author" value="<!-- TMPL_VAR NAME="author" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Dodatkowi autorzy</td><td><textarea name="additionalauthors" rows=4 cols=20><!-- TMPL_VAR NAME="additionalauthors" --></textarea></td></tr>
-	<tr bgcolor="#dddddd"><td>Ilustrator</td><td><input type="text" name="illustrator" value="<!-- TMPL_VAR NAME="illustrator" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Copyright</td><td><input type="text" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" size=20 maxlength=80></td></tr>
-	<tr bgcolor="#dddddd"><td>Tytuł Serii</td><td><input type="text" name="seriestitle" value="<!-- TMPL_VAR NAME="seriestitle" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Tom</td><td><input type="text" name="volume" value="<!-- TMPL_VAR NAME="volume" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#dddddd"><td>Numer</td><td><input type="text" name="number" value="<!-- TMPL_VAR NAME="number" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Data Volumenu</td><td><input type="text" name="volumedate" value="<!-- TMPL_VAR NAME="volumedate" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#dddddd"><td>Opis Tomu</td><td><input type="text" name="volumedesc" value="<!-- TMPL_VAR NAME="volumeddesc" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Temat</td><td><input type="text" name="subject" value="<!-- TMPL_VAR NAME="subject" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#dddddd"><td>Uwagi</td><td><input type="text" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Typ pozycji</td><td><select name=itemtype>$itemtypeselect</select></td></tr>
-	<tr bgcolor="#dddddd"><td>ISBN</td><td><input type="text" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" size=40 maxlength=40></td></tr>
-	<tr bgcolor="#ddaaaa"><td>ISSN</td><td><input type="text" name="issn" value="<!-- TMPL_VAR NAME="issn" -->" size=40 maxlength=40></td></tr>
-	<tr bgcolor="#dddddd"><td>LCCN</td><td><input type="text" name="lccn" value="<!-- TMPL_VAR NAME="lccn" -->" size=40 maxlength=40></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Dewey</td><td><input type="text" name="dewey" value="<!-- TMPL_VAR NAME="dewey" -->" size=8 maxlength=10></td></tr>
-	<tr bgcolor="#dddddd"><td>Podklasa</td><td><input type="text" name="subclass" value="<!-- TMPL_VAR NAME="subclass" -->" size=40 maxlength=40></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Rok publikacji</td><td><input type="text" name="pubyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" size=5 maxlength=10></td></tr>
-	<tr bgcolor="#dddddd"><td>Wydawca</td><td><input type="text" name="publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Miejsce</td><td><input type="text" name="place" value="<!-- TMPL_VAR NAME="place" -->" size=40 maxlength=255></td></tr>
-	<tr bgcolor="#dddddd"><td>Strony</td><td><input type="text" name="pages" value="<!-- TMPL_VAR NAME="pages" -->" size=5 maxlength=10></td></tr>
-	<tr bgcolor="#ddaaaa"><td>Rozmiar</td><td><input type="text" name="size" value="<!-- TMPL_VAR NAME="size" -->" size=40 maxlength=40></td></tr>
+<form method="post">
+<table border="1">
+	<tr bgcolor="#dddddd"><td>Tytuł</td><td><input type="text" name="title" value="<!-- TMPL_VAR NAME="title" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Podtytuł</td><td><input type="text" name="subtitle" value="<!-- TMPL_VAR NAME="subtitle" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#dddddd"><td>Autor</td><td><input type="text" name="author" value="<!-- TMPL_VAR NAME="author" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Dodatkowi autorzy</td><td><textarea name="additionalauthors" rows="4" cols="20"><!-- TMPL_VAR NAME="additionalauthors" --></textarea></td></tr>
+	<tr bgcolor="#dddddd"><td>Ilustrator</td><td><input type="text" name="illustrator" value="<!-- TMPL_VAR NAME="illustrator" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Copyright</td><td><input type="text" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" size="20" maxlength="80"></td></tr>
+	<tr bgcolor="#dddddd"><td>Tytuł Serii</td><td><input type="text" name="seriestitle" value="<!-- TMPL_VAR NAME="seriestitle" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Tom</td><td><input type="text" name="volume" value="<!-- TMPL_VAR NAME="volume" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#dddddd"><td>Numer</td><td><input type="text" name="number" value="<!-- TMPL_VAR NAME="number" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Data Volumenu</td><td><input type="text" name="volumedate" value="<!-- TMPL_VAR NAME="volumedate" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#dddddd"><td>Opis Tomu</td><td><input type="text" name="volumedesc" value="<!-- TMPL_VAR NAME="volumeddesc" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Temat</td><td><input type="text" name="subject" value="<!-- TMPL_VAR NAME="subject" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#dddddd"><td>Uwagi</td><td><input type="text" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Typ pozycji</td><td><select name="itemtype">$itemtypeselect</select></td></tr>
+	<tr bgcolor="#dddddd"><td>ISBN</td><td><input type="text" name="isbn" value="<!-- TMPL_VAR NAME="isbn" -->" size="40" maxlength="40"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>ISSN</td><td><input type="text" name="issn" value="<!-- TMPL_VAR NAME="issn" -->" size="40" maxlength="40"></td></tr>
+	<tr bgcolor="#dddddd"><td>LCCN</td><td><input type="text" name="lccn" value="<!-- TMPL_VAR NAME="lccn" -->" size="40" maxlength="40"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Dewey</td><td><input type="text" name="dewey" value="<!-- TMPL_VAR NAME="dewey" -->" size="8" maxlength="10"></td></tr>
+	<tr bgcolor="#dddddd"><td>Podklasa</td><td><input type="text" name="subclass" value="<!-- TMPL_VAR NAME="subclass" -->" size="40" maxlength="40"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Rok publikacji</td><td><input type="text" name="pubyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" size="5" maxlength="10"></td></tr>
+	<tr bgcolor="#dddddd"><td>Wydawca</td><td><input type="text" name="publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Miejsce</td><td><input type="text" name="place" value="<!-- TMPL_VAR NAME="place" -->" size="40" maxlength="255"></td></tr>
+	<tr bgcolor="#dddddd"><td>Strony</td><td><input type="text" name="pages" value="<!-- TMPL_VAR NAME="pages" -->" size="5" maxlength="10"></td></tr>
+	<tr bgcolor="#ddaaaa"><td>Rozmiar</td><td><input type="text" name="size" value="<!-- TMPL_VAR NAME="size" -->" size="40" maxlength="40"></td></tr>
 </table>
-<input type=submit>
-<input type="hidden" name="insertnewrecord" value=1>
-<!-- <input type="hidden" name="origisbn" value="<!-- TMPL_VAR name="qisbn" -->">
-<input type="hidden" name="origissn" value="<!-- TMPL_VAR name="qissn" -->">
-<input type="hidden" name="origlccn" value="<!-- TMPL_VAR name="qlccn" -->">
-<input type="hidden" name="origcontrolnumber" value="<!-- TMPL_VAR name="qcontrolnumber" -->"> -->
-<input type="hidden" name="file" value="<!-- TMPL_VAR name="file" -->">
-<input type="hidden" name="numrecord" value="<!-- TMPL_VAR name="numrecord" -->">
+<input type="submit">
+<input type="hidden" name="insertnewrecord" value="1">
+<!-- <input type="hidden" name="origisbn" value="<!-- TMPL_VAR NAME="qisbn" -->">
+<input type="hidden" name="origissn" value="<!-- TMPL_VAR NAME="qissn" -->">
+<input type="hidden" name="origlccn" value="<!-- TMPL_VAR NAME="qlccn" -->">
+<input type="hidden" name="origcontrolnumber" value="<!-- TMPL_VAR NAME="qcontrolnumber" -->"> -->
+<input type="hidden" name="file" value="<!-- TMPL_VAR NAME="file" -->">
+<input type="hidden" name="numrecord" value="<!-- TMPL_VAR NAME="numrecord" -->">
 </form>
 
 <!-- MARC RECORD -->
-<table width=100% cellspacing=1 cellpading=1>
-<th colspan=4 background="/images/background-acq.gif">REKORD MARC</th>
-<!-- TMPL_LOOP name="MARC" -->
-<tr bgcolor="<!-- TMPL_VAR name="color" -->">
-	<td width=5% align="right"><b><!-- TMPL_VAR name="tagid" --></b>&nbsp;</td>
-	<td width=3% align="right"><b><!-- TMPL_VAR name="subfield" --></b>&nbsp;</td>
-	<td width=48%><!-- TMPL_VAR name="tagmean" -->&nbsp;</td>
-	<td width=45% bgcolor="<!-- TMPL_VAR name="color" -->"><!-- TMPL_VAR name="tagvalue" -->&nbsp;</td>
+<table width="100%" cellspacing="1" cellpadding="1">
+<th colspan="4" background="/images/background-acq.gif">REKORD MARC</th>
+<!-- TMPL_LOOP NAME="MARC" -->
+<tr bgcolor="<!-- TMPL_VAR NAME="color" -->">
+	<td width="5%" align="right"><b><!-- TMPL_VAR NAME="tagid" --></b>&nbsp;</td>
+	<td width="3%" align="right"><b><!-- TMPL_VAR NAME="subfield" --></b>&nbsp;</td>
+	<td width="48%"><!-- TMPL_VAR NAME="tagmean" -->&nbsp;</td>
+	<td width="45%" bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="tagvalue" -->&nbsp;</td>
 <tr>
 <!-- /TMPL_LOOP -->
 </table>

Index: pl/marcimport/uploadmarc.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/marcimport/Attic/uploadmarc.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/marcimport/uploadmarc.tmpl	17 Apr 2004 16:26:27 -0000	1.3
+++ pl/marcimport/uploadmarc.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,38 +1,38 @@
 <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
-<h1><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->>Menu główne</a></h1>
+<h1><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->">Menu główne</a></h1>
 <ul>
-	<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=z3950>Wyszukiwanie Z39.50</a>
-	<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=uploadmarc>Wgraj rekordy MARC</a>
+	<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=z3950">Wyszukiwanie Z39.50</a>
+	<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=uploadmarc">Wgraj rekordy MARC</a>
 </ul>
 <h2>Wybierz zestaw rekordów MARC</h2><ul>
-<!-- TMPL_LOOP name="marc" -->
-	<li><a href=<!-- TMPL_VAR name="SCRIPT_NAME" -->?file=<!-- TMPL_VAR name="id" -->&menu=<!-- TMPL_VAR name="menu" -->><!-- TMPL_VAR name="name" --></a></li>
+<!-- TMPL_LOOP NAME="marc" -->
+	<li><a href="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?file=<!-- TMPL_VAR NAME="id" -->&amp;menu=<!-- TMPL_VAR NAME="menu" -->"><!-- TMPL_VAR NAME="name" --></a></li>
 <!-- /TMPL_LOOP -->
 </ul>
 <p>
-<table border=1 bgcolor=#dddddd>
-	<tr><th bgcolor=#bbbbbb colspan=2>
+<table border="1" bgcolor="#dddddd">
+	<tr><th bgcolor="#bbbbbb" colspan="2">
 		Upload zestaw rekordów MARC</th>
 	</tr>
 	<tr>
 		<td>Upload zestaw rekordów MARC:</td>
 		<td>
-			<form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->?menu=<!-- TMPL_VAR name="menu" -->" enctype="multipart/form-data">
-			<input type="file" name="uploadmarc"/>
+			<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->?menu=<!-- TMPL_VAR NAME="menu" -->" enctype="multipart/form-data">
+			<input type="file" name="uploadmarc" />
 		</td>
 	</tr>
 	<tr>
 		<td>
-			<input type=hidden name=menu value=<!-- TMPL_VAR name="menu" -->>
+			<input type="hidden" name="menu" value=<!-- TMPL_VAR NAME="menu" -->>
 			Nazwij ten zestaw rekordów MARC:
 		</td>
 		<td>
-			<input type=text name=name>
+			<input type="text" name="name">
 		</td>
 	</tr>
 	<tr>
-		<td colspan=2 align=center>
-			<input type=submit>
+		<td colspan="2" align="center">
+			<input type="submit">
 		</td>
 	</tr>
 </table>

Index: pl/members/imemberentry.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/Attic/imemberentry.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/members/imemberentry.tmpl	17 Apr 2004 16:26:26 -0000	1.3
+++ pl/members/imemberentry.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,132 +1,115 @@
-<!-- TMPL_INCLUDE name="members-top.inc" -->
-<BLOCKQUOTE>
-
-<!-- TMPL_IF name="surname" -->
-	<h1>Edytuj InstytucjÄ™</h1><br>
+<!-- TMPL_INCLUDE NAME="members-top.inc" -->
+<div id="mainbloc">
+<!-- TMPL_IF NAME="surname" -->
+	<h1>Edytuj InstytucjÄ™</h1>
 <!-- TMPL_ELSE -->
-	<h1>Dodaj nowÄ… instytucje</h1><br>
+	<h1>Dodaj nowÄ… instytucje</h1>
 <!-- /TMPL_IF -->
-<form action=/cgi-bin/koha/members/newimember.pl method=post>
-  <input type=hidden name=joining value="">
-  <input type=hidden name=expiry value="">
-  <input type=hidden name=type value="borrowers">
-  <input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME=member -->">
-  <input type=hidden name=updtype value=I>
+<form action="/cgi-bin/koha/members/newimember.pl" method="post">
+  <input type="hidden" name="joining" value="">
+  <input type="hidden" name="expiry" value="">
+  <input type="hidden" name="type" value="borrowers">
+  <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
+  <input type="hidden" name="updtype" value="I">
 
-  <table border=0 cellspacing=0 cellpadding=5>
+  <table border="0" cellspacing="0" cellpadding="5">
 
-    <tr valign=top>
-      <td ><input type=reset value="Wyczyść Pola"></td>
+    <tr valign="top">
+      <td colspan="3"><input type="reset" value="Wyczyść Pola"></td>
     </tr>
 
-    <tr align=right>
-      <td COLSPAN=2 ALIGN=RIGHT><font size=3 face='arial,helvetica'>
-        <STRONG>Czytelnik# <!-- TMPL_VAR NAME="member" -->, Numer Karty*</STRONG>
-      </TD>
-      <TD align=right><input type=text name=cardnumber_institution size=20 value=<!-- TMPL_VAR NAME=cardnumber_institution -->><br></td>
-    </TR>
-
-    <tr><td>&nbsp;</TD></TR>
-
-    <tr valign=top bgcolor="99cc33" >
-      <td  COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-        <B>DANE INSTYTUCJI</b>
+    <tr align="right">
+      <td colspan="2" align="right">
+        <strong>Czytelnik# <!-- TMPL_VAR NAME="member" -->, Numer Karty*</strong>
       </td>
-      <td  COLSPAN=2  ALIGN=RIGHT background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+      <td align="right"><input type="text" name="cardnumber_institution" size="20" value="<!-- TMPL_VAR NAME="cardnumber_institution" -->"></td>
+    </tr>
+
+    <tr valign="top" bgcolor="#99cc33">
+      <td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+        <b>DANE INSTYTUCJI</b>
       </td>
+      <td colspan="2" align="right" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">&nbsp;</td>
     </tr>
 
-    <tr valign=top bgcolor=white>
-      <td><FONT SIZE=2>Nazwa instytucji</FONT></td>
+    <tr>
+      <td colspan="3">Nazwa instytucji</td>
     </tr>
-    <tr valign=top bgcolor=white>
-      <td colspan=3><input type=text name=institution_name size=50 value="<!-- TMPL_VAR name="surname" -->"></td>
+    <tr>
+      <td colspan="3"><input type="text" name="institution_name" size="50" value="<!-- TMPL_VAR NAME="surname" -->"></td>
     </tr>
-    <tr><td>&nbsp;</TD></TR>
 
-    <tr valign=top bgcolor="99cc33" >
-      <td  COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-	  <B>ADRES INSTYTUCJI</b>
+    <tr valign="top" bgcolor="#99cc33" >
+      <td  colspan="3" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+	  <b>ADRES INSTYTUCJI</b>
       </td>
     </tr>
 
-    <tr valign=top bgcolor=white>
-	<td ><FONT SIZE=2>Adres Pocztowy*</FONT></td>
-	<td><FONT SIZE=2>Kod pocztowy / Miasto*</FONT></td>
-	<td><FONT SIZE=2>Obszar</FONT></td>
+    <tr>
+	<td >Adres Pocztowy*</td>
+	<td>Kod pocztowy / Miasto*</td>
+	<td>Obszar</td>
     </tr>
-    <tr valign=top bgcolor=white>
-	<td><input type=text name=address size=40 value="<!-- TMPL_VAR name="streetaddress" -->"></td>
-	<td><input type=text name=zipcode size=20 value="<!-- TMPL_VAR name="zipcode" -->"> <br/><input type=text name=city size=20 value="<!-- TMPL_VAR name="city" -->"></td>
+    <tr>
+	<td><input type="text" name="address" size="40" value="<!-- TMPL_VAR NAME="streetaddress" -->"></td>
+	<td><input type="text" name="zipcode" size="20" value="<!-- TMPL_VAR NAME="zipcode" -->"> <br> <input type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"></td>
 	<td>
-      	<!-- TMPL_VAR name="CGIbranch" -->
+      	<!-- TMPL_VAR NAME="CGIbranch" -->
 	 </td>
     </tr>
-    <tr><td>&nbsp;</TD></TR>
 
-    <tr valign=top bgcolor="99cc33">
-      <td COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-	  <B>DANE KONTAKTOWE</b>
+    <tr valign="top" bgcolor="#99cc33">
+      <td colspan="3" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+	  <b>DANE KONTAKTOWE</b>
       </td>
     </tr>
 
-    <tr valign=top bgcolor=white>
-	<td COLSPAN=3><FONT SIZE=2>Osoba kontaktowa*</td>
+    <tr>
+	<td colspan="3">Osoba kontaktowa*</td>
     </tr>
-    <tr valign=top bgcolor=white>
-	<td COLSPAN=3><input type=text name=contactname size=40 value="<!-- TMPL_VAR name="contactname" -->"></td>
+    <tr>
+	<td colspan="3"><input type="text" name="contactname" size="40" value="<!-- TMPL_VAR NAME="contactname" -->"></td>
     </tr>
 
 
-    <tr valign=top bgcolor=white>
-	<td><FONT SIZE=2>Telefon (praca)</td>
-	<td><FONT SIZE=2>Fax</td>
-	<td><FONT SIZE=2>Email</td>
+    <tr>
+	<td>Telefon (praca)</td>
+	<td>Fax</td>
+	<td>Email</td>
     </tr>
-    <tr valign=top bgcolor=white>
-	<td ><input type=text name=phoneday size=20 value="<!-- TMPL_VAR name="phoneday" -->"></td>
-	<td><input type=text name=faxnumber size=20 value="<!-- TMPL_VAR name="faxnumber" -->"></td>
-	<td ><input type=text name=emailaddress size=20 value="<!-- TMPL_VAR name="emailaddress" -->"></td>
+    <tr>
+	<td ><input type="text" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->"></td>
+	<td><input type="text" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->"></td>
+	<td ><input type="text" name="emailaddress" size="20" value="<!-- TMPL_VAR NAME="emailaddress" -->"></td>
     </tr>
 
-    <tr><td>&nbsp;</TD></TR>
-
-    <tr valign=top bgcolor=white>
-	<td><FONT SIZE=2>Uwagi</font></td>
+    <tr>
+	<td>Uwagi</td>
     </tr>
-    <tr valign=top bgcolor=white>
-	<td COLSPAN=4><textarea name=altnotes wrap=physical cols=70 rows=3><!-- TMPL_VAR name="altnotes" --></textarea></td>
+    <tr>
+	<td colspan="3"><textarea name="altnotes" cols="70" rows="3"><!-- TMPL_VAR NAME="altnotes" --></textarea></td>
     </tr>
 
-    <tr><td>&nbsp;</TD></TR>
-
-    <tr valign=top bgcolor="99cc33"  >
-	<td  COLSPAN=5  background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><B>NA UŻYTEK BIBLIOTEKI</B></td>
+    <tr valign="top" bgcolor="#99cc33"  >
+	<td  colspan="3"  background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>NA UŻYTEK BIBLIOTEKI</b></td>
     </tr>
 
-    <tr valign=top bgcolor=white>
-	<td ><FONT SIZE=2>Uwagi</font></td>
+    <tr>
+	<td colspan="3">Uwagi</td>
     </tr>
-    <tr valign=top >
-	<td  COLSPAN=5><textarea name=borrowernotes wrap=physical cols=70 rows=3><!-- TMPL_VAR name="borrowernotes" --></textarea></td>
+    <tr valign="top" >
+	<td colspan="3"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td>
     </tr>
 
-    <tr><td>&nbsp;</TD></TR>
-
-    <tr valign=top bgcolor=white>
-	<td  COLSPAN=5 align=right >
-	  <input type=submit class="button" value="Zapisz Zmiany" alt="Dodaj Nowego Czytelnika" border=0>
+    <tr>
+	<td  colspan="3" align="right" >
+	  <input type="submit" class="button" value="Zapisz Zmiany">
       </td>
     </tr>
-  </TABLE>
+  </table>
 </form>
-
-</BLOCKQUOTE>
-
-<br clear=all>
-<p> &nbsp; </p>
-
-<!-- TMPL_VAR NAME=endmenumember -->
+</div>
+<!-- TMPL_VAR NAME="endmenumember" -->
 
 </body>
-</HTML>
+</html>

Index: pl/members/jmemberentry.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/Attic/jmemberentry.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/members/jmemberentry.tmpl	17 Apr 2004 16:26:26 -0000	1.3
+++ pl/members/jmemberentry.tmpl	7 May 2007 13:55:52 -0000	1.3.10.1
@@ -1,96 +1,116 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
+<div id="mainbloc">
+	<h1>Dodaj Nowego Czytelnika Juniora </h1><br>
+	<form action="/cgi-bin/koha/members/newjmember.pl" method="post">
+		<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" -->">
+		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
+		<input type="hidden" name="zipcode" value="<!-- TMPL_VAR NAME="zipcode" -->">
+		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
+		<input type="hidden" name="updtype" value="I">
+		<input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->">
+		<input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city" -->">
+		<input type="hidden" name="physstreet" value="<!-- TMPL_VAR NAME="physstreet" -->">
+		<input type="hidden" name="streetaddress" value="<!-- TMPL_VAR NAME="streetaddress" -->">
+		<input type="hidden" name="streetcity" value="<!-- TMPL_VAR NAME="streetcity" -->">
+		<input type="hidden" name="phone" value="<!-- TMPL_VAR NAME="phone" -->">
+		<input type="hidden" name="phoneday" value="<!-- TMPL_VAR NAME="phoneday" -->">
+		<input type="hidden" name="faxnumber" value="<!-- TMPL_VAR NAME="faxnumber" -->">
+		<input type="hidden" name="emailaddress" value="<!-- TMPL_VAR NAME="emailaddress" -->">
+		<input type="hidden" name="contactname" value="<!-- TMPL_VAR NAME="contactname" -->">
+		<input type="hidden" name="altphone" value"<!-- TMPL_VAR NAME="altphone" -->">
 
-<h1>Dodaj Nowego Czytelnika Juniora </h1><br>
-<form action=/cgi-bin/koha/members/newjmember.pl method=post>
-	<!--<input type=hidden name=joining value="">
-	<input type=hidden name=expiry value="">
-	<input type=hidden name=type value="borrowers">-->
-	<input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME=member -->">
-	<input type=hidden name=updtype value=I>
-	<input type=hidden name=area value="<!-- TMPL_VAR NAME=area -->">
-	<input type=hidden name=city value="<!-- TMPL_VAR NAME=city -->">
-	<input type=hidden name=physstreet value="<!-- TMPL_VAR NAME=physstreet -->">
-	<input type=hidden name=streetaddress value="<!-- TMPL_VAR NAME=streetaddress -->">
-	<input type=hidden name=streetcity value="<!-- TMPL_VAR NAME=streetcity -->">
-	<input type=hidden name=phone value="<!-- TMPL_VAR NAME=phone -->">
-	<input type=hidden name=phoneday value="<!-- TMPL_VAR NAME=phoneday -->">
-	<input type=hidden name=faxnumber value="<!-- TMPL_VAR NAME=faxnumber -->">
-	<input type=hidden name=emailaddress value="<!-- TMPL_VAR NAME=emailaddress -->">
-	<input type=hidden name=contactname value="<!-- TMPL_VAR NAME=contactname -->">
-	<input type=hidden name=altphone value"<!-- TMPL_VAR NAME=altphone -->">
-
-	<table border=0 cellspacing=0 cellpadding=5 >
-	<tr valign=top bgcolor="99cc33" >
-		<td  COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-			<B>RODZIC LUB OPIEKUN </b>
-		</td>
+		<table border="0" cellspacing="0" cellpadding="5" >
+		<tr>
+			<th  colspan="5">
+				RODZIC LUB OPIEKUN 
+			</th>
+		</tr>
+		<tr valign="top" bgcolor="white">
+			<td>Tytułowanie</td>
+			<td>Imiona*</td>
+			<td colspan="2">Nazwisko*</td>
+			<td>Num. Członkowski</td>
 	</tr>
-	<tr valign=top bgcolor=white>
+		<tr>
 		<td>
-		<SELECT NAME="title" SIZE="1">
-			<OPTION value=" ">Bez Tytułu
-			<!-- TMPL_LOOP NAME=titleloop -->
-			<OPTION value="<!-- TMPL_VAR NAME=title -->" <!-- TMPL_VAR NAME=selected -->><!-- TMPL_VAR NAME=title -->
+				<select name="title" size="1">
+					<option value=" ">Bez Tytułu
+					<!-- TMPL_LOOP NAME="titleloop" -->
+					<option value="<!-- TMPL_VAR NAME="title" -->" <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="title" -->
 			<!-- /TMPL_LOOP -->
-		</SELECT>
+				</select>
+			</td>
+			<td><input type="text" name="firstname_guardian" size="20" value="<!-- TMPL_VAR NAME="firstname" -->"></td>
+			<td colspan="2"><input type="text" name="surname_guardian" size="20" value="<!-- TMPL_VAR NAME="surname" -->"></td>
+			<td><input type="text" name="guardian_number" size="20" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
+		</tr>
+		<!-- TMPL_LOOP NAME="cmemloop" -->
+		<tr>
+			<tH colspan="5">
+				DZIECKO <!-- TMPL_VAR NAME="count" -->
+			</tH>
+		</tr>
+		<tr>
+			<td colspan="5">
+				Numer Czytelnika <!-- TMPL_VAR NAME="cmember" -->, Numer Karty* <input type="text" name="cardnumber_child_<!-- TMPL_VAR NAME="i" -->" size="20" value="<!-- TMPL_VAR NAME="jcardnumber" -->"><br>
+				<input type="hidden" name="bornumber_child_<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="cmember" -->">
+			</td>
+		</tr>
+		<tr>
+			<td>ImiÄ™</td>
+			<td>Nazwisko*</td>
+			<td>Date of Birth (<!-- TMPL_VAR NAME="dateformat" -->)*</td>
+			<td>&nbsp;</td>
+			<td>Szkoła</td>
+		</tr>
+		<tr>
+			<td><input type="text" name="firstname_child_<!-- TMPL_VAR NAME="i" -->" size="20" value=""></td>
+			<td><input type="text" name="surname_child_<!-- TMPL_VAR NAME="i" -->" size="20" value=""></td>
+			<td><input type="text" name="dateofbirth_child_<!-- TMPL_VAR NAME="i" -->" size="10" value=""></td>
+			<td>
+				<input type="radio" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="F"><b>K</b> <input type="radio" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="M"><b>M*</b>
+			</td>
+			<td><input type="text" name="school_child_<!-- TMPL_VAR NAME="i" -->" size="20" value=""></td>
+		</tr>
+                <tr>
+                        <th colspan="5" >NA UŻYTEK BIBLIOTEKI</th>
+                </tr>
+                <tr>
+                    <td>Joining date (leave blank for today)</td>
+                    <td><input type="text" name="joining_child_<!-- TMPL_VAR NAME="i" -->" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->"></td>
+                    <td>Expiry date (leave blank for auto calc)</td>
+                    <td><input type="text" name="expiry_child_<!-- TMPL_VAR NAME="i" -->" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->"></td>
+                </tr>
+		<tr>
+			<td colspan="5">The 2 following fields are available for your own usage. They can be useful for stat purposes</td>
+		<tr>
+			<td>Sorting field 1</td>
+			<td colspan="4">
+				<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
+			</td>
+		</tr>
+		<tr>
+			<td>Sorting field 2</td>
+			<td colspan="4">
+				<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
 		</td>
-		<td><input type=text name=firstname_guardian size=20 value="<!-- TMPL_VAR NAME=firstname -->"></td>
-		<td colspan=2><input type=text name=surname_guardian size=20 value="<!-- TMPL_VAR NAME=surname -->"></td>
-		<td><input type=text name=guardian_number size=20 value="<!-- TMPL_VAR NAME=cardnumber -->"></td>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td><FONT SIZE=2>Tytułowanie</FONT></td>
-		<td><FONT SIZE=2>Imiona*</FONT></td>
-		<td colspan=2><FONT SIZE=2>Nazwisko*</FONT></td>
-		<td><FONT SIZE=2>Num. Członkowski</FONT></td>
-	</tr>
-	<!-- TMPL_LOOP NAME=cmemloop -->
-	<tr valign=top bgcolor="99cc33">
-		<td COLSPAN=5 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-			<B>DZIECKO <!-- TMPL_VAR NAME=count --></b>
-		</td>
-	</TR>
-	<TR>
-		<td  COLSPAN=4   ALIGN=RIGHT ><font size=3 face='arial,helvetica'>
-			<STRONG>Czytelnik# <!-- TMPL_VAR NAME=cmember --></STRONG>, <b>Numer karty*</b></STRONG>
-		</TD>
-		<TD>
-			<input type=text name=cardnumber_child_<!-- TMPL_VAR NAME=i --> size=20 value="<!-- TMPL_VAR NAME=jcardnumber -->"><br>
-			<input type=hidden name=bornumber_child_<!-- TMPL_VAR NAME=i --> value="<!-- TMPL_VAR NAME=cmember -->">
-		</td>
-	</TR>
-	<tr bgcolor=white>
-		<td><input type=text name=firstname_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></td>
-		<td><input type=text name=surname_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></td>
-		<td><input type=text name=dateofbirth_child_<!-- TMPL_VAR NAME=i --> size=10 value=""></TD>
-		<TD>
-			<input type="radio" name="sex_child_<!-- TMPL_VAR NAME=i -->" value="F"><b>K</b> <input type="radio" name="sex_child_<!-- TMPL_VAR NAME=i -->" value="M"><b>M*</b>
-		</td>
-		<TD align=right><input type=text name=school_child_<!-- TMPL_VAR NAME=i --> size=20 value=""></TD>
-	</tr>
-	<tr valign=top bgcolor=white>
-		<td><FONT SIZE=2><b>ImiÄ™</b></FONT></td>
-		<td><FONT SIZE=2><b>Nazwisko*</b></FONT></td>
-		<td><FONT SIZE=2><b>Data Urodzenia<BR>(<!-- TMPL_VAR NAME=dateformat -->)*</b></FONT></td>
-		<td><FONT SIZE=2>&nbsp;</FONT></td>
-		<td><FONT SIZE=2>Szkoła</FONT></td>
 	</tr>
-	<tr valign=top bgcolor=white>
-		<td  COLSPAN=5><textarea name=altnotes_child_<!-- TMPL_VAR NAME=i --> wrap=physical cols=70 rows=3></textarea></td>
+		<tr>
+			<td>Uwagi</td>
 	</tr>
-	<tr valign=top bgcolor=white>
-		<td><FONT SIZE=2>Uwagi</font></td>
+		<tr>
+			<td colspan="5"><textarea name="altnotes_child_<!-- TMPL_VAR NAME="i" -->" wrap="physical" cols="70" rows="3"></textarea></td>
 	</tr>
 	<!-- /TMPL_LOOP -->
-	<tr valign=top bgcolor=white>
-		<td colspan=2 align="center"><input type=reset value="Wyczyść Pola"></td>
-		<td  COLSPAN=3 align="center">
-			<input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png" alt="Dodaj Nowego Czytelnika" border=0>
+		<tr>
+			<td>
+				<input type="submit" class="button members" value="OK">
 		</td>
+			<td><input type="reset" class="button members" value="Wyczyść Pola"></td>
 	</tr>
 
-	</TABLE>
-</form>
-
+		</table>
+	</form>
+</div>
 
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: pl/members/member-flags.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/Attic/member-flags.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -b -r1.1 -r1.1.10.1
--- pl/members/member-flags.tmpl	17 Apr 2004 16:57:07 -0000	1.1
+++ pl/members/member-flags.tmpl	7 May 2007 13:55:52 -0000	1.1.10.1
@@ -1,18 +1,18 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
 <div id="mainbloc">
 	<div id="bloc25">
-		<div id="bloctitle">FLAGI dla <!-- TMPL_VAR NAME=surname -->, <!-- TMPL_VAR NAME=firstname --></div>
-		<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>
-			<!-- TMPL_LOOP NAME=loop -->
+		<div id="bloctitle">FLAGI dla <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></div>
+		<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">
+			<!-- TMPL_LOOP NAME="loop" -->
 				<p>
-					<input type=checkbox name="flag-<!-- TMPL_VAR NAME=bit -->" <!-- TMPL_VAR NAME=checked -->>
-					<!-- TMPL_VAR NAME=flag -->
-					<!-- TMPL_VAR NAME=flagdesc -->
+					<input type="checkbox" name="flag-<!-- TMPL_VAR NAME="bit" -->" <!-- TMPL_VAR NAME="checked" -->>
+					<!-- TMPL_VAR NAME="flag" -->
+					<!-- TMPL_VAR NAME="flagdesc" -->
 				</p>
 			<!-- /TMPL_LOOP -->
-			<input type=submit value="Ustaw flagi" class="button">
+			<input type="submit" value="Ustaw flagi" class="button">
 		</form>
 	</div>
 </div>

Index: pl/members/member-password.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/Attic/member-password.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/members/member-password.tmpl	17 Apr 2004 16:57:07 -0000	1.2
+++ pl/members/member-password.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -3,15 +3,18 @@
 <div id="mainbloc">
 		<div id="bloc25">
 		<div id="bloctitle"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></div>
-		<form method=post>
-			<input type=hidden name=member value=<!-- TMPL_VAR NAME=member -->>
+		<form method="post" action="/cgi-bin/koha/members/member-password.pl">
+			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->">
 			<!-- TMPL_IF NAME="warn" -->
-				Podałeś Nazwę Uzytkownika, która już istnieje. Wybierz inną.<br/>
+				Podałeś Nazwę Uzytkownika, która już istnieje. Wybierz inną.<br>
 			<!-- /TMPL_IF -->
-			Nowe ID Użytkownika: <input name=newuserid size=20 value=<!-- TMPL_VAR NAME=userid -->> <br/>
-			Nowe Hasło: <input name=newpassword size=20 value=<!-- TMPL_VAR NAME=defaultnewpassword -->><br/>
-			<input type=submit value="Potwierdź Hasło" class="button">
+		    <!-- TMPL_IF NAME= "ShortPass" -->
+	           Your new password must be at least <!-- TMPL_VAR NAME="MinPasswordLength" --> characters long.<br>
+	        <!-- /TMPL_IF -->
+			Nowe ID Użytkownika: <input name="newuserid" size="20" value="<!-- TMPL_VAR NAME="userid" -->"> <br>
+			Nowe Hasło: <input name="newpassword" size="20" value="<!-- TMPL_VAR NAME="defaultnewpassword" -->"><br>
+			<input type="submit" value="Potwierdź Hasło" class="button">
 		</form>
 </div>
-
+</div>
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: pl/members/member.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/Attic/member.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/members/member.tmpl	17 Apr 2004 16:26:26 -0000	1.4
+++ pl/members/member.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -2,47 +2,61 @@
 <div id="mainbloc">
 <h1>Wyszukiwanie Czytelników</h1>
 
-<div id="bloc100">
-	<div id="bloctitle">Szukaj </div>
-	<form action="/cgi-bin/koha/members/member.pl" method=post>
-		<input type=text name="member" value="<!-- TMPL_VAR NAME=member -->">
+<div class="bloc100">
+	<div class="bloctitle">Szukaj </div>
+	<form action="/cgi-bin/koha/members/member.pl" method="post">
+		<input type="text" name="member" value="<!-- TMPL_VAR NAME="member" -->">  order by 
+		<select name="orderby">
+			<option value="surname,firstname">Nazwisko</option>
+			<option value="cardnumber">Cardnumber</option>
+		</select>
 		<input type="submit" class="button" value="OK">
 	</form>
 </div>
 
-<div id="bloc100">
-	<div id="bloctitle">Szukano <!-- TMPL_VAR NAME=member --></div>
+<div class="bloc100">
+	<div class="bloctitle">Szukano <!-- TMPL_VAR NAME="member" --></div>
+	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> members were found.
+	 </p>
 	<table>
 		<tr>
+			<th>&nbsp;</th>
 			<th>Karta</th>
-			<th>Nazwisko</th>
-			<th>ImiÄ™</th>
+			<th>Nazwa</th>
+			<th>Oddział</th>
 			<th>Kategoria</th>
-			<th>Adres</th>
 			<th>Zaległe/Wypożyczone</th>
 			<th>Opłaty</th>
-			<th>Uwagi</th>
+			<th>Sort1</th>
+			<th>Sort2</th>
 		</tr>
-		<!-- TMPL_LOOP NAME=resultsloop -->
+		<!-- TMPL_LOOP NAME="resultsloop" -->
 			<!-- TMPL_IF NAME="background" -->
-				<TR bgcolor="#ffffcc">
+				<tr bgcolor="#ffffcc">
 			<!-- TMPL_ELSE -->
-				<TR bgcolor=white>
+				<tr bgcolor="white">
 			<!-- /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 --></td>
-				<td><!-- TMPL_VAR NAME=firstname --></a></td>
-				<td><!-- TMPL_VAR NAME=categorycode --></td>
-				<td><!-- TMPL_VAR NAME=streetaddress --> <!-- TMPL_VAR NAME=city --></td>
-				<td><!-- TMPL_VAR NAME=odissue --></td>
-				<td><!-- TMPL_VAR NAME=fines --></td>
-				<td><!-- TMPL_VAR NAME=borrowernotes --></td>
+				<td><!-- TMPL_VAR NAME="count" --></td>
+				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
+				<td>
+					<p><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <b><!-- TMPL_VAR NAME="firstname" --></b></a></p>
+					<p><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" --></p>
+					<p><i><!-- TMPL_VAR NAME="borrowernotes" --></i></p>
+				</td>
+				<td><!-- TMPL_VAR name="branchcode" --></td>
+				<td><!-- TMPL_VAR NAME="categorycode" --></td>
+				<td><!-- TMPL_VAR NAME="odissue" --></td>
+				<td><!-- TMPL_VAR NAME="fines" --></td>
+				<td><!-- TMPL_VAR NAME="sort1" --></td>
+				<td><!-- TMPL_VAR NAME="sort2" --></td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
-	<form action=/cgi-bin/koha/members/simpleredirect.pl method=post>
-	<input type=submit class="button" value="Dodaj Czytelnika" title="Dodaj Czytelnika" alt="Dodaj Czytelnika">
-	<INPUT TYPE="radio" name="chooseform" value="adult" checked>Dorosły <INPUT TYPE="radio" name="chooseform" value="organisation" >Organizacja
+	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
+	<input type="submit" class="button" value="Dodaj Czytelnika" title="Dodaj Czytelnika" alt="Dodaj Czytelnika">
+	<input type="radio" name="categorycode" value="" checked>Dorosły <input type="radio" name="categorycode" value="I" >Organizacja
+	<input type="hidden" name="actionType" value="Add">
 	</form>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: pl/members/memberentry.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/Attic/memberentry.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/members/memberentry.tmpl	17 Apr 2004 16:26:26 -0000	1.4
+++ pl/members/memberentry.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,9 +1,9 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
 <div id="mainbloc">
-	<!-- TMPL_IF NAME=addAction -->
+	<!-- TMPL_IF NAME="addAction" -->
 	<h1>
-		Dodaj Czytelnika
+		Dodaj <!-- TMPL_IF NAME="institution" -->Institutional <!-- /TMPL_IF -->Czytelnik
 	</h1>
 	<!-- TMPL_ELSE -->
 	<h1>
@@ -12,214 +12,222 @@
 	<!-- /TMPL_IF -->
 
 	<!-- TMPL_IF Name="NOK" -->
-		<h1 >BŁĄD</H1>
+		<h1>BŁĄD</h1>
 		<div id="problem">
 			<p>Następujące pola mają niewłaściwe wartości. Popraw je i ponownie nacisnij OK:</p>
-			<!-- TMPL_IF name="ERROR_cardnumber" -->
-				Numer karty<br/>
+			<!-- TMPL_IF NAME="ERROR_cardnumber" -->
+				Numer karty<br>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="ERROR_invalid_cardnumber" -->
-				Nie prawidłowy numer karty<br/>
+			<!-- TMPL_IF NAME="ERROR_invalid_cardnumber" -->
+				Nie prawidłowy numer karty<br>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="ERROR_gender" -->
-				Płeć<br/>
+			<!-- TMPL_IF NAME="ERROR_gender" -->
+				Płeć<br>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="ERROR_firstname" -->
-				Imiona<br/>
+			<!-- TMPL_IF NAME="ERROR_firstname" -->
+				Imiona<br>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="ERROR_surname" -->
-				Nazwisko<br/>
+			<!-- TMPL_IF NAME="ERROR_surname" -->
+				Nazwisko<br>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="aERROR_ddress" -->
-				Ulica Adresu Pocztowego<br/>
+			<!-- TMPL_IF NAME="ERROR_address" -->
+				Ulica Adresu Pocztowego<br>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="ERROR_city" -->
-				Miasto<br/>
+			<!-- TMPL_IF NAME="ERROR_city" -->
+				Miasto<br>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_branch" -->
+				Branch : member should be of the same branch as you<br>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_date" -->
+				Expiry date BEFORE enrollment date<br>
 			<!-- /TMPL_IF -->
 		</div>
 	<!-- /TMPL_IF -->
-	<form action=/cgi-bin/koha/members/memberentry.pl method=post>
-		<input type=hidden name=joining value="<!-- TMPL_VAR NAME=dateenrolled -->">
-		<input type=hidden name=expiry value="<!-- TMPL_VAR NAME=expiry -->">
-		<input type=hidden name=type value="borrowers">
-		<input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME=member -->">
-		<input type=hidden name=updtype value="<!-- TMPL_VAR NAME=updtype -->">
-		<!-- TMPL_IF NAME=addAction -->
+	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
+		<input type="hidden" name="type" value="borrowers">
+		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
+		<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->">
+		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
+		<!-- TMPL_IF NAME="addAction" -->
 			<input type="hidden" name="op" value="add">
 		<!-- TMPL_ELSE -->
 			<input type="hidden" name="op" value="modify">
 		<!-- /TMPL_IF -->
 		<table>
 			<tr>
-				<td colspan=5>Numer Czytelnika <!-- TMPL_VAR NAME=member -->, Numer Karty* <input type=text name=cardnumber size=10 value="<!-- TMPL_VAR NAME=cardnumber -->"></td>
+				<td colspan="5"><b>Member# <!-- TMPL_VAR NAME="member" -->, Card number*</b> <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
 			</tr>
 			<tr>
-				<th colspan=5>DANE OSOBISTE CZYTELNIKA</th>
+				<th colspan="5">MEMBER <!-- TMPL_UNLESS name="institution" -->PERSONAL<!-- /TMPL_UNLESS --> DETAILS</th>
 			</tr>
 			<tr>
 				<td><!-- TMPL_UNLESS name="institution" -->Tytułowanie<!-- /TMPL_UNLESS --></td>
 				<td><!-- TMPL_UNLESS name="institution" -->Inicjały<!-- /TMPL_UNLESS --></td>
 				<td><!-- TMPL_UNLESS name="institution" --><b> Imiona*</b><!-- /TMPL_UNLESS --></td>
-				<td><!-- TMPL_IF name="institution" --><b>Nazwa instytucji*</b><!-- TMPL_ELSE --><b> Nazwisko*</b><!-- /TMPL_IF --></td>
-				<td><!-- TMPL_UNLESS name="institution" -->ImiÄ™ Preferowane<!-- /TMPL_UNLESS --></td>
+				<td><!-- TMPL_IF NAME="institution" --><b>Nazwa instytucji*</b><!-- TMPL_ELSE --><b> Nazwisko*</b><!-- /TMPL_IF --></td>
+				<td><!-- TMPL_UNLESS name="institution" -->Preferred Name<!-- /TMPL_UNLESS --></td>
 			</tr>
 			<tr>
 				<td>
 				<!-- TMPL_UNLESS name="institution" -->
-				<!-- TMPL_VAR name="Mr" -->
-				<SELECT NAME="title">
-					<option <!-- TMPL_VAR name="title_selected_ " --> value=" ">Bez Tytułu</option>
-					<option value="Miss" <!-- TMPL_VAR name="title_Miss" -->>Panna</option>
-					<option value="Mrs" <!-- TMPL_VAR name="title_Mrs" -->>Pani</option>
-					<option value="Ms" <!-- TMPL_VAR name="title_Ms" -->>Pani</option>
-					<option <!-- TMPL_VAR name="title_Mr" --> value="Mr" >Pan</option>
-					<option value="Dr" <!-- TMPL_VAR name="title_Dr" -->>Dr</option>
-					<option value="Sir" <!-- TMPL_VAR name="title_Sir" -->>Pan</option>
-				</SELECT>
+				<!-- TMPL_VAR NAME="Mr" -->
+				<select name="title">
+					<option <!-- TMPL_VAR NAME="title_selected_ " --> value=" ">Bez Tytułu</option>
+					<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Panna</option>
+					<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Pani</option>
+					<option value="Ms" <!-- TMPL_VAR NAME="title_Ms" -->>Pani</option>
+					<option <!-- TMPL_VAR NAME="title_Mr" --> value="Mr" >Pan</option>
+					<option value="Dr" <!-- TMPL_VAR NAME="title_Dr" -->>Dr</option>
+					<option value="Sir" <!-- TMPL_VAR NAME="title_Sir" -->>Pan</option>
+				</select>
 				<!-- /TMPL_UNLESS -->
 				</td>
 				<td>
 					<!-- TMPL_UNLESS name="institution" -->
-						<input type=text name=initials size=5 value="<!-- TMPL_VAR NAME=initials -->">
+						<input type="text" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->">
 					<!-- /TMPL_UNLESS -->
 				</td>
 				<td>
 				<!-- TMPL_UNLESS name="institution" -->
-					<input type=text name=firstname size=20 value="<!-- TMPL_VAR NAME=firstname -->">
+					<input type="text" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
 					<!-- /TMPL_UNLESS -->
 				</td>
-				<td><input type=text name=surname size=20 value="<!-- TMPL_VAR NAME=surname -->"></td>
+				<td><input type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->"></td>
 				<td>
 					<!-- TMPL_UNLESS name="institution" -->
-						<input type=text name=othernames size=20 value="<!-- TMPL_VAR NAME=othernames -->">
+						<input type="text" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->">
 					<!-- /TMPL_UNLESS -->
 				</td>
 			</tr>
 
 			<tr>
-				<td colspan=2>
+				<td colspan="2">
 				<!-- TMPL_UNLESS name="institution" -->
-					<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME=female --> checked<!-- /TMPL_IF -->>F  <input type="radio" name="sex" value="M"<!-- TMPL_UNLESS NAME=female --> checked<!-- /TMPL_UNLESS -->> M
+                                    <!-- TMPL_IF NAME="female" -->
+					<input type="radio" name="sex" value="F" checked>Female  <input type="radio" name="sex" value="M" > Male
+                                    <!-- TMPL_ELSE -->
+					<input type="radio" name="sex" value="F">Female  <input type="radio" name="sex" value="M" checked> Male
+                                    <!-- /TMPL_IF -->
 				<!-- /TMPL_UNLESS -->
 
 				</td>
-				<td colspan=2>
+				<td colspan="2">
 					<!-- TMPL_UNLESS name="institution" -->
-					Data Urodzenia (<!-- TMPL_VAR NAME=dateformat -->) <input type=text name=dateofbirth size=10 value="<!-- TMPL_VAR NAME=dateofbirth -->">
+					Data Urodzenia (<!-- TMPL_VAR NAME="dateformat" -->) <input type="text" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
 					<!-- /TMPL_UNLESS -->
 				</td>
 				<td>
-					Kategoria <!-- TMPL_VAR NAME=catcodepopup -->
+					Kategoria <!-- TMPL_VAR NAME="catcodepopup" -->
 				</td>
 			</tr>
-			<!-- TMPL_IF NAME=ethcatpopup -->
-				<tr valign=top bgcolor=white>
-					<!-- TMPL_VAR NAME=ethcatpopup -->
-					<td colspan=2>Pochodzenie</td>
-					<td colspan=2>Uwagi o pochodzeniu</td>
-				</tr>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="ethcatpopup" -->
-				<tr valign=top bgcolor=white>
-					<td colspan=2>
-						<!-- TMPL_IF name="ethcatpopup" -->
-							<select name="ethnicity" size=1>
-								<!-- TMPL_LOOP NAME=ethnicityloop -->
-								<option value=<!-- TMPL_VAR NAME=value --><!-- TMPL_VAR NAME=selected -->><!-- TMPL_VAR NAME=label -->
+			<!-- TMPL_IF NAME="ethcatpopup" -->
+				<tr valign="top" bgcolor="white">
+					<!-- TMPL_VAR NAME="ethcatpopup" -->
+					<td colspan="2">Pochodzenie</td>
+					<td colspan="2">Uwagi o pochodzeniu</td>
+				</tr>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ethcatpopup" -->
+				<tr valign="top" bgcolor="white">
+					<td colspan="2">
+						<!-- TMPL_IF NAME="ethcatpopup" -->
+							<select name="ethnicity" size="1">
+								<!-- TMPL_LOOP NAME="ethnicityloop" -->
+								<option value=<!-- TMPL_VAR NAME="value" --><!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="label" -->
 								<!-- /TMPL_LOOP -->
 							</select>
 						<!-- /TMPL_IF -->
 						</td>
-						<!-- TMPL_IF NAME=ethcatpopup --><!-- TMPL_VAR NAME=ethcatpopup -->
-						<td colspan=2><input type=text name=ethnicnotes size=40 ></td>
+						<!-- TMPL_IF NAME="ethcatpopup" --><!-- TMPL_VAR NAME="ethcatpopup" -->
+						<td colspan="2"><input type="text" name="ethnicnotes" size="40" ></td>
 						<!-- TMPL_ELSE -->
-						<td colspan=2>&nbsp;</td>
+						<td colspan="2">&nbsp;</td>
 						<!-- /TMPL_IF -->
 				</tr>
 			<!-- /tmpl_if -->
 
 			<tr>
-				<th colspan=5>ADRES CZYTELNIKA</th>
+				<th colspan="5">ADRES CZYTELNIKA</th>
 			</tr>
 
 			<tr>
-				<td  colspan=2><b>Adres Pocztowy*</b></td>
-				<td><b>Kod pocztowy</b></td>
+				<td  colspan="2"><b>Adres Pocztowy*</b></td>
+				<td>Kod pocztowy</td>
 				<td><b> Miasto*</b></td>
 				<td>Oddział Zapisu</td>
 			</tr>
 			<tr>
-				<td colspan=2><input type="text" name="address" size="40" value="<!-- TMPL_VAR NAME=address -->"></td>
+				<td colspan="2"><input type="text" name="streetaddress" size="40" value="<!-- TMPL_VAR NAME="address" -->"></td>
 				<td>
-					<input type=text name="zipcode" size=10 maxlength=20 value="<!-- TMPL_VAR NAME="zipcode" -->">
+					<input type="text" name="zipcode" size="10" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->">
 				</td>
 				<td>
-					<input type=text name="city" size=20 value="<!-- TMPL_VAR NAME=city -->">
+					<input type="text" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->">
 				</td>
 				<td>
-					<!-- TMPL_VAR name="CGIbranch" -->
+					<!-- TMPL_VAR NAME="CGIbranch" -->
 				</td>
 			</tr>
 
 
 			<tr>
-				<td colspan=2>Adres zamieszkania jeśli inny</td>
-				<td></td>
-				<td></td>
+				<td colspan="2">Adres zamieszkania jeśli inny</td>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
 			</tr>
 			<tr>
-				<td colspan=2><input type=text name="streetaddress" size=40 value="<!-- TMPL_VAR NAME=streetaddress -->"></td>
+				<td colspan="2"><input type="text" name="physstreet" size="40" value="<!-- TMPL_VAR NAME="physstreet" -->"></td>
 				<td>
-					<input type=text name="homezipcode" size=10 maxlength=20 value="<!-- TMPL_VAR NAME="homezipcode" -->">
+					<input type="text" name="homezipcode" size="10" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->">
 				</td>
 				<td>
-					<input type=text name=streetcity size=20 value="<!-- TMPL_VAR NAME=streetcity -->"></td>
+					<input type="text" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->"></td>
 			</tr>
 
 			<tr>
-				<td colspan=2 >Tel. domowy</td>
+				<td colspan="2" >Tel. domowy</td>
 				<td>Fax</td>
 				<td>Email</td>
-				<td>Komunikatory</td>
 			</tr>
 			<tr>
-				<td colspan=2><input type=text name=phone size=20 value="<!-- TMPL_VAR NAME=phone -->"></td>
-				<td><input type=text name=faxnumber size=20 value="<!-- TMPL_VAR NAME=faxnumber -->"></td>
-				<td><input type=text name=emailaddress size=20 value="<!-- TMPL_VAR NAME=emailaddress -->"></td>
-				<td><input type=text name=textmessaging size=20 value="<!-- TMPL_VAR NAME=textmessaging -->"></td>
+				<td colspan="2"><input type="text" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->"></td>
+				<td><input type="text" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->"></td>
+				<td><input type="text" name="emailaddress" size="20" value="<!-- TMPL_VAR NAME="emailaddress" -->"></td>
 			</tr>
 
 
 			<tr>
-				<td colspan=2 >Tel. praca</td>
-				<td></td>
-				<td></td>
-				<td></td>
+				<td colspan="2" >Tel. praca</td>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
 			</tr>
 			<tr>
-				<td colspan=2><input type=text name="phoneday" size="20" value="<!-- TMPL_VAR NAME=phoneday -->"></td>
-				<td></td>
-				<td></td>
-				<td></td>
+				<td colspan="2"><input type="text" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->"></td>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
 			</tr>
 
 			<!-- TMPL_UNLESS name="institution" -->
 			<tr>
-				<th colspan=5>POÅšREDNIE FORMY KONTAKTU</th>
+				<th colspan="5">POÅšREDNIE FORMY KONTAKTU</th>
 			</tr>
 
 			<tr>
-				<td   colspan=3 ><b> Nazwisko*</b></td>
+				<td colspan="3">Full Name</td>
 				<td>Telefon</td>
 					<td>Relacja</td>
 			</tr>
 			<tr>
-				<td colspan=3 ><input type=text name=contactname size=40 value="<!-- TMPL_VAR NAME=contactname -->"></td>
-				<td><input type=text name=altphone size=20 value="<!-- TMPL_VAR NAME=altphone -->"></td>
+				<td colspan="3"><input type="text" name="contactname" size="40" value="<!-- TMPL_VAR NAME="contactname" -->"></td>
+				<td><input type="text" name="altphone" size="20" value="<!-- TMPL_VAR NAME="altphone" -->"></td>
 					<td>
-					<select name=altrelationship size=1>
-					<!-- TMPL_LOOP NAME=relshiploop -->
-						<OPTION <!-- TMPL_VAR NAME=selected -->><!-- TMPL_VAR NAME=relationship -->
+					<select name="altrelationship" size="1">
+					<!-- TMPL_LOOP NAME="relshiploop" -->
+						<option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
 					<!-- /TMPL_LOOP -->
 					</select>
 					</td>
@@ -228,36 +236,68 @@
 
 			<tr>
 				<td> Uwagi</td>
-				<td colspan=4><textarea name=altnotes wrap=physical cols=70 rows=3><!-- TMPL_VAR NAME=altnotes --></textarea></td>
+				<td colspan="4"><textarea name="altnotes" cols="70" rows="3"><!-- TMPL_VAR NAME="altnotes" --></textarea></td>
 			</tr>
 
 
 			<tr>
-				<th colspan=5 >NA UŻYTEK BIBLIOTEKI</th>
+				<th colspan="5" >NA UŻYTEK BIBLIOTEKI</th>
 			</tr>
-
 			<tr>
-				<td> Uwagi</td>
-				<td colspan=4><textarea name=borrowernotes wrap=physical cols=70 rows=3><!-- TMPL_VAR NAME=borrowernotes --></textarea></td>
+				<!-- TMPL_IF NAME="addAction" -->
+					<td>Joining date (leave blank for today)</td>
+					<td><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->"></td>
+				<!-- TMPL_ELSE -->
+					<td>Joining date</td>
+					<td><!-- TMPL_VAR name="joining" --></td>
+				<!-- /TMPL_IF -->
+				<td>Expiry date (leave blank for auto calc)</td>
+				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->"></td>
+			</tr>
+			<tr>
+				<td>Borrower message (appears in OPAC)</td>
+				<td colspan="4"><textarea name="textmessaging" cols="70" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td>
 			</tr>
-
-			<!-- TMPL_IF NAME=modify -->
-				<tr><td colspan=5>FLAGI</td></tr>
-				<!-- TMPL_LOOP NAME=flagloop -->
 				<tr>
-					<td colspan=2><!-- TMPL_VAR NAME=html --></td>
-					<td colspan=3><input type=radio name="<!-- TMPL_VAR NAME=name -->" value="1" <!-- TMPL_VAR NAME=yes -->>Tak <input type=radio name="<!-- TMPL_VAR NAME=name -->" value="0" <!-- TMPL_VAR NAME=no -->>Nie
+				<td>Circulation note (appears during issue/return)</td>
+				<td colspan="4"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td>
+			</tr>
+				<tr><td colspan="5">FLAGI</td></tr>
+				<!-- TMPL_LOOP NAME="flagloop" -->
+				<tr>
+					<td colspan="2"><!-- TMPL_VAR NAME="html" --></td>
+					<td colspan="3"><input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Tak <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>Nie
 					</td>
 				</tr>
 				<!-- /TMPL_LOOP -->
-			<!-- /TMPL_IF -->
 
+			<tr>
+				<td colspan="5">The 2 following fields are available for your own usage. They can be useful for stat purposes</td>
+			<tr>
+				<td>Sorting field 1</td>
+				<td colspan="4">
+					<!-- TMPL_IF Name="CGIsort1" -->
+						<!-- TMPL_VAR Name="CGIsort1" -->
+					<!-- TMPL_ELSE -->
+						<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
+					<!--/TMPL_IF -->
+				</td>
+			</tr>
+			<tr>
+				<td>Sorting field 2</td>
+				<td colspan="4">
+					<!-- TMPL_IF Name="CGIsort2" -->
+						<!-- TMPL_VAR Name="CGIsort2" -->
+					<!-- TMPL_ELSE -->
+						<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
+					<!--/TMPL_IF -->
+				</td>
+			</tr>
 
 			<tr>
 				<td></td>
 				<td>
-					<input type=hidden name=type value=<!-- TMPL_VAR NAME="type" -->>
-					<input type=reset value="Wyczyść Pola" class="button">
+					<input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
 					<input type="submit" value="Zapisz" class="button">
 				</td>
 			</tr>

Index: pl/members/members-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/Attic/members-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/members/members-home.tmpl	17 Apr 2004 16:26:26 -0000	1.2
+++ pl/members/members-home.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -3,42 +3,46 @@
 <h1>Czytelnicy</h1>
 
 <div id="bloc25">
-	<div id="bloctitle">Wyszukiwanie Czytelników</div>
-	<FORM ACTION="/cgi-bin/koha/members/member.pl" method=post>
-		<input type="text" size=50 name=member >
+	<div class="bloctitle">Wyszukiwanie Czytelników</div>
+	<form action="/cgi-bin/koha/members/member.pl" method="post">
+		<p><input type="text" size="30" name="member" >  order by 
+		<select name="orderby">
+			<option value="surname,firstname">Nazwisko</option>
+			<option value="cardnumber">Cardnumber</option>
+		</select>
 		<input type="submit" class="button" value="OK">
 		<p>Prolonguj pozycjÄ™, obejrzyj, dodaj, zmieniaj lub wymazuj rekordy. Wszystkie funkcje rozpoczynaj od wyszukania.</p>
 		<p>Wpisz nazwę czytelnika, część nazwiska, lub numer w powyższym polu i naciśnij klawisz "enter", by aktywować wyszukiwanie</p>
 	</form>
 </div>
 <div id="bloc25">
-			<div id="bloctitle">Przeglądaj Czytelników</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 class="bloctitle">Przeglądaj Czytelników</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>
 </div>
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->

Index: pl/members/moremember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/Attic/moremember.tmpl,v
retrieving revision 1.5
retrieving revision 1.5.10.1
diff -u -b -r1.5 -r1.5.10.1
--- pl/members/moremember.tmpl	17 Apr 2004 16:26:26 -0000	1.5
+++ pl/members/moremember.tmpl	7 May 2007 13:55:52 -0000	1.5.10.1
@@ -1,201 +1,214 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
 <div id="mainbloc">
-	<h1><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></h1>
-	<div id="bloc25">
-		<div id="bloctitle">DANE CZŁONKOWSKIE</div>
-		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF name="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
-		<p>Numer karty: <!-- TMPL_VAR NAME="cardnumber" --><br>
-		Adres Pocztowy: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR name="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
-		<!-- TMPL_UNLESS name="I" -->Adres Domowy: <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR name="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
-		Telefon domowy: <!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
-		Telefon praca: <!-- TMPL_VAR NAME="phoneday" --><br>
-		Fax: <!-- TMPL_VAR NAME="faxnumber" --><br>
-		E-mail: <a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
-		Komunikatory: <!-- TMPL_VAR NAME="textmessaging" --><p>
-		Numer Członkowstwa: <!-- TMPL_VAR NAME="borrowernumber" --><br>
-		Kategoria Członkowska: <!-- TMPL_VAR NAME="categorycode" --><br>
-		Opłata PLN30/rok, Zapłacono<br>
-		Zapis: <!-- TMPL_VAR NAME="dateenrolled" -->, Wygasa: <!-- TMPL_VAR NAME="expiry" --><br>
-		Oddział Zapisu: <!-- TMPL_VAR NAME="branchcode" -->
+	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
+	<div class="bloc25">
+		<h2 class="members">Membership record</h2>
+		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
+		<p><label class="label100">Numer Karty: </label><!-- TMPL_VAR NAME="cardnumber" --><br>
+		<label class="label100">Postal Address: </label><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
+		<!-- TMPL_UNLESS name="I" --><label class="label100">Home Address: </label><!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
+		<label class="label100">Phone home: </label><!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
+		<label class="label100">Phone daytime: </label><!-- TMPL_VAR NAME="phoneday" --><br>
+		<label class="label100">Fax: </label><!-- TMPL_VAR NAME="faxnumber" --><br>
+		<label class="label100">E-mail: </label><a href="mailto:<!-- TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" --></a><br>
+		<label class="label100">Text messaging: </label><!-- TMPL_VAR NAME="textmessaging" --><br>
+		<label class="label100">Membership Number: </label><!-- TMPL_VAR NAME="borrowernumber" --><br>
+		<label class="label100">Membership Category: </label><!-- TMPL_VAR NAME="categorycode" --><br>
+		<label class="label100">Joined: </label><!-- TMPL_VAR NAME="dateenrolled" -->,<br>
+		<label class="label100"> Expires:</label><!-- TMPL_VAR NAME="expiry" --><br>
+		<label class="label100">Joining branch: </label><!-- TMPL_VAR NAME="branchcode" -->
 		</p>
 		<p>
 		<!-- TMPL_IF NAME="printethnicityline" -->
-			Pochodzenie: <!-- TMPL_VAR NAME="ethnicity" -->, <!-- TMPL_VAR NAME="ethnotes" --><br>
+			<label class="label100">Ethnicity: </label><!-- TMPL_VAR NAME="ethnicity" -->, <!-- TMPL_VAR NAME="ethnotes" --><br>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_UNLESS name="I" -->
-			D.ur.: <!-- TMPL_VAR NAME="dateofbirth" --><br>
-			Płeć: <!-- TMPL_VAR NAME="sex" --><br>
-			Pośredni
+			<label class="label100">DoB: </label><!-- TMPL_VAR NAME="dateofbirth" --><br>
+			<label class="label100">Sex: </label><!-- TMPL_VAR NAME="sex" --><br>
 		<!-- /TMPL_UNLESS -->
-		Kontakt: <!-- TMPL_VAR NAME="contactname" --><br>
-		Telefon: <!-- TMPL_VAR NAME="altphone" --><br>
+		<label class="label100">Contact: </label><!-- TMPL_VAR NAME="contactname" --><br>
+		<label class="label100">Phone: </label><!-- TMPL_VAR NAME="altphone" --><br>
 		<!-- TMPL_UNLESS name="I" -->
-			Relacja: <!-- TMPL_VAR NAME="altrelationship" --><br>
+			<label class="label100">Relationship: </label><!-- TMPL_VAR NAME="altrelationship" --><br>
 		<!-- /TMPL_UNLESS -->
-		Uwagi: <!-- TMPL_VAR NAME="altnotes" -->
+		<label class="label100">Uwagi: </label><!-- TMPL_VAR NAME="altnotes" -->
+		<!-- TMPL_IF NAME="sort1" -->
+			<p><label class="label100">Sort field 1 : </label><!-- TMPL_VAR NAME="sort1" --></p>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="sort2" -->
+			<p><label class="label100">Sort field 2 : </label><!-- TMPL_VAR NAME="sort2" --></p>
+		<!-- /TMPL_IF -->
 		</p>
 		<p>
 		<!-- TMPL_UNLESS name="I" -->
 			<!-- TMPL_IF NAME="isguarantee" -->
-				Poręczeni:<br><!-- TMPL_LOOP NAME="guaranteeloop" --><A HREF="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name --> - <!-- TMPL_VAR NAME="cardnumber" --></a><br><!-- /TMPL_LOOP -->
+				Poręczeni:<br><!-- TMPL_LOOP NAME="guaranteeloop" --><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="name" --> - <!-- TMPL_VAR NAME="cardnumber" --></a><br><!-- /TMPL_LOOP -->
 			<!-- TMPL_ELSE -->
 				Poręczyciel:
 				<!-- TMPL_IF NAME="guarantorborrowernumber" -->
-					<A HREF="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorcardnumber" --></a><br>
+					<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorcardnumber" --></a><br>
 				<!-- TMPL_ELSE -->
-					bez poręczyciela<br>
+					No guarantor<br>
 				<!-- /TMPL_IF -->
 			<!-- /TMPL_IF -->
 		<!-- /TMPL_UNLESS -->
 		</p>
 		<p>
-			Uwagi Ogólne: <!--<A HREF="popbox.html" onclick="messenger(200,250,'Form that lets you add to and delete notes.'); return false">-->
-			<!-- TMPL_VAR NAME="borrowernotes" --><!--</a>-->
+			<label class="label100">Circulation note: </label>
+			<!-- TMPL_VAR NAME="borrowernotes" -->
 		</p>
-		<p align=right>
-		</font>
-		<!-- TMPL_IF name="IS_ADULT" -->
-			<p align=right>
-			<form action=/cgi-bin/koha/members/jmemberentry.pl method=post>
-				<input type="submit" name="submit" value="Dodaj Dziecko" class="button" alt="Dodaj Dziecko">
-				<input type=hidden name=type value=Add>
-				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME=borrowernumber -->">
-			</form>
-			</P>
-		<!-- /TMPL_IF -->
-		<br>
-		<!-- TMPL_IF name="I" -->
-			<form action=/cgi-bin/koha/members/imemberentry.pl method=post>
-				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME="bornum" -->">
-				<input type=submit class="button" value="Zmień">
-			</form>
+		<p>
+			 <label class="label100">OPAC login : </label><!-- TMPL_VAR name="userid" -->
+			 <!-- TMPL_IF name="password" -->(password defined)<!-- TMPL_ELSE -->(no password)<!-- /TMPL_IF -->
+		</p>
+		<p>
+		<!-- TMPL_UNLESS NAME="unvalidlibrarian"--> 
+			<!-- TMPL_IF NAME="I" -->
+				<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="bornum" -->&categorycode=I" class="button">Zmień</a>
 		<!-- TMPL_ELSE -->
-			<form action=/cgi-bin/koha/members/memberentry.pl method=post>
-				<input type=hidden name=bornum value="<!-- TMPL_VAR NAME="bornum" -->">
-				<input type=submit class="button" name="modify" value="Zmień">
-			</form>
+				<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="bornum" -->" class="button">Zmień</a>
 		<!-- /TMPL_IF -->
-		<form action="javascript:confirm_deletion()">
-			<input type=hidden name=member value="<!-- TMPL_VAR NAME="bornum" -->">
-			<input type=submit class="button" value="Wymaż">
-		</form>
-		<form action=/cgi-bin/koha/members/member-password.pl method=post>
-			<input type=hidden name=member value=<!-- TMPL_VAR NAME=bornum -->>
-			<input type=submit class="button" value="Zmień Hasło">
-		</form>
-		<form action=/cgi-bin/koha/members/member-flags.pl method=post>
-			<input type=hidden name=member value=<!-- TMPL_VAR NAME=bornum -->>
-			<input type=submit class="button" value="Zmień Flagi Uzytkownika">
-		</form>
+			<a href="javascript:confirm_deletion()" class="button">Delete</a>  <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->" class="button">Issue books</a>  <a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Change Password</a>
+			</p>
+			<br/>
+			<p>
+			<!-- TMPL_IF NAME="IS_ADULT" -->
+				<a href="/cgi-bin/koha/members/jmemberentry.pl?type=Add&bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="button">Dodaj Dziecko</a>
+			<!-- /TMPL_IF -->
+			<a href="/cgi-bin/koha/members/member-flags.pl?member=<!-- TMPL_VAR NAME="bornum" -->" class="button">Zmień Flagi Uzytkownika</a>
+		<!-- /TMPL_UNLESS -->
+		<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page" class="button">Print Page</a> <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip" class="button">Print Slip</a>
+		</p>
 	</div>
 
-	<div id="bloc25">
-		<div id="bloctitle">KARY & OPŁATY</div>
-		<!-- TMPL_IF name="totaldue" -->
-			Do zapłaty <!-- TMPL_VAR name="totaldue"-->
-			</tr>
+<!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
+		<h2 class="members">Member Flags</h2>
+		<ul>
+		<!-- TMPL_IF NAME="debarred" --><li>Member is debarred.</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="gonenoaddress" --><li>Member's address is in doubt.</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="lost" --><li>Member's card has been reported lost.</li><!-- /TMPL_IF -->
+		</ul>
+		<!-- TMPL_VAR NAME="borrowernotes" -->
+	</div><!-- /TMPL_IF -->
+
+	<div class="bloc25">
+		<h2 class="members">Fines &amp; charges</h2>
+		<!-- TMPL_IF NAME="totaldue" -->
+			Do zapłaty <!-- TMPL_VAR NAME="totaldue"-->
 		<TMPL_ELSE>
 			Brak długów
 		</TMPL_IF>
 		<p>
+		<!-- TMPL_UNLESS NAME="unvalidlibrarian"--> 
 			<a class="button" href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"> Przejrzyj Rachunek </a> <a class="button" href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"> Opłata Kar </a>
+		<!-- /TMPL_UNLESS -->
 		</p>
 	</div>
-	<div id="bloc25">
-		<div id="bloctitle">POZYCJE WYPOŻYCZONE TERAZ</div>
-		<!-- TMPL_IF name="issueloop" -->
-			<form action="renewscript.pl" method=post>
-			<input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->">
-
+	<div class="bloc25">
+		<h2 class="members">Items requested</h2>
+			<!-- TMPL_IF NAME="reserveloop" -->
+			<form action="/cgi-bin/koha/modrequest.pl" method="post">
 			<table>
 			<tr>
 				<th>Tytuł</th>
-				<th>Do zwrotu</th>
-				<th>Rodzaj pozycji</th>
-				<th>Opłata</th>
-				<th>Przedłuż</th>
+					<th>Zamówiona</th>
+					<th>Usuń</th>
 			</tr>
-
-			<!-- TMPL_LOOP NAME=issueloop -->
+					<!-- TMPL_LOOP NAME="reserveloop" -->
 			<tr>
-				<td><!-- TMPL_IF NAME=red --><font color=red><!-- /TMPL_IF -->
-				<!-- TMPL_VAR NAME="title" -->
-				<a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="biblionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
-					<!-- TMPL_VAR NAME="barcode" -->
-				</a>
+						<td><input type="hidden" name="from" value="borrower">
+							<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
+							<!-- TMPL_IF NAME="volumeddesc" -->
+								<!-- TMPL_VAR NAME="volumeddesc" -->
+								<!-- TMPL_VAR NAME="itemtype" -->
+							<!-- /TMPL_IF -->
 				</td>
-				<td><!-- TMPL_VAR NAME="date_due" --></td>
-				<td><!-- TMPL_VAR NAME="itemtype" --></td>
-				<td><!-- TMPL_VAR NAME="charge" --></td>
+						<td><!-- TMPL_VAR NAME="reservedate2" --></td>
 				<td>
-				<!-- TMPL_IF NAME=norenew -->
-					<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Zarezerwowana - nie można przedłużyć</a>
-				<!-- TMPL_ELSE -->
-					<input type=radio name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value=y>Y  <input type=radio name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value=n>N
-				<!-- /TMPL_IF -->
-				<!-- TMPL_IF NAME=red --></font><!-- /TMPL_IF -->
+							<select name="rank-request">
+							<option value="n">Nie
+							<option value="del">Tak
+							</select><input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+						<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->">
 				</td>
+						
 			</tr>
 			<!-- /TMPL_LOOP -->
+					<tr>
+						<td colspan="5" align="right">
+						<!-- TMPL_UNLESS NAME="unvalidlibrarian"--> 
+							<!-- TMPL_IF NAME="reserveloop" -->
+								<input type="submit" name="submit" value="Update" class="button">
+							<!-- /TMPL_IF -->
+						<!-- /TMPL_UNLESS -->
+						</td>
+					</tr>
 			</table>
-			<input type=submit class="button" value="Przedłuż Pozycje">
 		</form>
 		<!-- TMPL_ELSE -->
 			Brak
 		<!-- /TMPL_IF -->
 	</div>
-	<div id="bloc25">
-		<div id="bloctitle">BIEŻĄCE REZERWACJE</div>
-			<!-- TMPL_IF NAME=reserveloop -->
+
+	<div class="bloc25">
+		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Historia Wypożyczeń</a>
+	</div>
+	<!-- TMPL_IF NAME="patronimages" -->
+		<div class="bloc25">
+			<img src="/patronimages/<!-- TMPL_VAR NAME="cardnumber" -->.<!-- TMPL_VAR NAME="patronimages" -->" alt="NO IMAGE" border="0" />
+		</div>
+	<!-- /TMPL_IF -->
+	<div class="bloc25">
+		<h2 class="members">Items currently on issue</h2>
+		<!-- TMPL_IF NAME="issueloop" -->
+			<form action="../renewscript.pl" method="post">
+			<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
+
 				<table>
 					<tr>
 						<th>Tytuł</th>
-						<th>Zamówiona</th>
-						<th>Usuń</th>
+				<th>Do zwrotu</th>
+				<th>Rodzaj pozycji</th>
+				<th>Opłata</th>
+				<!-- TMPL_UNLESS Name ="unvalidlibrarian"--> 
+					<th>Przedłuż</th>
+				<!-- /TMPL_UNLESS -->
 					</tr>
-					<form action=/cgi-bin/koha/modrequest.pl method=post>
-						<input type=hidden name=from value=borrower>
-						<!-- TMPL_LOOP NAME=reserveloop -->
+
+			<!-- TMPL_LOOP NAME="issueloop" -->
 						<tr>
-							<td>
-								<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
-								<!-- TMPL_IF NAME=volumeddesc -->
-									<!-- TMPL_VAR NAME="volumeddesc" -->
-									<!-- TMPL_VAR NAME="itemtype" -->
-								<!-- /TMPL_IF -->
+				<td><!-- TMPL_IF NAME="red" --><p class="problem"><!-- TMPL_ELSE --> <p><!-- /TMPL_IF -->
+				<!-- TMPL_VAR NAME="title" --> <!-- TMPL_IF name="itemcallnumber" --> <i>(<!-- TMPL_VAR name="itemcallnumber" -->)</i> <!-- /TMPL_IF -->
+				<a href="/cgi-bin/koha/moredetail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+					<!-- TMPL_VAR NAME="barcode" -->
+				</a></p>
 							</td>
-							<td><!-- TMPL_VAR NAME="reservedate2" --></td>
+				<td><!-- TMPL_IF NAME="red" --><p class="problem"><!-- TMPL_ELSE --> <p><!-- /TMPL_IF --><!-- TMPL_VAR NAME="date_due" --></p></td>
+				<td><!-- TMPL_VAR NAME="itemtype" --></td>
+				<td><!-- TMPL_VAR NAME="charge" --></td>
+				<!-- TMPL_UNLESS Name ="unvalidlibrarian"--> 
 							<td>
-								<select name="rank-request">
-								<option value=n>Nie
-								<option value=del>Tak
-								</select>
-							</td>
-							<input type=hidden name=biblio value="<!-- TMPL_VAR NAME="biblionumber" -->">
-							<input type=hidden name=borrowernumber value="<!-- TMPL_VAR NAME="bornum" -->">
-						</tr>
-						<!-- /TMPL_LOOP -->
-						<tr>
-							<td colspan=5 align=right>
-							<!-- TMPL_IF name="reserveloop" -->
-								<input type="image" name="submit" value="aktualizuj" height=42 width=187 border=0 src="<!-- TMPL_VAR name="themelang" -->/images/cancel-requests.gif">
+						<!-- TMPL_IF NAME="norenew" -->
+							<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Zarezerwowana - nie można przedłużyć</a>
+						<!-- TMPL_ELSE -->
+							<input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y">Tak <input type="radio" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="n">Nie
 							<!-- /TMPL_IF -->
 							</td>
+				<!-- /TMPL_UNLESS --> 
 						</tr>
-					</form>
+			<!-- /TMPL_LOOP -->
 				</table>
+			<!-- TMPL_UNLESS Name ="unvalidlibrarian"--> 
+				<input type="submit" class="button" value="Przedłuż Pozycje">
+			<!-- /TMPL_UNLESS --> 
+		</form>
 			<!-- TMPL_ELSE -->
 				Brak
 			<!-- /TMPL_IF -->
 	</div>
-	<div id="bloc25">
-		<a class=button href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">
-			Historia Wypożyczeń
-		</a>
-	</div>
 </div>
-<script>
+<script language="JavaScript" type="text/javascript">
 function confirm_deletion() {
 	var is_confirmed = confirm('do you confirm deletetion ?');
 	if (is_confirmed) {

Index: pl/members/newimember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/Attic/newimember.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -b -r1.1 -r1.1.10.1
--- pl/members/newimember.tmpl	17 Apr 2004 16:53:53 -0000	1.1
+++ pl/members/newimember.tmpl	7 May 2007 13:55:52 -0000	1.1.10.1
@@ -1,178 +1,178 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
 <!-- TMPL_IF NAME="missingloop" -->
-	<!-- TMPL_VAR Name="string" -->
+	<!-- TMPL_VAR NAME="string" -->
 <!-- TMPL_ELSE -->
-	<!-- TMPL_IF NAME=invalid -->
+	<!-- TMPL_IF NAME="invalid" -->
 		Niewłaściwy numer karty.<p>
 	<!-- TMPL_ELSE -->
-	<H1> Potwierdź Wpis </H1>
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B> NOWY CZYTELNIK </B>
+	<h1> Potwierdź Wpis </h1>
+	<table border="0" cellspacing="0" cellpadding="5">
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b> NOWY CZYTELNIK </b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Nazwa</B>
+				<b>Nazwa</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="institution_name" -->
+				<!-- TMPL_VAR NAME="institution_name" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B> DANE CZŁONKOWSKIE </B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b> DANE CZŁONKOWSKIE </b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Numer Członkowski</B>
+				<b>Numer Członkowski</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="bornum" -->
+				<!-- TMPL_VAR NAME="bornum" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Numer karty</B>
+				<b>Numer karty</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="cardnumber_institution" -->
+				<!-- TMPL_VAR NAME="cardnumber_institution" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Oddział Zapisu</B>
+				<b>Oddział Zapisu</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="branchcode" -->
+				<!-- TMPL_VAR NAME="branchcode" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>ADRES CZYTELNIKA</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>ADRES CZYTELNIKA</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Adres Pocztowy</B>
+				<b>Adres Pocztowy</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="postal" -->
+				<!-- TMPL_VAR NAME="postal" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Adres Domowy</B>
+				<b>Adres Domowy</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="home" -->
+				<!-- TMPL_VAR NAME="home" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>SZCZEGÓŁY DANYCH KONTAKTOWYCH</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>SZCZEGÓŁY DANYCH KONTAKTOWYCH</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Telefon (Dom)</B>
+				<b>Telefon (Dom)</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="phone" -->
+				<!-- TMPL_VAR NAME="phone" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Telefon (Praca)</B>
+				<b>Telefon (Praca)</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="phoneday" -->
+				<!-- TMPL_VAR NAME="phoneday" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Fax</B>
+				<b>Fax</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="faxnumber" -->
+				<!-- TMPL_VAR NAME="faxnumber" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>E-mail</B>
+				<b>E-mail</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="emailaddress" -->
+				<!-- TMPL_VAR NAME="emailaddress" -->
 			</td>
 		</tr>
-                <tr valign=top bgcolor="white" >
+                <tr valign="top" bgcolor="white" >
                         <td>
-                                <B>Komunikatory</B>
+                                <b>Komunikatory</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR NAME=textmessaging -->
+				<!-- TMPL_VAR NAME="textmessaging" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>POÅšREDNI RODZAJ KONTAKTU</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>POÅšREDNI RODZAJ KONTAKTU</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Nazwa</B>
+				<b>Nazwa</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="contactname" -->
+				<!-- TMPL_VAR NAME="contactname" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Telefon</B>
+				<b>Telefon</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="altphone" -->
+				<!-- TMPL_VAR NAME="altphone" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Relacja</B>
+				<b>Relacja</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="altrelationship" -->
+				<!-- TMPL_VAR NAME="altrelationship" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Uwagi</B>
+				<b>Uwagi</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="altnotes" -->
+				<!-- TMPL_VAR NAME="altnotes" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>UWAGI</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>UWAGI</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Uwagi Ogólne</B>
+				<b>Uwagi Ogólne</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="bornotes" -->
+				<!-- TMPL_VAR NAME="bornotes" -->
 			</td>
 		</tr>
-		</TABLE><p>
+		</table><p>
 		Prawidłowe wartości. Naciśnij OK by potwierdzić tego nowego czytelnika
-		<form action="/cgi-bin/koha/members/insertidata.pl" method=post>
-			<!-- TMPL_LOOP NAME=inputsloop -->
-				<input type=hidden name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
+		<form action="/cgi-bin/koha/members/insertidata.pl" method="post">
+			<!-- TMPL_LOOP NAME="inputsloop" -->
+				<input type="hidden" name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
 			<!-- /TMPL_LOOP -->
-			<input type=submit name=submit value=OK>
+			<input type="submit" name="submit" value="OK">
 		</form>
 	<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->

Index: pl/members/newjmember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/Attic/newjmember.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -b -r1.1 -r1.1.10.1
--- pl/members/newjmember.tmpl	17 Apr 2004 16:57:07 -0000	1.1
+++ pl/members/newjmember.tmpl	7 May 2007 13:55:52 -0000	1.1.10.1
@@ -1,85 +1,116 @@
 <!-- TMPL_INCLUDE Name="members-top.inc" -->
-
-<!-- TMPL_IF Name="NOK" -->
-	<!-- TMPL_VAR Name="string" -->
-<!-- TMPL_ELSE -->
-	<H1> Potwierdź Wpis </H1>
+<div id="mainbloc">
+	<!-- TMPL_IF Name="NOK" -->
+	<h3>The following fields were entered incorrectly.  Please go back and correct them.</h3>
+	<ul>
+		<!-- TMPL_IF NAME="cardnumber_missing" --><li>Please enter a library card number.</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="firstname_missing" --><li>Please enter the patron's first name.</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="surname_missing" --><li>Please enter the patron's last name.</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="dob_missing" --><li>Please enter the patron's date of birth.</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="gender_missing" --><li>Please enter the patron's gender.</li><!-- /TMPL_IF -->
+	</ul>
+	<!-- TMPL_ELSE -->
+		<h1> Potwierdź Wpis </h1>
 	<!-- TMPL_LOOP Name="identsloop" -->
 		<!-- TMPL_IF Name="cardchild" -->
-			<table border=0 cellspacing=0 cellpadding=5>
-				<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-					<td background="<!-- TMPL_VAR Name="image" -->">
-					<B> NOWY CZYTELNIK </B>
+				<table border="0" cellspacing="0" cellpadding="5">
+					<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+						<td background="<!-- TMPL_VAR NAME="image" -->">
+						<b> NOWY CZYTELNIK </b>
 					</td>
 					<td>
 					&nbsp;
 					</td>
 				</tr>
-				<tr valign=top bgcolor="white" >
+					<tr valign="top" bgcolor="white" >
 					<td>
-					<B>Nazwa</B>
+						<b>Nazwa</b>
 					</td>
 					<td>
-					<!-- TMPL_VAR Name="name" -->
+						<!-- TMPL_VAR NAME="name" -->
 					</td>
 				</tr>
-				<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-					<td background="<!-- TMPL_VAR Name="image" -->">
-					<B> DANE CZŁONKOWSKIE </B>
+					<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+						<td background="<!-- TMPL_VAR NAME="image" -->">
+						<b> DANE CZŁONKOWSKIE </b>
 					</td>
 					<td>
 					&nbsp;
 					</td>
 				</tr>
-				<tr valign=top bgcolor="white" >
+					<tr valign="top" bgcolor="white" >
 					<td>
-					<B>Numer Członkowski</B>
+						<b>Numer Członkowski</b>
 					</td>
 					<td>
-					<!-- TMPL_VAR Name="bornum" -->
+						<!-- TMPL_VAR NAME="bornum" -->
 					</td>
 				</tr>
-				<tr valign=top bgcolor="white" >
+					<tr valign="top" bgcolor="white" >
 					<td>
-					<B>Data urodzenia</B>
+						<b>Barcode Number</b>
 					</td>
 					<td>
-					<!-- TMPL_VAR Name="dob" -->
+						<!-- TMPL_VAR NAME="cardchild" -->
 					</td>
 				</tr>
-				<tr valign=top bgcolor="white" >
+					<tr valign="top" bgcolor="white" >
 					<td>
-					<B>Płeć</B>
+						<b>Data urodzenia</b>
 					</td>
 					<td>
-					<!-- TMPL_VAR Name="sex" -->
+						<!-- TMPL_VAR NAME="dob" -->
 					</td>
 				</tr>
-				<tr valign=top bgcolor="white" >
+					<tr valign="top" bgcolor="white" >
 					<td>
-					<B>Szkoła</B>
+						<b>Płeć</b>
 					</td>
 					<td>
-					<!-- TMPL_VAR Name="school" -->
+						<!-- TMPL_VAR NAME="sex" -->
 					</td>
 				</tr>
-				<tr valign=top bgcolor="white" >
+					<tr valign="top" bgcolor="white" >
 					<td>
-					<B>Uwagi Ogólne</B>
+						<b>Szkoła</b>
 					</td>
 					<td>
-					<!-- TMPL_VAR Name="notes" -->
+						<!-- TMPL_VAR NAME="school" -->
 					</td>
 				</tr>
-			</TABLE><p>
+					<tr valign="top" bgcolor="white" >
+						<td>
+						<b>Uwagi Ogólne</b>
+						</td>
+						<td>
+						<!-- TMPL_VAR NAME="notes" -->
+						</td>
+					</tr>
+					<tr valign="top" bgcolor="white" >
+						<td>
+						<b>Joining date</b>
+						</td>
+						<td>
+						<!-- TMPL_VAR NAME="joining" -->
+						</td>
+					</tr>
+					<tr valign="top" bgcolor="white" >
+						<td>
+						<b>Expiry date</b>
+						</td>
+						<td>
+						<!-- TMPL_VAR NAME="expiry" -->
+						</td>
+					</tr>
+				</table><p>
 		<!-- /TMPL_IF -->
   <!-- /TMPL_LOOP -->
-	<form action="/cgi-bin/koha/members/insertjdata.pl" method=post>
-		<!-- TMPL_LOOP NAME=inputsloop -->
-			<input type=hidden name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
+		<form action="/cgi-bin/koha/members/insertjdata.pl" method="post">
+			<!-- TMPL_LOOP NAME="inputsloop" -->
+				<input type="hidden" name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
 		<!-- /TMPL_LOOP -->
-		<input type=submit name=submit value="prześlij">
+			<input type="submit" name="submit" value="prześlij" class="button members">
 	</form>
-<!-- /TMPL_IF -->
-
+	<!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE Name="members-bottom.inc" -->

Index: pl/members/newmember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/Attic/newmember.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -b -r1.1 -r1.1.10.1
--- pl/members/newmember.tmpl	17 Apr 2004 16:57:07 -0000	1.1
+++ pl/members/newmember.tmpl	7 May 2007 13:55:52 -0000	1.1.10.1
@@ -1,98 +1,98 @@
 <!-- TMPL_INCLUDE Name="members-top.inc" -->
 
 <!-- TMPL_IF Name="OK" -->
-	<H1> Potwierdź Wpis </H1>
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B> NOWY CZYTELNIK </B>
+	<h1> Potwierdź Wpis </h1>
+	<table border="0" cellspacing="0" cellpadding="5">
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b> NOWY CZYTELNIK </b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Nazwa</B>
+				<b>Nazwa</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="name" -->
+				<!-- TMPL_VAR NAME="name" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B> DANE CZŁONKOWSKIE </B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b> DANE CZŁONKOWSKIE </b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Numer Członkowski</B>
+				<b>Numer Członkowski</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="bornum" -->
+				<!-- TMPL_VAR NAME="bornum" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Numer karty</B>
+				<b>Numer karty</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="cardnum" -->
+				<!-- TMPL_VAR NAME="cardnum" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Kategoria Członkowska</B>
+				<b>Kategoria Członkowska</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="memcat" -->
+				<!-- TMPL_VAR NAME="memcat" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Opłata</B>
+				<b>Opłata</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="fee" -->
+				<!-- TMPL_VAR NAME="fee" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Data zapisu</B>
+				<b>Data zapisu</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="joindate" -->
+				<!-- TMPL_VAR NAME="joindate" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Data wygaśnięcia</B>
+				<b>Data wygaśnięcia</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="expdate" -->
+				<!-- TMPL_VAR NAME="expdate" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Oddział Zapisu</B>
+				<b>Oddział Zapisu</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="branchcode" -->
+				<!-- TMPL_VAR NAME="branchcode" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>DANE OSOBISTE</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>DANE OSOBISTE</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Data urodzenia</B>
+				<b>Data urodzenia</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="dob" -->
+				<!-- TMPL_VAR NAME="dob" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Płeć</B>
+				<b>Płeć</b>
 			</td>
 			<td>
 				<!-- TMPL_IF Name="sex" -->
@@ -102,151 +102,151 @@
 				<!-- /TMPL_IF -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>ADRES CZYTELNIKA</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>ADRES CZYTELNIKA</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Adres Pocztowy</B>
+				<b>Adres Pocztowy</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="postal" -->
+				<!-- TMPL_VAR NAME="postal" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Adres Domowy</B>
+				<b>Adres Domowy</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="home" -->
+				<!-- TMPL_VAR NAME="home" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>SZCZEGÓŁY DANYCH KONTAKTOWYCH</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>SZCZEGÓŁY DANYCH KONTAKTOWYCH</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Tel. domowy</B>
+				<b>Tel. domowy</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="phone" -->
+				<!-- TMPL_VAR NAME="phone" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Tel. praca</B>
+				<b>Tel. praca</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="phoneday" -->
+				<!-- TMPL_VAR NAME="phoneday" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Fax</B>
+				<b>Fax</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="faxnumber" -->
+				<!-- TMPL_VAR NAME="faxnumber" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>E-mail</B>
+				<b>E-mail</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="emailaddress" -->
+				<!-- TMPL_VAR NAME="emailaddress" -->
 			</td>
 		</tr>
-                <tr valign=top bgcolor="white" >
+                <tr valign="top" bgcolor="white" >
                         <td>
-                                <B>Komunikatory</B>
+                                <b>Komunikatory</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR NAME=textmessaging -->
+				<!-- TMPL_VAR NAME="textmessaging" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>POÅšREDNI RODZAJ KONTAKTU</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>POÅšREDNI RODZAJ KONTAKTU</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Nazwa</B>
+				<b>Nazwa</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="contactname" -->
+				<!-- TMPL_VAR NAME="contactname" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Telefon</B>
+				<b>Telefon</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="altphone" -->
+				<!-- TMPL_VAR NAME="altphone" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Relacja</B>
+				<b>Relacja</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="altrelationship" -->
+				<!-- TMPL_VAR NAME="altrelationship" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Uwagi</B>
+				<b>Uwagi</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="altnotes" -->
+				<!-- TMPL_VAR NAME="altnotes" -->
 			</td>
 		</tr>
-		<tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
-			<td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-				<B>UWAGI</B>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="main" -->" >
+			<td colspan="2" background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b>UWAGI</b>
 			</td>
 		</tr>
-		<tr valign=top bgcolor="white" >
+		<tr valign="top" bgcolor="white" >
 			<td>
-				<B>Uwagi Ogólne</B>
+				<b>Uwagi Ogólne</b>
 			</td>
 			<td>
-				<!-- TMPL_VAR Name="bornotes" -->
+				<!-- TMPL_VAR NAME="bornotes" -->
 			</td>
 		</tr>
-		</TABLE><p>
-		<form action="/cgi-bin/koha/members/insertdata.pl" method=post>
-			<!-- TMPL_LOOP NAME=inputsloop -->
-				<input type=hidden name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
+		</table><p>
+		<form action="/cgi-bin/koha/members/insertdata.pl" method="post">
+			<!-- TMPL_LOOP NAME="inputsloop" -->
+				<input type="hidden" name="<!-- TMPL_VAR NAME="key" -->" value="<!-- TMPL_VAR NAME="value" -->">
 			<!-- /TMPL_LOOP -->
-			<input type=submit name=submit value="Prześlij">
+			<input type="submit" name="submit" value="Prześlij">
 		</form>
 <!-- TMPL_ELSE -->
-	<h1>BŁĄD</H1>
+	<h1>BŁĄD</h1>
 	<p>Następujące pola mają niewłaściwe wartości. Nacisnij przycisk wstecz i popraw: </p>
-	<!-- TMPL_IF name="cardnumber" -->
+	<!-- TMPL_IF NAME="cardnumber" -->
 		Numer karty<br/>
 	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="invalid_cardnumber" -->
+	<!-- TMPL_IF NAME="invalid_cardnumber" -->
 		Nie prawidłowy numer karty<br/>
 	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="gender" -->
+	<!-- TMPL_IF NAME="gender" -->
 		Płeć<br/>
 	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="firstname" -->
+	<!-- TMPL_IF NAME="firstname" -->
 		Imiona<br/>
 	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="surname" -->
+	<!-- TMPL_IF NAME="surname" -->
 		Nazwisko<br/>
 	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="address" -->
+	<!-- TMPL_IF NAME="address" -->
 		Ulica Adresu Pocztowego<br/>
 	<!-- /TMPL_IF -->
-	<!-- TMPL_IF name="city" -->
+	<!-- TMPL_IF NAME="city" -->
 		Miasto<br/>
 	<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->

Index: pl/members/pay.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/Attic/pay.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/members/pay.tmpl	17 Apr 2004 16:26:26 -0000	1.2
+++ pl/members/pay.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,46 +1,44 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
+<div id="mainbloc">
+<h1>Opłata Kar dla <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
 
-<h1>Opłata Kar dla <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h1><P>
-<center>
-<p>
-	<form action=/cgi-bin/koha/pay.pl method=post>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-<TR VALIGN=TOP>
-	<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan=4><B>KARY & OPŁATY</B></TD>
-	<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan=4><B>KWOTA DŁUGU</B></TD>
-</TR>
-	<input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->">
-<!-- TMPL_LOOP name="loop_pay" -->
-<tr VALIGN=TOP  >
-	<TD><input type=radio name="payfine<!-- TMPL_VAR name="i" -->" value="no" checked>Niezapłacono <input type=radio name="payfine<!-- TMPL_VAR name="i" -->" value="yes">Płać <input type=radio name="payfine<!-- TMPL_VAR name="i" -->" value="wo">Odpisz
-	<input type=hidden name="itemnumber<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="itemnumber" -->">
-	<input type=hidden name="accounttype<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accounttype" -->">
-	<input type=hidden name="amount<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amount'}" -->">
-	<input type=hidden name="out<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amountoutstanding" -->">
-	<input type=hidden name="bornum<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="bornum" -->">
-	<input type=hidden name="accountno<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accountno" -->">
+<form action="/cgi-bin/koha/pay.pl" method="post">
+<table>
+<tr>
+	<th colspan="3">FINES &amp; CHARGES</th>
+	<th colspan="2">KWOTA DŁUGU</th>
+</tr>
+	
+<!-- TMPL_LOOP NAME="loop_pay" -->
+<tr>
+	<td>
+		<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->">
+		<input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="no" checked="checked">Niezapłacono <input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="yes">Płać <input type="radio" name="payfine<!-- TMPL_VAR NAME="i" -->" value="wo">Odpisz
+		<input type="hidden" name="itemnumber<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->">
+		<input type="hidden" name="accounttype<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accounttype" -->">
+		<input type="hidden" name="amount<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amount'}" -->">
+		<input type="hidden" name="out<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="amountoutstanding" -->">
+		<input type="hidden" name="bornum<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="bornum" -->">
+		<input type="hidden" name="accountno<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="accountno" -->">
 	</td>
-	<TD><!-- TMPL_VAR name="description" --> <!-- TMPL_VAR name="title" --></td>
-	<TD><!-- TMPL_VAR name="accounttype" --></td>
-	<td><!-- TMPL_VAR name="amount" --></td>
-	<TD><!-- TMPL_VAR name="amountoutstanding" --></td>
+	<td><!-- TMPL_VAR NAME="description" --> <!-- TMPL_VAR NAME="title" --></td>
+	<td><!-- TMPL_VAR NAME="accounttype" --></td>
+	<td><!-- TMPL_VAR NAME="amount" --></td>
+	<td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
 </tr>
 <!-- /TMPL_LOOP -->
-<tr VALIGN=TOP  >
-	<TD colspan=4 align=right><b>Do zapłaty</b></td>
-	<TD><b><!-- TMPL_VAR name="total" --></b></td>
-	</tr>
-	<tr VALIGN=TOP  >
-	<TD colspan=5 align=right>
-	<input type="submit" name="submit" value="zapłać" class="button"></td>
+<tr valign="top">
+	<th colspan="4" align="right">Do zapłaty</th>
+	<th><!-- TMPL_VAR NAME="total" --></th>
+</tr>
+<tr>
+	<td colspan="5" align="right">
+	<input type="submit" name="submit"  value="Pay" class="button"></td>
 </tr>
 </table>
 </form>
-<br clear=all>
-<p> &nbsp; </p>
-
-<br>
-<a href="moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->">Powrót</a> do Danych Czytelnika
 
+<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button member">Return to Member Record </a>
+</div>
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
 

Index: pl/members/readingrec.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/members/Attic/readingrec.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/members/readingrec.tmpl	17 Apr 2004 16:26:26 -0000	1.2
+++ pl/members/readingrec.tmpl	7 May 2007 13:55:52 -0000	1.2.10.1
@@ -1,55 +1,71 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
+<div id="mainbloc">
+	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
+	<p>Numer Czytelnika: <!-- TMPL_VAR NAME="bornum" --></p>
+	<p>Numer karty: <!-- TMPL_VAR NAME="cardnumber" --></p>
 
-<h1><!-- TMPL_VAR NAME=firstname --> <!-- TMPL_VAR NAME=surname --></h1>
-<br>Numer Czytelnika: <!-- TMPL_VAR NAME=bornum -->
-<br>Numer karty: <!-- TMPL_VAR NAME=cardnumber -->
-<P>
-<!-- TMPL_IF NAME=showfulllink -->
-<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&limit=full">Pełen wykaz</a>
-<br/>
-<!-- /TMPL_IF -->
-<br/>
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
-<TR VALIGN=TOP>
-	<TD background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=title&limit=<!-- TMPL_VAR name="limit" -->"><b>TYTUŁ</b></a>
-	</TD>
-	<TD background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=author&limit=<!-- TMPL_VAR name="limit" -->"><b>AUTOR</b></a>
-	</TD>
-	<TD background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&limit=<!-- TMPL_VAR name="limit" -->"><b>DO ZWROTU</b></a>
-	</TD>
-	<TD background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&order=returndate&limit=<!-- TMPL_VAR name="limit" -->"><b>ZWRÓCONO</b></a>
-	</TD>
-	<TD background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
-		<b>Tom</b>
-	</TD>
-</TR>
-<!-- TMPL_LOOP name="loop_reading" -->
-<TR VALIGN=TOP>
-	<TD  bgcolor="white">
- 		<!-- TMPL_VAR name="title" -->&nbsp;
-	</TD>
-	<TD  bgcolor="white">
- 		<!-- TMPL_VAR name="author" -->&nbsp;
-	</TD>
-	<TD  bgcolor="white">
-		<!-- TMPL_VAR name="date_due" -->&nbsp;
-	</TD>
-	<TD  bgcolor="white">
-		<!-- TMPL_VAR name="returndate" -->&nbsp;
-	</TD>
-	<TD  bgcolor="white">
-		<!-- TMPL_VAR name="volumeddesc" -->&nbsp;
-	</TD>
-<!-- /TMPL_LOOP -->
-</TABLE>
+	<!-- TMPL_IF NAME="showfulllink" -->
+	<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=50">Show Last 50 Only</a></p><!-- TMPL_ELSE -->
+	<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=full">Pełen wykaz</a></p>
+	<!-- /TMPL_IF -->
 
-<br>
-<a href="moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->">Powrót</a> do Danych Czytelnika
+	<table>
+	<tr>
+		<th>
+			<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=title&amp;limit=<!-- TMPL_VAR NAME="limit" -->">Tytuł</a></th>
+		</th>
+		<th>
+			<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=author&amp;limit=<!-- TMPL_VAR NAME="limit" -->">Autor</a>
+		</th>
+		<th>
+			<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=<!-- TMPL_VAR NAME="limit" -->">Date due</a>
+		</th>
+		<th>
+			<a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;order=returndate&amp;limit=<!-- TMPL_VAR NAME="limit" -->">Returned</a></th>
+		</th>
+	</tr>
+	<!-- TMPL_LOOP NAME="loop_reading" -->
+	<!-- TMPL_IF NAME="toggle" -->
+		<tr class="hilighted">
+	<!-- TMPL_ELSE -->
+		<tr>
+	<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="even" -->
+					<td class="hilighted">
+				<!-- TMPL_ELSE -->
+					<td>
+				<!-- /TMPL_IF -->
+							<!-- TMPL_IF name="MARC_ON" -->
+								<a class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
+							<!-- TMPL_ELSE -->
+								<a class="transparent resultlist" href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="volume" --> vol <!-- TMPL_VAR name="volume" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="volumeddesc" --> : <!-- TMPL_VAR name="volumeddesc" --> <!-- /TMPL_IF -->
+						<!-- TMPL_IF name="number" --> part <!-- TMPL_VAR name="number" --><!-- /TMPL_IF -->
+					<p><!-- TMPL_VAR NAME="author" -->
+						<!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
+					</p>
+				</td>
+				<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
+					<p><!-- TMPL_VAR NAME="description" --></p>
+				</td>
+		<td>
+			<!-- TMPL_VAR NAME="date_due" -->&nbsp;
+		</td>
+		<td>
+			<!-- TMPL_VAR NAME="returndate" -->&nbsp;
+		</td>
+	<!-- /TMPL_LOOP -->
+	</table>
 
+	<br>
+	<a href="members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" class="button member">Powrót</a> do Danych Czytelnika
+</div>
 <!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
 
 

Index: pl/parameters/admin-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/admin-home.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/parameters/admin-home.tmpl	17 Apr 2004 16:26:26 -0000	1.4
+++ pl/parameters/admin-home.tmpl	7 May 2007 13:55:52 -0000	1.4.10.1
@@ -1,95 +1,139 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 <div id="mainbloc">
-<center>
+<!-- TMPL_IF name="CAN_user_management" -->
 <h1>Parametry</h1><br>
+<!-- /TMPL_IF -->
+
 <div id="bloc100">
+<!-- TMPL_IF name="CAN_user_management" -->
 	<div id="bloctitle">Parametry Systemu </div>
-<table>
-<tr>
-<td colspan=2><b>Wypełnij poniższe tablice w kolejności, w jakiej występują, aby utworzyć funkcjonalny system biblioteczny Koha.</b></td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/branches.pl>Oddziały biblioteki</a></td>
+
+	<table>
+	<tr>
+	<td colspan="2"><b>Wypełnij poniższe tablice w kolejności, w jakiej występują, aby utworzyć funkcjonalny system biblioteczny Koha.</b></td>
+	</tr>
+	<!-- TMPL_IF name="CAN_user_parameters" -->	
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/branches.pl">Oddziały biblioteki</a></td>
 	<td>Odpowiednie oddziały, które obsługiwane są przez ten serwer Koha.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/aqbookfund.pl>Fundusze książkowy</a></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF name="CAN_user_management" -->
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/aqbookfund.pl">Fundusze książkowy</a></td>
 	<td>Administracja funduszu książkowego. Należy pamiętać o edycji funduszy książkowych zanim rozpocznie się edycję budgetu.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/currency.pl>Waluty</a></td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/currency.pl">Waluty</a></td>
 	<td>Definicja kursów wymiany.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/itemtypes.pl>Typy zasobów</a></td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/itemtypes.pl">Typy zasobów</a></td>
 	<td>Deninicja typów materiału.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/categorie.pl>Kategorie czytelników</a></td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/categorie.pl">Kategorie czytelników</a></td>
 	<td>Definicja kategorii czytelników.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/charges.pl>Opłaty</a></td>
-	<td>Kwoty opłat dla typów pozycji / czytelników</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/authorised_values.pl>Wartość autoryzowana</a></td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><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>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/authorised_values.pl">Wartość autoryzowana</a></td>
 	<td>Definicja kategorii oraz autoryzowanych dla nich wartości. Wartości autoryzowane są stosowane w formularzach MARC, by pomoć w edycji opisów bibliograficznych MARC.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/thesaurus.pl>Tezaurus</a></td>
-	<td>Zarządzanie tezaurusem oraz kartoteką haseł wzorcowych (khw).</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/marctagstructure.pl>Struktura etykiet MARC</a></td>
-	<td>Struktura etykiet MARC: Etykiety następnie podpola.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/koha2marclinks.pl>Powiązania pól: Koha - Baza MARC</a></td>
+		</tr>
+	<!-- /TMPL_IF -->
+		
+	<!-- TMPL_IF name="CAN_user_parameters" -->
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Structure</a></td>
+			<td>Define categories and thesaurus/authority MARC structure.</td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><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>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Powiązania pól: Koha - Baza MARC</a></td>
 	<td>Definicja powiązań pomiędzy standardową bazą Koha a bazą MARC. To samo uczynić można poprzez stukturę MARC. To narzędzie jest jedynie skrótem, aby przyśpieszyć powiązania.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/checkmarc.pl>Sprawdzanie bazy MARC</a></td>
-	<td>Sprawdza strukturę MARC. UŻYJ przed pracą na danych rzeczywistych. Narzędzie to sprawdzi błędy, które mogą załamać bazę Koha!</td></tr>
-
-<tr>
-<th colspan=2>Różne parametry</th>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/printers.pl>Drukarki</a></td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/checkmarc.pl">Sprawdzanie bazy MARC</a></td>
+			<td>Sprawdza strukturę MARC. UŻYJ przed pracą na danych rzeczywistych. Narzędzie to sprawdzi błędy, które mogą załamać bazę Koha!</td>
+		</tr>
+	<!-- /TMPL_IF -->
+	
+	<tr>
+	<th colspan="2">Różne parametry</th>
+	</tr>
+	<!-- TMPL_IF name="CAN_user_parameters" -->
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/printers.pl">Drukarki</a></td>
 	<td>Drukarki (ścieżki UNIXa)</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/stopwords.pl>SÅ‚owa pomijane</a></td>
-	<td>SÅ‚owa nie brane pod uwagÄ™ podczas szukania.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/z3950servers.pl>Serwery Z39.50</a></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF name="CAN_user_management" -->
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/stopwords.pl">SÅ‚owa pomijane</a></td>
+			<td>SÅ‚owa nie brane pod uwagÄ™ podczas szukania.
+				<!-- TMPL_UNLESS name="stopwords" --><p class="problem">WARNING : you should define stop words</p><!-- /TMPL_UNLESS --></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF name="CAN_user_parameters" -->
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/z3950servers.pl">Serwery Z39.50</a></td>
 	<td>Serwery do odpytania dla danych MARC.</td>
-</tr>
-<tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/systempreferences.pl>Preferencje Systemu</a></td>
+		</tr>
+
+		<tr>
+			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/systempreferences.pl">Preferencje Systemu</a></td>
 	<td>Preferencje systemu.</td>
-</tr>
-</table>
+		</tr>
+	<!-- /TMPL_IF -->
+	</table>
+<!-- /TMPL_IF -->
+
 
-<h1>Narzędzia</h1>
-<table>
+<!-- TMPL_IF name="CAN_user_tools" -->
+	<h1>Narzędzia</h1>
+	<table>
 	<tr>
-	<th colspan=2> Eksport</th>
+		<th colspan="2"> Eksport</th>
 	</tr>
 	<tr>
 		<td valign="top" width="25%"><a href="/cgi-bin/koha/export/marc.pl">Export Opisu MARC</a></td>
 		<td> Eksportowanie w formacie MARC.</td>
 	</tr>
 	<tr>
-	<th colspan=2>Import</th>
+		<th colspan="2">Import</th>
+		</tr>
+		<tr valign="top">
+			<td width="20%"><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records in reservoir</a></td>
+			<td>The reservoir is a table where imported MARC records are stored. A MARC record is stored in the reservoir as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the reservoir. If it is found, the biblio is added to Koha active table.
+			</td>
+		</tr>
+		<tr>
+		<th colspan="2">Barcode generator</th>
 	</tr>
 	<tr valign="top">
-		<td width="20%"><a href="/cgi-bin/koha/import/breeding.pl">Dograj opisy MARC do Rezerwuaru</a></td>
-		<td>Rezerwuar opisów to tablica gdzie składowane są rekordy MARC. Rekordy MARC oczekują w reserwuarze doputy dopóki nie ma dla nich egzemplarza. Po wpisaniu numeru ISBN lub tytułu opisu zostaje on odpytywany w rezerwuarze. Jeśli się tam znajduje to do aktywnej tablicy Koha ten opis zostaje dopisany, a usunięty z rezerwuaru.
+			<td width="20%"><a href="/cgi-bin/koha/barcodes/barcodes.pl">Generate barcodes</a></td>
+			<td>the barcode generator deals with generating barcodes for items you acquire
 		</td>
 	</tr>
-</table>
-</center>
+	</table>
+<!-- /TMPL_IF -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: pl/parameters/aqbookfund.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/aqbookfund.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/parameters/aqbookfund.tmpl	17 Apr 2004 16:26:26 -0000	1.2
+++ pl/parameters/aqbookfund.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,59 +1,79 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 <div id="mainbloc">
-	<!-- TMPL_IF name=else -->
+	<!-- TMPL_IF NAME="else" -->
 	<h1>Fundusz Książkowy - zarządzanie</h1>
-	<form action=<!-- TMPL_VAR name=scriptname --> method=post>
-	<input type=text name=searchfield value=""><input type=reset name=reset value="wyczyść"></form>
-	<!-- TMPL_IF name=search -->
-		<br>Wyszukiwano <b><!-- TMPL_VAR name=searchfield --></b><p><br>
+	<form action="<!-- TMPL_VAR NAME="scriptname" -->" method="post">
+	<input type="text" name="searchfield" value=""><input type="reset" name="reset" value="wyczyść"></form>
+	<!-- TMPL_IF NAME="search" -->
+		<br>Wyszukiwano <b><!-- TMPL_VAR NAME="searchfield" --></b><p><br>
 	<!-- /TMPL_IF -->
-	<table border=0 cellspacing=0 cellpadding=2 width="80%">
+		<p><br>Budgets <!-- TMPL_VAR NAME="min" --> to <!-- TMPL_VAR NAME="max" --> out of <!-- TMPL_VAR NAME="nbresults" --> <!--TMPL_IF Name="Next" --><a href="/cgi-bin/koha/admin/aqbookfund.pl?offset=<!-- TMPL_VAR NAME="max" -->">More </a><!-- /TMPL_IF--></p><br><p>
+	<table border="0" cellspacing="0" cellpadding="2" width="80%">
 	<tr>
 		<th>Fundusz książkowy</th>
 		<th>Nazwa</th>
+		<th>Oddział</th>
 		<th>Edytuj</th>
 		<th>Wymaż</th>
 		</tr>
-	<!-- TMPL_LOOP name="bookfund" -->
-		<tr valign=top bgcolor="ffffcc">
-			<td><!-- TMPL_VAR name="bookfundid" --></td>
-			<td><!-- TMPL_VAR name="bookfundname" --></td>
-			<td><a href="<!-- TMPL_VAR name="action" -->?op=add_form&bookfundid=<!-- TMPL_VAR name="bookfundid" --> ">
-				<img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a>
+	<!-- TMPL_LOOP NAME="bookfund" -->
+		<tr valign="top" bgcolor="ffffcc">
+			<td><!-- TMPL_VAR NAME="bookfundid" --></td>
+			<td><!-- TMPL_VAR NAME="bookfundname" --></td>
+			<td align="center">
+			<!--TMPL_VAR Name="branchname"-->
 			</td>
-			<td><a href="<!-- TMPL_VAR name="action" -->?op=delete_confirm&bookfundid=<!-- TMPL_VAR name="bookfundid" -->"><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="action" -->?op=add_form&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" --> ">
+				<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" alt="Edytuj" title="Edytuj" width="32" hspace="0" vspace="0" border="0"></a>
+			</td>
+			<td><a href="<!-- TMPL_VAR NAME="action" -->?op=delete_confirm&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" alt="Wymaż" title="Wymaż" width="32" hspace="0" vspace="0" border="0"></a></td>
 		</tr>
-		<tr valign=top bgcolor=#99cc33>
-			<th>&nbsp;</th>
+		<tr>
+			<td>&nbsp;</td>
 			<th>Budget</th>
-			<th>
-				<a href="aqbudget.pl?op=add_form&bookfundid=<!-- TMPL_VAR name="bookfundid" -->">
-				<img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png" alt="Dodaj budget" border=0></a>
-			</t>
-			<th>&nbsp;</th>
+			<th>Oddział</th>
+			<td>
+				<a href="aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->" class="button">
+				Dodaj budget</a>
+			</td>
+			<td>&nbsp;</td>
 		</tr>
-		<!-- TMPL_LOOP name="budget" -->
-			<tr valign=top>
+		<!-- TMPL_LOOP NAME="budget" -->
+			<tr valign="top">
 				<td>&nbsp;</td>
 				<td>
-					<!-- TMPL_VAR name="startdate" --> - <!-- TMPL_VAR name="enddate" --> : <b><!-- TMPL_VAR name="budgetamount" --></b>
+					<!-- TMPL_VAR NAME="startdate" --> - <!-- TMPL_VAR NAME="enddate" --> : <b><!-- TMPL_VAR NAME="budgetamount" --></b>
+				</td>
+				<td align="center">
+				<!--TMPL_IF Name="branchcode"-->
+				 	<!--TMPL_VAR Name="branchcode"-->
+				<!--TMPL_ELSE -->
+					&nbsp;
+				<!--/TMPL_IF-->
+				</td>
+				<td>
+					<a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;aqbudgetid=<!-- TMPL_VAR NAME="aqbudgetid" -->">
+						<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" alt="Edytuj" title="Edytuj" width="32" hspace="0" vspace="0" border="0">
+					</a>
+				</td>
+				<td>
+					<a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&amp;aqbudgetid=<!-- TMPL_VAR NAME="aqbudgetid" -->">
+						<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" alt="Wymaż" title="Wymaż" width="32" hspace="0" vspace="0" border="0">
+					</a>
 				</td>
-				<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&aqbudgetid=<!-- TMPL_VAR name="aqbudgetid" -->"><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="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&aqbudgetid=<!-- TMPL_VAR name="aqbudgetid" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
-	
 			</tr>
 		<!-- /TMPL_LOOP -->
 	<!-- /TMPL_LOOP -->
 	</table>
-	<form action='<!-- TMPL_VAR name=scriptname -->' method=post>
-		<input type=hidden name=op value=add_form>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-		<br><input type=submit class="button" value="Dodaj Fundusz" title="Dodaj Fundusz" alt="Dodaj Fundusz"><br>
-		<br></form><br clear=all>
+	<form action="<!-- TMPL_VAR NAME="scriptname" -->" method="post">
+		<input type="hidden" name="op" value="add_form">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+		<br><input type="submit" class="button" value="Dodaj Fundusz" title="Dodaj Fundusz" alt="Dodaj Fundusz"><br>
+		<br></form><br clear="all">
 	<p> &nbsp; </p>
 	<!-- /TMPL_IF -->
 	
-	<!-- TMPL_IF name="add_form" -->
-	<script>
+	<!-- TMPL_IF NAME="add_form" -->
+	<script language="javascript" type="text/javascript">
 		function _(s) { return s } // dummy function for gettext
 		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 		function isNotNull(f,noalert) {
@@ -106,57 +126,61 @@
 				alert(alertString2);
 			}
 		}
-		</SCRIPT>
+		</script>
 	<h1>
-		<!-- TMPL_IF name=use-header-flags-p -->
-		<!-- TMPL_IF name=header-is-add-p -->Dodaj fundusz<!-- /TMPL_IF -->
-		<!-- TMPL_IF name=header-is-modify-p -->Zmień fundusz<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="use-header-flags-p" -->
+		<!-- TMPL_IF NAME="header-is-add-p" -->Dodaj fundusz<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="header-is-modify-p" -->Zmień fundusz<!-- /TMPL_IF -->
 		<!-- TMPL_ELSE -->
-		<!-- TMPL_VAR name="header" -->
+		<!-- TMPL_VAR NAME="header" -->
 		<!-- /TMPL_IF -->
 	</h1>
-	<form action='<!-- TMPL_VAR name="action" -->' name=Aform method=post>
-	<input type=hidden name=op value='add_validate'>
-	<input type=hidden name=checked value=0>
-	<!-- TMPL_IF name="add_or_modify" -->
+	<form action="<!-- TMPL_VAR NAME="action" -->" name="Aform" method="post">
+	<input type="hidden" name="op" value="add_validate">
+	<input type="hidden" name="checked" value="0">
+	<!-- TMPL_IF NAME="add_or_modify" -->
 	<p>
-		<label>Fundusz książkowy</label><input type=hidden name=bookfundid value=<!-- TMPL_VAR name="bookfundid" -->><!-- TMPL_VAR name="bookfundid" -->
+		<label>Fundusz książkowy</label><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->"><!-- TMPL_VAR NAME="bookfundid" -->
 	</p>
 	<!-- TMPL_ELSE -->
 	<p>
-		<label>Fundusz książkowy</label><input type=text name=bookfundid size=5 maxlength=5 onBlur=toUC(this)>
+		<label>Fundusz książkowy</label><input type="text" name="bookfundid" size="5" maxlength="5" onblur="toUC(this)">
 	</p>
 	<!-- /TMPL_IF -->
 	<p>
-		<label>Nazwa</label><input type=text name=bookfundname size=40 maxlength=80 value='<!-- TMPL_VAR name="bookfundname" escape=HTML -->'>&nbsp;
+		<label>Nazwa</label><input type="text" name="bookfundname" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="bookfundname" escape=HTML -->">&nbsp;
+	</p>
+	<p>
+		<label>Oddział</label><!-- TMPL_VAR NAME="CGIbranch"-->&nbsp;
+		<br/> Select one if budget is branch specific, otherwise, leave it blank.
 	</p>
 	<p>
-		<label>&nbsp;</label><INPUT type=button value='OK' onClick='Check(this.form)' class="button">
+		<label>&nbsp;</label><input type="button" value="OK" onclick="Check(this.form)" class="button">
 	</p>
 	</form>
 	<!-- /TMPL_IF -->
 	
-	<!-- TMPL_IF name="add_validate" -->
+	<!-- TMPL_IF NAME="add_validate" -->
 	Dane zapisane
-	<form action='<!-- TMPL_VAR name="action" -->' method=post>
-	<input type=submit value=OK>
+	<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+	<input type="submit" value="OK">
 	</form>
 	<!-- /TMPL_IF -->
 	
-	<!-- TMPL_IF name="delete_confirm" -->
-	<table border=0 cellspacing=0 cellpadding=5>
-	<tr valign=top bgcolor=#99cc33><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Fundusz książkowy</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="bookfundid" --></b></td></tr>
-	<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" -->'>
-	<tr><td>Nazwa</td><td><!-- TMPL_VAR name="bookfundname" --></td></tr>
-	<tr><td colspan=2 align=center>POTWIERDŹ WYMAZANIE</td></tr>
-	<tr><td><input type=submit value="TAK"></form></td><td><form action='<!-- TMPL_VAR name="action" -->' method=post><input type=submit value="NIE"></form></td></tr><br clear=all>
+	<!-- TMPL_IF NAME="delete_confirm" -->
+	<table border="0" cellspacing="0" cellpadding="5">
+	<tr valign="top" bgcolor="#99cc33"><td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Fundusz książkowy</b></td><td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR NAME="bookfundid" --></b></td></tr>
+	<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" -->">
+	<tr><td>Nazwa</td><td><!-- TMPL_VAR NAME="bookfundname" --></td></tr>
+	<tr><td colspan="2" align="center">POTWIERDŹ WYMAZANIE</td></tr>
+	<tr><td><input type="submit" value="TAK"></form></td><td><form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="submit" value="NIE"></form></td></tr><br clear="all">
 	<p> &nbsp; </p>
 	<!-- /TMPL_IF -->
 	
-	<!-- TMPL_IF name="delete_confirmed" -->
+	<!-- TMPL_IF NAME="delete_confirmed" -->
 	Dane wymazane
-	<form action='<!-- TMPL_VAR name="action" -->' method=post>
-	<input type=submit value=OK>
+	<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+	<input type="submit" value="OK">
 	</form>
 	<!-- /TMPL_IF -->
 </div>

Index: pl/parameters/aqbudget.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/aqbudget.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/parameters/aqbudget.tmpl	17 Apr 2004 16:26:26 -0000	1.2
+++ pl/parameters/aqbudget.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,32 +1,51 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
-
-<!-- TMPL_IF name="else" -->
-	<h1>Budżet zarządzanie</h1><form action=/cgi-bin/koha/admin/aqbudget.pl method=post>
-	<input type=text name=searchfield value=""><input type=reset name=reset value="wyczyść"></form>
-	<!-- TMPL_IF name=search -->
-	<br>Wyszukiwano <b><!-- TMPL_VAR name=searchfield --></b><p><br>
-	<!-- /TMPL_IF -->
-	<table border=0 cellspacing=0 cellpadding=5>
-	<tr valign=top bgcolor=#99cc33><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Fundusz książkowy</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Data początkowa</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Data końcowa</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Kwota budgetu</b></td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td><td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td></tr>
-	<!-- TMPL_LOOP name="budget" -->
-		<tr valign=top bgcolor=<!-- TMPL_VAR name="toggle" --> >
-			<td><!-- TMPL_VAR name="bookfundid" --> (<!-- TMPL_VAR name="bookfundname" -->)</td>
-			<td><!-- TMPL_VAR name="startdate" --></td>
-			<td><!-- TMPL_VAR name="enddate" --></td>
-			<td align=right><!-- TMPL_VAR name="budgetamount" --></td>
-			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&bookfundid=<!-- TMPL_VAR name="bookfundid" -->"><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="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&bookfundid=<!-- TMPL_VAR name="bookfundid" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="else" -->
+		<h1>Budżet zarządzanie</h1><form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
+		<input type="text" name="searchfield" value="">
+		<input type="submit" class="button" value="OK"></form>
+		<!-- TMPL_IF NAME="search" -->
+		<br>Wyszukiwano <b><!-- TMPL_VAR NAME="searchfield" --></b><p><br>
+		<!-- /TMPL_IF -->
+		<table>
+		<tr>
+			<th>Fundusz książkowy</th>
+			<th>Data poczÄ…tkowa</th>
+			<th>Data końcowa</th>
+			<th>Kwota budgetu</th>
+			<th>&nbsp;</th>
+			<th>&nbsp;</th>
+		</tr>
+		<!-- TMPL_LOOP NAME="budget" -->
+			<tr bgcolor=<!-- TMPL_VAR NAME="toggle" --> >
+				<td><!-- TMPL_VAR NAME="bookfundid" --> (<!-- TMPL_VAR NAME="bookfundname" -->)</td>
+				<td><!-- TMPL_VAR NAME="startdate" --></td>
+				<td><!-- TMPL_VAR NAME="enddate" --></td>
+				<td align="right"><!-- TMPL_VAR NAME="budgetamount" --></td>
+				<td>
+					<a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->">
+						<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="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->">
+						<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0">
+					</a>
+				</td>
 		</tr>
 	<!-- /TMPL_LOOP -->
 	</table>
-	<form action='/cgi-bin/koha/admin/aqbudget.pl' method=post>
-	<input type=hidden name=op value=add_form>
-	<br><input type=submit class="button" value="Dodaj Budget" title="Dodaj Budget" alt="Dodaj Budget"><br>
-	</form><br clear=all>
-<!-- /TMPL_IF -->
+		<form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
+			<input type="hidden" name="op" value="add_form">
+			<br>
+			<input type="submit" class="button" value="Dodaj Budget" title="Dodaj Budget" alt="Dodaj Budget">
+			<br>
+		</form>
+		<br clear="all">
+	<!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="add_form" -->
-<script>
+	<!-- TMPL_IF NAME="add_form" -->
+	<script language="javascript" type="text/javascript">
 	function _(s) { return s } // dummy function for gettext
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	function isNotNull(f,noalert) {
@@ -76,75 +95,84 @@
 			alert(alertString2);
 		}
 	}
-	</SCRIPT>
-<h1><!-- TMPL_VAR name="header" --></h1>
-<form action='/cgi-bin/koha/admin/aqbudget.pl' name=Aform method=post>
-<input type=hidden name=op value=add_validate>
-<input type=hidden name=checked value=0>
-<table>
-
-<!-- TMPL_IF name="modify" -->
-	<tr><td>Fundusz książkowy</td><td><input type=hidden name=bookfundid value=<!-- TMPL_VAR name=bookfundid -->><!-- TMPL_VAR name="bookfundid" --></td></tr>
-	<tr><td>Nazwa funduszu książkowego</td><td><!-- TMPL_VAR name="bookfundname" --></td></tr>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="adding" -->
-	<tr><td>Fundusz Książkowy</td><td><input type=hidden name=bookfundid size=5 maxlength=5 value="<!-- TMPL_VAR name="bookfundid" -->"><!-- TMPL_VAR name="bookfundid" --></td></tr>
-<!-- /TMPL_IF -->
-
-<tr><td>Data poczÄ…tkowa <i>(<!-- TMPL_VAR NAME=dateformat -->)</i></td><td><input type=text name=startdate size=11 value='<!-- TMPL_VAR name="startdate" -->'>&nbsp;</td></tr>
-<tr><td>Data końcowa <i>(<!-- TMPL_VAR NAME=dateformat -->)</i></td><td><input type=text name=enddate size=11 value='<!-- TMPL_VAR name="enddate" -->'></td></tr>
-<tr><td>Kwota budgetu</td><td><input type=text name=budgetamount value='<!-- TMPL_VAR name="budgetamount" -->'></td></tr>
-<tr><td>&nbsp;</td><td><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->"><INPUT type=button value='OK' onClick='Check(this.form)'></td></tr>
-</table>
-</form>
-<br clear=all>
-<p> &nbsp; </p>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="add_validate" -->
-Dane zapisane
-<form action='<!-- TMPL_VAR name="action" -->' method=post>
-<input type=submit value=OK>
-</form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="delete_confirm" -->
-<table border=0 cellspacing=0 cellpadding=5>
-	<tr valign=top bgcolor=#99cc33>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">
+		</script>
+	<h1><!-- TMPL_VAR NAME="header" --></h1>
+	<div id="bloc25">
+		<form action="/cgi-bin/koha/admin/aqbudget.pl" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate">
+		<input type="hidden" name="checked" value="0">
+		<!-- TMPL_IF NAME="modify" -->
+			<p>
+				<label class="label100">Fundusz książkowy</label><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->"><!-- TMPL_VAR NAME="bookfundid" -->
+			</p>
+			<p>
+				<label class="label100">Nazwa funduszu książkowego</label><!-- TMPL_VAR NAME="bookfundname" -->
+			</p>
+		<!-- /TMPL_IF -->
+		
+		<!-- TMPL_IF NAME="adding" -->
+			<p>
+				<label class="label100">Fundusz Książkowy</label><input type="hidden" name="bookfundid" size="5" maxlength="5" value="<!-- TMPL_VAR NAME="bookfundid" -->"><!-- TMPL_VAR NAME="bookfundid" -->
+			</p>
+		<!-- /TMPL_IF -->
+		
+		<p>
+			<label class="label100">Data poczÄ…tkowa <i>(<!-- TMPL_VAR NAME="dateformat" -->)</i></label><input type="text" name="startdate" size="11" value="<!-- TMPL_VAR NAME="startdate" -->">
+		</p>
+		<p>
+			<label class="label100">Data końcowa <i>(<!-- TMPL_VAR NAME="dateformat" -->)</i></label><input type="text" name="enddate" size="11" value="<!-- TMPL_VAR NAME="enddate" -->">
+		</p>
+		<p>
+			<label class="label100">Kwota budgetu</label><input type="text" name="budgetamount" value="<!-- TMPL_VAR NAME="budgetamount" -->">
+		</p>
+		<p><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->"><input type="button" value="OK" onclick="Check(this.form)" class="button"></p>
+		</form>
+	</div>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="add_validate" -->
+	Dane zapisane
+	<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+	<input type="submit" value="OK">
+	</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirm" -->
+	<table border="0" cellspacing="0" cellpadding="5">
+		<tr valign="top" bgcolor="#99cc33">
+			<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
 			<b>Fundusz książkowy</b>
 		</td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">
-			<b><!-- TMPL_VAR name="bookfundid" --></b>
+			<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">
+				<b><!-- TMPL_VAR NAME="bookfundid" --></b>
 		</td>
 	</tr>
 
-	<form action='<!-- TMPL_VAR name="action" -->' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=aqbudgetid value='<!-- TMPL_VAR name="aqbudgetid" -->'>
+		<form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->">
 	<tr>
 		<td>Data poczÄ…tkowa</td>
-		<td><!-- TMPL_VAR name="startdate" --></td>
+			<td><!-- TMPL_VAR NAME="startdate" --></td>
 	</tr>
 	<tr>
-		<td>Data końcowa</td><td><!-- TMPL_VAR name="enddate" --></td>
+			<td>Data końcowa</td><td><!-- TMPL_VAR NAME="enddate" --></td>
 	</tr>
 	<tr>
-		<td>kwota budżetu</td><td><!-- TMPL_VAR name="budgetamount" --></td>
+			<td>kwota budżetu</td><td><!-- TMPL_VAR NAME="budgetamount" --></td>
 	</tr>
 	<tr>
-		<td colspan=2 align=center>POTWIERDŹ WYMAZANIE</td>
+			<td colspan="2" align="center">POTWIERDŹ WYMAZANIE</td>
 	</tr>
 	<tr>
-		<td><input type=submit value="TAK"></form></td><td><form action='<!-- TMPL_VAR name="action" -->' method=post><input type=submit value="NIE"></form></td>
+			<td><input type="submit" value="TAK"></form></td><td><form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="submit" value="NIE"></form></td>
 	</tr>
-</table>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="delete_confirmed" -->
-Dane wymazane
-<form action='<!-- TMPL_VAR name="action" -->' method=post>
-<input type=submit value=OK>
-</form>
-<!-- /TMPL_IF -->
+	</table>
+	<!-- /TMPL_IF -->
 
+	<!-- TMPL_IF NAME="delete_confirmed" -->
+	Dane wymazane
+	<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+	<input type="submit" value="OK">
+	</form>
+	<!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: pl/parameters/authorised_values.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/authorised_values.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/parameters/authorised_values.tmpl	17 Apr 2004 16:26:26 -0000	1.2
+++ pl/parameters/authorised_values.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,110 +1,91 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
-
-<!-- TMPL_IF name="add_form" -->
-<!---------------------------------------------------------------------------->
-	<H1>
+<div id="mainbloc">
+<!-- TMPL_IF NAME="add_form" -->
+<!-- ------------------------------------------------------------------------ -->
+	<h1>
 	<!-- TMPL_IF NAME="use-heading-flags-p" -->
 	<!-- TMPL_IF NAME="heading-modify-authorized-value-p" -->Zmień wartość autoryzowaną<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="heading-add-new-category-p" -->Dodaj nowÄ… kategoriÄ™<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="heading-add-authorized-value-p" -->Dodaj wartość autoryzowaną<!-- /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'>
-	<table>
-	<tr>
-		<td>Kategoria</td>
-		<td><!-- TMPL_VAR name="category" --></td>
-	</tr>
-	<tr>
-		<td>Wartość Autoryzowana</td>
-		<td><input type=text name="authorised_value" value='<!-- TMPL_VAR name="authorised_value" escape=HTML -->'></td>
-	</tr>
-	<tr>
-		<td>Etykieta</td>
-		<td><input type=text name="lib" value='<!-- TMPL_VAR name="lib" -->'></td>
-	</tr>
-	<tr>
-		<td>&nbsp;</td>
-		<td><input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->">
-			<INPUT type="submit" value='OK'></td>
-	</tr>
-	</table>
+	<!-- 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">
+		<p><label>Kategoria</label><!-- TMPL_VAR NAME="category" --></p>
+		<p><label>Wartość Autoryzowana</label><input type="text" name="authorised_value" value="<!-- TMPL_VAR NAME="authorised_value" escape=HTML -->"></p>
+		<p><label>Text</label><input type="text" name="lib" value="<!-- TMPL_VAR NAME="lib" -->"></p>
+		<p>
+			<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->">
+			<input type="submit" value="OK" class="button parameters">
+		</p>
 	</form>
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF name="delete_confirm" -->
-<!---------------------------------------------------------------------------->
-<table border=0 cellspacing=0 cellpadding=2>
-	<tr valign=top bgcolor=#99cc33>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Zmienna</b></td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Etykieta</b></td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="searchfield" --></b></td>
-	</tr>
-	<tr><td>Wartość</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
-	<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="searchfield" value="<!-- TMPL_VAR name="searchfield" -->">
-	<tr><td colspan=2 align=center>POTWIERDŹ WYMAZANIE</td></tr>
-	<tr><td><input type=submit value="TAK"></form></td>
-		<td><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value="NIE"></form></td></tr>
+<!-- TMPL_IF NAME="delete_confirm" -->
+<!-- ------------------------------------------------------------------------ -->
+<table border="0" cellspacing="0" cellpadding="2">
+	<tr valign="top" bgcolor="#99cc33">
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Zmienna</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Text</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
+	</tr>
+	<tr><td>Wartość</td><td><!-- TMPL_VAR NAME="Tvalue" --></td></tr>
+	<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="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+	<tr><td colspan="2" align="center">POTWIERDŹ WYMAZANIE</td></tr>
+	<tr><td><input type="submit" value="TAK"></form></td>
+		<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NIE"></form></td></tr>
 <!-- /TMPL_IF -->
 
-<!---------------------------------------------------------------------------->
-<!-- TMPL_IF name="else" -->
+<!-- ------------------------------------------------------------------------ -->
+<!-- TMPL_IF NAME="else" -->
 <h1>Admin Wartości Autoryzowanych</h1>
 <p>Tablica ta jest używana w definiowaniu MARC. Można definiować dowolną ilość kategorii oraz dowolną ilość wartości autoryzowanych w każdej kategorii.</p>
 <p>Przy definiowaniu struktury podpól MARC, można dowiązać podpole do pewnej kategorii wartości autoryzawanych. Gdy wprowadzający dokonuje zmian opisu bibliograficznego lub gdy go dodaje podpole to nie jest wprowadzane jako wartość dowolna lecz wybierana jest z listy wartości autoryzowanych.</p>
-<form action=/cgi-bin/koha/admin/authorised_values.pl method=post>
-	<!-- TMPL_VAR name="tab_list" --><input type="submit" value="OK">   <a href="authorised_values.pl?op=add_form">Nowa kategoria...</a>
+<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post">
+	<!-- TMPL_VAR NAME="tab_list" --><input type="submit" value="OK" class="button parameters">
+		<a href="authorised_values.pl?op=add_form" class="button parameters">Nowa kategoria...</a>
 </form>
-<!-- TMPL_VAR name="searchfield" -->
-<table border=0 cellspacing=0 cellpadding=2 width="80%">
-<tr valign=top bgcolor=#99cc33>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Kategoria</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Wartość Autoryzowana</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Etykieta</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Edytuj</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Wymaż</b></td>
-<!-- TMPL_LOOP name="loop" -->
-</tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
-	<td><!-- TMPL_VAR name="category" --></td>
-	<td><!-- TMPL_VAR name="authorised_value" --></td>
-	<td><!-- TMPL_VAR name="lib" --></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>
+<!-- TMPL_VAR NAME="searchfield" -->
+<table>
+<tr>
+	<th class="parameters">Kategoria</h>
+	<th class="parameters">Wartość Autoryzowana</th>
+	<th class="parameters">Text</th>
+	<th class="parameters">Edytuj</th>
+	<th class="parameters">Wymaż</th>
+</tr>
+<!-- TMPL_LOOP NAME="loop" -->
+<tr>
+	<td><!-- TMPL_VAR NAME="category" --></td>
+	<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+	<td><!-- TMPL_VAR NAME="lib" --></td>
+	<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
+	<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
 </tr>
 <!-- /TMPL_LOOP -->
-<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-<input type=hidden name=op value=add_form>
 </table>
-
-<table width=40%>
-	<tr>
-		<td width=50%>
-			<!-- TMPL_IF name="isprevpage" -->
-				<a href="<!-- TMPL_VAR name="script_name" -->?offset=<!-- TMPL_VAR name="prevpage" -->&searchfield=<!-- TMPL_VAR name="searchfield" -->">
-				<input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1leftarrow.png" title="wstecz" alt="wstecz" border=0>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+<input type="hidden" name="op" value="add_form">
+<!-- TMPL_IF NAME="isprevpage" -->
+	<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">
+	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="wstecz" alt="wstecz" border="0">
 				</a>
-			<!-- /TMPL_IF -->
-		</td>
-		<td width=50%>
-			<!-- TMPL_IF name="nextpage" -->
-				<a href="<!-- TMPL_VAR name="script_name" -->?offset=<!-- TMPL_VAR name="nextpage" -->&searchfield=<!-- TMPL_VAR name="searchfield" -->">
-					<input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1rightarrow.png" title="dalej" alt="dalej" border=0>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="nextpage" -->
+	<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">
+		<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="dalej" alt="dalej" border="0">
 				</a>
-			<!-- /TMPL_IF -->
-		</td>
-	</tr>
-</table>
-<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
+<!-- /TMPL_IF -->
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 <input type="hidden" name="op" value="add_form">
-<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
-<br><input type=submit class="button" value="Dodaj Wartość Autoryzowaną" title="Dodaj Wartość autoryzowaną" alt="Dodaj Wartość Autoryzowaną"><br>
+<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
+<br><input type="submit" class="button" value="Dodaj Wartość Autoryzowaną" title="Dodaj Wartość autoryzowaną" alt="Dodaj Wartość Autoryzowaną"><br>
 </form>
 <!-- /TMPL_IF -->
 
-
+</div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: pl/parameters/branches.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/branches.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.10.1
diff -u -b -r1.4 -r1.4.10.1
--- pl/parameters/branches.tmpl	17 Apr 2004 16:26:26 -0000	1.4
+++ pl/parameters/branches.tmpl	7 May 2007 13:55:53 -0000	1.4.10.1
@@ -3,12 +3,10 @@
 	<!-- TMPL_IF NAME="add" -->
 	
 	<h1>
-	<!-- TMPL_IF NAME="use-heading-flags-p" -->
 	<!-- TMPL_IF NAME="heading-branches-p" -->Oddziały<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="heading-branches-add-branch-p" -->Oddziały: Dodaj Oddział<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="heading-branches-edit-branch-p" -->Oddziały: Edytuj Oddział<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="heading-branches-edit-category-p" -->Oddziały: Edytuj Kategorie<!-- /TMPL_IF -->
-	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="head" --><!-- /TMPL_IF -->
 	</h1>
 	
 	<form action="<!-- TMPL_VAR NAME="action" -->" name="Aform" method="post">
@@ -34,7 +32,7 @@
 			<td><!-- 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>
+							<td><input type="checkbox" NAME="<!-- TMPL_VAR NAME="categorycode" -->" <!-- TMPL_VAR NAME="checked" -->><!-- TMPL_VAR NAME="codedescription" --></td>
 						</tr>
 					<!-- /TMPL_LOOP -->
 			</td>
@@ -72,10 +70,11 @@
 	<!-- /TMPL_IF -->
 	
 	<!-- TMPL_IF NAME="delete_confirm" -->
-		Potwierdź wymazanie:
+		Confirm deletion of <!-- TMPL_VAR NAME="branchname" --> (<!-- TMPL_VAR NAME="branchcode" -->)?
 		<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
 			<input type="hidden" name="op" value="delete_confirmed">
-			<input type="hidden" name="branchcode" value=<!-- TMPL_VAR NAME="branchcode" escape="HTML" -->>
+			<input type="hidden" name="branchcode" value="<!-- TMPL_VAR NAME="branchcode" escape="HTML" -->">
+			<input type="hidden" name="branchname" value="<!-- TMPL_VAR NAME="branchname" escape="HTML" -->">
 			<input type="submit" value="TAK" class="button">
 		</form>
 		<form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="hidden" name="op" value="">
@@ -85,15 +84,35 @@
 	
 	<!-- TMPL_IF NAME="else" -->
 		<h1>
-		<!-- TMPL_IF NAME="use-heading-flags-p" -->
 		<!-- TMPL_IF NAME="heading-branches-p" -->Oddziały<!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="heading-branches-add-branch-p" -->Oddziały: Dodaj Oddział<!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="heading-branches-edit-branch-p" -->Oddziały: Edytuj Oddział<!-- /TMPL_IF -->
 		<!-- TMPL_IF NAME="heading-branches-edit-category-p" -->Oddziały: Edytuj Kategorie<!-- /TMPL_IF -->
-		<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="head" --><!-- /TMPL_IF -->
 		</h1>
 	
-		<font color="red"><!-- TMPL_VAR NAME="message" --></font>
+		<font color="red">
+		<!-- TMPL_IF name="MESSAGE1" -->
+			Cannot change branch record: You must specify a Branchname and a Branchcode
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="MESSAGE2" -->
+			Branch record changed
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="MESSAGE3" -->
+			Branch record deleted
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="MESSAGE4" -->
+			Cannot change branch record: You must specify a Branchname and a Branchcode
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="MESSAGE5" -->
+			Category record changed
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="MESSAGE6" -->
+			The category has been deleted
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="MESSAGE7" -->
+			Branch cannot be deleted because there are items using that branch
+		<!-- /TMPL_IF -->
+		</font>
 		<table border="1" cellpadding="5" cellspacing="0">
 			<tr>
 				<th colspan="6" align="left" bgcolor="#99cc33">
@@ -149,6 +168,7 @@
 					<td align="left" valign="top">
 						<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="Wymaż" class="button">
 						</form>
 					</td>
@@ -156,7 +176,7 @@
 			<!-- /TMPL_LOOP -->
 		</table>
 		<br>
-		<form action=<!-- TMPL_VAR NAME="action" --> method="post">
+		<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
 			<input type="hidden" name="op" value="add">
 			<input type="submit" class="button" value="Dodaj Nowy Oddział">
 		</form>
@@ -197,7 +217,7 @@
 		<!-- /TMPL_LOOP -->
 		</table>
 		<br />
-		<form action=<!-- TMPL_VAR NAME="action" --> method="post">
+		<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
 			<input type="hidden" name="op" value="editcategory">
 			<input type="submit" class="button" value="Dodaj NowÄ… KategoriÄ™">
 		</form>

Index: pl/parameters/categorie.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/categorie.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/parameters/categorie.tmpl	17 Apr 2004 16:57:07 -0000	1.2
+++ pl/parameters/categorie.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 <div id="mainbloc">
-	<!-- TMPL_IF NAME=add_form -->
-		<script>
+	<!-- TMPL_IF NAME="add_form" -->
+		<script language="javascript" type="text/javascript">
 		function _(s) { return s } // dummy function for gettext
 		/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 		function isNotNull(f,noalert) {
@@ -58,32 +58,32 @@
 				alert(alertString2);
 			}
 		}
-		</SCRIPT>
+		</script>
 
-		<!-- TMPL_IF NAME=categorycode -->
+		<!-- TMPL_IF NAME="categorycode" -->
 			<h1>Zmieniaj kategoriÄ™</h1>
 		<!-- TMPL_ELSE -->
 			<h1>Dodaj kategoriÄ™</h1>
 		<!-- /TMPL_IF -->
 
-		<form action=<!-- TMPL_VAR NAME=script_name --> name=Aform method=post>
-		<input type=hidden name=op value='add_validate'>
-		<input type=hidden name=checked value=0>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate">
+		<input type="hidden" name="checked" value="0">
 
 		<table>
-		<!-- TMPL_IF NAME=categorycode -->
+		<!-- TMPL_IF NAME="categorycode" -->
 			<tr>
 				<td>Kod Kategorii</td>
 				<td>
-					<b><!-- TMPL_VAR NAME=categorycode --></b>
-					<input type=hidden name=categorycode value=<!-- TMPL_VAR NAME=categorycode -->>
+					<b><!-- TMPL_VAR NAME="categorycode" --></b>
+					<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
 				</td>
 			</tr>
 		<!-- TMPL_ELSE -->
 			<tr>
 				<td>Kod Kategorii</td>
 				<td>
-					<input type=text name=categorycode size=3 maxlength=2 onBlur=toUC(this)>
+					<input type="text" name="categorycode" size="3" maxlength="2" onblur="toUC(this)">
 				</td>
 			</tr>
 		<!-- /TMPL_IF -->
@@ -91,59 +91,53 @@
 			<tr>
 				<td>Wyjaśnienie</td>
 				<td>
-					<input type=text name=description size=40 maxlength=80 value="<!-- TMPL_VAR NAME=description escape=HTML -->">
+					<input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
 					&nbsp;
 				</td>
 			</tr>
 			<tr>
 				<td>Okres wpisu</td>
 				<td>
-					<input type=text name=enrolmentperiod size=3 maxlength=2 value="<!-- TMPL_VAR NAME=enrolmentperiod -->">
+					<input type="text" name="enrolmentperiod" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->"> year(s)
 				</td>
 			</tr>
 			<tr>
 				<td>Górna granica wieku</td>
 				<td>
-					<input type=text name=upperagelimit size=3 maxlength=3 value="<!-- TMPL_VAR NAME=upperagelimit -->">
+					<input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="upperagelimit" -->"> years
 				</td>
 			</tr>
 			<tr>
 				<td>Wymagany Wiek</td>
 				<td>
-					<input type=text name=dateofbirthrequired value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size=3 maxlength=2>
+					<input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->" size="3" maxlength="2"> year(s)
 				</td>
 			</tr>
 			<tr>
 				<td>Opłata wpisowa</td>
 				<td>
-					<input type=text name=enrolmentfee value="<!-- TMPL_VAR NAME=enrolmentfee -->">
+					<input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME="enrolmentfee" -->">
 				</td>
 			</tr>
 			<tr>
 				<td>Potrzebne upomnienie o zaległości</td>
 				<td>
 					<select name="overduenoticerequired">
-						<option <!-- TMPL_UNLESS name="overduenoticerequired" -->selected<!-- /TMPL_UNLESS --> value="0">Nie</option>
-						<option <!-- TMPL_IF name="overduenoticerequired" -->selected<!-- /TMPL_IF --> value="1">Tak</option>
+						<option<!-- TMPL_UNLESS name="overduenoticerequired" --> selected<!-- /TMPL_UNLESS --> value="0">Nie</option>
+						<option<!-- TMPL_IF NAME="overduenoticerequired" --> selected<!-- /TMPL_IF --> value="1">Tak</option>
 					</select>
 				</td>
 			</tr>
 			<tr>
-				<td>Limit wypożyczeń</td>
-				<td>
-					<input type=text name=issuelimit size=2 maxlength=2 value="<!-- TMPL_VAR NAME=issuelimit -->">
-				</td>
-			</tr>
-			<tr>
 				<td>Opłata rezerwacyjna</td>
 				<td>
-					<input type=text name=reservefee value="<!-- TMPL_VAR NAME=reservefee -->">
+					<input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->">
 				</td>
 			</tr>
 			<tr>
 				<td>&nbsp;</td>
 				<td>
-					<INPUT type=button value='OK' onClick='Check(this.form)'>
+					<input type="button" value="OK" onclick="Check(this.form)">
 				</td>
 			</tr>
 		</table>
@@ -151,156 +145,144 @@
 
 	<!-- /TMPL_IF -->
 
-	<!-- TMPL_IF NAME=add_validate -->
+	<!-- TMPL_IF NAME="add_validate" -->
 		Dane zapisane
-		<form action=<!-- TMPL_VAR NAME=script_name --> method=post>
-			<input type=submit value=OK>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="OK">
 		</form>
 	<!-- /TMPL_IF -->
 
-	<!-- TMPL_IF NAME=delete_confirm -->
-		KWOTA ŁĄCZNA: <!-- TMPL_VAR NAME=categorycode --> : <!-- TMPL_VAR NAME=total --><br>
+	<!-- TMPL_IF NAME="delete_confirm" -->
+		KWOTA ŁĄCZNA: <!-- TMPL_VAR NAME="categorycode" --> : <!-- TMPL_VAR NAME="total" --><br>
 
-		<table border=0 cellspacing=0 cellpadding=5>
-			<tr bgcolor='#99cc33'>
-				<td background='/images/background-mem.gif'>
+		<table border="0" cellspacing="0" cellpadding="5">
+			<tr bgcolor="#99cc33">
+				<td background="/images/background-mem.gif">
 					<b>Kod Kategorii</b>
 				</td>
-				<td background='/images/background-mem.gif'>
-					<!-- TMPL_VAR NAME=categorycode -->
+				<td background="/images/background-mem.gif">
+					<!-- TMPL_VAR NAME="categorycode" -->
 				</td>
 			</tr>
-			<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-				<input type=hidden name=op value=delete_confirmed>
-				<input type=hidden name=categorycode value=<!-- TMPL_VAR NAME=categorycode -->>        
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="op" value="delete_confirmed">
+				<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">        
 			<tr>
 				<td>Wyjaśnienie</td>
-				<td><!-- TMPL_VAR NAME=description --></td>
+				<td><!-- TMPL_VAR NAME="description" --></td>
 			</tr>
 			<tr>
 				<td>Okres wpisu</td>
-				<td><!-- TMPL_VAR NAME=enrolmentperiod --></td>
+				<td><!-- TMPL_VAR NAME="enrolmentperiod" --> year(s)</td>
 			</tr>
 			<tr>
 				<td>Górna granica wieku</td>
-				<td><!-- TMPL_VAR NAME=upperagelimit --></td>
+				<td><!-- TMPL_VAR NAME="upperagelimit" --> years</td>
 			</tr>
 			<tr>
 				<td>Wymagany Wiek</td>
-				<td><!-- TMPL_VAR NAME=dateofbirthrequired --></td>
-			</tr>
-			<tr>
-				<td>Typ kary</td>
-				<td><!-- TMPL_VAR NAME=finetype --></td>
+				<td><!-- TMPL_VAR NAME="dateofbirthrequired" --> year(s)</td>
 			</tr>
 			<tr>
 				<td>Opłata wpisowa</td>
-				<td><!-- TMPL_VAR NAME=enrolmentfee --></td>
+				<td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
 			</tr>
 			<tr>
 				<td>Potrzebne upomnienie o zaległości</td>
-				<td><!-- TMPL_IF NAME=overduenoticerequired -->Tak<!-- TMPL_ELSE -->Nie<!-- /TMPL_IF --></td>
-			</tr>
-			<tr>
-				<td>Limit wypożyczeń</td>
-				<td><!-- TMPL_VAR NAME=issuelimit --></td>
+				<td><!-- TMPL_IF NAME="overduenoticerequired" -->Tak<!-- TMPL_ELSE -->Nie<!-- /TMPL_IF --></td>
 			</tr>
 			<tr>
 				<td>Opłata rezerwacyjna</td>
-				<td><!-- TMPL_VAR NAME=reservefee --></td>
+				<td><!-- TMPL_VAR NAME="reservefee" --></td>
 			</tr>
-			<!-- TMPL_IF NAME=totalgtzero -->
+			<!-- TMPL_IF NAME="totalgtzero" -->
 			<tr>
-				<td colspan=2 align=center><b>Ten rekord był w użyciu <!-- TMPL_VAR NAME=total --> razy. Wymazanie nie jest możliwe</b></td>
+				<td colspan="2" align="center" class="problem">Ten rekord był w użyciu <!-- TMPL_VAR NAME="total" --> razy. Wymazanie nie jest możliwe</td>
 			</tr>
 		<tr>
-				<td colspan=2>
-					</form><form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-					<input type=submit value=OK>
+				<td colspan="2">
+					</form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="submit" value="OK">
 					</form>
 				</td>
 			</tr>
 			<!-- TMPL_ELSE -->
 			<tr>
-				<td colspan=2 align=center>POTWIERDŹ WYMAZANIE</td>
+				<td colspan="2" align="center">POTWIERDŹ WYMAZANIE</td>
 			</tr>
 			<tr>
-				<td><input type=submit value="TAK"></form></td>
-				<td><form action='<!-- TMPL_VAR NAME=script_name -->' method=post><input type=submit value="NIE"></form></td>
+				<td><input type="submit" value="TAK"></form></td>
+				<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NIE"></form></td>
 			</tr>
 			<!-- /TMPL_IF -->
-
+	</table>
 	<!-- /TMPL_IF -->
 
-	<!-- TMPL_IF NAME=delete_confirmed -->
+	<!-- TMPL_IF NAME="delete_confirmed" -->
 		Dane wymazane
-		<form action='<!-- TMPL_VAR NAME="script_name" -->' method=post>
-		<input type=submit value=OK>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="submit" value="OK">
 		</form>
 
 	<!-- /TMPL_IF -->
 
-	<!-- TMPL_IF NAME=else -->
+	<!-- TMPL_IF NAME="else" -->
 		<h2>Kategoria Czytelników - zarządzanie</h2>
-		<!-- TMPL_IF NAME=searchfield -->
-			Szukano <!-- TMPL_VAR name=searchfield -->
+		<!-- TMPL_IF NAME="searchfield" -->
+			Szukano <!-- TMPL_VAR NAME="searchfield" -->
 		<!-- /TMPL_IF -->
 		<!-- TMPL_UNLESS name="categoryChild" -->
 			<div id="problem">
 				OSTRZEŻENIE: musisz posiadać kod kategorii = P dla podopiecznych
-			</div
-		><!-- /TMPL_UNLESS -->
+			</div>
+		<!-- /TMPL_UNLESS -->
 		<!-- TMPL_UNLESS name="categoryInstitution" -->
 			<div id="problem">
 				OSTRZEŻENIE: musisz posiadać kod kategorii - I dla Instytucji
 			</div>
 		<!-- /TMPL_UNLESS -->
-		<form action='<TMPL_VAR NAME="script_name">' method=post>
-			<input type=text name=description value=<!-- TMPL_VAR name="searchfield" -->>
+		<form action="<TMPL_VAR NAME="script_name">" method="post">
+			<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
 			<input type="submit" name="submit" value="OK" class="button">
 		</form>
 
-		<table border=0 cellspacing=0 cellpadding=5>
-			<tr bgcolor='#99cc33'>
-				<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Kategoria</b></td>
-				<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Wyjaśnienie</b></td>
-				<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Okres wpisu</b></td>
-				<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Opłata wpisowa</b></td>
-				<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Górna Granica Wieku</b></td>
-				<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Wymagany Wiek</b></td>
-				<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Kara</b></td>
-				<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Zaległe</b></td>
-				<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Limit wypożyczeń</b></td>
-				<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Rezerwacja</b></td>
-				<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'> </td>
-				<td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'> </td>
-			</tr>
-			<!-- TMPL_LOOP NAME=loop -->
-			<tr bgcolor="<!-- TMPL_VAR NAME=toggle -->">
-				<td><!-- TMPL_VAR NAME=categorycode --></td>
-				<td><!-- TMPL_VAR NAME=description --></td>
-				<td><!-- TMPL_VAR NAME=enrolmentperiod --></td>
-				<td><!-- TMPL_VAR NAME=enrolmentfee --></td>
-				<td><!-- TMPL_VAR NAME=upperagelimit --></td>
-				<td><!-- TMPL_VAR NAME=dateofbirthrequired --></td>
-				<td><!-- TMPL_VAR NAME=finetype --></td>
-				<td><!-- TMPL_IF NAME=overduenoticerequired -->
+		<table border="0" cellspacing="0" cellpadding="5">
+			<tr bgcolor="#99cc33">
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Kategoria</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Wyjaśnienie</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Okres wpisu</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Opłata wpisowa</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Górna Granica Wieku</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Wymagany Wiek</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Zaległe</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Rezerwacja</b></td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"> </td>
+				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"> </td>
+			</tr>
+			<!-- TMPL_LOOP NAME="loop" -->
+			<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPl_IF -->>
+				<td><!-- TMPL_VAR NAME="categorycode" --></td>
+				<td><!-- TMPL_VAR NAME="description" --></td>
+				<td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
+				<td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
+				<td><!-- TMPL_VAR NAME="upperagelimit" --></td>
+				<td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
+				<td><!-- TMPL_IF NAME="overduenoticerequired" -->
 						<i>Tak</i>
 					<!-- TMPL_ELSE -->
 						<i>Nie</i>
 					<!-- /TMPL_IF -->
 				</td>
-				<td><!-- TMPL_VAR NAME=issuelimit --></td>
-				<td><!-- TMPL_VAR NAME=reservefee --></td>
-				<td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&categorycode=<!-- TMPL_VAR NAME=categorycode -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
-				<td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&categorycode=<!-- TMPL_VAR NAME=categorycode -->"><img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" border="0"></a></td>
+				<td><!-- TMPL_VAR NAME="reservefee" --></td>
+				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
+				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" border="0"></a></td>
 			</tr>
 			<!-- /TMPL_LOOP -->
 
 		</table>
-		<p><form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-			<input type=hidden name=op value=add_form>
-			<input type=submit class="button" value="Dodaj kategoriÄ™" alt="Dodaj kategoriÄ™"><br>
+		<p><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_form">
+			<input type="submit" class="button" value="Dodaj kategoriÄ™" alt="Dodaj kategoriÄ™"><br>
 		</form></p>
 	<!-- /TMPL_IF -->
 </div>

Index: pl/parameters/categoryitem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/categoryitem.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/parameters/categoryitem.tmpl	17 Apr 2004 16:57:07 -0000	1.2
+++ pl/parameters/categoryitem.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<!-- TMPL_IF NAME=add_form -->
-        <script>
+<!-- TMPL_IF NAME="add_form" -->
+        <script language="javascript" type="text/javascript">
 	function _(s) { return s } // dummy function for gettext
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         function isNotNull(f,noalert) {
@@ -57,245 +57,233 @@
                         alertString2 += _alertString;
                 }
         }
-        </SCRIPT>
+        </script>
 
-        <!-- TMPL_IF NAME=categorycode -->
+        <!-- TMPL_IF NAME="categorycode" -->
                 <h1>Zmieniaj kategoriÄ™</h1>
         <!-- TMPL_ELSE -->
                 <h1>Dodaj kategoriÄ™</h1>
         <!-- /TMPL_IF -->
 
-        <form action=<!-- TMPL_VAR NAME=script_name --> name=Aform method=post>
-        <input type=hidden name=op value='add_validate'>
-        <input type=hidden name=checked value=0>
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+        <input type="hidden" name="op" value="add_validate">
+        <input type="hidden" name="checked" value="0">
                         
         <table>  
-        <!-- TMPL_IF NAME=categorycode -->
+        <!-- TMPL_IF NAME="categorycode" -->
                 <tr>
                         <td>Kod Kategorii</td>
                         <td>
-                                <input type=hidden name=categorycode value=<!-- TMPL_VAR NAME=categorycode -->>
+                                <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
                         </td>
                 </tr>
         <!-- TMPL_ELSE -->
                 <tr>
                         <td>Kod Kategorii</td>
                         <td>
-                                <input type=text name=categorycode size=3 maxlength=2 onBlur=toUC(this)>
+                                <input type="text" name="categorycode" size="3" maxlength="2" onblur="toUC(this)">
                         </td>
                 </tr>
         <!-- /TMPL_IF -->
                 <tr>
                         <td>Wyjaśnienie</td>
                         <td>
-                                <input type=text name=description size=40 maxlength=80 value=<!-- TMPL_VAR NAME=description escape=HTML -->>
+                                <input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
                                 &nbsp;
                         </td>
                 </tr>
                 <tr>
                         <td>Okres zapisu</td>
                         <td>
-                                <input type=text name=enrolmentperiod value=<!-- TMPL_VAR NAME=enrolmentperiod -->>
+                                <input type="text" name="enrolmentperiod" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->">
                         </td>
                 </tr>
                 <tr>
                         <td>Górna granica wieku</td>
                         <td>
-                                <input type=text name=upperagelimit value=<!-- TMPL_VAR NAME=upperagelimit -->>
+                                <input type="text" name="upperagelimit" value="<!-- TMPL_VAR NAME="upperagelimit" -->">
                         </td>
                 </tr>
                 <tr>
                         <td>Wymagany Wiek</td>
                         <td>
-                                <input type=text name=dateofbirthrequired value=<!-- TMPL_VAR NAME=dateofbirthrequired -->>
+                                <input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->">
                         </td>
                 </tr>
                 <tr>
                         <td>Typ kary</td>
                         <td>
-                                <input type=text name=finetype size=30 maxlength=30 value=<!-- TMPL_VAR NAME=finetype -->>
+                                <input type="text" name="finetype" size="30" maxlength="30" value="<!-- TMPL_VAR NAME="finetype" -->">
                         </td>
                 </tr>
                 <tr>
                         <td>Hurt</td>
                         <td>
-                                <input type=text name=bulk value=<!-- TMPL_VAR NAME=bulk -->>
+                                <input type="text" name="bulk" value="<!-- TMPL_VAR NAME="bulk" -->">
                         </td>
                 </tr>
                 <tr>
                         <td>Opłata wpisowa</td>
                         <td>
-                                <input type=text name=enrolmentfee value=<!-- TMPL_VAR NAME=enrolmentfee -->>
+                                <input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME="enrolmentfee" -->">
                         </td>
                 </tr>
                 <tr>
                         <td>Potrzebne upomnienie o zaległości</td>
                         <td>
-                                <input type=text name=overduenoticerequired value=<!-- TMPL_VAR NAME=overduenoticerequired -->>
-                        </td>
-                </tr>
-                <tr>
-                        <td>Limit wypożyczeń</td>
-                        <td>
-                                <input type=text name=issuelimit value=<!-- TMPL_VAR NAME=issuelimit -->>
+                                <input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->">
                         </td>
                 </tr>
                 <tr>
                         <td>Opłata rezerwacyjna</td>
                         <td>
-                                <input type=text name=reservefee value=<!-- TMPL_VAR NAME=reservefee -->>
+                                <input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->">
                         </td>
                 </tr>
                 <tr>
                         <td>&nbsp;</td>
                         <td>
-                                <INPUT type=button value='OK' onClick='Check(this.form)'>
+                                <input type="button" value="OK" onclick="Check(this.form)">
                         </td>
                 </tr>
         </table>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=add_validate -->
+<!-- TMPL_IF NAME="add_validate" -->
         Dane zapisane
-        <form action=<!-- TMPL_VAR NAME=script_name --> method=post>
-                <input type=submit value=OK>
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                <input type="submit" value="OK">
         </form>
 <!-- /TMPL_IF -->
 
-        KWOTA ŁĄCZNA: <!-- TMPL_VAR NAME=categorycode --> : <!-- TMPL_VAR NAME=total --><br>
+        KWOTA ŁĄCZNA: <!-- TMPL_VAR NAME="categorycode" --> : <!-- TMPL_VAR NAME="total" --><br>
                     
-        <table border=0 cellspacing=0 cellpadding=5>
-                <tr bgcolor='#99cc33'>
-                        <td background='/images/background-mem.gif'>
+        <table border="0" cellspacing="0" cellpadding="5">
+                <tr bgcolor="#99cc33">
+                        <td background="/images/background-mem.gif">
                                 <b>Kod Kategorii</b>
                         </td>
-                        <td background='/images/background-mem.gif'>
-                                <!-- TMPL_VAR NAME=categorycode -->
+                        <td background="/images/background-mem.gif">
+                                <!-- TMPL_VAR NAME="categorycode" -->
                         </td>
                 </tr>
-                <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-                        <input type=hidden name=op value=delete_confirmed>
-                        <input type=hidden name=categorycode value=<!-- TMPL_VAR NAME=categorycode -->>
+                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                        <input type="hidden" name="op" value="delete_confirmed">
+                        <input type="hidden" name="categorycode" value=<!-- TMPL_VAR NAME="categorycode" -->>
                 <tr>
                         <td>Wyjaśnienie</td>
-                        <td><!-- TMPL_VAR NAME=description --></td>
+                        <td><!-- TMPL_VAR NAME="description" --></td>
                 </tr>
                 <tr>
                         <td>Okres zapisu</td>
-                        <td><!-- TMPL_VAR NAME=enrolmentperiod --></td>
+                        <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
                 </tr>
                 <tr>
                         <td>Górna granica wieku</td>
-                        <td><!-- TMPL_VAR NAME=upperagelimit --></td>
+                        <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
                 </tr>
                 <tr>
                         <td>Wymagany Wiek</td>
-                        <td><!-- TMPL_VAR NAME=dateofbirthrequired --></td>
+                        <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
                 </tr>
                 <tr>
                         <td>Typ kary</td>
-                        <td><!-- TMPL_VAR NAME=finetype --></td>
+                        <td><!-- TMPL_VAR NAME="finetype" --></td>
                 </tr>
                 <tr>
                         <td>Hurt</td>
-                        <td><!-- TMPL_VAR NAME=bulk --></td>
+                        <td><!-- TMPL_VAR NAME="bulk" --></td>
                 </tr>
                 <tr>
                         <td>Opłata wpisowa</td>
-                        <td><!-- TMPL_VAR NAME=enrolmentfee --></td>
+                        <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
                 </tr>
                 <tr>
                         <td>Potrzebne upomnienie o zaległości</td>
-                        <td><!-- TMPL_VAR NAME=overduenoticerequired --></td>
-                </tr>
-                <tr>
-                        <td>Limit wypożyczeń</td>
-                        <td><!-- TMPL_VAR NAME=issuelimit --></td>
+                        <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
                 </tr>
                 <tr>
                         <td>Opłata rezerwacyjna</td>
-                        <td><!-- TMPL_VAR NAME=reservefee --></td>
+                        <td><!-- TMPL_VAR NAME="reservefee" --></td>
                 </tr>
-                <!-- TMPL_IF NAME=totalgtzero -->
+                <!-- TMPL_IF NAME="totalgtzero" -->
                 <tr>
-                        <td colspan=2 align=center><b>Ten rekord był w użyciu <!-- TMPL_VAR NAME=total --> razy. Wymazanie nie jest możliwe</b></td>
+                        <td colspan="2" align="center"><b>Ten rekord był w użyciu <!-- TMPL_VAR NAME="total" --> razy. Wymazanie nie jest możliwe</b></td>
                 </tr>
                <tr>
-                        <td colspan=2>
-                                </form><form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-                                <input type=submit value=OK>
+                        <td colspan="2">
+                                </form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                                <input type="submit" value="OK">
                                 </form>
                         </td>
                 </tr>
                 <!-- TMPL_ELSE -->
                 <tr>
-                        <td colspan=2 align=center>POTWIERDŹ WYMAZANIE</td>
+                        <td colspan="2" align="center">POTWIERDŹ WYMAZANIE</td>
                 </tr>
                 <tr>
-                        <td><input type=submit value="TAK"></form></td>
-                        <td><form action='<!-- TMPL_VAR NAME=script_name -->' method=post><input type=submit value="NIE"></form></td>
+                        <td><input type="submit" value="TAK"></form></td>
+                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NIE"></form></td>
                 </tr>
                 <!-- /TMPL_IF -->
 
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=delete_confirmed -->
+<!-- TMPL_IF NAME="delete_confirmed" -->
         Dane wymazane
-        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-        <input type=submit value=OK>
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="submit" value="OK">
         </form>
 
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=else -->
+<!-- TMPL_IF NAME="else" -->
         <h2>Kategoria Czytelników - zarządzanie</h2>
-        <!-- TMPL_IF NAME=searchfield -->
-                Szukano <!-- TMPL_VAR NAME=searchfield -->
+        <!-- TMPL_IF NAME="searchfield" -->
+                Szukano <!-- TMPL_VAR NAME="searchfield" -->
         <!-- /TMPL_IF -->
 
-        <form action='<TMP_VAR NAME=script_name>' method=post>
-                <input type=text name=description value=<!-- TMPL_VAR NAME=searchfield -->>
-                <input type=reset name=reset value="wyczyść">
+        <form action="<!-- TMPL_VAR NAME="script_name">" method="post">
+                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
+                <input type="reset" name="reset" value="wyczyść">
         </form>
 
-        <table border=0 cellspacing=0 cellpadding=5>
-                <tr bgcolor='#99cc33'>
-                        <td background='/images/background-mem.gif'><b>Kategoria</b></td>
-                        <td background='/images/background-mem.gif'><b>Wyjaśnienie</b></td>
-                        <td background='/images/background-mem.gif'><b>Zapisy</b></td>
-                        <td background='/images/background-mem.gif'><b>Górna Granica Wieku</b></td>
-                        <td background='/images/background-mem.gif'><b>Wymagany Wiek</b></td>
-                        <td background='/images/background-mem.gif'><b>Kara</b></td>
-                        <td background='/images/background-mem.gif'><b>Hurt</b></td>
-                        <td background='/images/background-mem.gif'><b>Opłata</b></td>
-                        <td background='/images/background-mem.gif'><b>Zaległe</b></td>
-                        <td background='/images/background-mem.gif'><b>Limit wypożyczeń</b></td>
-                        <td background='/images/background-mem.gif'><b>Rezerwacja</b></td>
-                        <td background='/images/background-mem.gif'> </td>
-                        <td background='/images/background-mem.gif'> </td>
-                </tr>
-                <!-- TMPL_LOOP NAME=loop -->
-                <tr bgcolor="<!-- TMPL_VAR NAME=toggle -->">
-                        <td><!-- TMPL_VAR NAME=categorycode --></td>
-                        <td><!-- TMPL_VAR NAME=description --></td>
-                        <td><!-- TMPL_VAR NAME=enrolmentperiod --></td>
-                        <td><!-- TMPL_VAR NAME=upperagelimit --></td>
-                        <td><!-- TMPL_VAR NAME=dateofbirthrequired --></td>
-                        <td><!-- TMPL_VAR NAME=finetype --></td>
-                        <td><!-- TMPL_VAR NAME=bulk --></td>
-                        <td><!-- TMPL_VAR NAME=enrolmentfee --></td>
-                        <td><!-- TMPL_VAR NAME=overduenoticerequired --></td>
-                        <td><!-- TMPL_VAR NAME=issuelimit --></td>
-                        <td><!-- TMPL_VAR NAME=reservefee --></td>
-                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&categorycode=<!-- TMPL_VAR NAME=categorycode -->">Edytuj</a></td>
-                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&categorycode=<!-- TMPL_VAR NAME=categorycode -->">Wymaż</a></td>
+        <table border="0" cellspacing="0" cellpadding="5">
+                <tr bgcolor="#99cc33">
+                        <td background="/images/background-mem.gif"><b>Kategoria</b></td>
+                        <td background="/images/background-mem.gif"><b>Wyjaśnienie</b></td>
+                        <td background="/images/background-mem.gif"><b>Zapisy</b></td>
+                        <td background="/images/background-mem.gif"><b>Górna Granica Wieku</b></td>
+                        <td background="/images/background-mem.gif"><b>Wymagany Wiek</b></td>
+                        <td background="/images/background-mem.gif"><b>Kara</b></td>
+                        <td background="/images/background-mem.gif"><b>Hurt</b></td>
+                        <td background="/images/background-mem.gif"><b>Opłata</b></td>
+                        <td background="/images/background-mem.gif"><b>Zaległe</b></td>
+                        <td background="/images/background-mem.gif"><b>Rezerwacja</b></td>
+                        <td background="/images/background-mem.gif"> </td>
+                        <td background="/images/background-mem.gif"> </td>
+                </tr>
+                <!-- TMPL_LOOP NAME="loop" -->
+                <tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+                        <td><!-- TMPL_VAR NAME="categorycode" --></td>
+                        <td><!-- TMPL_VAR NAME="description" --></td>
+                        <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
+                        <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
+                        <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
+                        <td><!-- TMPL_VAR NAME="finetype" --></td>
+                        <td><!-- TMPL_VAR NAME="bulk" --></td>
+                        <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
+                        <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
+                        <td><!-- TMPL_VAR NAME="reservefee" --></td>
+                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edytuj</a></td>
+                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Wymaż</a></td>
 		</tr>
                 <!-- /TMPL_LOOP -->
 
         </table>
-        <p><form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-                <input type=hidden name=op value=add_form>
-                <input type=submit class="button" value="Dodaj kategoriÄ™" alt="Dodaj kategoriÄ™"><br>
+        <p><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                <input type="hidden" name="op" value="add_form">
+                <input type="submit" class="button" value="Dodaj kategoriÄ™" alt="Dodaj kategoriÄ™"><br>
         </form></p>
 <!-- /TMPL_IF -->
 

Index: pl/parameters/checkmarc.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/checkmarc.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/parameters/checkmarc.tmpl	17 Apr 2004 16:57:07 -0000	1.2
+++ pl/parameters/checkmarc.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,129 +1,158 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<table width="100%" cellpadding=5 cellspacing=5>
-	<tr background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">
-		<td><b>Test</b></td>
-		<td><b>Wynik</b></td>
+<div id="mainbloc">
+	<h1>Checking MARC setup</h1>
+	<table>
+		<tr>
+			<th>Test</th>
+			<th>Wynik</th>
 	</tr>
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="itemnum" -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="itemnum" -->
 	<tr>
 		<td><b>itemnum</b></td>
 		<td><li>Pole itemnum MUSI być zmapowane </li>
 			<li>podpole zaś to MUSI być w zakładce -1 (ignoruj)</td>
 	</tr>
-<!-- TMPL_ELSE -->
+	<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
 		<td><i>itemnum : pole itemnumber jest zmapowane do pola w zakładce -1</i></td>
 	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="itemfields" -->
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="itemfields" -->
 	<tr>
 		<td><b>item fields</b></td>
 		<td>WSZYSTKIE pola egzemplarzy MUSZÄ„:<br/>
 			<li>być zmapowane do tej samej etykiety,</li>
 			<li>a one wszystkie muszą znajdować się w 10 (egzemplarze) zakładce</li></td>
 	</tr>
-<!-- TMPL_ELSE -->
+	<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
 		<td><i>Wszystkie pola dokumentu są w tym samym znaczniku i w zakładce egzemplarzy</i></td>
 	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="itemtypes_empty" -->
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="itemtags" -->
+		<tr>
+			<td><b>Item tag</b></td>
+			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>OK</td>
+			<td><i>Only 1 marc tag mapped to items</i></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="itemtypes_empty" -->
 	<tr>
 		<td><b>tablica itemtypes pusta</b></td>
 		<td>tablica itemtypes (typ dokumentu) jest pusta. Musi zawierać choć jedną wartość</td>
 	</tr>
-<!-- TMPL_ELSE -->
+	<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
 		<td><i>tablica itemtypes wypełniona przynajmniej 1 wartością</i></td>
 	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="itemtype" -->
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="itemtype" -->
 	<tr>
 		<td><b>tablica itamtype NIE zmapowana</b></td>
 		<td>pole biblioitems.itemtype MUSI :<br/>
 			<li>być zmapowane do podpola MARC, </li>
-			<li>podpole zaś to MUSI posiadać wartość autoryzowaną=itemtype</li></td>
+				<li>the correspounding subfield MUST have authorised_value="itemtype"</li></td>
 	</tr>
-<!-- TMPL_ELSE -->
+	<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
 		<td><i>biblioitems.itemtype zdefiniowane</i></td>
 	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="branches_empty" -->
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="branches_empty" -->
 	<tr>
 		<td><b>tablica branch (oddział) pusta</b></td>
 		<td>tablica branch (oddział) jest pusta. Musi zawierać choć 1 wartość !</td>
 	</tr>
-<!-- TMPL_ELSE -->
+	<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
 		<td><i>tablica branch (oddział) wypełniona przynajmniej 1 wartością</i></td>
 	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="branch" -->
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="branch" -->
 	<tr>
 		<td><b>oddział właściwy NIE zmapowany</b></td>
 		<td>pole item.homebranch MUSI:<br/>
 			<li>być zmapowane do podpola MARC,</li>
-			<li>podpole zaś to MUSI posiadać wartość autoryzowaną=branches</li></td>
+				<li>the correspounding subfield MUST have authorised value="branches"</li></td>
 	</tr>
-<!-- TMPL_ELSE -->
+	<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
 		<td><i>oddział właściwy zdefiniowany</i></td>
 	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="holdingbranch" -->
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="holdingbranch" -->
 	<tr>
 		<td><b>oddział przechowania NIE zmapowany</b></td>
 		<td>pole items.holdingbranch MUSI:<br/>
 			<li>być zmapowane do podpola MARC, </li>
-			<li>podpole zaś to MUSI posiadać wartość autoryzowaną=branches</li></td>
+				<li>the correspounding subfield MUST have authorised value="branches"</li></td>
 	</tr>
-<!-- TMPL_ELSE -->
+	<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
 		<td><i>oddział przechowania zdefiniowany</i></td>
 	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="biblionumber" -->
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="biblionumber" -->
 	<tr>
 		<td><b>biblio and biblionumber</b></td>
 		<td>Pola biblio.biblionumber i biblioitems.biblioitemnumber MUSZÄ„:<br/>
 			<li>być zmapowane do podpola MARC,</li>
-			<li>być w tej SAMEJ etykiecie (na przykład: 090$a oraz 090$b)</li>
 			<li>być w zakładce -1</li></td>
 	</tr>
-<!-- TMPL_ELSE -->
+	<!-- TMPL_ELSE -->
 	<tr>
 		<td>OK</td>
 		<td><i>tablice biblionumber i biblioitemnumber zmapowane poprawnie</i></td>
 	</tr>
-<!-- /TMPL_IF -->
-<!------------------------------------------------------------------------------------------------------------>
-<!-- TMPL_IF name="total" -->
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="frameworknull" -->
+		<tr>
+			<td><b>framework values</b></td>
+			<td>there is a null value in a frameworkcode. Check the following tables<br/>
+				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
+				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>OK</td>
+			<td><i>no NULL value in frameworkcode</i></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!-- -------------------------------------------------------------------------------------------------------- -->
+	<!-- TMPL_IF NAME="total" -->
 	<tr>
 		<td><b>W SUMIE</b></td>
-		<td>Istnieją <b><!-- TMPL_VAR name="total" --></b> błędy w konfiguracji MARC. Popraw je zanim zaczniesz pracę w systemie koha.</td>
+			<td>Istnieją <b><!-- TMPL_VAR NAME="total" --></b> błędy w konfiguracji MARC. Popraw je zanim zaczniesz pracę w systemie koha.</td>
 	</tr>
-<!-- TMPL_ELSE -->
+	<!-- TMPL_ELSE -->
 	<tr>
 		<td>&nbsp;</td>
 		<td><b>Konfiguracja OK, nie ma błędów w tablicach parametrów MARC</b></td>
 	</tr>
-<!-- /TMPL_IF -->
-</table>
+	<!-- /TMPL_IF -->
+	</table>
+</div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: pl/parameters/currency.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/currency.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/parameters/currency.tmpl	17 Apr 2004 16:57:07 -0000	1.2
+++ pl/parameters/currency.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
-
-<!-- TMPL_IF NAME=add_form -->
-        <script>
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="add_form" -->
+			<script language="javascript" type="text/javascript">
 	function _(s) { return s } // dummy function for gettext
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         function isNotNull(f,noalert) {
@@ -54,159 +54,137 @@
                         alert(alertString2);
                 }
         }
-        </SCRIPT>
+			</script>
 
-	<!-- TMPL_IF NAME=searchfield -->
-		<h1>Zmieniaj walutÄ™</h1>
+		<!-- TMPL_IF NAME="searchfield" -->
+			<h1 class="parameters">Zmieniaj walutÄ™</h1>
 	<!-- TMPL_ELSE -->
-		<h1>Dodaj walutÄ™</h1>
+			<h1 class="parameters">Dodaj walutÄ™</h1>
 	<!-- /TMPL_IF -->
 
-        <form action='<!-- TMPL_VAR NAME=script_name -->' name=Aform method=post>
-        <input type=hidden name=op value='add_validate'>
-
-	<table>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+			<input type="hidden" name="op" value="add_validate">
 
-	<!-- TMPL_IF NAME=searchfield -->
-		<tr>
-			<td>Waluta</td>
-			<td>
-				<input type=hidden name=currency value='<!-- TMPL_VAR NAME=searchfield -->'><!-- TMPL_VAR NAME=searchfield -->
-			</td>
-		</tr>
+		<!-- TMPL_IF NAME="searchfield" -->
+			<p>
+				<label>Waluta</label>
+				<input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
+			</p>
 	<!-- TMPL_ELSE -->
-		<tr>
-			<td>Waluta</td>
-			<td>
-				<input type=text name=currency size=50 maxlength=50 onBlur=toUC(this)>
-			</td>
-		</tr>
+			<p>
+				<label>Waluta</label>
+				<input type="text" name="currency" size="50" maxlength="50" onblur="toUC(this)">
+			</p>
 	<!-- /TMPL_IF -->
-
-        	<tr>
-			<td>Kurs</td>
-			<td>
-				<input type=text name=rate size=10 maxlength=10 value='<!-- TMPL_VAR NAME=rate -->'>
-			</td>
-		</tr>
-        	<tr>
-			<td> </td>
-			<td><INPUT type=button value='OK' onClick='Check(this.form)'></td>
-		</tr>
-        </table>
+		<p>
+			<label>Kurs</label>
+			<input type="text" name="rate" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="rate" -->">
+		</p>
+		<p><input type="button" value="OK" onclick="Check(this.form)" class="button parameters"></p>
         </form>
 
-<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=add_validate -->
+	<!-- TMPL_IF NAME="add_validate" -->
 	Dane zapisane
-        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-        <input type=submit value=OK>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="OK">
         </form>
-<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=delete_confirm -->
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr bgcolor='#99cc33'>
-			<td background='/images/background-mem.gif'><b>Waluta</b></td>
-			<td background='/images/background-mem.gif'><b><!-- TMPL_VAR NAME=searchfield --></b></td>
+	<!-- TMPL_IF NAME="delete_confirm" -->
+		<table border="0" cellspacing="0" cellpadding="5">
+			<tr bgcolor="#99cc33">
+				<td background="/images/background-mem.gif"><b>Waluta</b></td>
+				<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
 		</tr>
 
-        	<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-			<input type=hidden name=op value=delete_confirmed>
-			<input type=hidden name=searchfield value='<!-- TMPL_VAR NAME=searchfield -->'>
+				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="op" value="delete_confirmed">
+				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
         
         	<tr>
 			<td>Kurs</td>
-			<td><!-- TMPL_VAR NAME=rate --></td>
+				<td><!-- TMPL_VAR NAME="rate" --></td>
 		</tr>
-		<!-- TMPL_IF NAME=totalgtzero -->
+			<!-- TMPL_IF NAME="totalgtzero" -->
 		<tr>
-			<td colspan=2 align=center>
-				<b>Ten rekord był w użyciu <!-- TMPL_VAR NAME=total --> razy. Wymazanie nie jest możliwe</b>
+				<td colspan="2" align="center">
+					<b>Ten rekord był w użyciu <!-- TMPL_VAR NAME="total" --> razy. Wymazanie nie jest możliwe</b>
 			</td>
 		</tr>
 		<tr>
-			<td colspan=2>
+				<td colspan="2">
 				</form>
-				<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-					<input type=submit value=OK>
+					<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+						<input type="submit" value="OK">
 				</form>
 			</td>
 		</tr>
 		<!-- TMPL_ELSE -->
 		<tr>
-			<td colspan=2 align=center>POTWIERDŹ WYMAZANIE</td>
+				<td colspan="2" align="center">POTWIERDŹ WYMAZANIE</td>
 		</tr>
 		<tr>
 			<td>
-				<input type=submit value="TAK">
+					<input type="submit" value="TAK">
 				</form>
 			</td>
 			<td>
-				<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-					<input type=submit value="NIE">
+					<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+						<input type="submit" value="NIE">
 				</form>
 			</td>
 		</tr>
 		<!-- /TMPL_IF -->
 	</table>
-<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=delete_confirmed -->
+	<!-- TMPL_IF NAME="delete_confirmed" -->
 	Dane wymazane
-	<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-		<input type=submit value=OK>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="OK">
 	</form>
-<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=else -->
-	<h2>ZarzÄ…dzaj WalutÄ…</h2>
-        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-                <input type=text name=description value=<!-- TMPL_VAR NAME=searchfield -->>
-                <input type=reset name=reset value="wyczyść">
-        </form>
-
-	<!-- TMPL_IF NAME=searchfield -->
-		Szukano <b><!-- TMPL_VAR NAME=searchfield --></b>
-	<!-- /TMPL_IF -->
-
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr bgcolor='#99cc33'>
-			<td background='/images/background-mem.gif'><b>Waluta</b></td>
-			<td background='/images/background-mem.gif'><b>Kurs</b></td>
-			<td background='/images/background-mem.gif'> </td>
-			<td background='/images/background-mem.gif'> </td>
-		</tr>
-		<!-- TMPL_LOOP NAME=loop -->
-		<tr bgcolor="<!-- TMPL_VAR NAME=toggle -->">
-			<td><!-- TMPL_VAR NAME=currency --></td>
-			<td><!-- TMPL_VAR NAME=rate --></td>
-			<td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&searchfield=<!-- TMPL_VAR NAME=currency -->" class="button">Edytuj</a></td>
-                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&searchfield=<!-- TMPL_VAR NAME=currency -->" class="button">Wymaż</a></td>
+	<!-- TMPL_IF NAME="else" -->
+		<h1 class="parameters">ZarzÄ…dzaj WalutÄ…</h1>
+		<table>
+			<tr>
+				<th class="parameters"><b>Waluta</b></td>
+				<th class="parameters"><b>Kurs</b></td>
+				<th class="parameters"> </td>
+				<th class="parameters"> </td>
+			</tr>
+			<!-- TMPL_LOOP NAME="loop" -->
+			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+				<td><!-- TMPL_VAR NAME="currency" --></td>
+				<td><!-- TMPL_VAR NAME="rate" --></td>
+				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->" class="button parameters">Edytuj</a></td>
+							<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="currency" -->" class="button parameters">Wymaż</a></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
 
-	<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-        <input type=hidden name=op value=add_form>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_form">
 	
-	<!-- TMPL_IF NAME=offsetgtzero -->
-		<a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=prevpage -->">&lt;&lt; Wstecz</a>
+		<!-- TMPL_IF NAME="offsetgtzero" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Wstecz</a>
 	<!-- /TMPL_IF -->
 
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
-	<!-- TMPL_IF NAME=ltcount -->
-		<a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">Dalej &gt;&gt;</a>	
+		<!-- TMPL_IF NAME="ltcount" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Dalej &gt;&gt;</a>	
 	<!-- /TMPL_iF -->
 
         <br>
-	<input type=submit class="button" value="Dodaj walutÄ™" alt="Dodaj walutÄ™">
+		<input type="submit" class="button parameters" value="Dodaj walutÄ™" alt="Dodaj walutÄ™">
 	<br>
         </form>
 
-<!-- /TMPL_IF -->
-
+	<!-- /TMPL_IF -->
+</div>
 
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: pl/parameters/itemtypes.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/itemtypes.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/parameters/itemtypes.tmpl	17 Apr 2004 16:57:07 -0000	1.2
+++ pl/parameters/itemtypes.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<script>
+<script language="javascript" type="text/javascript">
 function _(s) { return s } // dummy function for gettext
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 function isNotNull(f,noalert) {
@@ -44,9 +44,6 @@
 	if (!(isNotNull(window.document.Aform.description,1))) {
 		_alertString += "\n- " + _("Brak opisu");
 	}
-	if ((!isNum(f.loanlength,0)) && f.loanlength.value.length > 0) {
-		_alertString += "\n- " + _("Długość wypożyczenia nie jest cyfrą");
-	}
 	if ((!isNum(f.rentalcharge,0)) && f.rentalcharge.value.length > 0) {
 		_alertString += "\n- " + _("Opłata wynajmu nie jest cyfrą");
 	}
@@ -59,118 +56,111 @@
 		alert(alertString2);
 	}
 }
-</SCRIPT>
-<!-- TMPL_IF name="add_form" -->
-	<!-- TMPL_IF name="itemtype" -->
-		<h1>Zmień rodzaj pozycji</h1>
+</script>
+<div id="mainbloc">
+<!-- TMPL_IF NAME="add_form" -->
+	<!-- TMPL_IF NAME="itemtype" -->
+		<h1 class="parameters">Zmień rodzaj pozycji</h1>
 	<!-- TMPL_ELSE -->
-		<h1>Dodaj typ materiału</h1>
+		<h1 class="parameters">Dodaj typ materiału</h1>
 	<!-- /TMPL_IF -->
-	<form action='<!-- TMPL_VAR name="script_name" -->' name=Aform method=post>
-		<input type=hidden name=op value='add_validate'>
-		<input type=hidden name=checked value=0>
-		<table>
-			<!-- TMPL_IF name="itemtype" -->
-				<tr><td>Typ pozycji</td><td><input type=hidden name=itemtype value=<!-- TMPL_VAR name="itemtype" -->><!-- TMPL_VAR name="itemtype" --></td></tr>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate">
+		<input type="hidden" name="checked" value="0">
+			<!-- TMPL_IF NAME="itemtype" -->
+				<p><label class="label100">Typ pozycji<label><input type="hidden" name="itemtype" value="<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="itemtype" --></p>
 			<!-- TMPL_ELSE -->
-				<tr><td>Typ pozycji</td><td><input type=text name=itemtype size=6 maxlength=4 onBlur="toUC(this)"></td></tr>
+				<p><label class="label100">Typ pozycji<label><input type="text" name="itemtype" size="6" maxlength="4" onblur="toUC(this)"></p>
 			<!-- /TMPL_IF -->
-			<tr>
-				<td>Wyjaśnienie</td>
-				<td><input type=text name=description size=40 maxlength=80 value='<!-- TMPL_VAR name="description" escape=HTML -->'>&nbsp;</td>
-			</tr>
-			<tr>
-				<td>Nie na wynos</td>
-				<td>
-					<!-- TMPL_IF name="notforloan" -->
-						<input type=checkbox name=notforloan checked value=1>
+			<p>
+				<label class="label100">Wyjaśnienie</label>
+				<input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" escape=HTML -->">
+			</p>
+			<p>
+				<label class="label100">Nie na wynos</label>
+				<!-- TMPL_IF NAME="notforloan" -->
+					<input type="checkbox" name="notforloan" checked value="1">
 					<!-- TMPL_ELSE -->
-						<input type=checkbox name=notforloan value=1>
+					<input type="checkbox" name="notforloan" value="1">
 					<!-- /TMPL_IF -->
 					Jeśli zaznaczone to żaden dokument tego typu nie może być wypożyczony. Jeśli pozostawiony pusty, to każdy dokument tego typu może być wypożyczony, chyba, że dla konkretnego egzemplarza ustawiono flagę &quot;nienawynos.&quot;
-				</td>
-			</tr>
-			<tr>
-				<td>Okres wypożyczenia</td>
-				<td>
-					<input type=text name=loanlength size=10 value='<!-- TMPL_VAR name="loanlength" -->'> ma znaczenie tylko wtedy gdy &quot;nie na wynos&quot; jest puste
-				</td>
-			</tr>
-			<tr>
-				<td>Wolno przedłużać</td>
-				<td><input type=checkbox name=renewalsallowed <!-- TMPL_IF name="renewalsallowed" -->checked<!-- /TMPL_IF --> value=1></td>
-			</tr>
-			<tr>
-				<td>Opłata wynajmu</td>
-				<td><input type=text name=rentalcharge size=10 value='<!-- TMPL_VAR name="rentalcharge" -->'></td>
-			</tr>
-			<tr>
-				<td>&nbsp;</td>
-				<td><INPUT type=button value='OK' onClick='Check(this.form)'></td>
-			</tr>
-		</table>
+			</p>
+			<p>
+				<label class="label100" name="renewalsallowed">Number of renewals allowed</label>
+				<input type="text" name="renewalsallowed" value="<!-- TMPL_VAR NAME="renewalsallowed" -->">
+			</p>
+			<p>
+				<label class="label100">Opłata wynajmu</label>
+				<input type="text" name="rentalcharge" size="10" value="<!-- TMPL_VAR NAME="rentalcharge" -->">
+			</p>
+			<p>
+				<input type="button" value="OK" class="button" onclick="Check(this.form)">
+			</p>
 	</form>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="delete_confirm" -->
-	<TABLE bg="#99cc33">
-		<tr>
-			<th>Typ pozycji</th>
-			<th><!-- TMPL_VAR name="itemtype" --></th>
-		</tr>
-	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-		<input type=hidden name=op value=delete_confirmed><input type=hidden name=itemtype value='<!-- TMPL_VAR name="itemtype" -->'>
-	<tr><td>Wyjaśnienie</td><td><!-- TMPL_VAR name="description" --></td></tr>
-	<tr><td>Okres wypożyczenia</td><td><!-- TMPL_VAR name="loanlength" --></td></tr>
-	<tr><td>Przedłużenia</td><td><!-- TMPL_IF name="renewalsallowed" -->Możliwe<!-- TMPL_ELSE -->Nie możliwe<!-- /TMPL_IF --></td></tr>
-	<tr><td>Opłata wynajmu</td><td><!-- TMPL_VAR name="rentalcharge" --></td></tr>
-	<!-- TMPL_IF name="total" -->
-		<tr><td colspan=2 align=center><b>Ten rekord był w użyciu <!-- TMPL_VAR name="total" --> razy. Wymazanie nie jest możliwe</b></td></tr>
-		<tr><td colspan=2></form><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value=OK></form></td></tr>
+<!-- TMPL_IF NAME="delete_confirm" -->
+		<p><label>Typ pozycji</label><!-- TMPL_VAR NAME="itemtype" --></p>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="itemtype" value="<!-- TMPL_VAR NAME="itemtype" -->">
+	<p><label>Wyjaśnienie</label><!-- TMPL_VAR NAME="description" --></p>
+	<p><label>Przedłużenia</label><!-- TMPL_IF NAME="renewalsallowed" -->Możliwe<!-- TMPL_ELSE -->Nie możliwe<!-- /TMPL_IF --></p>
+	<p><lable>Opłata wynajmu</label><!-- TMPL_VAR NAME="rentalcharge" --></p>
+	<!-- TMPL_IF NAME="total" -->
+		<p>
+			<b>Ten rekord był w użyciu <!-- TMPL_VAR NAME="total" --> razy. Wymazanie nie jest możliwe</b>
+		</p>
+		<p>
+			</form>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="OK" class="button parameters"></form>
+		</p>
 	<!-- TMPL_ELSE -->
-		<tr><td colspan=2 align=center>POTWIERDŹ WYMAZANIE</td></tr>
-		<tr><td><input type=submit value="TAK"></form></td><td><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value="NIE"></form></td></tr>
+		<p>POTWIERDŹ WYMAZANIE</p>
+		<p>
+			<input type="submit" value="TAK" class="button parameters"></form>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NIE" class="button parameters"></form>
+		</p>
 	<!-- /TMPL_IF -->
 
-	</table>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="else" -->
-<h1>Typ Pozycji - zarzÄ…dzanie</h1>
-<table border='1' cellpadding='5' cellspacing='0' width='550'>
-	<tr>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Kod</b></th>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Wyjaśnienie</b></td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Okres wypożyczenia</b></td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Przedłużalność</b></td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Opłata</b></td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">Edytuj</td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">Wymaż</td>
-	</tr>
-	<!-- TMPL_LOOP name="loop" -->
-		<tr>
-			<td><!-- TMPL_VAR name="itemtype" --></td>
-			<td><!-- TMPL_VAR name="description" --></td>
-			<td><!-- TMPL_VAR name="loanlength" --></td>
-			<td><!-- TMPL_IF name="renewalsallowed" -->Tak<!-- TMPL_ELSE -->Nie<!-- /TMPL_IF --></td>
-			<td><!-- TMPL_VAR name="rentalcharge" --></td>
-			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&itemtype=<!-- TMPL_VAR name="itemtype" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
-			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&itemtype=<!-- TMPL_VAR name="itemtype" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
-		</tr>
-	<!-- /TMPL_LOOP -->
-</table>
-<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-<input type=hidden name=op value=add_form>
-<br>
-<table width=40%>
-	<tr>
-		<td width="33%">
-			<input type=submit class="button" value="Dodaj typ materiału" title="Dodaj typ materiału" alt="Dodaj typ materiału">
+<!-- TMPL_IF NAME="else" -->
+<h1 class="parameters">Typ Pozycji - zarzÄ…dzanie</h1>
+<table>
+	<tr>
+		<th class="parameters">Kod</th>
+		<th class="parameters">Wyjaśnienie</th>
+		<th class="parameters">not for loan</th>
+		<th class="parameters">Przedłużalność</th>
+		<th class="parameters">Opłata</th>
+		<th class="parameters">Edytuj</th>
+		<th class="parameters">Wymaż</th>
+	</tr>
+	<!-- TMPL_LOOP NAME="loop" -->
+		<tr>
+			<td><!-- TMPL_VAR NAME="itemtype" --></td>
+			<td><!-- TMPL_VAR NAME="description" --></td>
+			<td><!-- TMPL_IF NAME="notforloan" -->Tak<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_UNLESS name="notforloan" -->
+					<!-- TMPL_IF NAME="renewalsallowed" -->
+						<!-- TMPL_VAR name="renewalsallowed" --> time(s)
+					<!-- TMPL_ELSE -->
+						Nie
+					<!-- /TMPL_IF -->
+				<!-- /TMPL_UNLESS -->
 		</td>
-		<td width=33%><!-- TMPL_IF name="previous" --><a href="<!-- TMPL_VAR name=previous -->"><input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1leftarrow.png" title="wstecz" alt="wstecz" border=0></a><!-- /TMPL_IF --></td>
-		<td width=33%><!-- TMPL_IF name="next" --><a href="<!-- TMPL_VAR name=next -->"><input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1rightarrow.png" title="dalej" alt="dalej" border=0></a><!-- /TMPL_IF --></td>
+			<td><!-- TMPL_UNLESS name="notforloan" --><!-- TMPL_VAR NAME="rentalcharge" --><!-- /TMPL_UNLESS --></td>
+			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&itemtype=<!-- TMPL_VAR NAME="itemtype" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
+			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&itemtype=<!-- TMPL_VAR NAME="itemtype" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
 	</tr>
+	<!-- /TMPL_LOOP -->
 </table>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form">
+	<input type="submit" class="button parameters" value="Dodaj typ materiału" title="Dodaj typ materiału" alt="Dodaj typ materiału">
+	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="wstecz" alt="wstecz" border="0"></a><!-- /TMPL_IF --></td>
+	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->"><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="dalej" alt="dalej" border="0"></a><!-- /TMPL_IF --></td>
 </form>
+</div>
 <!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: pl/parameters/koha2marclinks.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/koha2marclinks.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/parameters/koha2marclinks.tmpl	17 Apr 2004 16:26:26 -0000	1.2
+++ pl/parameters/koha2marclinks.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,137 +1,137 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<!-- TMPL_IF name="add_form" -->
-<!---------------------------------------------------------------------------->
-	<H1><!-- TMPL_VAR name="action" --></H1>
-	<p>Wybierz i uprawomocnij 1 z następujących dla <b><!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --></b></p>
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="add_form" -->
+	<!-- ------------------------------------------------------------------------ -->
+		<h1>Wybierz i uprawomocnij 1 z następujących dla <b><!-- TMPL_VAR NAME="tablename" -->.<!-- TMPL_VAR NAME="kohafield" --></b></h1>
 	<table>
 	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+				<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist0" -->
+						<input type="hidden" name="op" value="add_validate">
+						<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+						<!-- TMPL_VAR NAME="marclist0" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+						<input type="submit" value="OK" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist1" -->
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist1" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="OK" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist2" -->
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist2" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="OK" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist3" -->
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist3" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="OK" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist4" -->
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist4" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="OK" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist5" -->
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist5" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="OK" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist6" -->
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist6" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="OK" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist7" -->
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist7" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="OK" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist8" -->
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist8" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="OK" class="button">
 		</td>
 	</form>
 	</tr>
 	<tr>
-	<form action='<!-- TMPL_VAR ESCAPE=URL name="script_name" -->' method=put>
+			<form action="<!-- TMPL_VAR ESCAPE="URL" NAME="script_name" -->" method=put>
 		<td>
-			<input type=hidden name=op value='add_validate'>
-			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-			<!-- TMPL_VAR name="marclist9" -->
+					<input type="hidden" name="op" value="add_validate">
+					<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+					<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+					<!-- TMPL_VAR NAME="marclist9" -->
 		</td>
 		<td>
-			<INPUT type=submit value='OK'>
+					<input type="submit" value="OK" class="button">
 		</td>
 	</form>
 	</tr>
@@ -140,44 +140,47 @@
 			<p align="right">Aby "odmapować", kliknij ==></p>
 		</td>
 		<td>
-			<form action='<!-- TMPL_VAR name="script_name" -->' name=Aform method=put>
-				<input type=hidden name=op value='add_validate'>
-				<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->">
-				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
+					<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method=put>
+						<input type="hidden" name="op" value="add_validate">
+						<input type="hidden" name="tablename" value="<!-- TMPL_VAR NAME="tablename" -->">
+						<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
 				<input type="hidden" name="choice" value="">
-				<input type=submit value="TUTAJ">
+						<input type="submit" value="TUTAJ" class="button">
 			</form>
 		</td>
 	</tr>
 	</table>
-<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
 
-<!---------------------------------------------------------------------------->
-<!-- TMPL_IF name="else" -->
-<font SIZE=6><em>Łącza MARC<!-- TMPL_VAR name="tagfield" --></em></font>
-<p><b>UWAGA: jeśli zmienisz łącze pomiedzy podpolem MARC oraz nie-MARC poproś administratora by uruchomił skrypt misc/rebuildnonmarc.pl.</b>
-</p>
-<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-<!-- TMPL_VAR name="tablename" --> <input type="submit" value="OK">
-</form>
-
-<table border=0 cellspacing=0 cellpadding=2>
-<tr valign=top bgcolor=#99cc33>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=10%><b>Pole Koha</b> <span style="font-size:8;color:red" title="Pole bazy Koha powiÄ…zane z tym podpolem">?</span></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>Etykieta</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>Podpole</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=42%><b>Etykieta</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=8%>
-<!-- TMPL_LOOP name="loop" -->
-<tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
-	<td><b><!-- TMPL_VAR name="kohafield" --></b></td>
-	<td><!-- TMPL_VAR name="tagfield" --></td>
-	<td><!-- TMPL_VAR name="tagsubfield" --></td>
-	<td><!-- TMPL_VAR name="liblibrarian" --></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>
-</tr>
-<!-- /TMPL_LOOP -->
-</table>
-<!-- /TMPL_IF -->
+	<!-- ------------------------------------------------------------------------ -->
+	<!-- TMPL_IF NAME="else" -->
+	<h1 class="parameters">Łącza MARC<!-- TMPL_VAR NAME="tagfield" --></h1>
+	<p><b>NOTES :</b></p>
+	<ul>
+		<p>If you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</p>
+		<p>If you change a link here, EVERY framework will be modified.</p>
+	</p>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<!-- TMPL_VAR NAME="tablename" --> <input type="submit" value="OK" class="button parameters">
+	</form>
 
+	<table>
+		<tr>
+			<th width="10%">Pole Koha <span style="font-size:8;color:red" title="Pole bazy Koha powiÄ…zane z tym podpolem">?</span></th>
+			<th width="5%">Etykieta</th>
+			<th width="5%">Podpole</th>
+			<th width="42%">Etykieta</th>
+			<th width="8%">&nbsp;</th>
+		<!-- TMPL_LOOP NAME="loop" -->
+			<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
+				<td><b><!-- TMPL_VAR NAME="kohafield" --></b></td>
+				<td><!-- TMPL_VAR NAME="tagfield" --></td>
+				<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
+				<td><!-- TMPL_VAR NAME="liblibrarian" --></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>
+			</tr>
+		<!-- /TMPL_LOOP -->
+	</table>
+	<!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: pl/parameters/marc_subfields_structure.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/marc_subfields_structure.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/parameters/marc_subfields_structure.tmpl	17 Apr 2004 16:26:26 -0000	1.3
+++ pl/parameters/marc_subfields_structure.tmpl	7 May 2007 13:55:53 -0000	1.3.10.1
@@ -1,120 +1,155 @@
-<html>
-<!-- clarification needed about this page. many questions... what is Lib? a Library? -->
-
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<!-- TMPL_IF name="add_form" -->
-<!---------------------------------------------------------------------------->
-	<H1>
+<div id="mainbloc">
+<!-- TMPL_IF NAME="add_form" -->
+<!-- ------------------------------------------------------------------------ -->
+	<h1>
 	<!-- TMPL_IF NAME="use-heading-flags-p" -->
-	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edytuj podpola<!-- /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'>
+	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints for framework <!-- TMPL_IF name="frameworkcode" --><!-- TMPL_VAR NAME="frameworkcode" --><!-- TMPL_ELSE -->default<!-- /TMPL_IF --><!-- /TMPL_IF -->
+	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
+	</h1>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+	<input type="hidden" name="op" value="add_validate">
+	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
 	<table>
-	<tr><th>Pole</th>
-		<th>Etykieta dla bibliotekarzy / dla katalogu</th>
-		<th>Powt</th>
-		<th>Obow</th>
-		<th>Pole Koha</th>
-		<th>Zakładka</th>
-		<th>Zob również (w wynikach)</th>
-		<th>Wartość autoryzowana lub<br/>
-				Kategoria tezaurusa</th>
+	<!-- TMPL_LOOP NAME="loop" -->
+		<tr>
+		<td>
+			<h2 class="parameters">Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
+			<h3>MARC constraints</h3>
+			<p>
+			<ul>
+				<p><!-- TMPL_VAR NAME="repeatable" --> repeatable </p>
+				<p><!-- TMPL_VAR NAME="mandatory" --> mandatory</p>
+				<!-- TMPL_IF name="frameworkcode" -->
+					<p>Search also: <i>(meaningful only for default framework)</i></p>
+				<!-- TMPL_ELSE -->
+					<p>
+						<label>Search also:</label> <input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (example for 200a : '200c','200d','200e'...)
+					</p>
+				<!-- /TMPL_IF -->
+				<p><label>Koha link:</label><!-- TMPL_VAR NAME="kohafield" --></p>
+			</ul>
+			</p>
+			<h3>Editor constaints</h3>
+			<ul><p>Wyjaśnienie
+				<p><label>for librarian:</label> <input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80">  for OPAC: <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
+				</p>
+				<p><label>In tab</label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</p>
+				<p><label>hidden</label><input type="text" id="hidden<!-- TMPL_VAR NAME="row" -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" /> (see online help)</label></p>
+				<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked)</p>
+				<p>
+					<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->  or thesaurus: <!-- TMPL_VAR NAME="authtypes" -->  or plugin: <!-- TMPL_VAR NAME="value_builder" -->
+				</p>
+				<p>
+					<label>&nbsp;</label>Link to field :  <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)
+				</p>
+			</ul>
+		</td>
 	</tr>
-	<!-- TMPL_LOOP name="loop" -->
-		<tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
-		<td><!-- TMPL_VAR name="tagfield" --> - <!-- TMPL_VAR name="tagsubfield" --></td>
-		<td><input type=text name="liblibrarian" value="<!-- TMPL_VAR name="liblibrarian" -->" size=40 maxlength=80><br/>
-				<input type=text name="libopac" value="<!-- TMPL_VAR name="libopac" -->" size=40 maxlength=80></td>
-		<td><!-- TMPL_VAR name="repeatable" --></td>
-		<td><!-- TMPL_VAR name="mandatory" --></td>
-		<td><!-- TMPL_VAR name="kohafield" --></td>
-		<td><!-- TMPL_VAR name="tab" --></td>
-		<td><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20 maxlength=80></td>
-		<td><!-- TMPL_VAR name="authorised_value" --><br/>
-				lub <!-- TMPL_VAR name="thesaurus_category" --><br/>
-				lub <!-- TMPL_VAR name="value_builder" --></td>
 	<!-- /TMPL_LOOP -->
 	</table>
-	<INPUT type=submit value='OK'>
-	<p>Uwaga: w ostatnij kolumnie możesz wybrać:
-	<ul><li>"Wartość autoryzowana": odnosi sie do autoryzowanych wartości dla tego podpola. Zob. odpowiednią tablicę administracyjną.</li>
-	<li>"Kategoria tezaurusa": odnosi siÄ™ do kategorii tazaurusa. Zob. odpowiednia tablica administracyjna.</li>
-	<li>"Kreator wartości": kreatory wartości to programy perla, które wspomagają wybór wartości pola. Zależą w dużej mierze od odmiany MARC i czasem automatycznie wypełniają inne podpola.</li>
-	</ul>
-	</p>
+	<input type="submit" value="OK">
 	</form>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="delete_confirm" -->
-<!---------------------------------------------------------------------------->
-<table border=0 cellspacing=0 cellpadding=2>
-	<tr valign=top bgcolor=#99cc33>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Podpole</b></td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="tagsubfield" --></b></td>
+<!-- TMPL_IF NAME="delete_confirm" -->
+<!-- ------------------------------------------------------------------------ -->
+<table border="0" cellspacing="0" cellpadding="2">
+	<tr valign="top" bgcolor="#99cc33">
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Podpole</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR NAME="tagsubfield" --></b></td>
+	</tr>
+	<tr><td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+	<tr><td colspan="2" align="center">POTWIERDŹ WYMAZANIE</td></tr>
+	<tr>
+		<td>
+			<form 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" -->">
+				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
+				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
+				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+				<input type="submit" value="TAK">
+			</form>
+		</td>
+		<td>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
+				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
+				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+				<input type="submit" value="NIE">
+			</form>
+		</td>
 	</tr>
-	<tr><td>&nbsp;</td><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
-	<form 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" -->'>
-	<input type=hidden name=tagfield value='<!-- TMPL_VAR name="tagfield" -->'>
-	<input type=hidden name=tagsubfield value='<!-- TMPL_VAR name="tagsubfield" -->'>
-	<tr><td colspan=2 align=center>POTWIERDŹ WYMAZANIE</td></tr>
-	<tr><td><input type=submit value="TAK"></form></td><td><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->"><input type=submit value="NIE"></form></td></tr>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="delete_confirmed" -->
-<!---------------------------------------------------------------------------->
+<!-- TMPL_IF NAME="delete_confirmed" -->
+<!-- ------------------------------------------------------------------------ -->
 	Dane wymazane
-	<form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->">
-	<input type=submit value=OK>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
+	<input type="submit" value="OK">
 	</form>
 <!-- /TMPL_IF -->
 
-<!---------------------------------------------------------------------------->
-<!-- TMPL_IF name="else" -->
-<h1>Struktura podpól MARC dla <!-- TMPL_VAR name="tagfield" --></h1>
+<!-- ------------------------------------------------------------------------ -->
+<!-- TMPL_IF NAME="else" -->
+<h1>MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> (framework <!--TMPL_VAR NAME="frameworkcode" -->)</h1>
 <p>Ten ekran pokazuje podpola skojarzone z wybraną etykietą. Można dokonać edycji podpól lub dodawać nowe naciskając edytuj. </p>
 <p>Kolumna <b>pole Koha</b> pokazuje, że podpole jest skorelowane z polem Koha. System potrafi zarządzać interfejsem MARC lub interfejsem Koha. Łącze to zapewnia spójność pomiedzy dwoma bazami. W efekcie można dość łatwo przechodzić z jednego interfejsu do drugiego.</p>
 
-<table border=0 cellspacing=0 cellpadding=2 width="80%">
-<tr valign=top bgcolor=#99cc33>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=5%><b>Podpole</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=30%><b>Etykieta</b></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width=10%><b>Pole Koha</b> <span style="font-size:8;color:red" title="Pole bazy Koha powiÄ…zane z tym podpolem">?</span></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Pow</b> <span style="font-size:8;color:red" title="podpole może być powtórzone (1=tak, 0=nie)">?</span></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Obow</b> <span style="font-size:8;color:red" title="podpole jest obowiÄ…zkowe (1=tak, 0=nie)">?</span></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Zakładka</b> <span style="font-size:8;color:red" title="w której zakładce ma być podpole ukazane (0-9 lub egzemplarz)">?</span></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Zob również</b> <span style="font-size:8;color:red" title="if subfields entered here, searches on this field will also be done on seealso subfields (syntax 200a,300e)">?</span></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Wartości</b> <span style="font-size:8;color:red" title="wartość autoryzowana dla tego podpola">?</span></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Tezaurus</b> <span style="font-size:8;color:red" title="Tezaurus skojarzony z tym podpolem">?</span></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%"><b>Buduj war.</b> <span style="font-size:8;color:red" title="Kreator Wartości">?</span></td>
-	<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="8%">Wymaż</td>
-<!-- TMPL_LOOP name="loop" -->
-<tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
-	<td><!-- TMPL_VAR name="tagsubfield" --></td>
-	<td><!-- TMPL_VAR name="liblibrarian" --></td>
-	<td><!-- TMPL_VAR name="kohafield" --></td>
-	<td><!-- TMPL_IF name="repeatable" -->Tak<!-- TMPL_ELSE -->Nie<!-- /TMPL_IF --></td>
-	<td><!-- TMPL_IF name="mandatory" -->Tak<!-- TMPL_ELSE -->Nie<!-- /TMPL_IF --></td>
-	<td><!-- TMPL_VAR name="tab" --></td>
-	<td><!-- TMPL_VAR name="seealso" --></td>
-	<td><!-- TMPL_VAR name="authorised_value" --></td>
-	<td><!-- TMPL_VAR name="thesaurus_category" --></td>
-	<td><!-- TMPL_VAR name="value_builder" --></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>
+<table>
+<tr>
+	<th>Podpole</th>
+	<th>Text</th>
+	<th>Constraints</th>
+	<th>Wymaż</th>
+<!-- TMPL_LOOP NAME="loop" -->
+<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
+	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
+	<td>
+		<!-- TMPL_IF NAME="subfield_ignored" -->
+			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
+		<!-- TMPL_ELSE -->
+			<!-- TMPL_VAR NAME="liblibrarian" -->
+		<!-- /TMPL_IF -->
+	</td>
+	<td>
+		<!-- TMPL_IF NAME="subfield_ignored" -->
+			<i>subfield ignored</i>
+		<!-- TMPL_ELSE -->
+			Tab :<!-- TMPL_VAR NAME="tab" -->,
+			<!-- TMPL_IF NAME="kohafield" -->Koha field : <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
+			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="link" -->Link:<!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
+		<!-- /TMPL_IF -->
+	</td>
+	<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
-<table width=60%>
-	<tr>
-		<td width="25%"><!-- 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 width="25%"><a href="marctagstructure.pl?searchfield=<!-- TMPL_VAR name="tagfield" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/2uparrow.png" width=32 hspace=0 vspace=0 border=0></a></td>
-		<td width="25%"><!-- TMPL_IF name="previous" --><input type=image src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/1leftarrow.png" title="wstecz" alt="wstecz" border=0></a><!-- /TMPL_IF --></td>
-		<td width="25%"><!-- TMPL_IF name="next" --><!-- TMPL_VAR name="next" --><input type=image src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/1rightarrow.png" title="dalej" alt="dalej" border=0></a><!-- /TMPL_IF --></td>
-	</tr>
-</table>
+<a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;tagfield=<!-- TMPL_VAR NAME="edit_tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="edit_frameworkcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a>
+<a href="marctagstructure.pl?searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
+	<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/2uparrow.png" width="32" hspace="0" vspace="0" border="0">
+</a>
+<!-- TMPL_IF NAME="previous" -->
+	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="wstecz" alt="wstecz" border="0">
+	</a><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="next" -->
+	<!-- TMPL_VAR NAME="next" -->
+		<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="dalej" alt="dalej" border="0">
+	</a>
 <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+</div>
 
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
-</html>

Index: pl/parameters/marctagstructure.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/marctagstructure.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/parameters/marctagstructure.tmpl	17 Apr 2004 16:26:26 -0000	1.3
+++ pl/parameters/marctagstructure.tmpl	7 May 2007 13:55:53 -0000	1.3.10.1
@@ -1,6 +1,8 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<script>
+<div id="mainbloc">
+<h1 class="parameters">MARC tag structure admin for <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->default MARC framework<!-- /TMPL_IF --></h1>
+<script language="javascript" type="text/javascript">
 	function _(s) { return s } // dummy function for gettext
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	function isNotNull(f,noalert) {
@@ -50,109 +52,168 @@
 			alert(alertString2);
 		}
 	}
-	</SCRIPT>
+	</script>
 
-<!-- TMPL_IF name="add_form" -->
-<!---------------------------------------------------------------------------->
-	<h1>
+<!-- TMPL_IF NAME="add_form" -->
+<!-- ------------------------------------------------------------------------ -->
+	<h1 class="parameters">
 	<!-- TMPL_IF NAME="use-heading-flags-p" -->
 	<!-- TMPL_IF NAME="heading-modify-tag-p" -->Zmieniaj etykietÄ™<!-- /TMPL_IF -->
 	<!-- TMPL_IF NAME="heading-add-tag-p" -->Dodaj znacznik<!-- /TMPL_IF -->
-	<!-- TMPL_ELSE --><!-- TMPL_VAR name="action" --><!-- /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'>
-	<table>
-	<tr><td>Etykieta</td><td><!-- TMPL_VAR name="searchfield" --></td></tr>
-	<tr><td>Etykieta dla bibliotekarzy</td><td><input type="text" name="liblibrarian" value='<!-- TMPL_VAR name="liblibrarian" escape=HTML -->' size=80 maxlength=100></td></tr>
-	<tr><td>Etykieta dla czytelników</td><td><input type="text" name="libopac" value='<!-- TMPL_VAR name="libopac" escape=HTML -->' size=80 maxlength=100></td></tr>
-	<tr><td>Powtarzalne</td><td><!-- TMPL_VAR name="repeatable" --></td></tr>
-	<tr><td>ObowiÄ…zkowe</td><td><!-- TMPL_VAR name="mandatory" --></td></tr>
-	<tr><td>Wartość Autoryzowana</td><td><!-- TMPL_VAR name="authorised_value" --> (jeśli wprowadzisz tutaj jakąś wartość to wskaźniki będą ograniczone do listy autoryzowanych wartości)</td></tr>
-	<tr><td>&nbsp;</td><td><INPUT type="button" value='OK' onClick='Check(this.form)'></td></tr>
-	</table>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate">
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+		<p><label>Etykieta<label><!-- TMPL_IF Name="searchfield" -->
+		<!-- TMPL_VAR NAME="searchfield" -->
+		<!-- TMPL_ELSE -->
+		<input type="text" name="tagfield" value="" escape="HTML">
+		<!-- /TMPL_IF -->
+		</p>
+		<p><label>Description for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100"></p>
+		<p><label>Description for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></p>
+		<p><label>Powtarzalne</label><!-- TMPL_VAR NAME="repeatable" --></p>
+		<p><label>ObowiÄ…zkowe</label><!-- TMPL_VAR NAME="mandatory" --></p>
+		<p><label>Wartość Autoryzowana</label><!-- TMPL_VAR NAME="authorised_value" --> (jeśli wprowadzisz tutaj jakąś wartość to wskaźniki będą ograniczone do listy autoryzowanych wartości)</p>
+		<p><label>&nbsp;</label><input type="button" value="OK" class="button" onclick="Check(this.form)"></p>
 	</form>
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF name="delete_confirm" -->
-<!---------------------------------------------------------------------------->
-<table border=0 cellspacing=0 cellpadding=2>
-	<tr valign=top bgcolor=#99cc33>
-		<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>etykieta</b></td>
-		<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR name="searchfield" --></b></td>
+<!-- TMPL_IF NAME="delete_confirm" -->
+<!-- ------------------------------------------------------------------------ -->
+<table>
+	<tr>
+		<td>etykieta</td>
+		<td><!-- TMPL_VAR NAME="searchfield" --></td>
 	</tr>
-	<tr><td>&nbsp;</td><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
-	<form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=hidden name=op value=delete_confirmed><input type=hidden name=searchfield value='<!-- TMPL_VAR name="searchfield" -->'>
-	<tr><td colspan=2 align=center>POTWIERDŹ WYMAZANIE</td></tr>
-	<tr><td><input type=submit value="TAK"></form></td><td><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value="NIE"></form></td></tr>
+	<tr><td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+	<tr><td colspan="2" align="center">POTWIERDŹ WYMAZANIE</td></tr>
+	<tr><td><input type="submit" value="TAK"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NIE"></form></td></tr>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="delete_confirmed" -->
-<!---------------------------------------------------------------------------->
+<!-- TMPL_IF NAME="delete_confirmed" -->
+<!-- ------------------------------------------------------------------------ -->
 	Dane wymazane
-	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-	<input type=submit value=OK>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+	<input type="submit" value="OK">
 	</form>
 <!-- /TMPL_IF -->
-
-<!---------------------------------------------------------------------------->
-<!-- TMPL_IF name="else" -->
-<h1>Struktura Etykiet MARC - zarzÄ…dzanie</h1>
-<b>UWAGA: jeśli zmienisz łącze pomiedzy podpolem MARC oraz nie-MARC poproś administratora by uruchomił skrypt misc/rebuildnonmarc.pl.</b>
-<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-	<input type=text name=searchfield value="">
-	<input type=reset name=reset value="wyczyść">
-</form>
-<!-- TMPL_VAR name="searchfield" -->
-<table border=0 cellspacing=0 cellpadding=2>
-<tr valign=top bgcolor=#99cc33>
-	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Etykieta</b></td>
-	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Etykieta</b></td>
-	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Powtarzalne</b></td>
-	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>ObowiÄ…zkowe</b></td>
-	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Autoryzowana<br />wartość</b></td>
-	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif"><b>Podpola</b></td>
-	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">Edytuj</td>
-	<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">Wymaż</td>
-<!-- TMPL_LOOP name="loop" -->
-<tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
-	<td><b><!-- TMPL_VAR name="tagfield" --></b></td>
-	<td><!-- TMPL_VAR name="liblibrarian" --></td>
-	<td><!-- TMPL_IF name="repeatable" -->Tak<!-- TMPL_ELSE -->Nie<!-- /TMPL_IF --></td>
-	<td><!-- TMPL_IF name="mandatory" -->Tak<!-- TMPL_ELSE -->Nie<!-- /TMPL_IF --></td>
-	<td><!-- TMPL_VAR name="authorised_value" --></td>
-	<td><a href="<!-- TMPL_VAR name="subfield_link" -->">podpola</a></td>
-	<td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
-	<td><a href="<!-- TMPL_VAR name="delete" -->"><img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></a></td>
-</tr>
-<!-- /TMPL_LOOP -->
-<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-<input type=hidden name=op value=add_form>
-</table>
-	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-	<input type=hidden name=op value=add_form>
-<table width=40%>
+<!-- TMPL_IF NAME="framework_create" -->
+<!-- ------------------------------------------------------------------------ -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="framework_create_confirm">
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+		Create framework for <!-- TMPL_VAR NAME="frameworkcode" --> (<!-- TMPL_VAR NAME="frameworktext" -->) using
+		<select name="existingframeworkcode">
+			<option value="">Default</option>
+		<!-- TMPL_LOOP NAME="existingframeworkloop" -->
+			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
+		<!-- /TMPL_LOOP -->
+		</select>
+		<input type="submit" value="OK" class="button">
+	</form>
+<!-- /TMPL_IF -->
+<!-- ------------------------------------------------------------------------ -->
+<!-- TMPL_IF NAME="else" -->
+	<div id="bloc25">
+	<h2 class="parameters">Select a framework</h2>
+	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<select name="frameworkcode">
+			<option value="">Default</option>
+		<!-- TMPL_LOOP NAME="frameworkloop" -->
+                    <!-- TMPL_IF NAME="selected" -->
+			<option value="<!-- TMPL_VAR NAME="value" -->" selected>
+                    <!-- TMPL_ELSE -->
+			<option value="<!-- TMPL_VAR NAME="value" -->" >
+                    <!-- /TMPL_IF -->
+			<!-- TMPL_VAR NAME="frameworktext" --></option>
+		<!-- /TMPL_LOOP -->
+		</select>
+		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+		<input type="submit" value="OK" class="button">
+		<p><!-- TMPL_IF Name="select_display"-->
+				<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" checked OnChange="javascript:document.f.submit()">
+			<!-- TMPL_ELSE -->
+				<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" OnChange="javascript:document.f.submit()">
+			<!--/TMPL_IF --> 
+		</p>
+	</form>
+	<b>UWAGA: jeśli zmienisz łącze pomiedzy podpolem MARC oraz nie-MARC poproś administratora by uruchomił skrypt misc/rebuildnonmarc.pl.</b>
+	</div>
+	<div id="bloc100">
+	<table>
 	<tr>
-		<td width="33%">
-			<input type=submit class="button" value="Dodaj Znacznik" title="Dodaj Znacznik" alt="Dodaj Znacznik">
+			<th>Etykieta</th>
+			<th>Etykieta</th>
+			<th>Powtarzalne</th>
+			<th>ObowiÄ…zkowe</th>
+			<th>Autoryzowana<br />wartość</th>
+			<th>Podpola</th>
+			<th>Edytuj</th>
+			<th>Wymaż</th>
+		<tr>
+	<!-- TMPL_IF NAME="select_display" -->
+		<!-- TMPL_LOOP NAME="loop" -->
+		<tr class="hilighted">
+			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+			<td><!-- TMPL_IF NAME="repeatable" -->Tak<!-- TMPL_ELSE -->Nie<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="mandatory" -->Tak<!-- TMPL_ELSE -->Nie<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">podpola</a></td>
+			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
+			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
+		</tr>
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
+			<td>
+				&nbsp;
+			</td>
+			<td colspan=7 border=0>
+				<!-- TMPL_LOOP NAME="subfields" -->
+					<p><label>&nbsp;</label>
+							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->  <!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
+					</p>
+				<!-- /TMPL_LOOP -->
 		</td>
-		<td width=33%>
-			<!-- TMPL_IF name="isprevpage" -->
-				<a href="<!-- TMPL_VAR name="script_name" -->?offset=<!-- TMPL_VAR name="prevpage" -->&searchfield=<!-- TMPL_VAR name="searchfield" -->">
-				<input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1leftarrow.png" title="wstecz" alt="wstecz" border=0>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	<!-- TMPL_ELSE -->
+		<!-- TMPL_LOOP NAME="loop" -->
+		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
+			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
+			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+			<td><!-- TMPL_IF NAME="repeatable" -->Tak<!-- TMPL_ELSE -->Nie<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="mandatory" -->Tak<!-- TMPL_ELSE -->Nie<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">podpola</a></td>
+			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
+			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	<!--/TMPL_IF -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form">
+	</table>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="add_form">
+	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+		<input type="submit" class="button" value="Dodaj Znacznik" title="Dodaj Znacznik" alt="Dodaj Znacznik">
+		<!-- TMPL_IF NAME="isprevpage" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
+			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="wstecz" alt="wstecz" border="0">
 				</a>
 			<!-- /TMPL_IF -->
-		</td>
-		<td width=33%>
-			<!-- TMPL_IF name="nextpage" -->
-				<a href="<!-- TMPL_VAR name="script_name" -->?offset=<!-- TMPL_VAR name="nextpage" -->&searchfield=<!-- TMPL_VAR name="searchfield" -->">
-					<input type=image src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1rightarrow.png" title="dalej" alt="dalej" border=0>
+		<!-- TMPL_IF NAME="nextpage" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
+				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="dalej" alt="dalej" border="0">
 				</a>
 			<!-- /TMPL_IF -->
-		</td>
-	</tr>
-</table>
 </form>
+</div>
 <!-- /TMPL_IF -->
+
+</div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: pl/parameters/printers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/printers.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/parameters/printers.tmpl	17 Apr 2004 16:57:07 -0000	1.2
+++ pl/parameters/printers.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,7 +1,9 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
-<!-- TMPL_IF NAME=add_form -->
-        <script>
+<div id="mainbloc">
+		<h1>Drukarka - zarzÄ…dzanie</h1>
+	<!-- TMPL_IF NAME="add_form" -->
+			<script language="javascript" type="text/javascript">
 	function _(s) { return s } // dummy function for gettext
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         function isNotNull(f,noalert) {
@@ -54,152 +56,126 @@
                         alert(alertString2);
                 }
         }
-        </SCRIPT>
-
-	<!-- TMPL_IF NAME=searchfield -->
-		<h1>Zmień drukarkę</h1>
+			</script>
+	<div id="bloc25">
+		<!-- TMPL_IF NAME="searchfield" -->
+			<h2 class="parameters">Zmień drukarkę</h2>
 	<!-- TMPL_ELSE -->
-		<h1>Dodaj drukarkÄ™</h1>
+			<h2 class="parameters">Dodaj drukarkÄ™</h2>
 	<!-- /TMPL_IF -->
 
-        <form action='<!-- TMPL_VAR NAME=script_name -->' name=Aform method=post>
-        <input type=hidden name=op value='add_validate'>
-        
-
-	<table>
-
-	<!-- TMPL_IF NAME=searchfield -->
-		<tr>
-			<td>Nazwa Drukarki</td>
-			<td>
-				<input type=hidden name=printername value='<!-- TMPL_VAR NAME=searchfield -->'><!-- TMPL_VAR NAME=searchfield -->
-			</td>
-		</tr>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+				<input type="hidden" name="op" value="add_validate">
+				<!-- TMPL_IF NAME="searchfield" -->
+						<p><label>Nazwa Drukarki</label><input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" --></p>
 	<!-- TMPL_ELSE -->
-		<tr>
-			<td>Nazwa Drukarki</td>
-			<td>
-				<input type=text name=printername size=50 maxlength=50>
-			</td>
-		</tr>
+						<p><label>Nazwa Drukarki</label><input type="text" name="printername" size="50" maxlength="50"></p>
 	<!-- /TMPL_IF -->
-
-        	<tr>
-			<td>Kolejka</td>
-			<td><input type=text name=printqueue size=50 maxlength=50 value='<!-- TMPL_VAR NAME=printqueue -->'> </td>
-		</tr>
-        	<tr>
-			<td>Typ</td>
-			<td><input type=text name=printtype size=50 maxlength=50 value='<!-- TMPL_VAR NAME=printtype -->'> </td>
-		</tr>
-        	<tr>
-			<td> </td>
-			<td><INPUT type=button value='OK' onClick='Check(this.form)'></td>
-		</tr>
-        </table>
+				<p><label>Kolejka</label><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->"> </p>
+				<p><label>Typ</label><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->"> </p>
+				<p><input type="button" value="OK" onclick="Check(this.form)" class="button"></p>
         </form>
+	</div>
+	<!-- /TMPL_IF -->
 
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME=add_validate -->
+	<!-- TMPL_IF NAME="add_validate" -->
 	Dane zapisane
-        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-        <input type=submit value=OK>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="OK" class="button">
         </form>
-<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=delete_confirm -->
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr bgcolor='#99cc33'>
-			<td background='/images/background-mem.gif'><b>Drukarka</b></td>
-			<td background='/images/background-mem.gif'><b><!-- TMPL_VAR NAME=searchfield --></b></td>
+	<!-- TMPL_IF NAME="delete_confirm" -->
+		<table border="0" cellspacing="0" cellpadding="5">
+			<tr bgcolor="#99cc33">
+				<td background="/images/background-mem.gif"><b>Drukarka</b></td>
+				<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
 		</tr>
 
-        	<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-			<input type=hidden name=op value=delete_confirmed>
-			<input type=hidden name=searchfield value='<!-- TMPL_VAR NAME=searchfield -->'>
+				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="op" value="delete_confirmed">
+				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
         
 		<tr>
 			<td>Kolejka</td>
-			<td><!-- TMPL_VAR NAME=printqueue --></td>
+				<td><!-- TMPL_VAR NAME="printqueue" --></td>
 		</tr>
         	<tr>
 			<td>Typ</td>
-			<td><!-- TMPL_VAR NAME=printtype --></td>
+				<td><!-- TMPL_VAR NAME="printtype" --></td>
 		</tr>
         	<tr>
-			<td colspan=2 align=center>POTWIERDŹ WYMAZANIE</td>
+				<td colspan="2" align="center">POTWIERDŹ WYMAZANIE</td>
 		</tr>
         	<tr>
 			<td>
-				<input type=submit value="TAK">
+					<input type="submit" value="TAK">
 				</form>
 			</td>
 			<td>
-				<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-				<input type=submit value="NIE">
+					<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="submit" value="NIE">
 				</form>
 			</td>
 		</tr>
 	</table>
-<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=delete_confirmed -->
+	<!-- TMPL_IF NAME="delete_confirmed" -->
 	Dane wymazane
-	<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-		<input type=submit value=OK>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="OK">
+		</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="else" -->
+			<form action="<!-- TMPL_VAR NAME="script_name">" method="post">
+					<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+					<input type="reset" name="reset" value="wyczyść">
 	</form>
-<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=else -->
-	<h2>Drukarka - zarzÄ…dzanie</h2>
-        <form action='<TMP_VAR NAME=script_name>' method=post>
-                <input type=text name=description value=<!-- TMPL_VAR NAME=searchfield -->>
-                <input type=reset name=reset value="wyczyść">
-        </form>
-
-	<!-- TMPL_IF NAME=searchfield -->
-		Szukano <b><!-- TMPL_VAR NAME=searchfield --></b>
-	<!-- /TMPL_IF -->
-
-	<table border=0 cellspacing=0 cellpadding=5>
-		<tr bgcolor='#99cc33'>
-			<td background='/images/background-mem.gif'><b>Nazwa</b></td>
-			<td background='/images/background-mem.gif'><b>Kolejka</b></td>
-			<td background='/images/background-mem.gif'><b>Typ</b></td>
-			<td background='/images/background-mem.gif'> </td>
-			<td background='/images/background-mem.gif'> </td>
-		</tr>
-		<!-- TMPL_LOOP NAME=loop -->
-		<tr bgcolor="<!-- TMPL_VAR NAME=toggle -->">
-			<td><!-- TMPL_VAR NAME=printername --></td>
-			<td><!-- TMPL_VAR NAME=printqueue --></td>
-			<td><!-- TMPL_VAR NAME=printtype --></td>
-			<td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&searchfield=<!-- TMPL_VAR NAME=printername -->">Edytuj</a></td>
-                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&searchfield=<!-- TMPL_VAR NAME=printername -->">Wymaż</a></td>
+		<!-- TMPL_IF NAME="searchfield" -->
+			Szukano <b><!-- TMPL_VAR NAME="searchfield" --></b>
+		<!-- /TMPL_IF -->
+	
+		<table border="0" cellspacing="0" cellpadding="5">
+			<tr bgcolor="#99cc33">
+				<td background="/images/background-mem.gif"><b>Nazwa</b></td>
+				<td background="/images/background-mem.gif"><b>Kolejka</b></td>
+				<td background="/images/background-mem.gif"><b>Typ</b></td>
+				<td background="/images/background-mem.gif"> </td>
+				<td background="/images/background-mem.gif"> </td>
+			</tr>
+			<!-- TMPL_LOOP NAME="loop" -->
+			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+				<td><!-- TMPL_VAR NAME="printername" --></td>
+				<td><!-- TMPL_VAR NAME="printqueue" --></td>
+				<td><!-- TMPL_VAR NAME="printtype" --></td>
+				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Edytuj</a></td>
+							<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Wymaż</a></td>
 		</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
 
-	<form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-        <input type=hidden name=op value=add_form>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_form">
 	
-	<!-- TMPL_IF NAME=offsetgtzero -->
-		<a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=prevpage -->">&lt;&lt; Wstecz</a>
+		<!-- TMPL_IF NAME="offsetgtzero" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Wstecz</a>
 	<!-- /TMPL_IF -->
 
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
-	<!-- TMPL_IF NAME=ltcount -->
-		<a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">Dalej &gt;&gt;</a>	
+		<!-- TMPL_IF NAME="ltcount" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Dalej &gt;&gt;</a>	
 	<!-- /TMPL_iF -->
 
         <br>
-	<input type=submit class="button" value="Dodaj drukarkÄ™" alt="Dodaj drukarkÄ™">
+		<input type="submit" class="button" value="Dodaj drukarkÄ™" alt="Dodaj drukarkÄ™">
 	<br>
         </form>
 
-<!-- /TMPL_IF -->
-
+	<!-- /TMPL_IF -->
+</div>
 
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: pl/parameters/stopwords.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/stopwords.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/parameters/stopwords.tmpl	17 Apr 2004 16:57:07 -0000	1.2
+++ pl/parameters/stopwords.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
-
-<!-- TMPL_IF NAME=add_form -->
-        <script>
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="add_form" -->
+		<script language="javascript" type="text/javascript">
 	function _(s) { return s } // dummy function for gettext
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         function isNotNull(f,noalert) {
@@ -51,126 +51,95 @@
                         alert(alertString2);
                 }
         }
-        </SCRIPT>
+			</script>
 
-        <!-- TMPL_IF NAME=searchfield -->
+			<!-- TMPL_IF NAME="searchfield" -->
                 <h1>Zmieniaj słowo</h1>
         <!-- TMPL_ELSE -->
                 <h1>Dodaj słowo</h1>
         <!-- /TMPL_IF -->
-        <form action="<!-- TMPL_VAR NAME=script_name -->" name=Aform method=post>
-        <input type=hidden name=op value='add_validate'>
-         
-        <table>
-        
-        <!-- TMPL_IF NAME=searchfield -->
-                <tr>
-                        <td>SÅ‚owo</td>
-                        <td>
-                                <input type=hidden name=word value='<!-- TMPL_VAR NAME=searchfield -->'><!-- TMPL_VAR NAME=searchfield -->
-                        </td>
-                </tr>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+			<input type="hidden" name="op" value="add_validate">
+			<!-- TMPL_IF NAME="searchfield" -->
+				<p>
+					<label>SÅ‚owo</label>
+					<label>
+						<input type="hidden" name="word" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
+					</label>
+				</p>
         <!-- TMPL_ELSE -->
-                <tr>
-                        <td>SÅ‚owo</td>
-                        <td>
-                                <input type=text name=word size=80 maxlength=250 onBlur=toUC(this)>
-                        </td>
-                </tr>
+				<p>
+					<label>SÅ‚owo</label>
+					<input type="text" name="word" size="80" maxlength="250" onblur="toUC(this)">
+				</p>
         <!-- /TMPL_IF -->
-                <tr>
-                        <td> </td>
-                        <td><INPUT type=button value='OK' onClick='Check(this.form)'></td>
-                </tr>
-        </table>
+					<p>
+						<td><input type="button" value="OK" onclick="Check(this.form)" class="button"></td>
+					</p>
         </form>
-<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=add_validate -->
+	<!-- TMPL_IF NAME="add_validate" -->
         Dane zapisane
-        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-        <input type=submit value=OK>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="OK">
         </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME=delete_confirm -->
-        <table border=0 cellspacing=0 cellpadding=5>
-                <tr bgcolor='#99cc33'>
-                        <td background='/images/background-mem.gif'><b>SÅ‚owo</b></td>
-                        <td background='/images/background-mem.gif'><b><!-- TMPL_VAR NAME=searchfield --></b></td>
-                </tr>
-
-                <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-                        <input type=hidden name=op value=delete_confirmed>
-                        <input type=hidden name=searchfield value='<!-- TMPL_VAR NAME=searchfield -->'>
+	<!-- /TMPL_IF -->
 
-                <tr>
-                        <td colspan=2 align=center>POTWIERDŹ WYMAZANIE</td>
-                </tr>
-                <tr>
-                        <td>
-                                <input type=submit value="TAK">
+	<!-- TMPL_IF NAME="delete_confirm" -->
+		<p>CONFIRM DELETION of <!-- TMPL_VAR NAME="searchfield" --></p>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="delete_confirmed">
+			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+			<input type="submit" value="TAK" class="button">
                                 </form>
-                        </td>
-                        <td>
-                                <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-                                        <input type=submit value="NIE">
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="NIE" class="button">
                                 </form>
-                        </td>
-                </tr>
-	</table>
-<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=delete_confirmed -->
+	<!-- TMPL_IF NAME="delete_confirmed" -->
         Dane wymazane
-        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-                <input type=submit value=OK>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="submit" value="OK" class="button">
         </form>
-<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=else -->
-        <h2>SÅ‚owa pomijane - zarzÄ…dzanie</h2>
+	<!-- TMPL_IF NAME="else" -->
+		<h1 class="parameters">SÅ‚owa pomijane - zarzÄ…dzanie</h1>
 	<b>UWAGA: jeśli zmienisz coś w tej tablicy, poproś administratora, aby uruchomił skrypt misc/rebuildnomarc.pl.</b>
-        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-                <input type=text name=searchfield value=<!-- TMPL_VAR NAME=searchfield -->>
-                <input type=reset name=reset value="wyczyść">
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+					<input type="submit" name="ok" value="OK" class="button">
         </form>
 
-        <!-- TMPL_IF NAME=searchfield -->
-                Szukano <b><!-- TMPL_VAR NAME=searchfield --></b>
+			<!-- TMPL_IF NAME="searchfield" -->
+					Szukano <b><!-- TMPL_VAR NAME="searchfield" --></b>
         <!-- /TMPL_IF -->
 
-        <table border=0 cellspacing=0 cellpadding=5>
-                <tr bgcolor='#99cc33'>
-                        <td background='/images/background-mem.gif'><b>SÅ‚owo</b></td>
-                        <td background='/images/background-mem.gif'> </td>
+			<table class="small">
+				<tr>
+					<th>SÅ‚owo</th>
+					<th> </th>
                 </tr>
-                <!-- TMPL_LOOP NAME=loop -->
-                <tr bgcolor="<!-- TMPL_VAR NAME=toggle -->">
-                        <td><!-- TMPL_VAR NAME=word --></td>
-                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&searchfield=<!-- TMPL_VAR NAME=word -->">Wymaż</a></td>
+				<!-- TMPL_LOOP NAME="loop" -->
+					<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+						<td><!-- TMPL_VAR NAME="word" --></td>
+						<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="word" -->" class="button">Wymaż</a></td>
                 </tr>
                 <!-- /TMPL_LOOP -->
         </table>
-
-        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-        <input type=hidden name=op value=add_form>
-
-        <!-- TMPL_IF NAME=offsetgtzero -->
-                <a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=prevpage -->">&lt;&lt; Wstecz</a>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="op" value="add_form">
+				<!-- TMPL_IF NAME="offsetgtzero" -->
+						<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->" class="button">&lt;&lt; Wstecz</a>
         <!-- /TMPL_IF -->
-
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-
-        <!-- TMPL_IF NAME=ltcount -->
-                <a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">Dalej &gt;&gt;</a>
+				<!-- TMPL_IF NAME="ltcount" -->
+					<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->" class="button">Dalej &gt;&gt;</a>
         <!-- /TMPL_iF -->
-
-        <br>
-        <input type=submit class="button" value="Dodaj SÅ‚owa Wykluczone" alt="Dodaj SÅ‚owa Wykluczone">
-        <br>
+				<input type="submit" class="button" value="Dodaj SÅ‚owa Wykluczone" alt="Dodaj SÅ‚owa Wykluczone">
         </form>
-<!-- /TMPL_IF -->
-
+	<!-- /TMPL_IF -->
+</div>
 
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: pl/parameters/systempreferences.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/systempreferences.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -u -b -r1.3 -r1.3.10.1
--- pl/parameters/systempreferences.tmpl	17 Apr 2004 16:26:26 -0000	1.3
+++ pl/parameters/systempreferences.tmpl	7 May 2007 13:55:53 -0000	1.3.10.1
@@ -55,92 +55,202 @@
 		}
 		</script>
 	
-	<!-- TMPL_IF name="add_form" -->
+	<!-- TMPL_IF NAME="add_form" -->
 	
-		<!-- TMPL_IF NAME=modify -->
+		<!-- TMPL_IF NAME="modify" -->
 			<h1>Zmień którąś z preferencji</h1>
 		<!-- TMPL_ELSE -->
 			<h1>Dodaj preferencje systemowe</h1>
 		<!-- /TMPL_IF -->
-		<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		<div id="bloc25">
+			<h2 class="parameters"><input type="text" name="explanation" size="60" value="<!-- TMPL_VAR NAME="explanation" escape="HTML" -->"></h2>
 		<input type="hidden" name="op" value="add_validate">
+			<p>
 		<!-- TMPL_IF NAME="searchfield" -->
-			<label>Zmienna</label><!-- TMPL_VAR name="searchfield" -->
-				<input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->">
+				<label>Zmienna</label><!-- TMPL_VAR NAME="searchfield" --><input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->">
 		<!-- TMPL_ELSE -->
 			<label>Zmienna</label><input type="text" name="variable" size="60">
 		<!-- /TMPL_IF -->
-		<p><label>Wartość</label><input type="text" name="value" value="<!-- TMPL_VAR name="value" escape="HTML" -->" size="100"></p>
-		<p><label>Wyjaśnienie</label><input type="text" name="explanation" size="60" value="<!-- TMPL_VAR name="explanation" escape="HTML" -->"></p>
-		<p><label>&nbsp;</label><INPUT type="button" value="OK" class="button" onclick="Check(this.form)"></p>
+			</p>
+			<p><label>Wartość</label>
+				<!-- TMPL_IF NAME="type-free" -->
+					<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" escape="HTML" -->" size="<!-- TMPL_VAR NAME="fieldlength" -->">
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="type-textarea" -->
+					<textarea name="value" rows="<!--TMPL_VAR NAME="rows" -->" cols="<!-- TMPL_VAR NAME="cols" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="type-choice" -->
+					<select name="value">
+						<!-- TMPL_LOOP NAME="options" -->
+							<option value="<!-- TMPL_VAR NAME="option" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="option" --></option>
+						<!-- /TMPL_LOOP -->
+					</select>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="type-yesno" -->
+					<input type="radio" name="value" value="1"<!-- TMPL_IF NAME="value-yes" --> checked<!-- /TMPL_IF -->>Tak <input type="radio" name="value" value="0"<!-- TMPL_IF NAME="value-no" --> checked<!-- /TMPL_IF -->>Nie
+				<!-- /TMPL_IF -->
+	
+			</p>
+			<p><label>&nbsp;</label><input type="submit" value="OK" class="button"></p>
+		</div>
+		<div id="bloc25">
+			<h2 class="parameters">Koha internal (you should have no reasons to modify the following default values)</h2>
+			<p>Variable type: <input type="text" name="preftype" value="<!--TMPL_VAR NAME="preftype" -->" size="40" maxlength="40"> (Choice, YesNo,Integer,Textarea,Float,Themes,Languages)</p>
+			Variable options :<input type="text" name="prefoptions" value="<!-- TMPL_VAR NAME="prefoptions" -->" size="80" maxlength="80"> (choice list for Choice (separated by |) and cols|rows for Texarea)
+		</div>
 		</form>
 	<!-- /TMPL_IF -->
 	
-	<!-- TMPL_IF name="add_validate" -->
+	<!-- TMPL_IF NAME="add_validate" -->
 	
 		Dane zapisane
-		<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<input type="submit" value="OK">
 		</form>
 	<!-- /TMPL_IF -->
 	
-	<!-- TMPL_IF name="delete_confirm" -->
+	<!-- TMPL_IF NAME="delete_confirm" -->
 	
 	<table border="0" cellspacing="0" cellpadding="2">
 		<tr valign="top" bgcolor="#99cc33">
-			<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Zmienna</b></td>
-			<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="searchfield" --></b></td>
+			<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Zmienna</b></td>
+			<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
 		</tr>
-		<tr><td>Wartość</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
-		<form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->">
+		<tr><td>Wartość</td><td><!-- TMPL_VAR NAME="Tvalue" --></td></tr>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
 		<tr><td colspan="2" align="center">POTWIERDŹ WYMAZANIE</td></tr>
-		<tr><td><input type="submit" value="TAK"></form></td><td><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="NIE"></form></td></tr>
+		<tr><td><input type="submit" value="TAK"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NIE"></form></td></tr>
 	</table>
 	
 	<!-- /TMPL_IF -->
 	
-	<!-- TMPL_IF name="delete_confirmed" -->
+	<!-- TMPL_IF NAME="delete_confirmed" -->
 	
 		Dane wymazane
-		<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<input type="submit" value="OK">
 		</form>
 	<!-- /TMPL_IF -->
 	
-	<!-- TMPL_IF name="else" -->
+	<!-- TMPL_IF NAME="else" -->
 	<h1>Zmiany preferencji systemowych</h1>
-	<form action="/cgi-bin/koha/admin/systempreferences.pl" method="post">
-		<input type="text" name="searchfield" value="">
-		<input type="reset" name="reset" value="wyczyść">
-	</form>
-	<!-- TMPL_VAR name="searchfield" -->
-	<table border="0" cellspacing="0" cellpadding="2">
-	<tr valign="top" bgcolor="#99cc33">
-		<th>Zmienna</th>
-		<th>Wartość</th>
-		<th colspan=3>Wyjaśnienie</th>
+	<table>
+		<tr>
+			<td>
+				<!--TMPL_IF Name="Admin"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin" class="button">Admin
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="Acquisitions"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions" class="button">Gromadzenie
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Gromadzenie
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="Authorities"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities" class="button">Authorities
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="Librarian"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet" class="button">Intranet
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet">Intranet
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="Catalogue"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="button">Katalog
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Katalog
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="Circulation"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation" class="button">Cyrkulacja
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Cyrkulacja
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="Members"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="button">Czytelnicy
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Czytelnicy
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="OPAC"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC" class="button">OPAC
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC
+					</a>
+				<!--/TMPL_IF-->
+			</td>
+			<td>
+				<!--TMPL_IF Name="Others"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=" class="button">Others
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others
+					</a>
+				<!--/TMPL_IF-->
+			</td>
 	</tr>
-	<!-- TMPL_LOOP name="loop" -->
-	<tr valign="top" bgcolor="<!-- TMPL_VAR name="bgcolor" -->">
-		<td><!-- TMPL_VAR name="variable" --></td>
-		<td><!-- TMPL_VAR name="value" --></td>
-		<td><!-- TMPL_VAR name="explanation" --></td>
-		<td><a href="<!-- TMPL_VAR name="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"><br>Edytuj</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"><br>Wymaż</a></td>
+	</table>
+	<table>
+	<!-- TMPL_LOOP NAME="loop" -->
+		<!-- TMPL_IF NAME="toggle" -->
+			<tr valign="top" class="hilighted">
+		<!-- TMPL_ELSE -->
+			<tr valign="top">
+		<!-- /TMPL_IF -->
+		<td>
+			<p><b><!-- TMPL_VAR NAME="variable" -->:</b> <!-- TMPL_VAR NAME="value" --></p>
+			<p align="right"><i>(<!-- TMPL_VAR NAME="explanation" -->)</i></p>
+		</td>
+		<td>
+			<p><a href="<!-- TMPL_VAR NAME="edit" -->" class="button parameters">Zmień</a></p>
+		</td>
+		<td>
+			<p><a href="<!-- TMPL_VAR NAME="delete" -->" class="button parameters">Wymaż</a></p>
+		</td>
 	</tr>
 	<!-- /TMPL_LOOP -->
-	<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 	<input type="hidden" name="op" value="add_form">
 	</table>
 	<table width="40%">
 		<tr>
-			<td width="50%"><!-- TMPL_VAR name="previous" --></td>
-			<td width="50%"><!-- TMPL_VAR name="next" --></td>
+			<td width="50%"><!-- TMPL_VAR NAME="previous" --></td>
+			<td width="50%"><!-- TMPL_VAR NAME="next" --></td>
 		</tr>
 	</table>
 	</form>
 	
-	<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 		<input type="hidden" name="op" value="add_form">
 		<input type="submit" class="button" value="Dodaj Preferencje Systemowe">
 	</form>

Index: pl/parameters/thesaurus.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/thesaurus.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/parameters/thesaurus.tmpl	17 Apr 2004 16:26:26 -0000	1.2
+++ pl/parameters/thesaurus.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,100 +1,100 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
-
-<!-- TMPL_IF name="detail_form" -->
-	<!-------------------------------------------------------------------->
-	<font SIZE=6><em>ZarzÄ…dzanie Tezaurusem</em></font><br />
-	<table border=0 cellspacing=0 cellpadding=2>
-	<tr valign=top bgcolor=#99cc33>
-		<td  background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Wartości odnoszące się do <!-- TMPL_VAR name="stdlib" --> (<!-- TMPL_VAR name="category" -->)</b></td>
+<div id="mainbloc">
+<!-- TMPL_IF NAME="detail_form" -->
+	<!-- ---------------------------------------------------------------- -->
+	<font size="6"><em>ZarzÄ…dzanie Tezaurusem</em></font><br />
+	<table border="0" cellspacing="0" cellpadding="2">
+	<tr valign="top" bgcolor="#99cc33">
+		<td  background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Wartości odnoszące się do <!-- TMPL_VAR NAME="stdlib" --> (<!-- TMPL_VAR NAME="category" -->)</b></td>
 	</tr>
 	</table>
 	<br/><br/>
-	<table border=0 cellspacing=0 cellpadding=2>
-	<tr valign=top bgcolor=#99cc33>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Inne formy</b></td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif">&nbsp;</td>
-	<!-- TMPL_LOOP name="loop" -->
-	</tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
-		<td><!-- TMPL_VAR name="freelib" --></td>
-		<td><a href="<!-- TMPL_VAR name="edit" -->">Edytuj</a></td>
-		<td><a href="<!-- TMPL_VAR name="delete" -->">Wymaż</a></td>
+	<table border="0" cellspacing="0" cellpadding="2">
+	<tr valign="top" bgcolor="#99cc33">
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Inne formy</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">&nbsp;</td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif">&nbsp;</td>
+	<!-- TMPL_LOOP NAME="loop" -->
+	</tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
+		<td><!-- TMPL_VAR NAME="freelib" --></td>
+		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edytuj</a></td>
+		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Wymaż</a></td>
 	</tr>
 	<!-- /TMPL_LOOP -->
-	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-	<input type=hidden name=op value=add_form>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form">
 	</table>
-	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 	<input type="hidden" name="op" value="add_form">
-	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
-	<input type="hidden" name="stdlib" value="<!-- TMPL_VAR name="stdlib" -->">
-	<br><input type=image src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png" title="Dodaj wpis tezaurusa" alt="Dodaj" border=0><br>
+	<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
+	<input type="hidden" name="stdlib" value="<!-- TMPL_VAR NAME="stdlib" -->">
+	<br><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" title="Dodaj wpis tezaurusa" alt="Dodaj" border="0"><br>
 	</form>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF name="add_form" -->
-<!---------------------------------------------------------------------------->
-<H1><!-- TMPL_IF name="search_category" -->Zmień<!-- TMPL_ELSE -->Dodaj<!-- /TMPL_IF --></H1>
-	<form action='<!-- TMPL_VAR name="script_name" -->' name=Aform method=post>
-	<!-- TMPL_IF name="search_category" -->
-		<input type=hidden name=op value='mod_validate'>
+<!-- TMPL_IF NAME="add_form" -->
+<!-- ------------------------------------------------------------------------ -->
+<h1><!-- TMPL_IF NAME="search_category" -->Zmień<!-- TMPL_ELSE -->Dodaj<!-- /TMPL_IF --></h1>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+	<!-- TMPL_IF NAME="search_category" -->
+		<input type="hidden" name="op" value="mod_validate">
 	<!-- TMPL_ELSE -->
-		<input type=hidden name=op value='add_validate'>
+		<input type="hidden" name="op" value="add_validate">
 	<!-- /TMPL_IF -->
-	<table cellpadding=3 cellspacing=3>
+	<table cellpadding="3" cellspacing="3">
 	<tr>
 		<td>Kategoria</td>
-		<td><!-- TMPL_VAR name="category" --></td>
+		<td><!-- TMPL_VAR NAME="category" --></td>
 	</tr>
 	<tr>
 		<td>Etykieta HW</td>
-		<!-- TMPL_IF name="id" -->
-			<td><!-- TMPL_VAR name="father" --><!-- TMPL_VAR name="stdlib" --><input type="hidden" name="stdlib" value="<!-- TMPL_VAR name="stdlib" -->" ></td>
+		<!-- TMPL_IF NAME="id" -->
+			<td><!-- TMPL_VAR NAME="father" --><!-- TMPL_VAR NAME="stdlib" --><input type="hidden" name="stdlib" value="<!-- TMPL_VAR NAME="stdlib" -->" ></td>
 		<!-- TMPL_ELSE -->
-			<td><!-- TMPL_VAR name="father" --><input type="text" name="stdlib" value="<!-- TMPL_VAR name="stdlib" escape=HTML -->" maxlength="80" size="80"></td>
+			<td><!-- TMPL_VAR NAME="father" --><input type="text" name="stdlib" value="<!-- TMPL_VAR NAME="stdlib" escape=HTML -->" maxlength="80" size="80"></td>
 		<!-- /TMPL_IF -->
 	</tr>
 	<tr>
 		<td>Inne etykiety</td>
-		<td><!-- TMPL_VAR name="father" --><input type="text" name="freelib" value="<!-- TMPL_VAR name="freelib" escape=HTML -->" maxlength="80" size="80"></td>
+		<td><!-- TMPL_VAR NAME="father" --><input type="text" name="freelib" value="<!-- TMPL_VAR NAME="freelib" escape=HTML -->" maxlength="80" size="80"></td>
 	</tr>
 	<tr>
 		<td>&nbsp;</td>
-		<td><input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->">
-			<input type="hidden" name="father" value="<!-- TMPL_VAR name="father" escape=HTML -->">
-			<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" escape=HTML -->">
-			<input type="hidden" name="search_category" value="<!-- TMPL_VAR name="search_category" -->">
-			<input type="hidden" name="searchstring" value="<!-- TMPL_VAR name="searchstring" escape=HTML -->">
-			<input type="hidden" name="offset" value="<!-- TMPL_VAR name="offset" -->">
-			<INPUT type="submit" value='OK'></td>
+		<td><input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->">
+			<input type="hidden" name="father" value="<!-- TMPL_VAR NAME="father" escape=HTML -->">
+			<input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" escape=HTML -->">
+			<input type="hidden" name="search_category" value="<!-- TMPL_VAR NAME="search_category" -->">
+			<input type="hidden" name="searchstring" value="<!-- TMPL_VAR NAME="searchstring" escape=HTML -->">
+			<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="offset" -->">
+			<input type="submit" value="OK"></td>
 	</tr>
 	</table>
 	</form>
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF name="delete_confirm" -->
-<!---------------------------------------------------------------------------->
-	<table border=0 cellspacing=0 cellpadding=2>
-		<tr valign=top bgcolor=#99cc33>
-			<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Etykieta</b></td>
-			<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="search_category" --></b></td>
+<!-- TMPL_IF NAME="delete_confirm" -->
+<!-- ------------------------------------------------------------------------ -->
+	<table border="0" cellspacing="0" cellpadding="2">
+		<tr valign="top" bgcolor="#99cc33">
+			<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Etykieta</b></td>
+			<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR NAME="search_category" --></b></td>
 		</tr>
-		<tr><td>Wartość</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
+		<tr><td>Wartość</td><td><!-- TMPL_VAR NAME="Tvalue" --></td></tr>
 		<tr><td>
-			<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-				<input type=hidden name=op value=delete_confirmed>
-				<input type=hidden name=id value='<!-- TMPL_VAR name="id" -->'>
-				<input type="hidden" name="search_category" value="<!-- TMPL_VAR name="search_category" -->">
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="op" value="delete_confirmed">
+				<input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->">
+				<input type="hidden" name="search_category" value="<!-- TMPL_VAR NAME="search_category" -->">
 		</tr></td>
-		<tr><td colspan=2 align=center>POTWIERDŹ WYMAZANIE tego wpisu <b>oraz wszystkie wpisy zależne od tego </b></td></tr>
-		<tr><td><input type=submit value="TAK"></form></td>
-				<td><form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value="NIE"></form></td></tr>
+		<tr><td colspan="2" align="center">POTWIERDŹ WYMAZANIE tego wpisu <b>oraz wszystkie wpisy zależne od tego </b></td></tr>
+		<tr><td><input type="submit" value="TAK"></form></td>
+				<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NIE"></form></td></tr>
 	</table>
 <!-- /TMPL_IF -->
 
-<!---------------------------------------------------------------------------->
-<!-- TMPL_IF name="else" -->
+<!-- ------------------------------------------------------------------------ -->
+<!-- TMPL_IF NAME="else" -->
 	<h1>ZarzÄ…dzanie Tezaurusem</h1>
 	<p>Zarządzanie tezaurusem i kartoteką haseł wzorcowych.<br />
 	<ul>
@@ -102,54 +102,50 @@
 		<b>Related</b>: zobacz inne formy tego wpisu HW</p>
 	</ul>
 	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="post">
-		<!-- TMPL_VAR name="tab_list" -->
-		<input type="text" name="searchstring" value="<!-- TMPL_VAR name="searchstring" -->">
-		<input type="submit" value="OK">
-		<a href="thesaurus.pl?op=add_form">Nowa kategoria...</a>
+		<!-- TMPL_VAR NAME="tab_list" -->
+		<input type="text" name="searchstring" value="<!-- TMPL_VAR NAME="searchstring" -->">
+		<input type="submit" value="OK" class="button parameters">
+		<a href="thesaurus.pl?op=add_form" class="button parameters">Nowa kategoria...</a>
 	</form>
-	<!-- TMPL_LOOP name="hierarchy_loop" -->
-		<a href="thesaurus.pl?branch=<!-- TMPL_VAR name="branch" -->&search_category=<!-- TMPL_VAR name="category" -->"><!-- TMPL_VAR name="string" --></a><br />
+	<!-- TMPL_LOOP NAME="hierarchy_loop" -->
+		<a href="thesaurus.pl?branch=<!-- TMPL_VAR NAME="branch" -->&amp;search_category=<!-- TMPL_VAR NAME="category" -->"><!-- TMPL_VAR NAME="string" --></a><br />
 	<!-- /TMPL_LOOP -->
-	<table border=0 cellspacing=0 cellpadding=0>
-	<tr valign=top bgcolor=#99cc33>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="5%">&nbsp;</td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Wyrażenie dowolne</b></td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>HW</b></td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="5%"><b>Głębsze</b></td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="10%"><b>Pokrewne</b></td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="5%"><b>Edytuj</b></td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif" width="5%"><b>Wymaż</b></td>
-	<!-- TMPL_LOOP name="loop" -->
-	</tr valign=top bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
+	<table border="0" cellspacing="0" cellpadding="0">
+	<tr valign="top" bgcolor="#99cc33">
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" width="5%">&nbsp;</td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Wyrażenie dowolne</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>HW</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" width="5%"><b>Głębsze</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" width="10%"><b>Pokrewne</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" width="5%"><b>Edytuj</b></td>
+		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif" width="5%"><b>Wymaż</b></td>
+	<!-- TMPL_LOOP NAME="loop" -->
+	</tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
 		<td>&nbsp;</td>
-		<td><!-- TMPL_VAR name="freelib" --></td>
-		<td><!-- TMPL_VAR name="father" --> <!-- TMPL_VAR name="stdlib" --></td>
-		<td><!-- TMPL_VAR name="dig" -->Głębsze</a>&nbsp;&nbsp;</td>
-		<td><!-- TMPL_VAR name="related" -->Pokrewne</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><!-- TMPL_VAR NAME="freelib" --></td>
+		<td><!-- TMPL_VAR NAME="father" --> <!-- TMPL_VAR NAME="stdlib" --></td>
+		<td><!-- TMPL_VAR NAME="dig" -->Głębsze</a>&nbsp;&nbsp;</td>
+		<td><!-- TMPL_VAR NAME="related" -->Pokrewne</a></td>
+		<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
+		<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
 	</tr>
 	<!-- /TMPL_LOOP -->
-	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-	<input type=hidden name=op value=add_form>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form">
 	</table>
-	<br/>
-	<table width=40% height="80">
-		<tr>
-			<td width=50%><a href="<!-- TMPL_VAR name="previous" -->" class="button">Wstecz</a></td>
-			<td width=50%><a href="<!-- TMPL_VAR name="next" -->" class="button"> Dalej</a></td>
+	<p>
+		<a href="<!-- TMPL_VAR NAME="previous" -->" class="button parameters">Previous</a>  <a href="<!-- TMPL_VAR NAME="next" -->" class="button parameters"> Next</a>
 		</tr>
-	</table>
-	<br/>
-	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
+	</p>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
 	<input type="hidden" name="op" value="add_form">
-	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
-	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->">
-	<input type="hidden" name="father" value="<!-- TMPL_VAR name="father" -->">
-	<br><input type=submit class="button" value="Dodaj" title="Dodaj Element Tezaurusa" alt="Dodaj Element Tezaurusa"><br>
+	<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" -->">
+	<br><input type="submit" class="button" value="Dodaj" title="Dodaj Element Tezaurusa" alt="Dodaj Element Tezaurusa"><br>
 	</form>
 
 
 <!-- /TMPL_IF -->
-
+</div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: pl/parameters/z3950servers.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/parameters/Attic/z3950servers.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/parameters/z3950servers.tmpl	17 Apr 2004 17:05:56 -0000	1.2
+++ pl/parameters/z3950servers.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
-
-<!-- TMPL_IF NAME=add_form -->
-        <script>
+<div id="mainbloc">
+	<!-- TMPL_IF NAME="add_form" -->
+		<script language="javascript" type="text/javascript">
 	function _(s) { return s } // dummy function for gettext
         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         function isNotNull(f,noalert) {
@@ -69,221 +69,176 @@
                         alert(alertString2);
                 }
         }
-        </SCRIPT>
-
-        <!-- TMPL_IF NAME=searchfield -->
+		</script>
+		<!-- TMPL_IF NAME="searchfield" -->
                 <h1>Zmieniaj serwer Z39.50</h1>
         <!-- TMPL_ELSE -->
                 <h1>Dodaj Serwer Z39.50</h1>
         <!-- /TMPL_IF -->
-        <form action="<!-- TMPL_VAR NAME=script_name -->" name=Aform method=post>
-        <input type=hidden name=op value='add_validate'>
-                
-        <table>
-        
-        <!-- TMPL_IF NAME=searchfield -->
-                <tr>
-                        <td>Serwer Z39.50</td>
-                        <td>
-                                <input type=hidden name=searchfield value='<!-- TMPL_VAR NAME=searchfield -->'><!-- TMPL_VAR NAME=searchfield -->
-                        </td>
-                </tr>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+			<input type="hidden" name="op" value="add_validate">
+			<!-- TMPL_IF NAME="searchfield" -->
+				<p>
+					<label class="label100">Serwer Z39.50</label>
+					<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
+				</p>
         <!-- TMPL_ELSE -->
-                <tr>
-                        <td>Serwer Z39.50</td>
-                        <td>
-                                <input type=text name=searchfield size=100 maxlength=100 onBlur=toUC(this)>
-                        </td>
-                </tr>
+				<p>
+					<label class="label100">Serwer Z39.50</label>
+					<input type="text" name="searchfield" size="100" maxlength="100" onblur="toUC(this)">
+				</p>
         <!-- /TMPL_IF -->
-
-		<tr>
-			<td>Nazwa hosta</td>
-			<td>
-				<input type=text name=host size=30 value='<!-- TMPL_VAR NAME=host -->'>
-			</td>
-		</tr>
-		<tr>
-			<td>Port</td>
-			<td>
-				<input type=text name=port size=5 value='<!-- TMPL_VAR NAME=port -->' onBlur=isNum(this)>
-			</td>
-		</tr>
-		<tr>
-			<td>Baza danych</td>
-			<td>
-				<input type=text name=db value='<!-- TMPL_VAR NAME=db -->'>
-			</td>
-		</tr>
-		<tr>
-			<td>Użytkownik</td>
-			<td>
-				<input type=text name=userid value='<!-- TMPL_VAR NAME=userid -->'>
-			</td>
-		</tr>
-		<tr>
-			<td>Hasło</td>
-			<td>
-				<input type=text name=password value='<!-- TMPL_VAR NAME=password -->'>
-			</td>
-		</tr>
-		<tr>
-			<td>Zaznaczony (używany domyślnie)</td>
-			<td>
-				<input type=text size=1 name=checked value='<!-- TMPL_VAR NAME=checked -->' onBlur=isNum(this)>  
-		<tr>
-			<td>Ranga (kolejność występowania)</td>
-			<td>
-				<input type=text name=rank size=4 value='<!-- TMPL_VAR NAME=rank -->' onBlur=isNum(this)>
-			</td>
-		</tr>
-		<tr>
-			<td>Składnia (z3950 może przesyłać rekordy w rozmaitych formatach. Wybierz jeden)</td>
-			<td>
+			<p>
+				<label class="label100">Nazwa hosta</label>
+				<input type="text" name="host" size="30" value="<!-- TMPL_VAR NAME="host" -->">
+			</p>
+			<p>
+				<label class="label100">Port</label>
+				<input type="text" name="port" size="5" value="<!-- TMPL_VAR NAME="port" -->" onblur="isNum(this)">
+			</p>
+			<p>
+				<label class="label100">Baza danych</label>
+				<input type="text" name="db" value="<!-- TMPL_VAR NAME="db" -->">
+			</p>
+			<p>
+				<label class="label100">Użytkownik</label>
+				<input type="text" name="userid" value="<!-- TMPL_VAR NAME="userid" -->">
+			</p>
+			<p>
+				<label class="label100">Hasło</label>
+				<input type="text" name="password" value="<!-- TMPL_VAR NAME="password" -->">
+			</p>
+			<p>
+				<label class="label100">Zaznaczony (używany domyślnie)</label>
+				<input type="text" size="1" name="checked" value="<!-- TMPL_VAR NAME="checked" -->" onblur="isNum(this)">
+			</p>
+			<p>
+				<label class="label100">Ranga (kolejność występowania)</label>
+				<input type="text" name="rank" size="4" value="<!-- TMPL_VAR NAME="rank" -->" onblur="isNum(this)">
+			</p>
+			<p>
+				<label class="label100">Składnia (z3950 może przesyłać rekordy w rozmaitych formatach. Wybierz jeden)</label>
 				<select name="syntax">
 					<option value="MARC21">MARC21</option>
 					<option value="UNIMARC">UNIMARC</option>
 				</select>
-			</td>
-		</tr>
-		<tr>
-			<td> </td>
-			<td>
-				<INPUT type=button value='OK' onClick='Check(this.form)'>
-			</td>
-		</tr>
-        </table>
+			</p>
+			<input type="button" value="OK" onclick="Check(this.form)" class="button">
         </form>
-<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=add_validate -->
+	<!-- TMPL_IF NAME="add_validate" -->
         Dane zapisane
-        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-        <input type=submit value=OK>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="OK" class="button">
         </form>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME=delete_confirm -->
-	<!-- TMPL_VAR NAME=reqsel -->
+	<!-- /TMPL_IF -->
 	
-        <table border=0 cellspacing=0 cellpadding=5>
-                <tr bgcolor='#99cc33'>
-                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'>
-                                <b>Źródło</b>
-                        </td>
-                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'>
-                                <!-- TMPL_VAR NAME=searchfield -->
-                        </td>
-                </tr>
-                <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-                        <input type=hidden name=op value=delete_confirmed>
-                        <input type=hidden name=searchfield value=<!-- TMPL_VAR NAME=searchfield -->>
+	<!-- TMPL_IF NAME="delete_confirm" -->
+		<!-- TMPL_VAR NAME="reqsel" -->
+			<table>
+			<tr>
+				<th>Źródło</th>
+				<th><!-- TMPL_VAR NAME="searchfield" --></th>
+			</tr>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="hidden" name="op" value="delete_confirmed">
+				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
                 <tr>
                         <td>Nazwa hosta</td>
-                        <td><!-- TMPL_VAR NAME=host --></td>
+				<td><!-- TMPL_VAR NAME="host" --></td>
                 </tr>
                 <tr>
                         <td>Port</td>
-                        <td><!-- TMPL_VAR NAME=port --></td>
+				<td><!-- TMPL_VAR NAME="port" --></td>
                 </tr>
                 <tr>
                         <td>Baza danych</td>
-                        <td><!-- TMPL_VAR NAME=db --></td>
+				<td><!-- TMPL_VAR NAME="db" --></td>
                 </tr>
                 <tr>
                         <td>Użytkownik</td>
-                        <td><!-- TMPL_VAR NAME=userid --></td>
+				<td><!-- TMPL_VAR NAME="userid" --></td>
                 </tr>
                 <tr>
                         <td>Hasło</td>
-                        <td><!-- TMPL_VAR NAME=password --></td>
+				<td><!-- TMPL_VAR NAME="password" --></td>
                 </tr>
                 <tr>
                         <td>Zaznaczony</td>
-                        <td><!-- TMPL_VAR NAME=checked --></td>
+				<td><!-- TMPL_VAR NAME="checked" --></td>
                 </tr>
                 <tr>
                         <td>Ranga</td>
-                        <td><!-- TMPL_VAR NAME=rank --></td>
+				<td><!-- TMPL_VAR NAME="rank" --></td>
                 </tr>
                 <tr>
-                        <td colspan=2 align=center>POTWIERDŹ WYMAZANIE</td>
+				<td colspan="2" align="center">POTWIERDŹ WYMAZANIE</td>
                 </tr>
                 <tr>
-                        <td><input type=submit value="TAK"></form></td>
-                        <td><form action='<!-- TMPL_VAR NAME=script_name -->' method=post><input type=submit value="NIE"></form></td>
+				<td><input type="submit" value="TAK"></form></td>
+				<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NIE"></form></td>
                 </tr>
 	</table>
+	<!-- /TMPL_IF -->
 
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME=delete_confirmed -->
+	<!-- TMPL_IF NAME="delete_confirmed" -->
         Dane wymazane
-        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-                <input type=submit value=OK>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="submit" value="OK">
         </form>
-<!-- /TMPL_IF -->
+	<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME=else -->
-        <h2>Serwery Z39.50</h2>
-        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-                <input type=text name=description value=<!-- TMPL_VAR NAME=searchfield -->>
-                <input type=reset name=reset value="wyczyść">
+	<!-- TMPL_IF NAME="else" -->
+			<h1 class="parameters">Serwery Z39.50</h1>
+			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
+				<input type="submit" name="ok" value="OK" class="button">
         </form>
-
-        <!-- TMPL_IF NAME=searchfield -->
-                Szukano <b><!-- TMPL_VAR NAME=searchfield --></b>
+			<!-- TMPL_IF NAME="searchfield" -->
+				Szukano <b><!-- TMPL_VAR NAME="searchfield" --></b>
         <!-- /TMPL_IF -->
-
-        <table border=0 cellspacing=0 cellpadding=5>
-                <tr bgcolor='#99cc33'>
-                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Źródło</b></td>
-                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Nazwa hosta</b></td>
-                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Port</b></td>
-                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Baza danych</b></td>
-                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Użytkownik</b></td>
-                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Hasło</b></td>
-                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Zaznaczony</b></td>
-                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Ranga</b></td>
-                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'><b>Składnia</b></td>
-                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'> </td>
-                        <td background='<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif'> </td>
-                </tr>
-                <!-- TMPL_LOOP NAME=loop -->
-                <tr bgcolor="<!-- TMPL_VAR NAME=toggle -->">
-                        <td><!-- TMPL_VAR NAME=name --></td>
-                        <td><!-- TMPL_VAR NAME=host --></td>
-                        <td><!-- TMPL_VAR NAME=port --></td>
-                        <td><!-- TMPL_VAR NAME=db --></td>
-                        <td><!-- TMPL_VAR NAME=userid --></td>
-                        <td><!-- TMPL_VAR NAME=password --></td>
-                        <td><!-- TMPL_VAR NAME=checked --></td>
-                        <td><!-- TMPL_VAR NAME=rank --></td>
-                        <td><!-- TMPL_VAR NAME=syntax --></td>
-                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&searchfield=<!-- TMPL_VAR NAME=name -->"><img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" alt="Edytuj" title="edytuj" border=0></a></td>
-                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&searchfield=<!-- TMPL_VAR NAME=name -->"><img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" alt="Wymaż" title="wymaż" border=0></a></td>
+			<table>
+				<tr>
+					<th>Źródło</th>
+					<th>Nazwa hosta</th>
+					<th>Port</th>
+					<th>Baza danych</th>
+					<th>Użytkownik</th>
+					<th>Hasło</th>
+					<th>Zaznaczony</th>
+					<th>Ranga</th>
+					<th>Składnia</th>
+					<th> </td>
+					<th> </td>
+				</tr>
+				<!-- TMPL_LOOP NAME="loop" -->
+				<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
+					<td><!-- TMPL_VAR NAME="name" --></td>
+					<td><!-- TMPL_VAR NAME="host" --></td>
+					<td><!-- TMPL_VAR NAME="port" --></td>
+					<td><!-- TMPL_VAR NAME="db" --></td>
+					<td><!-- TMPL_VAR NAME="userid" --></td>
+					<td><!-- TMPL_VAR NAME="password" --></td>
+					<td><!-- TMPL_VAR NAME="checked" --></td>
+					<td><!-- TMPL_VAR NAME="rank" --></td>
+					<td><!-- TMPL_VAR NAME="syntax" --></td>
+					<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="name" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" alt="Edytuj" title="edytuj" border="0"></a></td>
+					<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="name" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" alt="Wymaż" title="wymaż" border="0"></a></td>
 			</tr>
                 <!-- /TMPL_LOOP -->
 	</table>
-
-        <form action='<!-- TMPL_VAR NAME=script_name -->' method=post>
-        <input type=hidden name=op value=add_form>
-                        
-        <!-- TMPL_IF NAME=offsetgtzero -->
-                <a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=prevpage -->">&lt;&lt; Wstecz</a>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_form">
+			<!-- TMPL_IF NAME="offsetgtzero" -->
+					<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->" class="button">&lt;&lt; Wstecz</a>
         <!-- /TMPL_IF -->
-        
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-
-        <!-- TMPL_IF NAME=ltcount -->
-                <a href="<!-- TMPL_VAR NAME=script_name -->?offset=<!-- TMPL_VAR NAME=nextpage -->">Dalej &gt;&gt;</a>
+			<!-- TMPL_IF NAME="ltcount" -->
+					<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->" class="button">Dalej &gt;&gt;</a>
         <!-- /TMPL_iF -->
-                
-        <br>
-        <input type=submit class="button" alt="Dodaj Serwer Z39.50" value="Dodaj Serwer Z39.50">
-        <br>
+			<input type="submit" class="button" alt="Dodaj Serwer Z39.50" value="Dodaj Serwer Z39.50">
         </form>
 
-<!-- /TMPL_IF -->
-
+	<!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: pl/reports/inventory.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/reports/Attic/inventory.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/reports/inventory.tmpl	17 Apr 2004 16:57:07 -0000	1.2
+++ pl/reports/inventory.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,110 +1,97 @@
 <!-- TMPL_INCLUDE NAME="reports-top.inc" -->
-<h1>Inwentarz/Inwentaryzacja</h1>
-<form method="post">
+<div id="mainbloc">
+	<h1 class="reports">Inwentarz/Inwentaryzacja</h1>
+	<div id="bloc25"><form method="post">
+		<h2 class="reports">Wybierz pozycje do sprawdzenia</h2>
+		<p>
+			Item Location (items.itemcallnumber) between  <input type="text" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->">  and  <input type="text" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
+		</p>
+		<p><label>nie przeglÄ…dana od</label>
+			<input type="text" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
+		</p>
+		<p><label>pokaż</label>
+			<input type="text" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" maxlength="5" size="5"> <i>pozycji rozpoczynajacych siÄ™ przy ofsecie</i> <input type="text" name="offset" value="<!-- TMPL_VAR NAME="offset" -->" size="5" maxlength="5">
+		</p>
+		<p>
+			<input type="submit" value="OK" class="button reports">
+		</p>
+	</form>
+	
+	</div>
+	<div id="bloc25">
+		<form  name="barcodefile" method="post">
+		<h2 class="reports">Use a barcode file</h2>
+		<p>barcode filename : <input type="file" name="uploadbarcodes" /></p>
+		<p>Set datelastseen to : <input type="text" name="setdate" /></p>
+		<p><input type="submit" value="OK" class="button reports"></p>
+		</form>
+		<!--TMPL_IF Name="Number" --><p><!--TMPL_VAR Name="Number"--> items modified : datelastseen set to <!--TMPL_VAR Name="date"--></p><!-- /TMPL_IF-->
+		<!--TMPL_IF Name="errorfile" --><p class="error"><!--TMPL_VAR Name="errorfile"--> can't be opened</p><!-- /TMPL_IF-->
+	</div>
+	<!--TMPL_LOOP Name="errorloop"--><p class="error"><!--TMPL_VAR Name="barcode"-->
+	<!--TMPL_IF Name="ERR_BARCODE"--> : barcode not found<!--/TMPL_IF-->
+	<!--TMPL_IF Name="ERR_WTHDRAWN"--> : item withdrawn<!--/TMPL_IF-->
+	<!--TMPL_IF Name="ERR_ONLOAN_RET"--> : item was on loan. It was returned before marked as seen<!--/TMPL_IF-->
+	<!--TMPL_IF Name="ERR_ONLOAN_NOT_RET"--> : item was on loan. couldn't be returned.<!--/TMPL_IF-->
+	</p><!-- /TMPL_LOOP-->
+	<!-- TMPL_IF NAME="loop" -->
+	<form method="post">
+	<input type="hidden" name="markseen" value="1">
+	<input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->">
+	<input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
+	<input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
+	<input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->">
+	<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="offset" -->">
 	<table>
 		<tr>
-			<th colspan=2>
-				Wybierz pozycje do sprawdzenia
-			</th>
-		</tr>
-		<tr>
-			<td>
-					Lokalizacja pozycji (items.itemcallnumber) pomiędzy
-			</td>
-			<td>
-				 <input type="text" name="minlocation" value="<!-- TMPL_VAR name="minlocation" -->"> i <input type="text" name="maxlocation" value="<!-- TMPL_VAR name="maxlocation" -->">
-			</td>
+			<th class="reports">Przejrzana</th>
+			<th class="reports">Kod Paskowy</th>
+			<th class="reports">Call number</th>
+			<th class="reports">Tytuł</th>
+			<th class="reports">Autor</th>
 		</tr>
+	<!-- TMPL_LOOP NAME="loop" -->
 		<tr>
 			<td>
-					nie przeglÄ…dana od
+				<input type="checkbox" name="SEEN-<!-- TMPL_VAR NAME="itemnumber" -->" value="1">
 			</td>
 			<td>
-				<input type="text" name="datelastseen" value="<!-- TMPL_VAR name="datelastseen" -->">
+				<!-- TMPL_VAR NAME="barcode" -->
 			</td>
-		</tr>
-		<tr>
 			<td>
-					pokaż
+				<!-- TMPL_VAR NAME="itemcallnumber" -->
 			</td>
 			<td>
-				<input type="text" name="pagesize" value="<!-- TMPL_VAR name="pagesize" -->"> <i>pozycji rozpoczynajacych siÄ™ przy ofsecie</i> <input type="text" name="offset" value="<!-- TMPL_VAR name="offset" -->">
+				<!-- TMPL_VAR NAME="title" -->
 			</td>
-		</tr>
-		<tr colspan=2>
 			<td>
-				<input type="submit" value="OK" class="button">
+				<!-- TMPL_VAR NAME="author" -->
 			</td>
 		</tr>
+	<!-- /TMPL_LOOP -->
 	</table>
-</form>
-
-<form method="post">
-<input type="hidden" name="markseen" value="1">
-<input type="hidden" name="minlocation" value="<!-- TMPL_VAR name="minlocation" -->">
-<input type="hidden" name="maxlocation" value="<!-- TMPL_VAR name="maxlocation" -->">
-<input type="hidden" name="datelastseen" value="<!-- TMPL_VAR name="datelastseen" -->">
-<input type="hidden" name="pagesize" value="<!-- TMPL_VAR name="pagesize" -->">
-<input type="hidden" name="offset" value="<!-- TMPL_VAR name="offset" -->">
-<!-- TMPL_IF name="loop" -->
-<table width="100%">
-	<tr>
-		<th>Przejrzana</th>
-		<th>Kod Paskowy</th>
-		<th>Hurt</th>
-		<th>Tytuł</th>
-		<th>Autor</th>
-	</tr>
-<!-- TMPL_LOOP name="loop" -->
-	<tr>
-		<td>
-			<input type="checkbox" name="SEEN-<!-- TMPL_VAR name="itemnumber" -->" value="1">
-		</td>
-		<td>
-			<!-- TMPL_VAR name="barcode" -->
-		</td>
-		<td>
-			<!-- TMPL_VAR name="itemcallnumber" -->
-		</td>
-		<td>
-			<!-- TMPL_VAR name="title" -->
-		</td>
-		<td>
-			<!-- TMPL_VAR name="author" -->
-		</td>
-	</tr>
-<!-- /TMPL_LOOP -->
-</table>
-<input type="submit" value="Oznacz jako przejrzane" class="button">
-</form>
-<!-- /TMPL_IF -->
-
-<table>
-<tr>
-	<td>
-		<!-- TMPL_IF name="offset" -->
+	<input type="submit" value="Oznacz jako przejrzane" class="button reports">
+	</form>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="offset" -->
 		<form method="post">
-			<input type="hidden" name="minlocation" value="<!-- TMPL_VAR name="minlocation" -->">
-			<input type="hidden" name="maxlocation" value="<!-- TMPL_VAR name="maxlocation" -->">
-			<input type="hidden" name="datelastseen" value="<!-- TMPL_VAR name="datelastseen" -->">
-			<input type="hidden" name="pagesize" value="<!-- TMPL_VAR name="pagesize" -->">
-			<input type="hidden" name="offset" value="<!-- TMPL_VAR name="prevoffset" -->">
-			<input type="submit" value="&lt;&lt;&lt;" class="button">
+		<input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->">
+		<input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
+		<input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
+		<input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->">
+		<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevoffset" -->">
+		<input type="submit" value="&lt;&lt;&lt;" class="button reports">
 		</form>
 		<!-- /TMPL_IF -->
-	</td>
-	<td>
-		<!-- TMPL_IF name="nextoffset" -->
+	<!-- TMPL_IF NAME="nextoffset" -->
 		<form method="post">
-			<input type="hidden" name="minlocation" value="<!-- TMPL_VAR name="minlocation" -->">
-			<input type="hidden" name="maxlocation" value="<!-- TMPL_VAR name="maxlocation" -->">
-			<input type="hidden" name="datelastseen" value="<!-- TMPL_VAR name="datelastseen" -->">
-			<input type="hidden" name="pagesize" value="<!-- TMPL_VAR name="pagesize" -->">
-			<input type="hidden" name="offset" value="<!-- TMPL_VAR name="nextoffset" -->">
-			<input type="submit" value="&gt;&gt;&gt;" class="button">
+		<input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->">
+		<input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
+		<input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
+		<input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->">
+		<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextoffset" -->">
+		<input type="submit" value="&gt;&gt;&gt;" class="button reports">
 		</form>
 		<!-- /TMPL_IF -->
-	</td>
-</tr>
-</table>
+</div>
 <!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->

Index: pl/reports/issues_by_borrower_category.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/reports/Attic/issues_by_borrower_category.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -b -r1.1 -r1.1.10.1
--- pl/reports/issues_by_borrower_category.tmpl	17 Apr 2004 16:57:07 -0000	1.1
+++ pl/reports/issues_by_borrower_category.tmpl	7 May 2007 13:55:53 -0000	1.1.10.1
@@ -1,48 +1,47 @@
 <!-- TMPL_INCLUDE NAME="reports-top.inc" -->
-<div id="mainbloc">
-<!-- TMPL_IF name="do_it" -->
-<!-- TMPL_LOOP name="mainloop" -->
-	<h1>Koha: Wypożyczenia wg. kategorii czytelników <!--TMPL_IF name="borrower_category" --> dla kategorii = <!-- TMPL_VAR name="borrower_category" --><!-- /TMPL_IF --></h1>
+<div id="mainbloc" >
+<!-- TMPL_IF NAME="do_it" -->
+<!-- TMPL_LOOP NAME="mainloop" -->
+	<h1 class="reports">Koha: Wypożyczenia wg. kategorii czytelników <!--TMPL_IF NAME="borrower_category" --> dla kategorii = <!-- TMPL_VAR NAME="borrower_category" --><!-- /TMPL_IF --></h1>
 	<table>
 		<tr>
 			<th>&nbsp;</th>
-			<!-- TMPL_LOOP name="categorycodeloop" -->
-				<th><!-- TMPL_VAR name="categorycode" --></th>
+			<!-- TMPL_LOOP NAME="categorycodeloop" -->
+				<th><!-- TMPL_VAR NAME="categorycode" --></th>
 			<!-- /TMPL_LOOP -->
 			<th>W SUMIE</th>
 		</tr>
-			<!-- TMPL_LOOP name="loopborrowertype" -->
+			<!-- TMPL_LOOP NAME="loopborrowertype" -->
 				<tr>
-					<!-- TMPL_IF name="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-					<!-- TMPL_VAR name="itemtype" --></td>
-					<!-- TMPL_LOOP name="loopitemtype" -->
-						<!-- TMPL_IF name="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-							<!-- TMPL_VAR name="issues" -->
+					<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+					<!-- TMPL_VAR NAME="itemtype" --></td>
+					<!-- TMPL_LOOP NAME="loopitemtype" -->
+						<!-- TMPL_IF NAME="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+							<!-- TMPL_VAR NAME="issues" -->
 						</td>
 					<!-- /TMPL_LOOP -->
-					<!-- TMPL_IF name="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-						<!-- TMPL_VAR name="totalitemtype" -->
+					<!-- TMPL_IF NAME="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+						<!-- TMPL_VAR NAME="totalitemtype" -->
 					</td>
 				</tr>
-			<!-- /TMPL_LOOP name="loopitemtype" -->
+			<!-- /TMPL_LOOP NAME="loopitemtype" -->
 			<tr>
 				<th>W SUMIE</th>
-				<!-- TMPL_LOOP name="loopborrowertotal" -->
+				<!-- TMPL_LOOP NAME="loopborrowertotal" -->
 					<th>
-						<!-- TMPL_VAR name="issues" -->
+						<!-- TMPL_VAR NAME="issues" -->
 					</th>
 				<!-- /TMPL_LOOP -->
-				<th>&nbsp;</th>
+				<th><!-- TMPL_VAR NAME="grantotal" --></th>
 			</tr>
 	</table>
 <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-	<h1>Wypożyczenia wg. kategorii czytelników</h1>
+	<h1 class = "reports">Wypożyczenia wg. kategorii czytelników</h1>
 	<form method="post">
-		<p>Wybierz kategoriÄ™ czytelnika (bez wyboru zobaczysz status globalny) <input type="text" name="value"></p>
-		<p>Wybierz Oddział: <!-- TMPL_VAR name="CGIbranch" --></p>
-		<input type="submit" value="OK" class="button">
-		<input type="hidden" name="report_name" value="<!--TMPL_VAR name="report_name" -->">
+		<p>Wybierz Oddział: <!-- TMPL_VAR NAME="CGIbranch" --></p>
+		<input type="submit" value="OK" class="button reports">
+		<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
 		<input type="hidden" name="do_it" value="1">
 	</form>
 <!-- /TMPL_IF -->

Index: pl/reports/itemtypes.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/reports/Attic/itemtypes.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -b -r1.1 -r1.1.10.1
--- pl/reports/itemtypes.tmpl	17 Apr 2004 16:57:07 -0000	1.1
+++ pl/reports/itemtypes.tmpl	7 May 2007 13:55:53 -0000	1.1.10.1
@@ -1,30 +1,30 @@
 <!-- TMPL_INCLUDE NAME="reports-top.inc" -->
 <div id="mainbloc">
-<!-- TMPL_IF name="do_it" -->
-<!-- TMPL_LOOP name="mainloop" -->
-	<h1>Koha: Raporty nt. typów dokumentów <!--TMPL_IF name="branch" --> dla oddziału = <!-- TMPL_VAR name="branch" --><!-- /TMPL_IF --></h1>
+<!-- TMPL_IF NAME="do_it" -->
+<!-- TMPL_LOOP NAME="mainloop" -->
+	<h1>Koha: Raporty nt. typów dokumentów <!--TMPL_IF NAME="branch" --> dla oddziału = <!-- TMPL_VAR NAME="branch" --><!-- /TMPL_IF --></h1>
 	<table>
 		<tr>
 			<th>Typ pozycji</th>
 			<th>ilość</th>
 		</tr>
-			<!-- TMPL_LOOP name="loopitemtype" -->
+			<!-- TMPL_LOOP NAME="loopitemtype" -->
 				<tr>
-					<td><!-- TMPL_VAR name="itemtype" --></td>
-					<td><!-- TMPL_VAR name="count" --></td>
+					<td><!-- TMPL_VAR NAME="itemtype" --></td>
+					<td><!-- TMPL_VAR NAME="count" --></td>
 				</tr>
-			<!-- /TMPL_LOOP name="loopitemtype" -->
+			<!-- /TMPL_LOOP NAME="loopitemtype" -->
 			<tr>
 				<th>W SUMIE</th>
-				<th><!-- TMPL_VAR name="total" --></th>
+				<th><!-- TMPL_VAR NAME="total" --></th>
 	</table>
 <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
 	<h1>Obejrzyj grupÄ™ katalogowÄ… wg. typu dokumentu</h1>
 	<form method="post">
-		Wybierz oddział (bez wyboru zobaczysz raport dla wszystkich) <!-- TMPL_VAR name="CGIbranch" -->
+		Wybierz oddział (bez wyboru zobaczysz raport dla wszystkich) <!-- TMPL_VAR NAME="CGIbranch" -->
 		<input type="submit" value="OK" class="button">
-		<input type="hidden" name="report_name" value="<!--TMPL_VAR name="report_name" -->">
+		<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
 		<input type="hidden" name="do_it" value="1">
 	</form>
 <!-- /TMPL_IF -->

Index: pl/reports/reports-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/reports/Attic/reports-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/reports/reports-home.tmpl	17 Apr 2004 16:26:25 -0000	1.2
+++ pl/reports/reports-home.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,16 +1,46 @@
 <!-- TMPL_INCLUDE NAME="reports-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
-<h1>Raporty</h1>
-<ul>
+
+
+<h1 class="reports">Raporty</h1>
+<div id="bloc25">
+	<h2 class="reports">Stat wizards</h2>
+	<ul>
+		<li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Gromadzenie</a></li>
+		<li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Borrowers</a></li>
+		<li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Katalog</a></li>
+		<li><a href="/cgi-bin/koha/reports/issues_stats.pl">Cyrkulacja</a></li>
+	</ul>
+</div>
+<div id="bloc25">
+	<h2 class="reports">Top Lists</h2>
+	<ul>
+		<li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Most issuing Borrowers</a></li>
+		<li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most issued items</a></li>
+	</ul>
+	<h2 class="reports">Outsiders</h2>
+	<ul>
+		<li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Borrowers without issues</a></li>
+		<li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items not issued</a></li>
+	</ul>
+</div>
+<div id="bloc25">
+	<h2 class="reports">Other stats</h2>
+	<p>on catalogue</p>
+	<ul>
+		<li><a href="/cgi-bin/koha/reports/inventory.pl">Inwentarz/Inwentaryzacja</a></li>
+		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Katalogowanie wg. typu dokumentu</a></li>
+	</ul>
+	<p>on issues</p>
+	<ul>
 	<li><a href="/cgi-bin/koha/stats.pl?time=yesterday">Do punktu wyrównania:</a> Raport dzienny (wczoraj)</li>
 	<li><a href="/cgi-bin/koha/stats.pl?time=today">Do punktu wyrównania:</a> Raport dzienny (dziś)</li>
 	<li><a href="/cgi-bin/koha/overdue.pl">Pozycje zaległe</a></li>
-	<li><a href="/cgi-bin/koha/reports/inventory.pl">Inwentarz/Inwentaryzacja</a></li>
-	<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Katalogowanie wg. typu dokumentu</a></li>
 	<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Wypożyczenia wg. kategorii czytelników</a></li>
-	
-</ul>
+		<li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li>
+	</ul>
+</div>
 </div>
 <!-- TMPL_INCLUDE NAME="reports-bottom.inc" -->
 

Index: pl/search.marc/result.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/search.marc/Attic/result.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/search.marc/result.tmpl	17 Apr 2004 17:00:27 -0000	1.2
+++ pl/search.marc/result.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -4,71 +4,84 @@
     <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
 <!-- /TMPL_IF -->
 <div id="mainbloc">
-	<h1 class="catalogue">Wyniki szukania MARC</h1>
+	<h1 class="catalogue">Search results</h1>
 	<div id="resultnumber">
-		<p>
-			<!-- TMPL_IF NAME=displayprev -->
-				<a href=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="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
-				</a>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME=numbers -->
-				<!-- TMPL_IF NAME=highlight -->
-					<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
+		<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search">&lt;&lt;Previous</a><!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search">Next&gt;&gt;</a><!-- /TMPL_IF --></p>
+		<p class="resultcount"><!-- TMPL_IF NAME="total" -->Wyświetlono od <!-- TMPL_VAR NAME="from" --> do <!-- TMPL_VAR NAME="to" --> z <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->No results found.<!-- /TMPL_IF --></p></div>
+	<div id="resultlist">
+		<table>
+			<tr>
+				<th class="catalogue">Summary</th>
+				<th class="catalogue">Typ pozycji</th>
+				<th class="catalogue">Ilość pozycji</th>
+				<th class="catalogue">Lokalizacja</th>
+				<th class="catalogue">&nbsp;</th>
+			</tr>
+			<!-- TMPL_LOOP NAME="result" -->
+			<tr>
+				<!-- TMPL_IF NAME="even" -->
+					<td class="hilighted">
 				<!-- TMPL_ELSE -->
-					<a href=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="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
-				<!-- /TMPL_IF -->
-			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF NAME=displaynext -->
-				<a href=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="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
+					<td>
 				<!-- /TMPL_IF -->
+							<!-- TMPL_IF name="MARC_ON" -->
+								<a class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!--TMPL_IF Name="title" --><!-- TMPL_VAR NAME="title" --><!--TMPL_ELSE --><em>Bez Tytułu</em><!--/TMPL_IF--></a> <!-- TMPL_VAR NAME="subtitle" --> 
+							<!-- TMPL_ELSE -->
+								<a class="transparent resultlist" href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="volume" --> vol <!-- TMPL_VAR name="volume" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="volumeddesc" --> : <!-- TMPL_VAR name="volumeddesc" --> <!-- /TMPL_IF -->
+						<!-- TMPL_IF name="number" --> part <!-- TMPL_VAR name="number" --><!-- /TMPL_IF -->
+					<p><!-- TMPL_VAR NAME="author" -->
+						<!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
 		</p>
+				</td>
+				<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
+					<p><!-- TMPL_VAR NAME="description" --></p>
+				</td>
+				<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_VAR NAME="totitem" -->
+				</td>
+				<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_LOOP NAME="CN" -->
 		<p>
-			<!-- TMPL_IF name=total -->
-			&nbsp<b>Wyświetlono od <!-- TMPL_VAR name="from" --> do <!-- TMPL_VAR name="to" --> z <!-- TMPL_VAR name="total" --></b><br><br>
+							<!-- TMPL_VAR NAME="holdingbranch" -->
+							<!-- TMPL_IF name="date_due" -->
+								On Loan until <!-- TMPL_VAR NAME="date_due" -->
 			<!-- TMPL_ELSE -->
-			&nbsp Nic nie znaleziono.<br>
+								<!-- TMPL_IF NAME="itemcallnumber" -->
+									(<!-- TMPL_VAR NAME="itemcallnumber" -->)
+                                <!-- TMPL_IF name="cnt" -->
+                                  x <!-- TMPL_VAR name="cnt" -->
+                                <!--/TMPL_IF-->
+								<!-- /TMPL_IF -->
+							<!-- /TMPL_IF -->
+							<!-- TMPL_IF name="notforloan" -->
+								<i>(<!-- TMPL_VAR name="notforloan" -->)</i>
 			<!-- /TMPL_IF -->
 		</p>
-	</div>
-	<div id="resultlist">
-		<table>
-		<thead>
-			<!-- TMPL_IF NAME="opac" -->
-			<tr>
+					<!-- /TMPL_LOOP -->
+					<!-- TMPL_IF name="onorder" --><p>On order</p><!-- /TMPL_IF -->
+				</td>
+				<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
+					<!-- TMPL_UNLESS name="norequests" -->
+						<p><a class="button catalogue" href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">Zamów</a></p>
 				<!-- TMPL_ELSE -->
-			<tr>
-				<!-- /TMPL_IF -->
-			<th class="catalogue">Opis #</th>
-			<th class="catalogue">Autor</th>
-			<th class="catalogue">Tytuł</th>
-			</tr>
-		<tbody>
-			<!-- TMPL_LOOP name="result" -->
-				<tr>
-					<td><a href="../MARCdetail.pl?bibid=<!-- TMPL_VAR name="bibid" -->"><!-- TMPL_VAR name="bibid" --></a></td>
-					<td><!-- TMPL_VAR name="author" --></td>
-					<td><!-- TMPL_VAR name="title" --></td>
+						<p>Nie rezerwowalne</p>
+					<!-- /TMPL_UNLESS -->
+				</td>
 				</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
 	</div>
 	<div id="resultnumber">
-		<p>
-			<!-- TMPL_IF NAME=displayprev -->
-			<a href=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="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
-			<!-- /TMPL_IF -->
-			<!-- TMPL_LOOP NAME=numbers -->
-				<!-- TMPL_IF NAME=highlight -->
-				<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
-				<!-- TMPL_ELSE -->
-				<a href=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="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
-				<!-- /TMPL_IF -->
-			<!-- /TMPL_LOOP -->
-			<!-- TMPL_IF NAME=displaynext -->
-			<a href=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="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
-				<!-- /TMPL_IF -->
-		</p>
+		<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search">&lt;&lt;Previous</a><!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;<!--TMPL_IF NAME="orderby"-->orderby=<!-- TMPL_VAR NAME="orderby" -->&amp;<!--/TMPL_IF--><!--TMPL_IF NAME="desc_asc"-->desc_or_asc=<!-- TMPL_VAR NAME="desc_asc" -->&amp;<!--/TMPL_IF-->type=intranet&amp;op=do_search">Next&gt;&gt;</a><!-- /TMPL_IF --></p>
 	</div>	
 </div>
 <!-- TMPL_IF NAME="opac" -->

Index: pl/search.marc/search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/search.marc/Attic/search.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/search.marc/search.tmpl	17 Apr 2004 17:00:27 -0000	1.2
+++ pl/search.marc/search.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -7,79 +7,112 @@
 
 <h1 class="catalogue">Szukaj w katalogu </h1>
 
-<form name="f" method="post">
+<form name="f" method="post" action="/cgi-bin/koha/search.marc/search.pl">
 	<input type="hidden" name="op" value="do_search">
 	<input type="hidden" name="type" value="intranet">
 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
-	<div id="bloc25">
+	<div class="bloc25">
 		<h2 class="catalogue">Szukaj </h2>
 		<p>
-			<label class="label20">SÅ‚owo kluczowe</label>
+			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
+			<label class="label100" for="keyword">Any word</label>
 			<input type="hidden" name="marclist" value="">
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
 			<input type="hidden" name="operator" value="contains">
-			<input type="text" name="value" onchange="sql_update()">
+			<input type="text" name="value" id="keyword" onchange="sql_update()" size="35">
 		</p>
 		<p>
-			<label class="label20">Tytuł</label>
+			<label class="label100" for="title">Tytuł</label>
 			<input type="hidden" name="marclist" value="biblio.title">
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
 			<input type="hidden" name="operator" value="contains">
-			<input type="text" name="value" onchange="sql_update()">
+			<input type="text" name="value" id="title" onchange="sql_update()" size="35">
+			<!-- TMPL_UNLESS Name="Disable_Dictionary" -->
+				<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)" class="button catalogue">
+					...
+				</a>
+			<!-- /TMPL_UNLESS -->
 		</p>
 		<p>
-			<label class="label20">autor</label> <input type="hidden" name="marclist" value="biblio.author">
+			<label class="label100" for="author">Autor</label> <input type="hidden" name="marclist" value="biblio.author">
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
 			<input type="hidden" name="operator" value="contains">
-			<input type="text" name="value" onchange="sql_update()">
+			<input type="text" name="value" id="author" onchange="sql_update()" size="35">
+			<!-- TMPL_UNLESS Name="Disable_Dictionary" -->
+				<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)" class="button catalogue">
+					...
+				</a>
+			<!-- /TMPL_UNLESS -->
 		</p>
 	<p>
-				<label class="label20">Kod Paskowy </label>
-				<input type="hidden" name="marclist" value="items.barcode">
+			<label class="label100" for="subject">Temat</label>
+			<input type="hidden" name="marclist" value="bibliosubject.subject">
 				<input type="hidden" name="and_or" value="and">
 				<input type="hidden" name="excluding" value="">
 				<input type="hidden" name="operator" value="contains">
-				<input type="text" name="value" onchange="sql_update()">
+			<input type="text" name="value" id="subject" onchange="sql_update()" size="35">
+			<!-- TMPL_UNLESS Name="Disable_Dictionary" -->
+				<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)" class="button catalogue">
+					...
+				</a>
+			<!-- /TMPL_UNLESS -->
+		</p>
+		<p>
+			<label class="label100" for="itemtype">Typ Pozycji</label>
+			<input type="hidden" name="marclist" value="biblioitems.itemtype">
+			<input type="hidden" name="and_or" value="and">
+			<input type="hidden" name="excluding" value="">
+			<input type="hidden" name="operator" value="=">
+			<!-- TMPL_VAR name="CGIitemtype" -->
+		</p>
+		<p>
+				<label class="label100" for="branch">Oddział</label>
+				<input type="hidden" name="marclist" value="items.holdingbranch">
+				<input type="hidden" name="and_or" value="and">
+				<input type="hidden" name="excluding" value="">
+				<input type="hidden" name="operator" value="=">  
+				<!-- TMPL_VAR name="CGIbranch" -->
 	</p>
 	</div>
-	<div id="bloc25">
-		<h2 class="catalogue">Szukaj </h2>
+	<div class="bloc25">
+		<h2 class="catalogue">Other options</h2>
 		<p>
-			<label class="label20">Ilustrator</label>
-			<input type="hidden" name="marclist" value="biblioitems.illus">
+				<label class="label100" for="barcode">Item barcode</label>
+				<input type="hidden" name="marclist" value="items.barcode">
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
 			<input type="hidden" name="operator" value="contains">
-			<input type="text" name="value" onchange="sql_update()">
+				<input type="text" name="value" id="barcode" onchange="sql_update()"> 
 		</p>
 		<p>
-			<label class="label20">Dewey</label><input type="hidden" name="marclist" value="biblioitems.dewey">
+			<label class="label100" for="callno">Call Number</label>
+			<input type="hidden" name="marclist" value="items.itemcallnumber">
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
-			<input type="hidden" name="operator" value="contains">
-			<input type="text" name="value" onchange="sql_update()">
+			<input type="hidden" name="operator" value="start">
+			<input type="text" name="value" id="callno" onchange="sql_update()">
 		</p>
 		<p>
-			<label class="label20">Typ Pozycji</label> <input type="hidden" name="marclist" value="biblioitems.itemtype">
+			<label class="label100" for="isbn">ISBN</label>
+			<input type="hidden" name="marclist" value="biblioitems.isbn">
 			<input type="hidden" name="and_or" value="and">
 			<input type="hidden" name="excluding" value="">
 			<input type="hidden" name="operator" value="=">
-			<!-- TMPL_VAR name="CGIitemtype" -->
+			<input type="text" name="value" id="isbn" onchange="sql_update()">
 		</p>
 						<p>
-				<label class="label20">oddział</label>
-				<input type="hidden" name="marclist" value="items.holdingbranch">
+			<label class="label100" for="publisher">Wydawca</label>
+			<input type="hidden" name="marclist" value="biblioitems.publishercode">
 				<input type="hidden" name="and_or" value="and">
 				<input type="hidden" name="excluding" value="">
-				<input type="hidden" name="operator" value="=">
-				<!-- TMPL_VAR name="CGIbranch" -->
+			<input type="hidden" name="operator" value="contains">
+			<input type="text" name="value" id="publisher" onchange="sql_update()">
 	</p>
-
 	</div>
-	<div id="bloc25">
+	<div id="bloc100">
 		<h2 class="catalogue">Więcej pól</h2>
 		<!-- TMPL_LOOP NAME="statements" -->
 			<p>
@@ -87,7 +120,7 @@
 					<option value="and">i</option>
 					<option <!-- TMPL_IF NAME="or" -->selected <!-- /TMPL_IF -->value="or">lub</option>
 				</select>
-				<!-- TMPL_VAR name="marclist" -->
+				<!-- TMPL_VAR NAME="marclist" -->
 				<select name="excluding" size="1" onchange="sql_update()">
 					<option value="0"> </option>
 					<option <!-- TMPL_IF NAME="not" -->selected <!-- /TMPL_IF -->value="1">nie</option>
@@ -105,17 +138,13 @@
 			</p>
 		<!-- /TMPL_LOOP -->
 		<p>
-		<input type="button catalogue" value="Dodaj kryteria" onclick="AddStatement()" class="button catalogue">
-		Ostrzeżenie: deklaracja "zawiera" nie działa jeśli występują jedynie 2 lub mniej literek
+		<input type="button" value="Dodaj kryteria" onclick="AddStatement()" class="button catalogue">
+		Ostrzeżenie: deklaracja "zawiera" nie działa jeśli występują jedynie 2 lub mniej literek</p>
 	</div>
-	<div id="bloc25">
-		<p>
-			<div name="sql">
-				<textarea name="sql" rows=3 cols=70 disabled readonly></textarea>
-			</div>
-		</p>
+	<div class="bloc25">
+		<p><textarea name="sql" rows="3" cols="70" disabled readonly></textarea></p>
 		<p>Liczba wyświetleń na stronę:
-			<select align="right" name="resultsperpage" size="1">
+			<select name="resultsperpage" size="1">
 				<option value="20">20</option>
 				<option value="50">50</option>
 				<option value="100">100</option>
@@ -128,15 +157,19 @@
 				<option value="biblioitems.publicationyear">Rok publikacji</option>
 				<option value="biblioitems.publishercode">Wydawca</option>
 			</select>
+			<select name="desc_or_asc" size="1">
+				<option value="ASC">Ascending</option>
+				<option value="DESC">Descending</option>
+			</select>
 		</p>
 		<p>
 			<input type="submit" value="Szukaj" class="button catalogue">
-			<a href="javascript:PopupSuggestion()" class="button catalogue">Sugestie</a>
+			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Spelling suggestion</a>
 		</p>
 	</div>
 </form>
 
-<script>
+<script language="javascript" type="text/javascript">
 function sql_update() {
 document.f.sql.value="";
 	for (i=0 ; i<document.f.marclist.length ; i++) {
@@ -153,10 +186,16 @@
 
 function AddStatement() {
 
-	document.forms[0].op.value="AddStatement";
+	document.forms['f'].op.value="AddStatement";
 	document.f.submit();
 }
 
+function Dopop(link,i) {
+	var searchstring=document.forms['f'].value[i].value;
+	newin=window.open(link+'&amp;search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
+}
+
+
 function PopupSuggestion() {
     var strQuery="";
 	for (i=0 ; i<document.f.marclist.length ; i++) {

Index: pl/search.marc/suggest.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/search.marc/Attic/suggest.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.10.1
diff -u -b -r1.1 -r1.1.10.1
--- pl/search.marc/suggest.tmpl	17 Apr 2004 17:00:27 -0000	1.1
+++ pl/search.marc/suggest.tmpl	7 May 2007 13:55:53 -0000	1.1.10.1
@@ -18,33 +18,33 @@
 					Użyto X razy
 				</th>
 			</tr>
-		<!-- TMPL_LOOP name="loop" -->
+		<!-- TMPL_LOOP NAME="loop" -->
 			<tr>
 				<td>
-					<!-- TMPL_VAR name="word" -->
+					<!-- TMPL_VAR NAME="word" -->
 				</td>
 				<td>
-					<a href="javascript:Import('<!-- TMPL_VAR name="word" -->','<!-- TMPL_VAR name="suggestion" -->')">
-						<!-- TMPL_VAR name="suggestion" -->
+					<a href="javascript:Import('<!-- TMPL_VAR NAME="word" -->','<!-- TMPL_VAR NAME="suggestion" -->')">
+						<!-- TMPL_VAR NAME="suggestion" -->
 					</a>
 				</td>
 				<td>
-					<!-- TMPL_VAR name="count" -->
+					<!-- TMPL_VAR NAME="count" -->
 				</td>
 			</tr>
 		<!-- /TMPL_LOOP -->
 		</table>
 	</div>
 </div>
-<script>
+<script language="javascript" type="text/javascript">
 	function Import(Replaced,ReplaceBy) {
 		for (i=0 ; i<opener.document.f.value.length ; i++) {
-				opener.document.forms[0].value[i].value = opener.document.forms[0].value[i].value.replace(Replaced,ReplaceBy);
-//			if (document.forms[0].kohafield[i].value == "biblioitems.isbn" && document.forms[0].field_value[i].value.length>0) {
-//				strQuery += "&isbn="+document.forms[0].field_value[i].value;
+				opener.document.forms['f'].value[i].value = opener.document.forms['f'].value[i].value.replace(Replaced,ReplaceBy);
+//			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;
 //			}
-//			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR name="oldbiblionumber" -->&breedingid="+GetThisOne;
-//			self.close();
+//			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
+			self.close();
 //			return false;
 		}
 	}

Index: pl/user/userpage.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/user/Attic/userpage.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/user/userpage.tmpl	17 Apr 2004 16:26:25 -0000	1.2
+++ pl/user/userpage.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="members-top.inc" -->
 
 <!-- TMPL_IF NAME="loggedinuser" -->
-	<p align=left>Zalogowano jako: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href=/cgi-bin/koha/logout.pl>Wyloguj</a>]</p>
+	<p align=left>Zalogowano jako: <!-- TMPL_VAR NAME="loggedinuser" --> [<a href="/cgi-bin/koha/logout.pl">Wyloguj</a>]</p>
 	<p>
 	<center>
 	<h3>Ta strona jest tylko projektem</h3>
@@ -10,7 +10,7 @@
 	<tr><td valign=top>
 
 	<table border=1 cellpadding=10>
-	<tr><th bgcolor=#99cccc background=/images/background-opac.gif><font size=+2>Rezerwacje</font></th></tr>
+	<tr><th bgcolor="#99cccc" background="/images/background-opac.gif"><font size="+2">Rezerwacje</font></th></tr>
 	<tr><td>
 	<b>CzekajÄ… na Ciebie nastepujÄ…ce pozycje do odebrania:</b>
 	<ul>
@@ -18,7 +18,7 @@
 	<li>Between Brothers by Irene Morck at Main Library
 	</ul>
 	<p>
-	<b>You have the following requests for items on loan:</b>
+	<b>Trzymasz następujące pozycje, które zarezerwowano:</b>
 	<ul>
 	<li>The Amazing Apple Book by Paulette Bourgeois
 	<li>Tracey the Great by Alan Cliburn
@@ -29,10 +29,10 @@
 
 	</td><td valign=top>
 
-		<form method=post>
+		<form method="post">
 		<table border=1 cellpadding=10>
-		<tr><th bgcolor=#99cccc background=/images/background-opac.gif><font size=+2>Preferencje Użytkownika</font></th></tr>
-		<tr><td align =center>
+		<tr><th bgcolor="#99cccc" background="/images/background-opac.gif"><font size="+2">Preferencje Użytkownika</font></th></tr>
+		<tr><td align ="center">
 		<table border=0 cellpadding=5>
 			<tr><td>Język</td><td>
 			<select name=language>
@@ -42,7 +42,7 @@
 			<option value=english>Polski
 			</select>
 			</td></tr>
-			<tr><td>Adres E-mail</td><td><input name=email size=30 value=<!-- TMPL_VAR NAME=loggedinuser -->@mylibrary.com></td></tr>
+			<tr><td>Adres E-mail</td><td><input name=email size=30 value="<!-- TMPL_VAR NAME=loggedinuser -->@mylibrary.com"></td></tr>
 			<tr><td>Preferowany Oddział<br>for reserve pickups</td><td>
 			<select name=pickupbranch>
 			<option value=MAIN>Biblioteka Główna
@@ -52,10 +52,10 @@
 			</select>
 			</td></tr>
 			<tr><td colspan=2>
-			<input name=specialeventsbyemail type=checkbox checked> Powiadom mnie o Ważnych Wydarzeniach  e-mailem<br>
-			<input name=overduesbyemail type=checkbox checked> Powiadom mnie o zaległych e-mailem<br>
-			<input name=recordreadingrecord type=checkbox> Zatrzymaj historię książek, które czytałem/am.<br>
-			<input name=recordreadingrecord type=checkbox> Zezwalaj pracownikom biblioteki na przeglądanie historii wypożyczeń<br>
+			<input name="specialeventsbyemail" type="checkbox" checked> Powiadom mnie o Ważnych Wydarzeniach  e-mailem<br>
+			<input name="overduesbyemail" type="checkbox" checked> Powiadom mnie o zaległych e-mailem<br>
+			<input name="recordreadingrecord" type="checkbox"> Zatrzymaj historię książek, które czytałem/am.<br>
+			<input name="recordreadingrecord" type="checkbox"> Zezwalaj pracownikom biblioteki na przeglądanie historii wypożyczeń<br>
 			</td></tr>
 			<tr><td align=center colspan=2>
 			<input type=submit value="Ustaw preferencje">
@@ -74,11 +74,11 @@
 	<center>
 	<form method=post>
 		<table border=1 cellpadding=10>
-		<tr><th bgcolor=#99cccc background=/images/background-opac.gif colspan=2><font size=+2>Preferencje Użytkownika</font></th></tr>
+		<tr><th bgcolor="#99cccc" background="/images/background-opac.gif" colspan=2><font size=+2>Preferencje Użytkownika</font></th></tr>
 		<tr><td>Nazwisko:</td><td><input name="userid"></td></tr>
-		<tr><td>Hasło:</td><td><input type=password name=password></td></tr>
-		<tr><td align=center colspan=2>
-		    <input type=submit value="Login">
+		<tr><td>Hasło:</td><td><input type="password" name="password"></td></tr>
+		<tr><td align="center" colspan=2>
+		    <input type="submit" value="Login">
 		</td>
 		</tr>
 	    </table>

Index: pl/value_builder/unimarc_field_100.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/value_builder/Attic/unimarc_field_100.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/value_builder/unimarc_field_100.tmpl	17 Apr 2004 16:26:25 -0000	1.2
+++ pl/value_builder/unimarc_field_100.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,45 +1,696 @@
 <html>
 <head>
-<title>Kreator pola 100 UNIMARC</title>
+<title>UNIMARC Field 100 builder</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
 <table>
 	<tr>
-		<td>Date d'enregistrement </td>
-		<td><input type="text" name="f1" maxlength=8 size=8 value="<!-- TMPL_VAR name="f1" -->"></td>
+		<td>Date d'enregistrement</td>
+		<td><input type="text" name="f1" maxlength=8 size=9 value="<!-- TMPL_VAR name="f1" -->"></td>
 	</tr>
 	<tr>
-		<td>Kod daty publikacji </td><td><select name="f2" size="1">
-		<option value="a" <!-- TMPL_IF name="f2a" -->SELECTED<!-- /TMPL_IF -->>Periodyk wydawany</option>
-			<option value="b" <!-- TMPL_IF name="f2b" -->SELECTED<!-- /TMPL_IF -->>Periodyk nie wydawany</option>
-			<option value="c" <!-- TMPL_IF name="f2c" -->SELECTED<!-- /TMPL_IF -->>Periodyk nieznanego statusu</option>
-			<option value="d" <!-- TMPL_IF name="f2d" -->SELECTED<!-- /TMPL_IF -->>monografia skończona</option>
-			<option value="e" <!-- TMPL_IF name="f2e" -->SELECTED<!-- /TMPL_IF -->>reprodukcja</option>
+		<td>Code de date de publication </td>
+		<td>
+			<select name="f2" size="1">
+	    <!-- TMPL_IF name="f2 " -->
+              <option value=" " SELECTED>Brak</option>
+                 <!-- TMPL_ELSE -->
+                    <option value=" ">Brak</option>
+
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f2a" -->
+				<option value="a" SELECTED>Periodique
+				en cours</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Periodique en cours</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2b" -->
+				<option value="b" SELECTED>Periodique mort</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Periodique mort</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2c" -->
+				<option value="c" SELECTED>Periodique
+				d'etat inconnu</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">Periodique d'etat inconnu</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2d" -->
+				<option value="d" SELECTED>Monographie
+				complete</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">Monographie
+				complete</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2e" -->
+				<option value="e" SELECTED>reproduction</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">reproduction</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f2f" -->
+				<option value="f"
+				SELECTED>monographie, date de
+				publication incertaine</option>
+			<!-- TMPL_ELSE -->
+				<option value="f">monographie, date de
+				publication incertaine</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f2g" -->
+				<option value="g"
+				SELECTED>monographie dont la
+				publication s'etend sur plus d'un an</option>
+			<!-- TMPL_ELSE -->
+				<option value="g">monographie dont la
+				publication s'etend sur plus d'un an</option>
+			<!-- /TMPL_IF -->
+			
+			
+			<!-- TMPL_IF name="f2h" -->
+				<option value="h"
+				SELECTED>monographie ayant a la fois
+				une date reelle et une date de
+				copyright ou de privilege</option>
+			<!-- TMPL_ELSE -->
+				<option value="h">monographie ayant a la fois
+				une date reelle et une date de
+				copyright ou de privilege</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f2i" -->
+				<option value="i"
+				SELECTED>monographie ayant a la fois
+				une date d'edition ou de reedition et
+				une date de production</option>
+			<!-- TMPL_ELSE -->
+				<option value="i">monographie ayant a la fois
+				une date d'edition ou de reedition et
+				une date de production</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f2j" -->
+				<option value="j"
+				SELECTED>monographie avec date
+				publication detaillee</option>
+			<!-- TMPL_ELSE -->
+				<option value="j">monographie avec date
+				publication detaillee </option>
+			<!-- /TMPL_IF -->
+			
 			</select>
 		</td>
 	</tr>
 	<tr>
-		<td>Année début</td>
+		<td>Premiere date de publication</td>
 		<td><input type="text" name="f3" maxlength=4 size=5 value="<!-- TMPL_VAR name="f3" -->"></td>
 	</tr>
 	<tr>
-	<td>Année fin</td>
-	<td><input type="text" name="f4" maxlength=4 size=5 value="<!-- TMPL_VAR name="f4" -->"></td>
+	<td>Deuxieme date de publication</td>
+	<td><input type="text" name="f4" maxlength=4 size=5
+		value="<!-- TMPL_VAR name="f4" -->"></td>
+        
 	</tr>
+	<tr>
+		<td>Niveau intellectuel ou public destinataire 1</td>
+		<td>
+			<select name="f5" size="1">
+	    <!-- TMPL_IF name="f5 " -->
+              <option value=" " SELECTED>Brak</option>
+                 <!-- TMPL_ELSE -->
+                    <option value=" ">Brak</option>
+
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5a" -->
+				<option value="a" SELECTED>Jeunesse en
+	general </option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Jeunesse en general</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5b" -->
+				<option value="b"
+	SELECTED>Pre-scolaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Pre-scolaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5c" -->
+				<option value="c" SELECTED>scolaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">scolaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5d" -->
+				<option value="d" SELECTED>enfant</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">enfant</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5e" -->
+				<option value="e" SELECTED>jeune adulte</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">jeune adulte</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f5k" -->
+				<option value="k"
+				SELECTED>adulte, haut niveau</option>
+			<!-- TMPL_ELSE -->
+				<option value="k">adulte, haut niveau</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f5m" -->
+				<option value="m"
+				SELECTED>fiction ou vulg adulte</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">fiction ou vulg adulte</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f5u" -->
+				<option value="u"
+				SELECTED>inconnu</option>
+			<!-- TMPL_ELSE -->
+				<option value="u">inconnu</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>Niveau intellectuel ou public destinataire 2</td>
+		<td>
+			<select name="f6" size="1">
+	    <!-- TMPL_IF name="f6 " -->
+              <option value=" " SELECTED>Brak</option>
+                 <!-- TMPL_ELSE -->
+                    <option value=" ">Brak</option>
+
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6a" -->
+				<option value="a" SELECTED>Jeunesse en
+	general </option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Jeunesse en general</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6b" -->
+				<option value="b"
+	SELECTED>Pre-scolaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Pre-scolaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6c" -->
+				<option value="c" SELECTED>scolaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">scolaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6d" -->
+				<option value="d" SELECTED>enfant</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">enfant</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6e" -->
+				<option value="e" SELECTED>jeune adulte</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">jeune adulte</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f6k" -->
+				<option value="k"
+				SELECTED>adulte, haut niveau</option>
+			<!-- TMPL_ELSE -->
+				<option value="k">adulte, haut niveau</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f6m" -->
+				<option value="m"
+				SELECTED>fiction ou vulg adulte</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">fiction ou vulg adulte</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f6u" -->
+				<option value="u"
+				SELECTED>inconnu</option>
+			<!-- TMPL_ELSE -->
+				<option value="u">inconnu</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>Niveau intellectuel ou public destinataire 3</td>
+		<td>
+			<select name="f7" size="1">
+	    <!-- TMPL_IF name="f7 " -->
+              <option value=" " SELECTED>Brak</option>
+                 <!-- TMPL_ELSE -->
+                    <option value=" ">Brak</option>
+
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7a" -->
+				<option value="a" SELECTED>Jeunesse en
+	general </option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Jeunesse en general</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7b" -->
+				<option value="b"
+	SELECTED>Pre-scolaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Pre-scolaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7c" -->
+				<option value="c" SELECTED>scolaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">scolaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7d" -->
+				<option value="d" SELECTED>enfant</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">enfant</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7e" -->
+				<option value="e" SELECTED>jeune adulte</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">jeune adulte</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f7k" -->
+				<option value="k"
+				SELECTED>adulte, haut niveau</option>
+			<!-- TMPL_ELSE -->
+				<option value="k">adulte, haut niveau</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f7m" -->
+				<option value="m"
+				SELECTED>fiction ou vulg adulte</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">fiction ou vulg adulte</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f7u" -->
+				<option value="u"
+				SELECTED>inconnu</option>
+			<!-- TMPL_ELSE -->
+				<option value="u">inconnu</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td>Publication officielle</td>
+		<td>
+			<select name="f8" size="1">
+                   <!-- TMPL_IF name="f8 " -->
+                                <option value=" " SELECTED>Brak</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">Brak</option>
+                        <!-- /TMPL_IF -->
+		<!-- TMPL_IF name="f8a" -->
+				<option value="a" SELECTED>Federal/national</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Federal/national</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8b" -->
+				<option value="b" SELECTED>etat/province</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">etat/province</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8c" -->
+				<option value="c" SELECTED>compte/departement</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">compte/departement</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8d" -->
+				<option value="d"
+				SELECTED>local(municipal, etc.)</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">local(municipal, etc.)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8e" -->
+				<option value="e"
+				SELECTED>multi-local(inter-departemental,
+				etc. sous le niveau national)</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">multi-local(inter-departemental,
+				etc. sous le niveau national)</option>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF name="f8f" -->
+				<option value="f"
+				SELECTED>Inter-gouvernemental</option>
+			<!-- TMPL_ELSE -->
+				<option value="f">Inter-gouvernemental</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f8g" -->
+				<option value="g"
+				SELECTED>gouvernement en exil ou clandestin</option>
+			<!-- TMPL_ELSE -->
+				<option value="g">gouvernement en exil
+				ou clandestin</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f8h" -->
+				<option value="h"
+				SELECTED>Niveau indetermine</option>
+			<!-- TMPL_ELSE -->
+				<option value="h">Niveau indetermine</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8u" -->
+				<option value="u"
+				SELECTED>inconnu</option>
+			<!-- TMPL_ELSE -->
+				<option value="u">inconnu</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8y" -->
+				<option value="y"
+				SELECTED>il ne s'agit pas d'une
+				publication officielle</option>
+			<!-- TMPL_ELSE -->
+				<option value="y">il ne s'agit pas
+				d'une publication officielle</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8z" -->
+				<option value="z"
+				SELECTED>Autre instance officielle</option>
+			<!-- TMPL_ELSE -->
+				<option value="z">Autre instance officielle</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+
+	<tr>
+		<td>Code de modification de la notice</td>
+		<td>
+			<select name="f9" size="1">
+	                  <!-- TMPL_IF name="f9 " -->
+                                <option value=" " SELECTED>Brak</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">Brak</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f90" -->
+				<option value="0" SELECTED>Notice non modifiee</option>
+			<!-- TMPL_ELSE -->
+				<option value="0">Notice non modifiee</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f91" -->
+				<option value="1" SELECTED>notice modifiee</option>
+			<!-- TMPL_ELSE -->
+				<option value="1">notice modifiee</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+
+
+	<tr>
+	<td>Langue de catalogage (obligatoire)</td>
+	<td><input type="text" name="f10" maxlength=3 size=4
+		value="<!-- TMPL_VAR name="f10" -->"></td>
+        
+	</tr>
+
+
+
+	<tr>
+		<td>Code de transliteration</td>
+		<td>
+			<select name="f11" size="1">
+	                  <!-- TMPL_IF name="f11 " -->
+                                <option value=" " SELECTED>Brak</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">Brak</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f11a" -->
+				<option value="a" SELECTED>Norme ISO
+		pour la translitteration</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Norme ISO
+		pour la translitteration</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f11b" -->
+				<option value="b" SELECTED>autre</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">autre</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f11c" -->
+				<option value="c"
+		SELECTED>Translitterations multiples : ISO et autres regles</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">Translitterations multiples : ISO et autres regles</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f11y" -->
+				<option value="y" SELECTED>Sans regles
+		de translitteration</option>
+			<!-- TMPL_ELSE -->
+				<option value="y">Sans regles
+		de translitteration</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+	</tr>
+
+	<tr>
+	<td>Jeux de caracteres (obligatoire) 1</td>
+		<td>
+			<select name="f12" size="1">
+	   <!-- TMPL_IF name="f12  " -->
+                                <option value="  " SELECTED>Brak</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="  ">Brak</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f1201" -->
+				<option value="01" SELECTED>ISO 646,
+	version IRV (caracteres latins de base)</option>
+			<!-- TMPL_ELSE -->
+				<option value="01">ISO 646,
+	version IRV (caracteres latins de base)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1202" -->
+				<option value="02" SELECTED>Registre
+	ISO #37 (caracteres cyrilliques de base)</option>
+			<!-- TMPL_ELSE -->
+				<option value="02">Registre
+	ISO #37 (caracteres cyrilliques de base)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1203" -->
+				<option value="03"
+		SELECTED>ISO 5426 (jeu de caractere latin etendu)</option>
+			<!-- TMPL_ELSE -->
+				<option value="03">ISO 5426 (jeu de caractere latin etendu)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1204" -->
+				<option value="04" SELECTED>ISO DIS
+	5427 (jeu de caracteres cyrilliques etendu)</option>
+			<!-- TMPL_ELSE -->
+				<option value="04">ISO DIS
+	5427 (jeu de caracteres cyrilliques etendu)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1205" -->
+				<option value="05" SELECTED>ISO  5428
+	(caracteres grecs)</option>
+			<!-- TMPL_ELSE -->
+				<option value="05">ISO  5428
+	(caracteres grecs)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1206" -->
+				<option value="06" SELECTED>ISO 6438
+	(caracteres africains codes)</option>
+			<!-- TMPL_ELSE -->
+				<option value="06">ISO 6438
+	(caracteres africains codes)</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+
+        
+	</tr>
+	<tr>
+	<td>Jeux de caracteres (obligatoire) 2</td>
+		<td>
+			<select name="f13" size="1">
+	   <!-- TMPL_IF name="f13  " -->
+                                <option value="  " SELECTED>Brak</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="  ">Brak</option>
+                        <!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f1301" -->
+				<option value="01" SELECTED>ISO 646,
+	version IRV (caracteres latins de base)</option>
+			<!-- TMPL_ELSE -->
+				<option value="01">ISO 646,
+	version IRV (caracteres latins de base)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1302" -->
+				<option value="02" SELECTED>Registre
+	ISO #37 (caracteres cyrilliques de base)</option>
+			<!-- TMPL_ELSE -->
+				<option value="02">Registre
+	ISO #37 (caracteres cyrilliques de base)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1303" -->
+				<option value="03"
+		SELECTED>ISO 5426 (jeu de caractere latin etendu)</option>
+			<!-- TMPL_ELSE -->
+				<option value="03">ISO 5426 (jeu de caractere latin etendu)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1304" -->
+				<option value="04" SELECTED>ISO DIS
+	5427 (jeu de caracteres cyrilliques etendu)</option>
+			<!-- TMPL_ELSE -->
+				<option value="04">ISO DIS
+	5427 (jeu de caracteres cyrilliques etendu)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1305" -->
+				<option value="05" SELECTED>ISO  5428
+	(caracteres grecs)</option>
+			<!-- TMPL_ELSE -->
+				<option value="05">ISO  5428
+	(caracteres grecs)</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1306" -->
+				<option value="06" SELECTED>ISO 6438
+	(caracteres africains codes)</option>
+			<!-- TMPL_ELSE -->
+				<option value="06">ISO 6438
+	(caracteres africains codes)</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+
+        
+	</tr>
+
+	<tr>
+	<td>Jeu de caracteres additionnels</td>
+	<td><input type="text" name="f14" maxlength=4 size=5
+		value="<!-- TMPL_VAR name="f14" -->"></td>
+        
+	</tr>
+
+	<tr>
+	<td>Alphabet du titre</td>
+	<td>
+	<select name="f15" size="1">
+	   <!-- TMPL_IF name="f15  " -->
+                                <option value="  " SELECTED>Brak</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="  ">Brak</option>
+                        <!-- /TMPL_IF -->
+
+	<!-- TMPL_IF name="f15ba" -->
+				<option value="ba" SELECTED>Latin</option>
+			<!-- TMPL_ELSE -->
+				<option value="ba">Latin</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15ca" -->
+				<option value="ca" SELECTED>Cyrillique</option>
+			<!-- TMPL_ELSE -->
+				<option value="ca">Cyrillique</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f15da" -->
+				<option value="da" SELECTED>Japonais -
+				alphabet non precise</option>
+			<!-- TMPL_ELSE -->
+				<option value="da">Japonais non precise</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f15db" -->
+				<option value="db" SELECTED>Japonais -
+				Kanji</option>
+			<!-- TMPL_ELSE -->
+				<option value="db">Japonais - Kanji</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f15dc" -->
+				<option value="dc" SELECTED>Japonais -
+				Kana</option>
+			<!-- TMPL_ELSE -->
+				<option value="dc">Japonais - Kana</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15ea" -->
+				<option value="ea" SELECTED>Chinois</option>
+			<!-- TMPL_ELSE -->
+				<option value="ea">Chinois</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15fa" -->
+				<option value="fa" SELECTED>Arabe</option>
+			<!-- TMPL_ELSE -->
+				<option value="fa">Arabe</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15ga" -->
+				<option value="ga" SELECTED>Grec</option>
+			<!-- TMPL_ELSE -->
+				<option value="ga">Grec</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15ha" -->
+				<option value="ha" SELECTED>Hebreu</option>
+			<!-- TMPL_ELSE -->
+				<option value="ha">Hebreu</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15ia" -->
+				<option value="ia" SELECTED>Thai</option>
+			<!-- TMPL_ELSE -->
+				<option value="ia">Thai</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15ja" -->
+				<option value="ja" SELECTED>Devanagari</option>
+			<!-- TMPL_ELSE -->
+				<option value="ja">Devanagari</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15ka" -->
+				<option value="ka" SELECTED>Coreen</option>
+			<!-- TMPL_ELSE -->
+				<option value="ka">Coreen</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15la" -->
+				<option value="la" SELECTED>Tamil</option>
+			<!-- TMPL_ELSE -->
+				<option value="la">Tamil</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f15zz" -->
+				<option value="zz" SELECTED>autres</option>
+			<!-- TMPL_ELSE -->
+				<option value="zz">autres</option>
+			<!-- /TMPL_IF -->
+			</select>
+
+
+	</td>
+        
+	</tr>
+	
 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
 </table>
 </form>
 <script>
 	function report() {
+
 		document.f_pop.f1.value=document.f_pop.f1.value+'        ';
 		document.f_pop.f3.value=document.f_pop.f3.value+'    ';
 		document.f_pop.f4.value=document.f_pop.f4.value+'    ';
-		document.f_pop.f1.value=document.f_pop.f1.value.substring(0,8);
-		document.f_pop.f3.value=document.f_pop.f3.value.substring(0,4);
-		document.f_pop.f4.value=document.f_pop.f4.value.substring(0,4);
+		document.f_pop.f10.value=document.f_pop.f10.value+'   ';
+		document.f_pop.f14.value=document.f_pop.f14.value+'    ';
+
+		
+
+document.f_pop.f1.value=document.f_pop.f1.value.substring(0,8);
+document.f_pop.f3.value=document.f_pop.f3.value.substring(0,4);
+document.f_pop.f4.value=document.f_pop.f4.value.substring(0,4);
+document.f_pop.f10.value=document.f_pop.f10.value.substring(0,3);
+document.f_pop.f14.value=document.f_pop.f14.value.substring(0,4);
+
 
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value;
+		opener.document.f.field_value[<!-- TMPL_VAR
+		name="index" -->].value= document.f_pop.f1.value +
+		document.f_pop.f2.value +document.f_pop.f3.value
+		+document.f_pop.f4.value+document.f_pop.f5.value+document.f_pop.f6.value+document.f_pop.f7.value+document.f_pop.f8.value+document.f_pop.f9.value+document.f_pop.f10.value+document.f_pop.f11.value+document.f_pop.f12.value+document.f_pop.f13.value+document.f_pop.f14.value+document.f_pop.f15.value;
 		self.close();
 		return false;
 	}

Index: pl/value_builder/unimarc_field_105.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/value_builder/Attic/unimarc_field_105.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/value_builder/unimarc_field_105.tmpl	17 Apr 2004 16:57:06 -0000	1.2
+++ pl/value_builder/unimarc_field_105.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,45 +1,1165 @@
 <html>
 <head>
-<title>Kreator pola 100 UNIMARC</title>
+<title>UNIMARC constructeur champ 105</title>
 </head>
 <body>
 <form name="f_pop" onSubmit="javascript:report()">
 <table>
 	<tr>
-		<td>Date d'enregistrement </td>
-		<td><input type="text" name="f1" maxlength=8 size=8 value="<!-- TMPL_VAR name="f1" -->"></td>
+		<td>Illustration 1:</td>
+		<td>
+			<select name="f1" size="1">
+			<!-- TMPL_IF name="f1 " -->
+				<option value=" " SELECTED>Brak</option>
+			<!-- TMPL_ELSE -->
+				<option value=" ">Brak</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1a" -->
+				<option value="a" SELECTED>Ilustracje</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Ilustracje</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1b" -->
+				<option value="b" SELECTED>Cartes</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Cartes</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1c" -->
+				<option value="c" SELECTED>Portraits</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">Portraits</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1d" -->
+				<option value="d" SELECTED>cartes marines</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">cartes marines</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1e" -->
+				<option value="e" SELECTED>plans</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">plans</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1e" -->
+				<option value="e" SELECTED>plans</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">plans</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1f" -->
+				<option value="f" SELECTED>Planches</option>
+			<!-- TMPL_ELSE -->
+				<option value="f">Planches</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1g" -->
+				<option value="g" SELECTED>Musique imprimee</option>
+			<!-- TMPL_ELSE -->
+				<option value="g">Musique imprimee</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1h" -->
+				<option value="h" SELECTED>fac-similes</option>
+			<!-- TMPL_ELSE -->
+				<option value="h">fac-similes</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1i" -->
+				<option value="i" SELECTED>armoiries</option>
+			<!-- TMPL_ELSE -->
+				<option value="i">armoiries</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1j" -->
+				<option value="j" SELECTED>Tables Genealogique</option>
+			<!-- TMPL_ELSE -->
+				<option value="j">Tables Genealogique</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1k" -->
+				<option value="k" SELECTED>Formulaires</option>
+			<!-- TMPL_ELSE -->
+				<option value="k">Formulaires</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1l" -->
+				<option value="l" SELECTED>Specimens</option>
+			<!-- TMPL_ELSE -->
+				<option value="l">Specimens</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1m" -->
+				<option value="m"
+				SELECTED>Enregistrement sonore</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">Enregistrement sonore</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1n" -->
+				<option value="n" SELECTED>Transparents</option>
+			<!-- TMPL_ELSE -->
+				<option value="n">Transparents</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1o" -->
+				<option value="o" SELECTED>Enluminures</option>
+			<!-- TMPL_ELSE -->
+				<option value="o">Enluminures</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f1y" -->
+				<option value="y" SELECTED>Sans illustration</option>
+			<!-- TMPL_ELSE -->
+				<option value="y">Sans illustrations</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+		<td>Illustration 2:</td>
+		<td>
+			<select name="f2" size="1">
+			<!-- TMPL_IF name="f2 " -->
+				<option value=" " SELECTED>Brak</option>
+			<!-- TMPL_ELSE -->
+				<option value=" ">Brak</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2a" -->
+				<option value="a" SELECTED>Ilustracje</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Ilustracje</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2b" -->
+				<option value="b" SELECTED>Cartes</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Cartes</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2c" -->
+				<option value="c" SELECTED>Portraits</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">Portraits</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2d" -->
+				<option value="d" SELECTED>cartes marines</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">cartes marines</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2e" -->
+				<option value="e" SELECTED>plans</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">plans</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2e" -->
+				<option value="e" SELECTED>plans</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">plans</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2f" -->
+				<option value="f" SELECTED>Planches</option>
+			<!-- TMPL_ELSE -->
+				<option value="f">Planches</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2g" -->
+				<option value="g" SELECTED>Musique imprimee</option>
+			<!-- TMPL_ELSE -->
+				<option value="g">Musique imprimee</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2h" -->
+				<option value="h" SELECTED>fac-similes</option>
+			<!-- TMPL_ELSE -->
+				<option value="h">fac-similes</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2i" -->
+				<option value="i" SELECTED>armoiries</option>
+			<!-- TMPL_ELSE -->
+				<option value="i">armoiries</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2j" -->
+				<option value="j" SELECTED>Tables Genealogique</option>
+			<!-- TMPL_ELSE -->
+				<option value="j">Tables Genealogique</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2k" -->
+				<option value="k" SELECTED>Formulaires</option>
+			<!-- TMPL_ELSE -->
+				<option value="k">Formulaires</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2l" -->
+				<option value="l" SELECTED>Specimens</option>
+			<!-- TMPL_ELSE -->
+				<option value="l">Specimens</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2m" -->
+				<option value="m"
+				SELECTED>Enregistrement sonore</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">Enregistrement sonore</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2n" -->
+				<option value="n" SELECTED>Transparents</option>
+			<!-- TMPL_ELSE -->
+				<option value="n">Transparents</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2o" -->
+				<option value="o" SELECTED>Enluminures</option>
+			<!-- TMPL_ELSE -->
+				<option value="o">Enluminures</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f2y" -->
+				<option value="y" SELECTED>Sans illustration</option>
+			<!-- TMPL_ELSE -->
+				<option value="y">Sans illustrations</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td></tr><tr>
+		<td>Illustration 3:</td>
+		<td>
+			<select name="f3" size="1">
+			<!-- TMPL_IF name="f3 " -->
+				<option value=" " SELECTED>Brak</option>
+			<!-- TMPL_ELSE -->
+				<option value=" ">Brak</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3a" -->
+				<option value="a" SELECTED>Ilustracje</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Ilustracje</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3b" -->
+				<option value="b" SELECTED>Cartes</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Cartes</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3c" -->
+				<option value="c" SELECTED>Portraits</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">Portraits</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3d" -->
+				<option value="d" SELECTED>cartes marines</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">cartes marines</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3e" -->
+				<option value="e" SELECTED>plans</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">plans</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3e" -->
+				<option value="e" SELECTED>plans</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">plans</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3f" -->
+				<option value="f" SELECTED>Planches</option>
+			<!-- TMPL_ELSE -->
+				<option value="f">Planches</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3g" -->
+				<option value="g" SELECTED>Musique imprimee</option>
+			<!-- TMPL_ELSE -->
+				<option value="g">Musique imprimee</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3h" -->
+				<option value="h" SELECTED>fac-similes</option>
+			<!-- TMPL_ELSE -->
+				<option value="h">fac-similes</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3i" -->
+				<option value="i" SELECTED>armoiries</option>
+			<!-- TMPL_ELSE -->
+				<option value="i">armoiries</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3j" -->
+				<option value="j" SELECTED>Tables Genealogique</option>
+			<!-- TMPL_ELSE -->
+				<option value="j">Tables Genealogique</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3k" -->
+				<option value="k" SELECTED>Formulaires</option>
+			<!-- TMPL_ELSE -->
+				<option value="k">Formulaires</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3l" -->
+				<option value="l" SELECTED>Specimens</option>
+			<!-- TMPL_ELSE -->
+				<option value="l">Specimens</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3m" -->
+				<option value="m"
+				SELECTED>Enregistrement sonore</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">Enregistrement sonore</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3n" -->
+				<option value="n" SELECTED>Transparents</option>
+			<!-- TMPL_ELSE -->
+				<option value="n">Transparents</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3o" -->
+				<option value="o" SELECTED>Enluminures</option>
+			<!-- TMPL_ELSE -->
+				<option value="o">Enluminures</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f3y" -->
+				<option value="y" SELECTED>Sans illustration</option>
+			<!-- TMPL_ELSE -->
+				<option value="y">Sans illustrations</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
+		<td>Illustration 4:</td>
+		<td>
+			<select name="f4" size="1">
+			<!-- TMPL_IF name="f4 " -->
+				<option value=" " SELECTED>Brak</option>
+			<!-- TMPL_ELSE -->
+				<option value=" ">Brak</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4a" -->
+				<option value="a" SELECTED>Ilustracje</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Ilustracje</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4b" -->
+				<option value="b" SELECTED>Cartes</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Cartes</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4c" -->
+				<option value="c" SELECTED>Portraits</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">Portraits</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4d" -->
+				<option value="d" SELECTED>cartes marines</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">cartes marines</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4e" -->
+				<option value="e" SELECTED>plans</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">plans</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4e" -->
+				<option value="e" SELECTED>plans</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">plans</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4f" -->
+				<option value="f" SELECTED>Planches</option>
+			<!-- TMPL_ELSE -->
+				<option value="f">Planches</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4g" -->
+				<option value="g" SELECTED>Musique imprimee</option>
+			<!-- TMPL_ELSE -->
+				<option value="g">Musique imprimee</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4h" -->
+				<option value="h" SELECTED>fac-similes</option>
+			<!-- TMPL_ELSE -->
+				<option value="h">fac-similes</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4i" -->
+				<option value="i" SELECTED>armoiries</option>
+			<!-- TMPL_ELSE -->
+				<option value="i">armoiries</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4j" -->
+				<option value="j" SELECTED>Tables Genealogique</option>
+			<!-- TMPL_ELSE -->
+				<option value="j">Tables Genealogique</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4k" -->
+				<option value="k" SELECTED>Formulaires</option>
+			<!-- TMPL_ELSE -->
+				<option value="k">Formulaires</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4l" -->
+				<option value="l" SELECTED>Specimens</option>
+			<!-- TMPL_ELSE -->
+				<option value="l">Specimens</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4m" -->
+				<option value="m"
+				SELECTED>Enregistrement sonore</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">Enregistrement sonore</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4n" -->
+				<option value="n" SELECTED>Transparents</option>
+			<!-- TMPL_ELSE -->
+				<option value="n">Transparents</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4o" -->
+				<option value="o" SELECTED>Enluminures</option>
+			<!-- TMPL_ELSE -->
+				<option value="o">Enluminures</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f4y" -->
+				<option value="y" SELECTED>Sans illustration</option>
+			<!-- TMPL_ELSE -->
+				<option value="y">Sans illustrations</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>
 	</tr>
-	<tr>
-		<td>Kod daty publikacji </td><td><select name="f2" size="1">
-		<option value="a" <!-- TMPL_IF name="f2a" -->SELECTED<!-- /TMPL_IF -->>Periodyk wydawany</option>
-			<option value="b" <!-- TMPL_IF name="f2b" -->SELECTED<!-- /TMPL_IF -->>Periodyk nie wydawany</option>
-			<option value="c" <!-- TMPL_IF name="f2c" -->SELECTED<!-- /TMPL_IF -->>Periodyk nieznanego statusu</option>
-			<option value="d" <!-- TMPL_IF name="f2d" -->SELECTED<!-- /TMPL_IF -->>monografia skończona</option>
-			<option value="e" <!-- TMPL_IF name="f2e" -->SELECTED<!-- /TMPL_IF -->>reprodukcja</option>
+	<tr>		<td>Type d'ouvrage de reference 1:</td>
+		<td>
+			<select name="f5" size="1">
+			<!-- TMPL_IF name="f5 " -->
+				<option value=" " SELECTED>Brak</option>
+			<!-- TMPL_ELSE -->
+				<option value=" ">Brak</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5a" -->
+				<option value="a" SELECTED>Bibliographie</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Bibliographie</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5b" -->
+				<option value="b" SELECTED>Katalog</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Katalog</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5c" -->
+				<option value="c" SELECTED>index</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">index</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5d" -->
+				<option value="d" SELECTED>resume</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">resume</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5e" -->
+				<option value="e" SELECTED>Dictionnaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">Dictionnaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5f" -->
+				<option value="f" SELECTED>encyclopedie</option>
+			<!-- TMPL_ELSE -->
+				<option value="f">encyclopedie</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5g" -->
+				<option value="g" SELECTED>Repertoire</option>
+			<!-- TMPL_ELSE -->
+				<option value="g">Repertoire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5h" -->
+				<option value="h" SELECTED>Description
+				de projet</option>
+			<!-- TMPL_ELSE -->
+				<option value="h">Description de projet</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5i" -->
+				<option value="i" SELECTED>statistiques</option>
+			<!-- TMPL_ELSE -->
+				<option value="i">statistiques</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5j" -->
+				<option value="j" SELECTED>Manuels
+				d'enseignement programme</option>
+			<!-- TMPL_ELSE -->
+				<option value="j">Manuels
+				d'enseignement programme</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5k" -->
+				<option value="k" SELECTED>Brevet</option>
+			<!-- TMPL_ELSE -->
+				<option value="k">Brevet</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5l" -->
+				<option value="l" SELECTED>norme</option>
+			<!-- TMPL_ELSE -->
+				<option value="l">norme</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5m" -->
+				<option value="m"
+				SELECTED>Memoire ou these</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">Memoire ou these</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5n" -->
+				<option value="n" SELECTED>Lois et decrets</option>
+			<!-- TMPL_ELSE -->
+				<option value="n">Lois et decrets</option>
+			<!-- /TMPL_IF -->
+
+
+
+
+			<!-- TMPL_IF name="f5o" -->
+				<option value="o" SELECTED>Table numerique</option>
+			<!-- TMPL_ELSE -->
+				<option value="o">Table numerique</option>
+			<!-- /TMPL_IF -->
+
+
+
+
+
+
+
+			<!-- TMPL_IF name="f5p" -->
+				<option value="p" SELECTED>Rapport technique</option>
+			<!-- TMPL_ELSE -->
+				<option value="p">Rapport techique</option>
+			<!-- /TMPL_IF -->
+
+
+
+
+
+
+			<!-- TMPL_IF name="f5q" -->
+				<option value="q" SELECTED>Sujet d'examen</option>
+			<!-- TMPL_ELSE -->
+				<option value="q">Sujet d'examen</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5r" -->
+				<option value="r" SELECTED>Synthese bibliographique</option>
+			<!-- TMPL_ELSE -->
+				<option value="r">Synthese bibliographique</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5s" -->
+				<option value="s" SELECTED>Traite</option>
+			<!-- TMPL_ELSE -->
+				<option value="s">Traite</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f5t" -->
+				<option value="t" SELECTED>Bande dessinee</option>
+			<!-- TMPL_ELSE -->
+				<option value="t">Bande dessinee</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f5z" -->
+				<option value="z" SELECTED>Autres</option>
+			<!-- TMPL_ELSE -->
+				<option value="z">Autres</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>		<td>Type d'ouvrage de reference 2:</td>
+		<td>
+			<select name="f6" size="1">
+	<!-- TMPL_IF name="f6 " -->
+										<option value=" " SELECTED>Brak</option>
+			<!-- TMPL_ELSE -->
+				<option value=" ">Brak</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f6a" -->
+				<option value="a" SELECTED>Bibliographie</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Bibliographie</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6b" -->
+				<option value="b" SELECTED>Katalog</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Katalog</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6c" -->
+				<option value="c" SELECTED>index</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">index</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6d" -->
+				<option value="d" SELECTED>resume</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">resume</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6e" -->
+				<option value="e" SELECTED>Dictionnaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">Dictionnaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6f" -->
+				<option value="f" SELECTED>encyclopedie</option>
+			<!-- TMPL_ELSE -->
+				<option value="f">encyclopedie</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6g" -->
+				<option value="g" SELECTED>Repertoire</option>
+			<!-- TMPL_ELSE -->
+				<option value="g">Repertoire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6h" -->
+				<option value="h" SELECTED>Description
+				de projet</option>
+			<!-- TMPL_ELSE -->
+				<option value="h">Description de projet</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6i" -->
+				<option value="i" SELECTED>statistiques</option>
+			<!-- TMPL_ELSE -->
+				<option value="i">statistiques</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6j" -->
+				<option value="j" SELECTED>Manuels
+				d'enseignement programme</option>
+			<!-- TMPL_ELSE -->
+				<option value="j">Manuels
+				d'enseignement programme</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6k" -->
+				<option value="k" SELECTED>Brevet</option>
+			<!-- TMPL_ELSE -->
+				<option value="k">Brevet</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6l" -->
+				<option value="l" SELECTED>norme</option>
+			<!-- TMPL_ELSE -->
+				<option value="l">norme</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6m" -->
+				<option value="m"
+				SELECTED>Memoire ou these</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">Memoire ou these</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6n" -->
+				<option value="n" SELECTED>Lois et decrets</option>
+			<!-- TMPL_ELSE -->
+				<option value="n">Lois et decrets</option>
+			<!-- /TMPL_IF -->
+
+
+
+
+			<!-- TMPL_IF name="f6o" -->
+				<option value="o" SELECTED>Table numerique</option>
+			<!-- TMPL_ELSE -->
+				<option value="o">Table numerique</option>
+			<!-- /TMPL_IF -->
+
+
+
+
+
+
+
+			<!-- TMPL_IF name="f6p" -->
+				<option value="p" SELECTED>Rapport technique</option>
+			<!-- TMPL_ELSE -->
+				<option value="p">Rapport techique</option>
+			<!-- /TMPL_IF -->
+
+
+
+
+
+
+			<!-- TMPL_IF name="f6q" -->
+				<option value="q" SELECTED>Sujet d'examen</option>
+			<!-- TMPL_ELSE -->
+				<option value="q">Sujet d'examen</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6r" -->
+				<option value="r" SELECTED>Synthese bibliographique</option>
+			<!-- TMPL_ELSE -->
+				<option value="r">Synthese bibliographique</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6s" -->
+				<option value="s" SELECTED>Traite</option>
+			<!-- TMPL_ELSE -->
+				<option value="s">Traite</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f6t" -->
+				<option value="t" SELECTED>Bande dessinee</option>
+			<!-- TMPL_ELSE -->
+				<option value="t">Bande dessinee</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f6z" -->
+				<option value="z" SELECTED>Autres</option>
+			<!-- TMPL_ELSE -->
+				<option value="z">Autres</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td></tr><tr>		<td>Type d'ouvrage de reference 3:</td>
+		<td>
+			<select name="f7" size="1">
+			<!-- TMPL_IF name="f7 " -->
+				<option value=" " SELECTED>Brak</option>
+			<!-- TMPL_ELSE -->
+				<option value=" ">Brak</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7a" -->
+				<option value="a" SELECTED>Bibliographie</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Bibliographie</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7b" -->
+				<option value="b" SELECTED>Katalog</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Katalog</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7c" -->
+				<option value="c" SELECTED>index</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">index</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7d" -->
+				<option value="d" SELECTED>resume</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">resume</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7e" -->
+				<option value="e" SELECTED>Dictionnaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">Dictionnaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7f" -->
+				<option value="f" SELECTED>encyclopedie</option>
+			<!-- TMPL_ELSE -->
+				<option value="f">encyclopedie</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7g" -->
+				<option value="g" SELECTED>Repertoire</option>
+			<!-- TMPL_ELSE -->
+				<option value="g">Repertoire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7h" -->
+				<option value="h" SELECTED>Description
+				de projet</option>
+			<!-- TMPL_ELSE -->
+				<option value="h">Description de projet</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7i" -->
+				<option value="i" SELECTED>statistiques</option>
+			<!-- TMPL_ELSE -->
+				<option value="i">statistiques</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7j" -->
+				<option value="j" SELECTED>Manuels
+				d'enseignement programme</option>
+			<!-- TMPL_ELSE -->
+				<option value="j">Manuels
+				d'enseignement programme</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7k" -->
+				<option value="k" SELECTED>Brevet</option>
+			<!-- TMPL_ELSE -->
+				<option value="k">Brevet</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7l" -->
+				<option value="l" SELECTED>norme</option>
+			<!-- TMPL_ELSE -->
+				<option value="l">norme</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7m" -->
+				<option value="m"
+				SELECTED>Memoire ou these</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">Memoire ou these</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7n" -->
+				<option value="n" SELECTED>Lois et decrets</option>
+			<!-- TMPL_ELSE -->
+				<option value="n">Lois et decrets</option>
+			<!-- /TMPL_IF -->
+
+
+
+
+			<!-- TMPL_IF name="f7o" -->
+				<option value="o" SELECTED>Table numerique</option>
+			<!-- TMPL_ELSE -->
+				<option value="o">Table numerique</option>
+			<!-- /TMPL_IF -->
+
+
+
+
+
+
+
+			<!-- TMPL_IF name="f7p" -->
+				<option value="p" SELECTED>Rapport technique</option>
+			<!-- TMPL_ELSE -->
+				<option value="p">Rapport techique</option>
+			<!-- /TMPL_IF -->
+
+
+
+
+
+
+			<!-- TMPL_IF name="f7q" -->
+				<option value="q" SELECTED>Sujet d'examen</option>
+			<!-- TMPL_ELSE -->
+				<option value="q">Sujet d'examen</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7r" -->
+				<option value="r" SELECTED>Synthese bibliographique</option>
+			<!-- TMPL_ELSE -->
+				<option value="r">Synthese bibliographique</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7s" -->
+				<option value="s" SELECTED>Traite</option>
+			<!-- TMPL_ELSE -->
+				<option value="s">Traite</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f7t" -->
+				<option value="t" SELECTED>Bande dessinee</option>
+			<!-- TMPL_ELSE -->
+				<option value="t">Bande dessinee</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f7z" -->
+				<option value="z" SELECTED>Autres</option>
+			<!-- TMPL_ELSE -->
+				<option value="z">Autres</option>
+			<!-- /TMPL_IF -->
+			</select>
+		</td>		<td>Type d'ouvrage de reference 4:</td>
+		<td>
+			<select name="f8" size="1">
+			<!-- TMPL_IF name="f8 " -->
+				<option value=" " SELECTED>Brak</option>
+			<!-- TMPL_ELSE -->
+				<option value=" ">Brak</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8a" -->
+				<option value="a" SELECTED>Bibliographie</option>
+			<!-- TMPL_ELSE -->
+				<option value="a">Bibliographie</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8b" -->
+				<option value="b" SELECTED>Katalog</option>
+			<!-- TMPL_ELSE -->
+				<option value="b">Katalog</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8c" -->
+				<option value="c" SELECTED>index</option>
+			<!-- TMPL_ELSE -->
+				<option value="c">index</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8d" -->
+				<option value="d" SELECTED>resume</option>
+			<!-- TMPL_ELSE -->
+				<option value="d">resume</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8e" -->
+				<option value="e" SELECTED>Dictionnaire</option>
+			<!-- TMPL_ELSE -->
+				<option value="e">Dictionnaire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8f" -->
+				<option value="f" SELECTED>encyclopedie</option>
+			<!-- TMPL_ELSE -->
+				<option value="f">encyclopedie</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8g" -->
+				<option value="g" SELECTED>Repertoire</option>
+			<!-- TMPL_ELSE -->
+				<option value="g">Repertoire</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8h" -->
+				<option value="h" SELECTED>Description
+				de projet</option>
+			<!-- TMPL_ELSE -->
+				<option value="h">Description de projet</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8i" -->
+				<option value="i" SELECTED>statistiques</option>
+			<!-- TMPL_ELSE -->
+				<option value="i">statistiques</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8j" -->
+				<option value="j" SELECTED>Manuels
+				d'enseignement programme</option>
+			<!-- TMPL_ELSE -->
+				<option value="j">Manuels
+				d'enseignement programme</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8k" -->
+				<option value="k" SELECTED>Brevet</option>
+			<!-- TMPL_ELSE -->
+				<option value="k">Brevet</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8l" -->
+				<option value="l" SELECTED>norme</option>
+			<!-- TMPL_ELSE -->
+				<option value="l">norme</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8m" -->
+				<option value="m"
+				SELECTED>Memoire ou these</option>
+			<!-- TMPL_ELSE -->
+				<option value="m">Memoire ou these</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8n" -->
+				<option value="n" SELECTED>Lois et decrets</option>
+			<!-- TMPL_ELSE -->
+				<option value="n">Lois et decrets</option>
+			<!-- /TMPL_IF -->
+
+
+
+
+			<!-- TMPL_IF name="f8o" -->
+				<option value="o" SELECTED>Table numerique</option>
+			<!-- TMPL_ELSE -->
+				<option value="o">Table numerique</option>
+			<!-- /TMPL_IF -->
+
+
+
+
+
+
+
+			<!-- TMPL_IF name="f8p" -->
+				<option value="p" SELECTED>Rapport technique</option>
+			<!-- TMPL_ELSE -->
+				<option value="p">Rapport techique</option>
+			<!-- /TMPL_IF -->
+
+
+
+
+
+
+			<!-- TMPL_IF name="f8q" -->
+				<option value="q" SELECTED>Sujet d'examen</option>
+			<!-- TMPL_ELSE -->
+				<option value="q">Sujet d'examen</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8r" -->
+				<option value="r" SELECTED>Synthese bibliographique</option>
+			<!-- TMPL_ELSE -->
+				<option value="r">Synthese bibliographique</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8s" -->
+				<option value="s" SELECTED>Traite</option>
+			<!-- TMPL_ELSE -->
+				<option value="s">Traite</option>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF name="f8t" -->
+				<option value="t" SELECTED>Bande dessinee</option>
+			<!-- TMPL_ELSE -->
+				<option value="t">Bande dessinee</option>
+			<!-- /TMPL_IF -->
+
+			<!-- TMPL_IF name="f8z" -->
+				<option value="z" SELECTED>Autres</option>
+			<!-- TMPL_ELSE -->
+				<option value="z">Autres</option>
+			<!-- /TMPL_IF -->
 			</select>
 		</td>
+</tr>
+  <tr>
+        <td>Colloque ou congres:</td>
+                <td>
+                        <select name="f9" size="1">
+	                        <!-- TMPL_IF name="f9 " -->
+                                <option value=" " SELECTED>Brak</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">Brak</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f90" -->
+                                <option value="0"
+				SELECTED>Le document n'est pas un
+				colloque ou un congres</optio\
+n>
+                        <!-- TMPL_ELSE -->
+                                <option
+				value="0">Le document n'est pas un
+				colloque ou un congres</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f91" -->
+                                <option value="1"
+				SELECTED>Le document est un colloque
+				ou un congres</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="1">Le document est un
+				colloque ou un congres</option>
+                        <!-- /TMPL_IF -->
+
+        </tr>
+  <tr>
+        <td>Melanges</td>
+                <td>
+                        <select name="f10" size="1">
+                        <!-- TMPL_IF name="f10 " -->
+                                <option value=" " SELECTED>Brak</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">Brak</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f100" -->
+                                <option value="0"
+				SELECTED>Document pas constitue de melanges</optio\
+n>
+                        <!-- TMPL_ELSE -->
+                                <option
+				value="0">Document pas constitue de melanges</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f101" -->
+                                <option value="1"
+				SELECTED>Le document est constitue de melanges</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="1">Le document est
+  constitue de melanges</option>
+                        <!-- /TMPL_IF -->
+
 	</tr>
+
+
 	<tr>
-		<td>Année début</td>
-		<td><input type="text" name="f3" maxlength=4 size=5 value="<!-- TMPL_VAR name="f3" -->"></td>
+        <td>Index</td>
+                <td>
+                        <select name="f11" size="1">
+                        <!-- TMPL_IF name="f11 " -->
+                                <option value=" " SELECTED>Brak</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">Brak</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f110" -->
+                                <option value="0"
+				SELECTED>Document qui ne contient pas d'index</optio\
+n>
+                        <!-- TMPL_ELSE -->
+                                <option
+				value="0">Document qui ne contient pas
+        d'index</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f111" -->
+                                <option value="1"
+				SELECTED>Le document contient un index</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="1">Le document contient
+        un index</option>
+                        <!-- /TMPL_IF -->
+
 	</tr>
+
+
+
+
+
+
 	<tr>
-	<td>Année fin</td>
-	<td><input type="text" name="f4" maxlength=4 size=5 value="<!-- TMPL_VAR name="f4" -->"></td>
+        <td>Genre litteraire</td>
+                <td>
+                        <select name="f12" size="1">
+                        <!-- TMPL_IF name="f12 " -->
+                                <option value=" " SELECTED>Brak</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">Brak</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f12a" -->
+                                <option value="a"
+				SELECTED>fiction, roman</option>
+                        <!-- TMPL_ELSE -->
+                                <option
+				value="a">fiction, roman</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f12b" -->
+                       <option value="b" SELECTED>Theatre, piece televisee</option>
+                        <!-- TMPL_ELSE -->
+                       <option value="b">Theatre, piece televisee</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f12c" -->
+                       <option value="c" SELECTED>Essais</option>
+                        <!-- TMPL_ELSE -->
+                       <option value="c">Essais</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f12d" -->
+                       <option value="d" SELECTED>Humour, satire</option>
+                        <!-- TMPL_ELSE -->
+                       <option value="d">Humour, satire</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f12e" -->
+                       <option value="e" SELECTED>Lettres</option>
+                        <!-- TMPL_ELSE -->
+                       <option value="e">Lettres</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f12f" -->
+                       <option value="f" SELECTED>Nouvelles</option>
+                        <!-- TMPL_ELSE -->
+                       <option value="f">Nouvelles</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f12g" -->
+                       <option value="g" SELECTED>Poesie</option>
+                        <!-- TMPL_ELSE -->
+                       <option value="g">Poesie</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f12h" -->
+                       <option value="h" SELECTED>Discours, art oratoire</option>
+                        <!-- TMPL_ELSE -->
+                       <option value="h">Discours, art oratoire</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f12y" -->
+                       <option value="y" SELECTED>Il ne s'agit pas
+                       d'un texte litteraire</option>
+                        <!-- TMPL_ELSE -->
+                       <option value="y">Il ne s'agit pas d'un texte litteraire</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f12z" -->
+                       <option value="z" SELECTED>formes variees ou
+                       autres formes litteraires</option>
+                        <!-- TMPL_ELSE -->
+                       <option value="z">formes variees ou
+                       autres formes litteraires</option>
+                        <!-- /TMPL_IF -->
+			
+
+        </tr>
+
+  <tr>
+        <td>Biographie</td>
+                <td>
+
+                        <select name="f13" size="1">
+                        <!-- TMPL_IF name="f13 " -->
+                                <option value=" " SELECTED>Brak</option>
+                        <!-- TMPL_ELSE -->
+                                <option value=" ">Brak</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f13y" -->
+                                <option value="y"
+				SELECTED>C'est pas une biographie</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="y">C'est pas une biographie</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f13a" -->
+                                <option value="a"
+				SELECTED>autobiographie (y compris correspondance...)</optio\
+n>
+                        <!-- TMPL_ELSE -->
+                                <option
+				value="a">autobiographie (y compris correspondance...)</option>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="f13b" -->
+                                <option value="b"
+				SELECTED>Biographie individuelle</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="b">Biographie individuelle</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f13c" -->
+                                <option value="c"
+				SELECTED>Biographie collective</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="c">Biographie collective</option>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="f13d" -->
+                                <option value="d"
+				SELECTED>Contient des informations biographiques</option>
+                        <!-- TMPL_ELSE -->
+                                <option value="d">Contient des
+                                informations biographiques</option>
+                        <!-- /TMPL_IF -->
+
+
+
+
 	</tr>
+
+
+
 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
 </table>
 </form>
 <script>
 	function report() {
-		document.f_pop.f1.value=document.f_pop.f1.value+'        ';
-		document.f_pop.f3.value=document.f_pop.f3.value+'    ';
-		document.f_pop.f4.value=document.f_pop.f4.value+'    ';
-		document.f_pop.f1.value=document.f_pop.f1.value.substring(0,8);
-		document.f_pop.f3.value=document.f_pop.f3.value.substring(0,4);
-		document.f_pop.f4.value=document.f_pop.f4.value.substring(0,4);
 
-		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value;
+		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value + document.f_pop.f2.value +document.f_pop.f3.value +document.f_pop.f4.value +document.f_pop.f5.value +document.f_pop.f6.value +document.f_pop.f7.value +document.f_pop.f8.value +document.f_pop.f9.value +document.f_pop.f10.value +document.f_pop.f11.value +document.f_pop.f12.value +document.f_pop.f13.value;
 		self.close();
 		return false;
 	}

Index: pl/value_builder/unimarc_field_225a.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/value_builder/Attic/unimarc_field_225a.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/value_builder/unimarc_field_225a.tmpl	17 Apr 2004 16:26:25 -0000	1.2
+++ pl/value_builder/unimarc_field_225a.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,17 +1,14 @@
-<html>
-<head>
-<title>Kreator pola 225a UNIMARC</title>
+<!-- TMPL_INCLUDE name="auth-search-top.inc" -->
+<title>UNIMARC Field 225a builder</title>
 </head>
 <body>
-<form name="f_pop" onSubmit="javascript:report()">
-<table>
-	<tr>
-		<td>Wybierz kolekcjÄ™</td>
-		<td><!-- TMPL_VAR name="collection" --></td>
-	</tr>
-	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
-</table>
-</form>
+<div id="mainbloc">
+	<form name="f_pop" onSubmit="javascript:report()">
+		<h2 class="authority">Collection</h2>
+		<p><label>Select a collection</label><!-- TMPL_VAR name="collection" --></p>
+		<input type="submit" value="OK" class="button authority"></p>
+	</form>
+</div>
 <script>
 	function report() {
 		opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
@@ -19,5 +16,4 @@
 		return false;
 	}
 </script>
-</body>
-</html>
+<!-- TMPL_INCLUDE name="auth-search-bottom.inc" -->

Index: pl/value_builder/unimarc_field_60X.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/value_builder/Attic/unimarc_field_60X.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/value_builder/unimarc_field_60X.tmpl	17 Apr 2004 16:57:06 -0000	1.2
+++ pl/value_builder/unimarc_field_60X.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,6 +1,6 @@
 <html>
 <head>
-	<title>Szukaj w tezaurusie</title>
+	<title>Thesaurus search</title>
 </head>
 <body>
 	<script>
@@ -31,7 +31,7 @@
 			<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
 			<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
 			<input type="hidden" name="op" value="search">
-			<input type="submit" value="Szukaj">
+			<input type="submit" value="Chercher">
 		</p>
 	</form>
 	<table>
@@ -56,7 +56,7 @@
 		<td>
 		<!-- TMPL_IF name=deeper -->
 		<td valign="top">
-			<h2>Zależności</h2>
+			<h2>Dependancies</h2>
 			<!-- /TMPL_IF -->
 			<table>
 			<!-- TMPL_LOOP name="deeper" -->
@@ -72,12 +72,12 @@
 		</td>
 	</tr>
 	</table>
-<h2>Dodawanie</h2>
+<h2>Adding</h2>
 <form name="f3_pop"  action="thesaurus_popup.pl" method="post">
 	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
 	<input type="hidden" name="op" value="add">
 	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
-	Utwórz nowy wpis HW/tezaurusa: <input type="text" name="insert" value="<!-- TMPL_VAR name="search_string" -->">
+	Create a new authority/thesaurus entry : <input type="text" name="insert" value="<!-- TMPL_VAR name="search_string" -->">
 	<input type="submit" name="NEW" value="Ajouter">
 	</form>
 </body>

Index: pl/value_builder/unimarc_field_700-4.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/value_builder/Attic/unimarc_field_700-4.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/value_builder/unimarc_field_700-4.tmpl	17 Apr 2004 16:26:25 -0000	1.2
+++ pl/value_builder/unimarc_field_700-4.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,18 +1,18 @@
 <html>
 <head>
-<title>Kreator pola 700-4 UNIMARC</title>
+<title>UNIMARC constructeur champ 700-4</title>
 </head>
 <body>
-<p>Wybierz wartość dla pola 700 $4. Elle sera automatiquement reportée dans la zone 700 $8 qui suit.</p>
+<p>Sélectionnez la valeur pour le champ 700 $4. Elle sera automatiquement reportée dans la zone 700 $8 qui suit.</p>
 <form name="f_pop" onSubmit="javascript:report()">
 <table>
 	<tr>
-		<td>Kod daty publikacji </td><td><select name="f1" size="1">
-		<option value="075 - postface" <!-- TMPL_IF name="f1_075" -->SELECTED<!-- /TMPL_IF -->>posłowie</option>
-			<option value="651 - dir. de publication" <!-- TMPL_IF name="f1_651" -->SELECTED<!-- /TMPL_IF -->>Edytor publikacji</option>
-			<option value="440 - illustrateur" <!-- TMPL_IF name="f1_440" -->SELECTED<!-- /TMPL_IF -->>Ilustrator</option>
-			<option value="080 - préface, notes" <!-- TMPL_IF name="f1_080" -->SELECTED<!-- /TMPL_IF -->>przedmowa, uwagi</option>
-			<option value="730 - traducteur" <!-- TMPL_IF name="f1_730" -->SELECTED<!-- /TMPL_IF -->>tłumacz</option>
+		<td>Code date publication </td><td><select name="f1" size="1">
+		<option value="075 - postface" <!-- TMPL_IF name="f1_075" -->SELECTED<!-- /TMPL_IF -->>postface</option>
+			<option value="651 - dir. de publication" <!-- TMPL_IF name="f1_651" -->SELECTED<!-- /TMPL_IF -->>dir. de publication</option>
+			<option value="440 - illustrateur" <!-- TMPL_IF name="f1_440" -->SELECTED<!-- /TMPL_IF -->>illustrateur</option>
+			<option value="080 - préface, notes" <!-- TMPL_IF name="f1_080" -->SELECTED<!-- /TMPL_IF -->>préface, notes</option>
+			<option value="730 - traducteur" <!-- TMPL_IF name="f1_730" -->SELECTED<!-- /TMPL_IF -->>traducteur</option>
 			</select>
 		</td>
 	</tr>

Index: pl/z3950/searchresult.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/default/pl/z3950/Attic/searchresult.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.10.1
diff -u -b -r1.2 -r1.2.10.1
--- pl/z3950/searchresult.tmpl	17 Apr 2004 17:01:45 -0000	1.2
+++ pl/z3950/searchresult.tmpl	7 May 2007 13:55:53 -0000	1.2.10.1
@@ -1,45 +1,79 @@
-<HTML>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<!-- TMPL_IF name="refresh" -->
-	<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR name="refresh" -->">
-<!-- /TMPL_IF -->
-<font size="6"><em>Wyniki Szukania Z3950</em></font><br />
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Z39.50 Search Results</title>
+    <!-- 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 -->
+<link rel="shortcut icon" href="/intranet-tmpl/npl/en/includes/favicon.ico" type="image/x-icon" />
+<style type="text/css"> 
+    <!-- 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>
 
-<table width="80%" cellpadding="3">
-	<tr valign="center">
-	<td><font size="4">Znalezione Opisy</font></td>
-	</tr>
-</table>
-<table border="0" cellspacing="0" cellpadding="5" width="80%">
-	<tr valign=top bgcolor=#ffcc00>
-		<td><b>Tytuł</b></td>
-		<td><b>Autor</b></td>
-		<td><b>ISBN</b></td>
-		<td><b>Źródło opisu</b></td>
-		<td><b>&nbsp;</b></td>
-		<td>&nbsp;</td>
+<body>
+<div id="main-compact">
+<!-- TMPL_IF name="opsearch" -->
+    <h2>Szukaj </h2>
+    
+    <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" -->" />
+    
+    <!-- TMPL_LOOP name="serverloop" -->
+        <p>
+            <!-- TMPL_IF name="checked" -->
+                <input type="checkbox" name="id" value=<!-- TMPL_VAR NAME="id" --> checked="1">
+            <!-- TMPL_ELSE -->
+                <input type="checkbox" name="id" value=<!-- TMPL_VAR NAME="id" --> checked="1">
+            <!-- /TMPL_IF --><label><!-- TMPL_VAR NAME="server" --></label>
+        </p>
+    <!-- /TMPL_LOOP -->
+    <input type="submit"  class="submit" value="Search internet" onclick="cursor :'wait'"/>
+    </form>
+<!-- TMPL_ELSE -->
+    <h2>Wyniki</h2>
+    <table>
+    <tr>
+        <th>Server</th>
+        <th>Tytuł</th>
+        <th>Autor</th>
+        <th>ISBN</th>
+        <th>&nbsp;</th>
+        <th>&nbsp;</th>
 	</tr>
 	<!-- TMPL_IF name="breeding_loop" -->
 	<!-- TMPL_LOOP name="breeding_loop" -->
-		<tr valign="top" bgcolor="<!-- TMPL_VAR name="toggle" -->">
-			<td><!-- TMPL_VAR name="title" --></a>
-			<td><!-- TMPL_VAR name="author" --></td>
-			<td><!-- TMPL_VAR name="isbn" --></td>
-			<td><!-- TMPL_VAR name="file" --></td>
-			<td><a href="javascript:Import(<!-- TMPL_VAR name="id" -->)">Importuj opis</a></td>
+        <tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+            <td><!-- TMPL_VAR name="server" --></td>
+            <td><!-- TMPL_VAR NAME="title" --></td>
+            <td><!-- TMPL_VAR NAME="author" --></td>
+            <td><!-- TMPL_VAR NAME="isbn" --></td>
+            <td><a href="javascript:Import(<!-- TMPL_VAR NAME="id" -->,<!-- TMPL_VAR NAME="oldbiblionumber" -->)">Import</a></td> 
+        
 		</tr>
 	<!-- /TMPL_LOOP -->
 	<!-- TMPL_ELSE -->
-		<tr><td colspan=6>Nic nie znaleziono</td></tr>
+        <tr><td colspan="6">Nic nie znaleziono</td></tr>
 	<!-- /TMPL_IF -->
 </table>
-<!-- TMPL_IF name="numberpending" --><H1><center>Jeszcze <!-- TMPL_VAR name="numberpending" --> kwerenda do zrobienia</center></H1><!-- /TMPL_IF -->
-<br />
-<script>
-	function Import(GetThisOne) {
-		opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR name="oldbiblionumber" -->&breedingid="+GetThisOne;
+<!-- /TMPL_IF -->
+
+</div>
+<!-- TMPL_IF name="numberpending" --><h3 align="center">Still <!-- TMPL_VAR NAME="numberpending" --> servers to search</h3><!-- /TMPL_IF -->
+<script language="JavaScript" type="text/javascript">
+    function Import(GetThisOne,biblionumber) {
+        opener.document.location= "../acqui.simple/addbiblio.pl?oldbiblionumber="+biblionumber+"&z3950=1&breedingid="+GetThisOne;
 		self.close();
 		return false;
 	}
 </script>
-<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
+</div>
+</body>
+</html>
+





More information about the Koha-cvs mailing list