koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha/koha-tmpl/intranet-tmpl/ccfls/en about.tmp... [dev_week]


From: Kyle Hall
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/ccfls/en about.tmp... [dev_week]
Date: Thu, 30 Nov 2006 15:56:29 +0000

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Kyle Hall <kylemhall>   06/11/30 15:56:28

Modified files:
        koha-tmpl/intranet-tmpl/ccfls/en: about.tmpl auth.tmpl 
                                          bookcount.tmpl boraccount.tmpl 
                                          intranet-main.tmpl 
                                          mancredit.tmpl maninvoice.tmpl 
                                          modbibitem.tmpl overdue.tmpl 
                                          request.tmpl stats.tmpl 
        koha-tmpl/intranet-tmpl/ccfls/en/acqui: acqui-home.tmpl 
                                                acquire.tmpl basket.tmpl 
                                                histsearch.tmpl 
                                                lateorders.tmpl 
                                                newbasket2.tmpl 
                                                order.tmpl recieve.tmpl 
                                                recieveorder.tmpl 
                                                suggestion-select.tmpl 
                                                supplier.tmpl 
        koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple: 
                                                       addbiblio-nomarc.tmpl 
                                                       addbiblio.tmpl 
                                                       addbooks.tmpl 
                                                       additem-nomarc.tmpl 
                                                       additem.tmpl 
                                                       isbnsearch.tmpl 
                                                       marcimport.tmpl 
        koha-tmpl/intranet-tmpl/ccfls/en/authorities: auth_finder.tmpl 
                                                      authorities-home.tmpl 
                                                      authorities.tmpl 
                                                      
blinddetail-biblio-search.tmpl 
                                                      detail-biblio-search.tmpl 
                                                      detail.tmpl 
                                                      
searchresultlist-auth.tmpl 
                                                      searchresultlist.tmpl 
        koha-tmpl/intranet-tmpl/ccfls/en/bookshelves: 
                                                      
addbookbybiblionumber.tmpl 
                                                      shelves.tmpl 
        koha-tmpl/intranet-tmpl/ccfls/en/circ: branchtransfers.tmpl 
                                               circulation.tmpl 
                                               reserve.tmpl returns.tmpl 
                                               selectbranchprinter.tmpl 
        koha-tmpl/intranet-tmpl/ccfls/en/export: marc.tmpl 
        koha-tmpl/intranet-tmpl/ccfls/en/import: breeding.tmpl 
        koha-tmpl/intranet-tmpl/ccfls/en/includes: body-top.inc 
                                                   styles.css 
        koha-tmpl/intranet-tmpl/ccfls/en/members: imemberentry.tmpl 
                                                  jmemberentry.tmpl 
                                                  member-flags.tmpl 
                                                  member-password.tmpl 
                                                  member.tmpl 
                                                  memberentry.tmpl 
                                                  members-home.tmpl 
                                                  moremember-receipt.tmpl 
                                                  moremember.tmpl 
                                                  newimember.tmpl 
                                                  newjmember.tmpl 
                                                  newmember.tmpl 
                                                  pay.tmpl 
                                                  readingrec.tmpl 
        koha-tmpl/intranet-tmpl/ccfls/en/parameters: admin-home.tmpl 
                                                     aqbookfund.tmpl 
                                                     aqbudget.tmpl 
                                                     
auth_subfields_structure.tmpl 
                                                     auth_tag_structure.tmpl 
                                                     authorised_values.tmpl 
                                                     authtypes.tmpl 
                                                     biblio_framework.tmpl 
                                                     branches.tmpl 
                                                     categorie.tmpl 
                                                     categoryitem.tmpl 
                                                     charges.tmpl 
                                                     checkmarc.tmpl 
                                                     currency.tmpl 
                                                     issuingrules.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/ccfls/en/reports: 
                                                  acquisitions_stats.tmpl 
                                                  bor_issues_top.tmpl 
                                                  borrowers_out.tmpl 
                                                  borrowers_stats.tmpl 
                                                  cat_issues_top.tmpl 
                                                  catalogue_out.tmpl 
                                                  catalogue_stats.tmpl 
                                                  inventory.tmpl 
                                                  issues_avg_stats.tmpl 
                                                  
issues_by_borrower_category.tmpl 
                                                  issues_stats.tmpl 
                                                  itemtypes.tmpl 
                                                  reports-home.tmpl 
        koha-tmpl/intranet-tmpl/ccfls/en/search.marc: dictionary.tmpl 
                                                      result.tmpl 
                                                      search.tmpl 
                                                      suggest.tmpl 
        koha-tmpl/intranet-tmpl/ccfls/en/value_builder: 
                                                        marc21_leader.tmpl 
        koha-tmpl/intranet-tmpl/ccfls/en/z3950: searchresult.tmpl 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/about.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/auth.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/bookcount.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/boraccount.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/intranet-main.tmpl?cvsroot=koha&only_with_tag=dev_week&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/ccfls/en/mancredit.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/maninvoice.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/modbibitem.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/overdue.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/request.tmpl?cvsroot=koha&only_with_tag=dev_week&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/ccfls/en/stats.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/acqui-home.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/acquire.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/basket.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/histsearch.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/lateorders.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/newbasket2.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/order.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/recieve.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/recieveorder.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/suggestion-select.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/supplier.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/addbiblio-nomarc.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/addbiblio.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/addbooks.tmpl?cvsroot=koha&only_with_tag=dev_week&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/ccfls/en/acqui.simple/additem-nomarc.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/additem.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/isbnsearch.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/marcimport.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/auth_finder.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/authorities-home.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/authorities.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/blinddetail-biblio-search.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/detail-biblio-search.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/detail.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/searchresultlist-auth.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/searchresultlist.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/bookshelves/addbookbybiblionumber.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/bookshelves/shelves.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/branchtransfers.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=dev_week&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/ccfls/en/circ/reserve.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/returns.tmpl?cvsroot=koha&only_with_tag=dev_week&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/ccfls/en/circ/selectbranchprinter.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/export/marc.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/import/breeding.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/includes/body-top.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/includes/styles.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/imemberentry.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/jmemberentry.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/member-flags.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/member-password.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/member.tmpl?cvsroot=koha&only_with_tag=dev_week&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/ccfls/en/members/memberentry.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/members-home.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/moremember-receipt.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=dev_week&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/ccfls/en/members/newimember.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/newjmember.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/newmember.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/pay.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/readingrec.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/admin-home.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/aqbookfund.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/aqbudget.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/auth_subfields_structure.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/auth_tag_structure.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/authorised_values.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/authtypes.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/biblio_framework.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/branches.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/categorie.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/categoryitem.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/charges.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/checkmarc.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/currency.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/issuingrules.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/itemtypes.tmpl?cvsroot=koha&only_with_tag=dev_week&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/ccfls/en/parameters/koha2marclinks.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/marc_subfields_structure.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/marctagstructure.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/printers.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/stopwords.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/systempreferences.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/thesaurus.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/z3950servers.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/acquisitions_stats.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/bor_issues_top.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/borrowers_out.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/borrowers_stats.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/cat_issues_top.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/catalogue_out.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/catalogue_stats.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/inventory.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/issues_avg_stats.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/issues_by_borrower_category.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/issues_stats.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/itemtypes.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/reports-home.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/search.marc/dictionary.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/search.marc/result.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/search.marc/search.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/search.marc/suggest.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/value_builder/marc21_leader.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/z3950/searchresult.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.1.2.1

Patches:
Index: about.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/Attic/about.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
--- about.tmpl  12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ about.tmpl  30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -1,12 +1,12 @@
 <!-- TMPL_INCLUDE NAME="head.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-noneSelected.inc" -->
+  <dl class="bodyPane">
+    <dt class="bodyPane">About Koha</dt>
 
-<dl>
-<dt>About Koha</dt>
-<dd>
-
+    <dd class="bodyPane">
 <div id="main"><!-- TMPL_VAR NAME="about" -->
+<h1>About Koha</h1>
 <p>Data about the current version of Koha for bug reports (or general 
 interest).</p>
 <div class="table items"><table>
@@ -38,7 +38,7 @@
                        <tr><td><ul><li><b>Horowhenua Library Trust</b> and 
Rosalie Blake, Head of Libraries, (Koha 1.0)</li>
                <li>The <b>Nelsonville Public Library</b>, USA, Ohio (MARC 
support funding)</li>
                <li><b>EMN (Ecole des Mines de Nantes)</b>, France (Suggestion, 
stats modules and improved ldap support funding)</li>
-               <li><b>ENSMP (Ecole Nationale Supérieure des Mines de 
Paris)</b>, France (biblio frameworks, MARC authorities, OPAC basket, Serials 
support funding)</li></ul></td></tr>
+               <li><b>ENSMP (Ecole Nationale Sup�ieure des Mines de 
Paris)</b>, France (biblio frameworks, MARC authorities, OPAC basket, Serials 
support funding)</li></ul></td></tr>
        <tr>
        <th>Core Team for 2.2</th></tr>
        <tr><td>
@@ -51,7 +51,7 @@
                        <li>Rachel Hamilton-Williams, General Manager 
(Webmistress)</li>
                        <li>Chris Cormack, 1.2 release manager</li>
                        <li>and Simon Blake, Amanda Atkins, Operations Manager, 
Olwen Williams, Finlay Thompson, Gynn Lomax, Richard Anderson, Jeremy Blake, 
Rebecca Holden, Olive T. Canine</li></ul>
-               <li>Emiliano Marmonti, Matías Veleda &amp; Sebastian Catañeda 
<b>La Plata University, Argentina</b> (barcode printing)</li>
+               <li>Emiliano Marmonti, Mat�s Veleda &amp; Sebastian Cata�da 
<b>La Plata University, Argentina</b> (barcode printing)</li>
                <li>MJ Ray and <b>Turo Technology LLP</b>, (quality control, 
installer &amp; updater, 2.0 release maintainer)</li>
                <li>Nicholas Rosasco, (Documentation Compiler)</li>
                <li>Mike Hansen</li>
@@ -74,7 +74,7 @@
                                        <li>Dorian Meid (German 
translation)</li>
                                        <li>doXulting (Matthieu Branlat) OPAC 
basket</li>
                                        <li>Ed Summers (Some code and Perl 
packages like MARC::Record)</li>
-                                       <li>Esiee School (Jérome Vizcaino, 
Michel Lerenard, Pierre Cauchois)</li>
+                                       <li>Esiee School (J�ome Vizcaino, 
Michel Lerenard, Pierre Cauchois)</li>
                                        <li>Florian Bischof</li>
                                        <li>Francisco M. Marzoa Alonso</li>
                                        <li>Glen Stewart</li>
@@ -98,10 +98,7 @@
                        </table>
 </div>
 </div>
-
-
-</dd>
-</dl>
+    </dd>
+  </dl>
 </body>
 </html>
-

Index: auth.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/Attic/auth.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
--- auth.tmpl   12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ auth.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -1,57 +1,104 @@
 <!-- TMPL_INCLUDE NAME="head.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-noneSelected.inc" -->
-
-<dl>
-<dt>Koha -- <!-- TMPL_IF NAME="nopermission" -->Access Denied<!-- /TMPL_IF 
--><!-- TMPL_IF NAME="timed_out" -->Session Timed Out --<!-- /TMPL_IF --><!-- 
TMPL_IF NAME="different_ip" -->IP Change -- <!-- /TMPL_IF --><!-- TMPL_IF 
NAME="invalid_username_or_password" -->Invalid Username or Password -- <!-- 
/TMPL_IF --><!-- TMPL_IF NAME="loginprompt" -->Log in to Koha<!-- /TMPL_IF -->
-</dt>
-<dd>
-
-<div id="auth">
-
-<!-- TMPL_IF NAME="nopermission" -->
-<div class="error"><!-- This is what is displayed if user doesn"t have 
permission --><h3>Login Error</h3>
-Sorry, Koha doesn"t think you have permission for this page.</div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="timed_out" -->
-<div class="error"><!-- This is what is displayed if login has timed out -->
-<h3>Login Error</h3>Sorry, your session has timed out.  Please login 
again.</div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="different_ip" -->
-<div class="error"><!-- This is what is displayed if user"s IP has changed -->
-<h3>Login Error</h3>You are accessing Koha from a different ip address! Please 
login again.</div>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="invalid_username_or_password" -->
-<div class="error"><!-- This is what is displayed if the username or password 
doesn"t work -->
-<h3>Login Error</h3>You entered an incorrect username or password.  Please try 
again.</div>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME="loginprompt" -->
-<!-- login prompt time-->
-
-<form action="<!-- TMPL_VAR NAME="url" -->" method="post" name="mainform" 
id="mainform">
-<!-- TMPL_LOOP NAME="INPUTS" -->
+  <dl class="bodyPane">
+    <dt class="bodyPane">
+      <!-- TMPL_IF NAME="nopermission" -->
+        Access Denied
+      <!-- /TMPL_IF -->
+
+      <!-- TMPL_IF NAME="timed_out" -->
+        Session Timed Out --
+      <!-- /TMPL_IF -->
+
+      <!-- TMPL_IF NAME="different_ip" -->
+        IP Change -- 
+      <!-- /TMPL_IF -->
+
+      <!-- TMPL_IF NAME="invalid_username_or_password" -->
+        Invalid Username or Password -- 
+      <!-- /TMPL_IF -->
+
+      <!-- TMPL_IF NAME="loginprompt" -->
+        Log in to Koha
+      <!-- /TMPL_IF -->
+    </dt>
+
+    <dd class="bodyPane">
+      <div id="auth">
+
+        <!-- TMPL_IF NAME="nopermission" -->
+          <div class="error">
+            <!-- This is what is displayed if user doesn"t have permission -->
+            <h3>Login Error</h3>
+            Sorry, Koha doesn't think you have permission for this page.
+          </div>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="timed_out" -->
+          <div class="error">
+            <!-- This is what is displayed if login has timed out -->
+            <h3>Login Error</h3>
+            Sorry, your session has timed out.  Please login again.
+          </div>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="different_ip" -->
+          <div class="error">
+            <!-- This is what is displayed if user"s IP has changed -->
+            <h3>Login Error</h3>
+            You are accessing Koha from a different ip address! Please login 
again.
+          </div>
+        <!-- /TMPL_IF -->
+
+        <!-- TMPL_IF NAME="invalid_username_or_password" -->
+          <div class="error">
+            <!-- This is what is displayed if the username or password doesn"t 
work -->
+            <h3>Login Error</h3>
+            You entered an incorrect username or password.  Please try again.
+          </div>
+        <!-- /TMPL_IF -->
+
+
+        <!-- TMPL_IF NAME="loginprompt" -->
+          <!-- login prompt time-->
+          <form action="<!-- TMPL_VAR NAME="url" -->" method="post" 
name="mainform" id="mainform">
+            <!-- TMPL_LOOP NAME="INPUTS" -->
   <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- 
TMPL_VAR NAME="value" -->" />
-<!-- /TMPL_LOOP -->
+            <!-- /TMPL_LOOP -->
 
-<div class="details">    <table>
+            <div class="details">
+              <table>
        <caption>Log In to Koha</caption>
-    <tr><th><label for="userid">Cardnumber:</label></th><td><input 
name="userid" id="userid" /></td></tr>
-    <tr><th><label for="password">Password:</label></th><td><input 
type="password" name="password" id="password" /></td></tr>
+                <tr>
+                  <th>
+                    <label for="userid">Cardnumber:</label>
+                  </th>
+
+                  <td>
+                    <input name="userid" id="userid" />
+                  </td>
+                </tr>
+    
+                <tr>
+                  <th>
+                    <label for="password">Password:</label>
+                  </th>
+
+                  <td>
+                    <input type="password" name="password" id="password" />
+                  </td>
+                </tr>
     </table>
-<p><input type="submit" value="Submit" class="submit" /></p></div>
-</form>
 
-
-<!-- /TMPL_IF -->
-</div>
-
-</dd>
-</dl>
+              <p>
+                <input type="submit" value="Submit" class="submit" />
+              </p>
+            </div>
+          </form>
+        <!-- /TMPL_IF -->
+      </div>
+    </dd>
+  </dl>
 </body>
 </html>
-

Index: bookcount.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/Attic/bookcount.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
--- bookcount.tmpl      12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ bookcount.tmpl      30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -20,46 +20,78 @@
        </a>
 </div>
 
-<dl>
-       <dt>
-               Patrons: Circulation Statistics for <!-- TMPL_VAR Name="title" 
--><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-       </dt>
-<dd>
-
-<div id="main">
-<h1>
-<!-- TMPL_VAR Name="title" --> <!-- TMPL_IF NAME="author" -->(<!-- TMPL_VAR 
Name="author" -->)<!-- /TMPL_IF --></a></h1>
-<h2>Barcode <!-- TMPL_VAR Name="barcode" --></h2>
-<div class="tabitem"><form action="/cgi-bin/koha/detail.pl" 
method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR Name="bib" 
-->"><input type="hidden" name="type" value="intra"><input type="submit" 
class="submit" value="Brief Display"></form> <form 
action="/cgi-bin/koha/moredetail.pl" method="get"><input type="hidden" 
name="type" value="<!-- TMPL_VAR NAME="type" -->"><input type="hidden" 
name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->"><input type="hidden" 
name="bib" value="<!-- TMPL_VAR NAME="bib" -->"><input type="hidden" name="bi" 
value="<!-- TMPL_VAR NAME="biblioitemnumber" -->"> <input type="submit" 
class="submit" value="Item Details"></form><!-- TMPL_IF NAME="norequests" 
--><!-- TMPL_ELSE --> <form action="request.pl" method="get"><input 
type="hidden" value="<!-- TMPL_VAR name="bib" -->" name="bib"> <input 
type="submit" value="Place Reserve" class="submit"></form><!-- /TMPL_IF 
--></div>
-<div class="data">
-<table>
-               <tr><th>Home Branch: </th><td> <!-- TMPL_VAR Name="homebranch" 
--> </td></tr>
-               <tr><th>Current Branch: </th><td> <!-- TMPL_VAR 
Name="holdingbranch" --></td></tr>
-               <tr><th>Date arrived at current branch: </th><td> <!-- TMPL_VAR 
Name="lastdate" --> </td></tr>
-               <tr><th>Number of issues since since the above date :</th><td> 
<!-- TMPL_VAR Name="count" --> </td></tr>
-</table>
-</div>
-<div class="table">
+  <dl class="bodyPane">
+    <dt class="bodyPane">Circulation Statistics for <!-- TMPL_VAR Name="title" 
--></dt>
+
+    <dd class="bodyPane">
+      <div id="main">
+        <h1><!-- TMPL_VAR Name="title" --> <!-- TMPL_IF NAME="author" -->(<!-- 
TMPL_VAR Name="author" -->)<!-- /TMPL_IF --></h1>
+
+        <h2>Barcode <!-- TMPL_VAR Name="barcode" --></h2>
+
+        <div class="tabitem">
+          <form action="/cgi-bin/koha/detail.pl" method="get">
+            <input type="hidden" name="bib" value="&lt;!-- TMPL_VAR 
Name=">&quot;&gt;<input type="hidden" name="type" value="intra"><input 
type="submit" class="submit" value="Brief Display">
+          </form>
+
+          <form action="/cgi-bin/koha/moredetail.pl" method="get">
+            <input type="hidden" name="type" value="&lt;!-- TMPL_VAR 
NAME=">&quot;&gt;<input type="hidden" name="item" value="&lt;!-- TMPL_VAR 
NAME=">&quot;&gt;<input type="hidden" name="bib" value="&lt;!-- TMPL_VAR 
NAME=">&quot;&gt;<input type="hidden" name="bi" value="&lt;!-- TMPL_VAR 
NAME=">&quot;&gt; <input type="submit" class="submit" value="Item Details">
+          </form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE -->
+
+          <form action="request.pl" method="get">
+            <input type="hidden" value="&lt;!-- TMPL_VAR name=">&quot; 
name=&quot;bib&quot;&gt; <input type="submit" value="Place Reserve" 
class="submit">
+          </form><!-- /TMPL_IF -->
+        </div>
+
+        <div class="data">
                <table>
                        <tr>
-                               <th> Branch</th>
-                               <th> No. of Issues</th>
-                               <th> Last seen at branch</th>
+              <th>Home Branch:</th>
+
+              <td><!-- TMPL_VAR Name="homebranch" --></td>
+            </tr>
+
+            <tr>
+              <th>Current Branch:</th>
+
+              <td><!-- TMPL_VAR Name="holdingbranch" --></td>
                        </tr>
-                       <!-- TMPL_LOOP Name="branchloop" -->
+
                                <tr>
-                                       <td class="data"><!-- TMPL_VAR 
Name="branchname" --> </td>
-                                       <td class="data"><!-- TMPL_VAR 
Name="issues" --> </td>
-                                       <td class="data"><!-- TMPL_VAR 
Name="seen" --> </td>
+              <th>Date arrived at current branch:</th>
+
+              <td><!-- TMPL_VAR Name="lastdate" --></td>
                                </tr>
-                       <!-- /TMPL_LOOP -->
-               </table></div>
-               </td>
+
+            <tr>
+              <th>Number of issues since since the above date :</th>
+
+              <td><!-- TMPL_VAR Name="count" --></td>
        </tr>
-</table></div>
+          </table>
+        </div>
+
+        <div class="table">
+          <table>
+            <tr>
+              <th>Branch</th>
+
+              <th>No. of Issues</th>
+
+              <th>Last seen at branch</th>
+            </tr><!-- TMPL_LOOP Name="branchloop" -->
+
+            <tr>
+              <td class="data"><!-- TMPL_VAR Name="branchname" --></td>
 
+              <td class="data"><!-- TMPL_VAR Name="issues" --></td>
 
-</dd>
-</dl>
+              <td class="data"><!-- TMPL_VAR Name="seen" --></td>
+            </tr><!-- /TMPL_LOOP -->
+          </table>
+        </div>
+      </div>
+    </dd>
+  </dl>
 </body>
 </html>
\ No newline at end of file

Index: boraccount.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/Attic/boraccount.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
--- boraccount.tmpl     12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ boraccount.tmpl     30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,63 +2,89 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-members.inc" -->
 
-<div id="subTab-1">
-       <a href="/cgi-bin/koha/members/members-home.pl">
-               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-members-search-selected.png" border="0" />
-       </a>
-</div>
-
-<div id="subTab-2">
-       <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">
-               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-members-addMember-unselected.png" border="0" />
-       </a>
-</div>
-
-<div id="subTab-3">
-       <a 
href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add">
-               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-members-addOrganization-unselected.png" border="0" />
-       </a>
-</div>
-
-<dl>
-<dt>Patrons: Account for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR 
NAME="firstname" --></dt>
-<dd>
-
-<!-- The table with the account items -->
-<div id="main">
-<div class="table"><table>
-<caption>Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR 
NAME="surname" --></caption>
+  <div id="subTab-1">
+    <a href="/cgi-bin/koha/members/members-home.pl"><img src="<!-- TMPL_VAR 
NAME='themelang' -->/images/subTab-members-search-selected.png" border="0"></a>
+  </div>
+
+  <div id="subTab-2">
+    <a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add"><img 
src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-members-addMember-unselected.png" border="0"></a>
+  </div>
+
+  <div id="subTab-3">
+    <a 
href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add"><img 
src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-members-addOrganization-unselected.png" border="0"></a>
+  </div>
+
+  <dl class="bodyPane">
+    <dt class="bodyPane">Patrons: Account for <!-- TMPL_VAR NAME="surname" 
-->, <!-- TMPL_VAR NAME="firstname" --></dt>
+
+    <dd class="bodyPane">
+      <!-- The table with the account items -->
+
+      <div id="main">
+        <div class="table">
+          <table>
+            <caption>
+              Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR 
NAME="surname" -->
+            </caption>
+
   <tr>
        <th>Date</th>
+
     <th>Description of Charges</th>
+
     <th>Amount</th>
+
     <th>Still Owed</th>
+            </tr><!-- TMPL_LOOP NAME="accounts" -->
+            <!-- TMPL_IF NAME="toggle" -->
+
+            <tr>
+              <!-- TMPL_ELSE -->
   </tr>
 
-  <!-- TMPL_LOOP NAME="accounts" -->
+            <tr class="highlight">
+              <!-- /TMPL_IF -->
 
-   <!-- TMPL_IF NAME="toggle" --> <tr><!-- TMPL_ELSE --><tr 
class="highlight"><!-- /TMPL_IF -->
       <td><!-- TMPL_VAR NAME="date" --></td>
-      <td><!-- TMPL_VAR NAME="description" --><!-- TMPL_IF NAME="printtitle" 
--> <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
-      <!-- TMPL_IF NAME="amountcredit" --><td class="credit"><!-- TMPL_ELSE 
--><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="amount" --></td>
-      <!-- TMPL_IF NAME="amountoutstandingcredit" --><td class="credit"><!-- 
TMPL_ELSE --><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR 
NAME="amountoutstanding" --></td>
-    </tr>
 
-  <!-- /TMPL_LOOP -->
-<tfoot>
+              <td><!-- TMPL_VAR NAME="description" --><!-- TMPL_IF 
NAME="printtitle" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td><!-- 
TMPL_IF NAME="amountcredit" -->
+
+              <td class="credit"><!-- TMPL_ELSE --></td>
+
+              <td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="amount" 
--></td><!-- TMPL_IF NAME="amountoutstandingcredit" -->
+
+              <td class="credit"><!-- TMPL_ELSE --></td>
+
+              <td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR 
NAME="amountoutstanding" --></td>
+            </tr><!-- /TMPL_LOOP -->
+
+            <tfoot>
   <tr>
-    <td colspan="3">Total Due</td>
-    <!-- TMPL_IF NAME="totalcredit" --><td class="credit"><!-- TMPL_ELSE 
--><td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="total" --></td>
+                <td colspan="3">Total Due</td><!-- TMPL_IF NAME="totalcredit" 
-->
+
+                <td class="credit"><!-- TMPL_ELSE --></td>
+
+                <td class="debit"><!-- /TMPL_IF -->$<!-- TMPL_VAR NAME="total" 
--></td>
   </tr>
   </tfoot>
-</table></div>
-<!-- The manual invoice and credit buttons -->
-<div class="tabitem">
-<form action="/cgi-bin/koha/maninvoice.pl" method="get"><input type="hidden" 
name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /><input type="submit" 
class="submit" value="Create Manual Invoice" /></form> <form 
action="/cgi-bin/koha/mancredit.pl" method="get"> <input type="hidden" 
name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" 
class="submit" value="Create Manual Credit" /></form> <form 
action="/cgi-bin/koha/members/moremember.pl" method="get"><input type="hidden" 
name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" 
value="Return to Patron Record" class="submit" /></form>
-</div>
-</div>
+          </table>
+        </div><!-- The manual invoice and credit buttons -->
 
-</dd>
-</dl>
+        <div class="tabitem">
+          <form action="/cgi-bin/koha/maninvoice.pl" method="get">
+            <input type="hidden" name="bornum" value="&lt;!-- TMPL_VAR 
NAME=">&quot; /&gt;<input type="submit" class="submit" value="Create Manual 
Invoice">
+          </form>
+
+          <form action="/cgi-bin/koha/mancredit.pl" method="get">
+            <input type="hidden" name="bornum" value="&lt;!-- TMPL_VAR 
NAME=">&quot; /&gt; <input type="submit" class="submit" value="Create Manual 
Credit">
+          </form>
+
+          <form action="/cgi-bin/koha/members/moremember.pl" method="get">
+            <input type="hidden" name="bornum" value="&lt;!-- TMPL_VAR 
NAME=">&quot; /&gt; <input type="submit" value="Return to Patron Record" 
class="submit">
+          </form>
+        </div>
+      </div>
+    </dd>
+  </dl>
 </body>
 </html>
\ No newline at end of file

Index: intranet-main.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/Attic/intranet-main.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
--- intranet-main.tmpl  18 Sep 2006 19:13:24 -0000      1.1.2.1.2.1
+++ intranet-main.tmpl  30 Nov 2006 15:56:27 -0000      1.1.2.1.2.2
@@ -1,79 +1,136 @@
 <!-- TMPL_INCLUDE NAME="head.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-noneSelected.inc" -->
+  <dl class="bodyPane">
+    <dt class="bodyPane">Intranet: Home</dt>
+
+    <dd class="bodyPane">
+      <div id="main">
+        <div id="menu">
+          <dl>
+            <!-- TMPL_IF NAME="CAN_user_circulate" -->
+
+            <dt><a 
href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></dt>
 
-<dl>
-<dt>Intranet: Home</dt>
-<div id="mainNULL">
-  <div id="menuNULL">
-    <dd><a href="/cgi-bin/koha/circ/circulation.pl"> Circulation</a></dd>
     <dd>
       <ul>
         <li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a></li>
+
         <li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a></li>
+
         <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li>
+
         <li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set 
Branch</a></li>
       </ul>
-    </dd>
-    <dd><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></dd>
-    <dd>Start with a search to add, update, or delete a record, check 
accounts, &amp; renew items.
+            </dd><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="CAN_user_borrowers" -->
+
+            <dt><a 
href="/cgi-bin/koha/members/members-home.pl">Patrons</a></dt>
+
+            <dd>
       <form action="/cgi-bin/koha/members/member.pl" method="post">
-        <label for="member">Enter Name or Barcode</label>
-        <input id="member" type="text" size="25" name="member" />
-        <input type="submit" value="Search" class="submit" />
-      </form>
-    </dd>
-    <dd><a 
href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Catalog
 Search</a></dd>
-    <dd>Search bibilographic records
-      <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="3" />
-        <label for="keyword">Quick Search: </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" id="keyword" name="value" size="25" />
-        <input type="submit" value="Start search" class="submit">
+                <label for="member">Enter Name or Barcode</label><input 
id="member" type="text" size="25" name="member"> <input type="submit" 
value="Search" class="submit">
       </form>
+            </dd><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="CAN_user_catalogue" -->
+
+            <dt><a href="/search">Catalog Search</a></dt>
+
+            <dd>
+              <form name="searchform" method="get" action="/search" 
id="searchform">
+                <label for="main_search">Search</label> <select name="idx" 
id="main_search">
+                  <option selected="selected" value="">
+                    Library Catalog
+                  </option>
+
+                  <option value="ti">
+                    Title
+                  </option>
+
+                  <option value="au">
+                    Author
+                  </option>
+
+                  <option value="su">
+                    Subject
+                  </option>
+
+                  <option value="isbn">
+                    ISBN
+                  </option>
+
+                  <option value="se">
+                    Series
+                  </option>
+
+                  <option value="callnum">
+                    Call Number
+                  </option>
+                </select> <input type="text" name="q" style="width: 23%;"> 
<input type="submit" value="Search" class="submit">
+
       <ul>
-        <li><a 
href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Advanced
 Search</a></li>
+                  <li><a href="/search">Advanced Search</a></li>
+
         <li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual 
shelves</a></li>
       </ul>
-    </dd>
+              </form>
+            </dd><!-- /TMPL_IF -->
+          </dl>
   </div>
-  <div id="submenuNULL">
-    <dd><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a></dd>
+
+        <div id="submenu">
+          <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
+
+          <dl>
+            <dt><a 
href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a></dt>
+
     <dd>
       <ul>
         <li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Advanced 
Cataloging</a></li>
+
         <li><a 
href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li>
-        <li><a href="/cgi-bin/koha/bull-home.pl">Serials</a></li>
         
+                <li><a 
href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
+
+                <li><a href="/cgi-bin/koha/bull-home.pl">Serials</a></li>
       </ul>
     </dd>
+          </dl><!-- /TMPL_IF -->
+          <!-- TMPL_IF NAME="CAN_user_catalogue" -->
+
+          <dl>
+            <dt><a href="/cgi-bin/koha/reports-home.pl">Reports</a></dt>
     
-    <dd><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports </a></dd>
     <dd>Till reconciliation, overdues, and inventory</dd>
+          </dl><!-- /TMPL_IF -->
+          <!-- TMPL_IF NAME="CAN_user_parameters" -->
     
+          <dl>
+            <dt><a href="/cgi-bin/koha/admin-home.pl">Koha 
Administration</a></dt>
     
-    <dd><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a></dd>
     <dd>
       <ul>
         <li><a href="/cgi-bin/koha/admin-home.pl">System Adminstration 
Home</a></li>
+
         <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System 
Preferences</a></li>
+
         <li><a href="/cgi-bin/koha/barcodes/barcodes.pl">Barcodes 
generator</a></li>
+
         <li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></li>
+
         <li><a href="/cgi-bin/koha/import/breeding.pl">Import to 
reservoir</a></li>
+
+                <li><a href="/cgi-bin/koha/label-home.pl">Spine and Barcode 
Labels</a></li>
       </ul>
-<br clear="both" />
     </dd>
-    
+          </dl><!-- /TMPL_IF -->
+          <!-- TMPL_IF name="IntranetmainUserblock" -->
+          <!-- TMPL_VAR name="IntranetmainUserblock" -->
+          <!-- /TMPL_IF -->
+          <br class="clear">
   </div>
-</div>
-
-</dl>
+      </div>
+    </dd>
+  </dl>
 </body>
 </html>
-

Index: mancredit.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/Attic/mancredit.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
--- mancredit.tmpl      12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ mancredit.tmpl      30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -20,9 +20,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Patrons: Create Manual Credit</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Patrons: Create Manual Credit</dt>
+<dd class="bodyPane">
 
 <div id="main"><h3>Manual Credit</h3>
 <form class="inline" action="/cgi-bin/koha/mancredit.pl" method="post">
@@ -45,6 +45,9 @@
 </div>
 
 
+</div>
+
+
 </dd>
 </dl>
 </body>

Index: maninvoice.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/Attic/maninvoice.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
--- maninvoice.tmpl     12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ maninvoice.tmpl     30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -20,9 +20,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Patrons: Create Manual Invoice</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Patrons: Create Manual Invoice</dt>
+<dd class="bodyPane">
 
 <div id="main">
 <form class="inline" action="/cgi-bin/koha/maninvoice.pl" method="post"><input 
type="hidden" name="bornum" value="<!-- TMPL_VAR Name="bornum" -->" />
@@ -43,11 +43,8 @@
        </table></div>
 <input type="submit" name="add" value="Add Charge" class="submit" />
 </form> <form class="inline" action="/cgi-bin/koha/boraccount.pl" 
method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR 
Name="bornum" -->" /><input type="submit" class="cancel" value="Cancel" 
/></form>
-
-
 </div>
 
-
 </dd>
 </dl>
 </body>

Index: modbibitem.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/Attic/modbibitem.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
--- modbibitem.tmpl     12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ modbibitem.tmpl     30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -85,7 +85,7 @@
                <!-- TMPL_LOOP Name="itemloop" -->
                        <tr>
 <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><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>

Index: overdue.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/Attic/overdue.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
--- overdue.tmpl        12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ overdue.tmpl        30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,12 +2,14 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-reports.inc" -->
 
-<dl>
-<dt>Reports : Items Overdue as of <!-- TMPL_VAR NAME="todaysdate" --></dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Reports : Items Overdue as of <!-- TMPL_VAR 
NAME="todaysdate" --></dt>
+<dd class="bodyPane">
 
 <div id="main"><!-- the site -->
 
+<h2>Items Overdue as of <!-- TMPL_VAR NAME="todaysdate" --></h2>
+
        <form method="post" action="/cgi-bin/koha/overdue.pl">
 <div class="data">     <table>
        <caption>Filter Results:</caption>
@@ -26,16 +28,26 @@
                <tr><th scope="row"><label for="branch">Branch 
:</label></th><td><select name="branch" id="branch">
                                <option value="">Any</option>
                        <!-- TMPL_LOOP name="branchloop" -->
-                               <option value="<!-- TMPL_VAR name="value" 
-->"<!-- TMPL_IF name="selected" -->selected="selected"<!-- /TMPL_IF -->><!-- 
TMPL_VAR name="branchname" --></option>
+                               <!-- TMPL_IF name="selected" -->
+                               <option value="<!-- TMPL_VAR name="value" -->" 
selected="selected"><!-- TMPL_VAR name="branchname" --></option>
+                               <!-- TMPL_ELSE -->
+                               <option value="<!-- TMPL_VAR name="value" 
-->"><!-- TMPL_VAR name="branchname" --></option>
+                               <!-- /TMPL_IF -->
                        <!-- /TMPL_LOOP -->
                        </select></td></tr>
-               <tr><th scope="row"><label for="showall">Show any items 
currently issued:</label></th><td><input type="checkbox" name="showall" 
id="showall" value="show" <!--TMPL_IF Name="showall"--> 
checked="checked"<!--/TMPL_IF-->></td></tr>
+               <tr><th scope="row"><label for="showall">Show any items 
currently issued:</label></th><td><!--TMPL_IF Name="showall"--><input 
type="checkbox" name="showall" id="showall" value="show" checked="checked" 
/><!-- TMPL_ELSE --><input type="checkbox" name="showall" id="showall" 
value="show" /><!--/TMPL_IF--></td></tr>
                <tr><th scope="row"><label for="order">Sort 
By</label></th><td><select name="order" id="order">
-<option<!--TMPL_UNLESS name="order"--> selected="selected"<!-- /TMPL_UNLESS--> 
value="">Due Date</option>
-<option<!--TMPL_IF name="order"--> selected="selected"<!-- /TMPL_IF--> 
value="borrower">Borrower</option>
+<!--TMPL_IF name="order"-->
+       <option value="">Due Date</option>
+       <option selected="selected" value="borrower">Borrower</option>
+<!-- TMPL_ELSE -->
+       <option selected="selected" value="">Due Date</option>
+       <option value="borrower">Borrower</option>
+<!-- /TMPL_IF -->
+
 </select></td></tr>
 </table></div>
-                       <input type="submit" class="submit" value="Apply 
Filter" class="button reports">
+                       <input type="submit" class="submit" value="Apply 
Filter" class="submit" />
        </form>
        </p>
 

Index: request.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/Attic/request.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
--- request.tmpl        18 Sep 2006 19:13:24 -0000      1.1.2.1.2.1
+++ request.tmpl        30 Nov 2006 15:56:27 -0000      1.1.2.1.2.2
@@ -32,9 +32,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Add Reserve for <!-- TMPL_VAR Name="title" --></dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Add Reserve for <!-- TMPL_VAR Name="title" --></dt>
+<dd class="bodyPane">
 
 <div id="main">
 <form action="placerequest.pl" method="post" id="mainform">
@@ -43,10 +43,10 @@
 <input type="hidden" name="type" value="str8" />
 <input type="hidden" name="title" value="<!-- TMPL_VAR Name="title" -->" />
 
-<h3>Add Reserve for
+<h2>Add Reserve for
 <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="bib" -->"><!-- 
TMPL_VAR Name="title" --></a>
-<!-- TMPL_VAR Name="author" --></h3>
-<div class="form">
+<!-- TMPL_VAR Name="author" --></h2>
+<div class="data">
        <table>
                <tr><th>Rank</th><td>
 <select name="rank-request">
@@ -58,19 +58,21 @@
                        </select>
                        </td></tr>
 
-               <tr><th><label for="notes">Notes</label></th><td><input 
type="text" size="20" name="notes" id="notes"></tr>
+               <tr><th><label for="rsvnotes">Notes</label></th><td><input 
type="text" size="20" name="notes" id="rsvnotes"></tr>
                <tr><th><label for="date">Date</label></th><td><!-- TMPL_VAR 
name="date" --></td></tr>
                <tr><th><label for="pickup">Pickup</label></th><td><!-- 
TMPL_VAR name="CGIbranch" --></td></tr>
-               <tr><th><label for="request">Request</label></th><td><input 
type="checkbox" name="request" id="request" value="any">Next Available, (or 
choose from list below)</tr>
-               <tr><th><label for="member">Card Number</label> <a 
href="/cgi-bin/koha/members/members-home.pl?quicksearch=1" 
onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick 
Search)</a></th><td><input type="text" size="10" name="member" id="member" 
/></td></tr>
+               <tr><th>Request</th><td><input type="checkbox" name="request" 
id="request" value="any" checked="checked" /><label for="request">Next 
Available, (or choose from list below)</label></tr>
+               <tr><th><label for="member">Card Number</label></th><td><input 
type="text" size="10" name="member" id="member" /> <a 
href="/cgi-bin/koha/members/members-home.pl?quicksearch=1" 
onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick 
Search)</a></td></tr>
        </table>
 </div>
 
-       <div class="table"><table>
-<tr><th>Reserve</th>
-       <th>Item Type</th>
-       <th>Call Number</th><th>Volume</th><th>Pubdate</th>
-       <th>Copies</th>
+       <div class="data"><table>
+<tr>
+       <th scope="col">Reserve</th>
+       <th scope="col">Item Type</th>
+       <th scope="col">Call Number</th>
+       <th scope="col">Pubdate</th>
+       <th scope="col">Copies</th>
 </tr>
 
 <!-- TMPL_LOOP Name="bibitemloop" -->
@@ -79,8 +81,8 @@
                        <!-- TMPL_IF Name="itemlost" -->
                                Cannot be selected
                        <!-- 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" -->" checked="checked" />
+                               <input type="hidden" name="biblioitem" 
value="<!-- TMPL_VAR Name="biblioitemnumber" -->" />
                        <!-- /TMPL_IF -->
                </td>
                <td>
@@ -90,9 +92,6 @@
                        <!-- TMPL_IF NAME="class" --><!-- TMPL_VAR Name="class" 
--><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
                </td>
                <td>
-                       <!-- TMPL_IF NAME="volumedesc" --><!-- TMPL_VAR 
Name="volumeddesc" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
-               </td>
-               <td>
                        <!-- TMPL_IF NAME="publicationyear" --><!-- TMPL_VAR 
Name="publicationyear" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
                </td>
                <td><ul>
@@ -158,7 +157,8 @@
                                                <!-- /TMPL_LOOP -->
                                        </select>
                                <!-- /TMPL_IF -->
-                       </td><td>
+                       </td>
+<td>
                                <!-- TMPL_IF Name="wait" -->
                                        <a 
href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> 
&amp;type=intra">
                                                <!-- TMPL_VAR Name="barcode" -->

Index: stats.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/Attic/stats.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
--- stats.tmpl  12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ stats.tmpl  30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -12,6 +12,7 @@
        <caption>Statistics</caption>
                <tr>
                        <th>Name</th>
+                       <th>Description</th>
                        <th>Type</th>
                        <th>Date/time</th>
                        <th>Amount</th>
@@ -20,6 +21,7 @@
                <!-- TMPL_LOOP name="loop1" -->
                <tr>
                        <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>

Index: acqui/acqui-home.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/Attic/acqui-home.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
--- acqui/acqui-home.tmpl       12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui/acqui-home.tmpl       30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -20,15 +20,15 @@
        </a>
 </div>
 
-<dl>
-<dt>Aquisitions</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Aquisitions</dt>
+<dd class="bodyPane">
 
 <div id="main">
 
 <h1>Acquisitions</h1>
        <!-- TMPL_IF name="nobudget" -->
-               <div class="error">You must define a budget in parameters</div>
+               <div class="error">You must <a 
href="/cgi-bin/koha/admin/aqbookfund.pl">define a budget</a></div>
        <!-- TMPL_ELSE -->
 <div class="details">
 <form action="/cgi-bin/koha/acqui/order.pl" method="post"><table>
@@ -38,7 +38,7 @@
        <td><input type="text" size="25" name="supplier" id="supplier" /></td>
 </tr>
 </table>
-<input type="submit" class="submit" value="Search" /></form>
+<input type="submit" class="submit" value="Search" /> (hint: you must search 
for a supplier to add a new one)</form>
 <p>    <form action="histsearch.pl" method="get"><input type="submit" 
class="submit" value="Search Order History" /></form></p>
 </div>
 <!-- /TMPL_IF -->
@@ -80,12 +80,14 @@
 
 <!-- showbudget-->
        <!-- TMPL_IF name="nobudget" -->
-               <div class="error">You must define a budget in parameters</div>
+               <div class="error">You must <a 
href="/cgi-bin/koha/admin/aqbookfund.pl">define a budget</a></div>
        <!-- TMPL_ELSE -->
        <table>
                <caption>Budgets and Bookfunds</caption>
                        <tr>
                                <th>Budgets</th>
+                               <th>From</th>
+                               <th>To</th>
                                <th>Total</th>
                                <th>Spent</th>
                                <th>Comtd</th>
@@ -94,6 +96,8 @@
                        <!-- TMPL_LOOP name="loop_budget" -->
                                <tr>
                                        <td><!-- TMPL_VAR name="bookfundname" 
--></td>
+                                       <td><!-- TMPL_VAR name="startdate" 
--></td>
+                                       <td><!-- TMPL_VAR name="enddate" 
--></td>
                                        <td><!-- TMPL_VAR name="budgetamount" 
--></td>
                                        <td><!-- TMPL_VAR name="spent" --></td>
                                        <td><!-- TMPL_VAR name="comtd" --></td>
@@ -102,7 +106,7 @@
                        <!-- /TMPL_LOOP -->
                        <tr>
                                <tfoot>
-                               <td>Total</td>
+                               <th colspan="3">Total</th>
                                <td><!-- TMPL_VAR name="total" --></td>
                                <td><!-- TMPL_VAR name="totspent" --></td>
                                <td><!-- TMPL_VAR name="totcomtd" --></td>

Index: acqui/acquire.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/Attic/acquire.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
--- acqui/acquire.tmpl  12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui/acquire.tmpl  30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -1,6 +1,28 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : 
<!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Invoice, <!-- 
TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE 
NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="head.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top-acqui.inc" -->
+
+<div id="subTab-1">
+       <a href="/cgi-bin/koha/acqui/acqui-home.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-mainPage-selected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-2">
+       <a href="/cgi-bin/koha/acqui/lateorders.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-lateOrders-unselected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-3">
+       <a href="/cgi-bin/koha/acqui/histsearch.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-historySearch-unselected.png" border="0" />
+       </a>
+</div>
+
+<dl class="bodyPane">
+<dt class="bodyPane">Aquisitions</dt>
+<dd class="bodyPane">
 
 <div id="main">
 
@@ -27,6 +49,7 @@
        </script>
        <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post">
        <h1><!-- TMPL_VAR NAME="ordernumber" --> - Receive Order</h1>
+       <div class="data">
        <ul><li>Shopping Basket For: <!-- TMPL_VAR NAME="name" --></li>
                <li>Order placed: <!-- TMPL_VAR NAME="date" --></li>
        </ul>
@@ -34,98 +57,95 @@
        <table>
        <caption>Catalogue Details</caption>
                <tr>
-                       <td><b>Title *</b></td>
-                       <td><input type="text" size="20" name="title" 
value="<!-- TMPL_VAR NAME="title" -->" />
+                       <th scope="row"><label for="title" 
class="required">Title</label></th>
+                       <td><input type="text" size="20" name="title" 
id="title" value="<!-- TMPL_VAR NAME="title" -->" />
                        </td>
                </tr>
                <tr>
-                       <td>Author</td>
-                       <td><input type="text" size="20" name="author" 
value="<!-- TMPL_VAR NAME="author" -->" />
+                       <th scope="row"><label for="author">Author</label></th>
+                       <td><input type="text" size="20" name="author" 
id="author" value="<!-- TMPL_VAR NAME="author" -->" />
                        </td>
                </tr>
                <tr>
-                       <td>Copyright Date</td>
-                       <td><input type="text" size="20" name="copyright" 
value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
+                       <th scope="row"><label for="copyright">Copyright 
Date</label></th>
+                       <td><input type="text" size="20" name="copyright" 
id="copyright" value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
                        </td>
                </tr>
                <tr>
-                       <td>Format</td>
+                       <th scope="row"><label for="">Format</label></th>
                        <td><!-- TMPL_VAR NAME="CGIitemtype" --></td>
                </tr>
                <tr>
-                       <td>ISBN</td>
-                       <td><input type="text" size="20" name="ISBN" 
value="<!-- TMPL_VAR NAME="isbn" -->" /></td>
+                       <th scope="row"><label for="ISBN">ISBN</label></th>
+                       <td><input type="text" size="20" name="ISBN" id="ISBN" 
value="<!-- TMPL_VAR NAME="isbn" -->" /></td>
                </tr>
                <tr>
-                       <td>Series</td>
-                       <td><input type="text" size="20" name="Series" 
value="<!-- TMPL_VAR NAME="seriestitle" -->" /></td>
+                       <th scope="row"><label for="Series">Series</label></th>
+                       <td><input type="text" size="20" name="Series" 
id="Series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /></td>
                </tr>
                <tr>
-                       <td>Branch</td>
+                       <th scope="row"><label for="branch">Branch</label></th>
                        <td><!-- TMPL_VAR NAME="CGIbranch" --></td>
                </tr>
                <tr>
-                       <td><b>Item Barcode *</b></td>
-                       <td><input type="text" size="20" name="barcode" 
value="<!-- TMPL_VAR NAME="barcode" -->" /></td>
+                       <th scope="row"><label for="barcode" 
class="required">Item Barcode </label></th>
+                       <td><input type="text" size="20" name="barcode" 
id="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" /></td>
                </tr>
                <tr>
-                       <td><b>Volume Info (for serials) *</b></td>
-                       <td><input type="text" size="20" name="volinf" /></td>
+                       <th scope="row"><label for="volinf" 
class="required">Volume Info (for serials) </label></th>
+                       <td><input type="text" size="20" name="volinf" 
id="volinf" /></td>
                </tr>
-               <tr>
-                       <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" -->" />
+</table>
+               <p>             <input type="hidden" name="biblio" id="biblio" 
value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+                               <input type="hidden" name="ordnum" id="ordnum" 
value="<!-- TMPL_VAR NAME="ordernumber" -->" />
+                               <input type="hidden" name="biblioitemnum" 
id="biblioitemnum" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
+                               <input type="hidden" name="id" id="id" 
value="<!-- TMPL_VAR NAME="booksellerid" -->" />
+                               <input type="hidden" name="freight" 
id="freight" value="<!-- TMPL_VAR NAME="freight" -->" />
+                               <input type="hidden" name="gst" id="gst" 
value="<!-- TMPL_VAR NAME="gst" -->" />
                                <!-- TMPL_IF name="catview" -->
                                        <input type="submit" class="submit"  
name="submit" value="Save" />
                                <!-- TMPL_ELSE -->
                                        <a 
href="/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" 
-->&amp;id=<!-- TMPL_VAR NAME="booksellerid" -->">Edit</a>
-                               <!-- /TMPL_IF -->
-                       </td>
-               </tr>
-       </table>
+                               <!-- /TMPL_IF --></p>
+               
        <table>
        <caption>Accounting Details</caption>
                <tr>
-                       <td><b>Bookfund *</b></td>
+                       <th scope="row"><label for="bookfund" 
class="required">Bookfund </label></th>
                        <td><!-- TMPL_VAR NAME="CGIbookfund" -->
                </tr>
                <tr>
-                       <td>Quantity Ordered</td>
-                       <td><input type="text" size="20" name="quantity" 
value="<!-- TMPL_VAR NAME="quantity" -->" />
+                       <th scope="row"><label for="quantity">Quantity 
Ordered</label></th>
+                       <td><input type="text" size="20" name="quantity" 
id="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" />
                        </td>
                </tr>
                <tr>
-                       <td><b>Quantity Received *</b></td>
-                       <td><input type="text" size="20" name="quantityrec" 
value="<!-- TMPL_VAR NAME="quantityreceived" -->" />
+                       <th scope="row"><label for="quantityrec" 
class="required">Quantity Received </label></th>
+                       <td><input type="text" size="20" name="quantityrec" 
id="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->" />
                        </td>
                </tr>
                <tr>
-                       <td>Replacement Cost</td>
-                       <td><input type="text" size="20" name="rrp" value="<!-- 
TMPL_VAR NAME="rrp" -->" />
+                       <th scope="row"><label for="rrp">Replacement 
Cost</label></th>
+                       <td><input type="text" size="20" name="rrp" id="rrp" 
value="<!-- TMPL_VAR NAME="rrp" -->" />
                </tr>
                <tr>
-                       <td>Budgeted Cost </td>
-                       <td><input type="text" size="20" name="ecost" 
value="<!-- TMPL_VAR NAME="ecost" -->" /></td>
+                       <th scope="row"><label for="ecost">Budgeted 
Cost</label> </td>
+                       <td><input type="text" size="20" name="ecost" 
id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" /></td>
                </tr>
                <tr>
-                       <td><b>Actual Cost *</b></td>
-                       <td><input type="text" size="20" name="cost" 
value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- 
TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->" /></td>
+                       <th scope="row"><label for="cost" 
class="required">Actual Cost </label></th>
+                       <td><input type="text" size="20" name="cost" id="cost" 
value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- 
TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->" /></td>
                </tr>
                <tr>
-                       <td>Invoice Number</td>
+                       <th scope="row"><label for="invoice">Invoice 
Number</label></th>
                        <td>
                                <!-- TMPL_VAR NAME="invoice" -->
-                               <input type="hidden" name="invoice" value="<!-- 
TMPL_VAR NAME="invoice" -->" />
+                               <input type="hidden" name="invoice" 
id="invoice" value="<!-- TMPL_VAR NAME="invoice" -->" />
                        </td>
                </tr>
                <tr>
-                       <td>Notes</td>
-                       <td><input type="text" size="20" name="notes" 
value="<!-- TMPL_VAR NAME="notes" -->" /></td>
+                       <th scope="row"><label for="aqnotes">Notes</label></th>
+                       <td><input type="text" size="20" name="notes" 
id="aqnotes" value="<!-- TMPL_VAR NAME="notes" -->" /></td>
                </tr>
        </table>
        </form>
@@ -154,4 +174,9 @@
        </table>
 <!-- /TMPL_IF -->
 </div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+
+</dd>
+</dl>
+</body>
+</html>

Index: acqui/basket.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/Attic/basket.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
--- acqui/basket.tmpl   12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui/basket.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -1,22 +1,55 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_UNLESS 
name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket (<!-- TMPL_VAR 
NAME="basketno" -->) for <!-- TMPL_VAR NAME="name" --><!-- TMPL_INCLUDE 
NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="head.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top-acqui.inc" -->
+
+<div id="subTab-1">
+       <a href="/cgi-bin/koha/acqui/acqui-home.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-mainPage-selected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-2">
+       <a href="/cgi-bin/koha/acqui/lateorders.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-lateOrders-unselected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-3">
+       <a href="/cgi-bin/koha/acqui/histsearch.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-historySearch-unselected.png" border="0" />
+       </a>
+</div>
+
+<dl class="bodyPane">
+<dt class="bodyPane">Aquisitions</dt>
+<dd class="bodyPane">
 
 <div id="main">
        <h1><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS 
-->Shopping Basket <b><!-- TMPL_VAR NAME="basketno" --> </b>for <a 
href="supplier.pl?id=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR 
NAME="name" --></a></h1><br />
-       <!-- TMPL_UNLESS name="closedate" -->
-               <div class="data">
+       
+               <div class="data"><!-- TMPL_UNLESS name="closedate" -->
+       <!-- TMPL_IF name="basketno" -->
                        <table>
                        <caption>Basket Details</caption>
-                       <tr><th>Basket Number:</th><td><!-- TMPL_VAR 
NAME="basketno" --></td></tr>
                        <tr><th>Managed By:</th><td><!-- TMPL_VAR 
NAME="authorisedbyname" --></td></tr>
+                       <tr><th>Basket Number:</th><td><!-- TMPL_VAR 
NAME="basketno" --></td></tr>
                        <tr><th>Open On:</th><td><!-- TMPL_VAR 
NAME="creationdate" --></td></tr>
-                       <tr><th>For:</th><td>Supplier Id <!-- TMPL_VAR 
NAME="booksellerid" --></td></tr>
                        <tr><th>Invoice Number:</th><td><!-- TMPL_VAR 
NAME="booksellerinvoicenumber" --></td></tr>
                        <!-- TMPL_IF name="closedate" --><tr><th>Closed 
On:</th><td> <!-- TMPL_VAR name="closedate" --></td></tr><!-- /TMPL_IF -->
-                       </table><!-- TMPL_UNLESS name="closedate" --><form 
action="/cgi-bin/koha/acqui/order.pl" method="get"><input type="hidden" 
name="op" value="close" /><input type="hidden" name="basket" value="<!-- 
TMPL_VAR NAME="basketno" -->" /><input type="hidden" name="supplier" 
value="<!-- TMPL_VAR name="booksellerid" -->" /><input type="submit" 
class="submit" value="Close this Basket" /></form><!-- /TMPL_UNLESS -->
-               </div>
+                       </table>        
+       
+       <!-- TMPL_UNLESS name="closedate" --><form 
action="/cgi-bin/koha/acqui/order.pl" method="get"><input type="hidden" 
name="op" value="close" /><input type="hidden" name="basket" value="<!-- 
TMPL_VAR NAME="basketno" -->" /><input type="hidden" name="supplier" 
value="<!-- TMPL_VAR name="booksellerid" -->" /><input type="submit" 
class="submit" value="Close this Basket" /></form><!-- /TMPL_UNLESS -->
+               
+       <!-- /TMPL_IF -->
        <!-- /TMPL_UNLESS -->
+               <table>
+               <tr><th>For:</th><td><!-- TMPL_VAR NAME="name" --></td></tr>
+               <tr><th rowspan="4">Address:</th><td><!-- TMPL_VAR 
name="postal" --></td></tr>
+               <tr><td><!-- TMPL_VAR name="address2" --></td></tr>
+               <tr><td><!-- TMPL_VAR name="address3" --></td></tr>
+               <tr><td><!-- TMPL_VAR name="address4" --></td></tr>
+               </table>
+               </div>  
        
        <div class="data">
        <!-- TMPL_IF name="books_loop" -->
@@ -31,10 +64,9 @@
                                <th scope="col">Qty.</th>
                                <th scope="col">Total</th>
                                <th scope="col"><a href="basket.pl?basket=<!-- 
TMPL_VAR name="basketno" 
-->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
-<!-- TMPL_IF name="active" -->
-<!-- TMPL_UNLESS name="closedate" -->
+                                       <!-- TMPL_IF name="active" -->
                                        <th scope="col">Remove</th>
-                               <!-- /TMPL_UNLESS -->
+                                       <th scope="col">Edit</th>
                                        <!-- /TMPL_IF -->
                        </tr>
                        <!-- TMPL_LOOP NAME="books_loop" -->
@@ -52,7 +84,7 @@
                                        <!-- TMPL_ELSE -->
                                                <td>
                                                        <p>
-                                                       <a 
href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" 
-->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- 
TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
+                                                       <a 
href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" 
-->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- 
TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
                                                                <!-- TMPL_VAR 
NAME="author" -->
                                                                <!-- TMPL_IF 
name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
                                                                <!-- TMPL_IF 
name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
@@ -65,36 +97,40 @@
                                        <td><!-- TMPL_VAR NAME="line_total" 
--></td>
                                        <td><!-- TMPL_VAR NAME="bookfundid" 
--></td>
                                        <!-- TMPL_IF name="active" -->
-                                       <!-- TMPL_UNLESS name="closedate" -->
                                        <td>
                                                        <form 
action="addorder.pl" method="get"><input type="hidden" name="ordnum" 
value="<!-- TMPL_VAR NAME="ordernumber" -->" /><input type="hidden" 
name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" /><input 
type="hidden" name="quantity" value="0" /><input type="hidden" name="biblio" 
value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" 
class="delete" value="Delete" /></form>
                                                </td>
-                                       <!-- /TMPL_UNLESS -->
+                                               <td>
+                                               <form action="newbiblio.pl" 
method="get"><input type="hidden" name="sub" value="" /><input type="hidden" 
name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" /><input 
type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" 
/><input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" 
-->" /><input type="hidden" name="ordnum" value="<!-- TMPL_VAR 
NAME="ordernumber" -->" /><!--TMPL_IF name="closedate"--><input type="hidden" 
name="close" value="1" /><!--/TMPL_IF --><input type="submit" class="submit" 
value="Edit" />
+                                                       </form>
+                                               </td>
                                                <!-- /TMPL_IF -->
                                </tr>
                        <!-- /TMPL_LOOP -->
                        
                        <tr>
-                               <td colspan="2" rowspan="3">
-<input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" 
/><input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" 
-->" />  </td>
+                               <td colspan="2" rowspan="3">&nbsp;</td>
                                <th>SubTotal</th>
                                <th><!-- TMPL_VAR NAME="sub_total_est" --></th>
-                               <th><!-- TMPL_VAR NAME="sub_total" --></td>
-                               <th><!-- TMPL_VAR name="qty_total" --></th>
-                               <td colspan="2" rowspan="3">&nbsp;</td>
+                               <th>&nbsp;</th>
+                               <th><!-- TMPL_VAR name="qty_total" --></td>
+                               <th><!-- TMPL_VAR NAME="sub_total" --></th>
+                               <td colspan="3" rowspan="3">&nbsp;</td>
                                
                        </tr>
                        <tr>
                                <th>GST</th>
                                <th><!-- TMPL_VAR NAME="gist_est" --></th>
-                               <th><!-- TMPL_VAR NAME="gist" --></th>
                                <th>&nbsp;</th>
+                               <th>&nbsp;</th>
+                               <th><!-- TMPL_VAR NAME="gist" --></th>
                        </tr>
                        <tr>
                                <th>TOTAL  (<!-- TMPL_VAR NAME="currency" 
-->)</th>
                                <th><!-- TMPL_VAR NAME="grand_total_est" 
--></th>
-                               <th><!-- TMPL_VAR NAME="grand_total" --></th>
                                <th>&nbsp;</th>
+                               <th>&nbsp;</th>
+                               <th><!-- TMPL_VAR NAME="grand_total" --></th>
                        </tr>
                </table>
        <!-- TMPL_ELSE -->
@@ -104,6 +140,7 @@
                </table>
        <!-- /TMPL_IF -->
        </div>
+       <!-- TMPL_IF name="active" -->
        <!-- TMPL_UNLESS name="closedate" -->
        <div class="details">
                <h2>Add To Order</h2>
@@ -117,6 +154,10 @@
                </form>
        </div>
        <!-- /TMPL_UNLESS -->
+       <!-- /TMPL_IF -->
 </div>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</dd>
+</dl>
+</body>
+</html>

Index: acqui/histsearch.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/Attic/histsearch.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
--- acqui/histsearch.tmpl       12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui/histsearch.tmpl       30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -20,11 +20,12 @@
        </a>
 </div>
 
-<dl>
-<dt>Aquisitions: Order History Search</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Aquisitions: Order History Search</dt>
+<dd class="bodyPane">
 
 <div id="main">
+       <h1>Order search</h3>
        <div class="results"><!-- TMPL_VAR Name ="numresults" --> orders were 
found.</div>
        <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
        <div class="data">

Index: acqui/lateorders.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/Attic/lateorders.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
--- acqui/lateorders.tmpl       12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui/lateorders.tmpl       30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -20,9 +20,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Aquisitions: Late Orders</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Aquisitions: Late Orders</dt>
+<dd class="bodyPane">
 
 <div id="main">
        <h1><!-- TMPL_IF name="Supplier" --><!-- TMPL_VAR name="Supplier" --> : 
<!--/TMPL_IF -->Late issues</h1>

Index: acqui/newbasket2.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/Attic/newbasket2.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
--- acqui/newbasket2.tmpl       12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui/newbasket2.tmpl       30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -1,19 +1,40 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Shopping Basket For: 
<!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" 
-->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="head.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top-acqui.inc" -->
+
+<div id="subTab-1">
+       <a href="/cgi-bin/koha/acqui/acqui-home.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-mainPage-selected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-2">
+       <a href="/cgi-bin/koha/acqui/lateorders.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-lateOrders-unselected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-3">
+       <a href="/cgi-bin/koha/acqui/histsearch.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-historySearch-unselected.png" border="0" />
+       </a>
+</div>
+
+<dl class="bodyPane">
+<dt class="bodyPane">Aquisitions: Shopping Basket For: <!-- TMPL_VAR 
name="bookselname" --></dt>
+<dd class="bodyPane">
 
 <div id="main">
- <h1>Shopping Basket For: <!-- TMPL_VAR name="bookselname" --></h1>
+ <h1>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" -->">Add New Biblio</a> | 
+       <a href="basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">View 
Basket</a> | 
 
-<!-- TMPL_IF name ="testdonation" -->
-       <a href="newbiblio.pl?id=<!-- TMPL_VAR name="id" -->&amp;basket=<!-- 
TMPL_VAR name="basket" -->&amp;sub=<!-- TMPL_VAR name="parsub" -->">Add New 
Biblio</a>
-<!-- TMPL_ELSE -->
-       <a href="newdonation.pl?id=<!-- TMPL_VAR name="id" -->&amp;basket=<!-- 
TMPL_VAR name="basket" -->&amp;sub=<!-- TMPL_VAR name="parsub" -->">Add New 
Biblio</a>
-<!-- /TMPL_IF --> | <a href="basket.pl?basket=<!-- TMPL_VAR name="basket" 
-->">View Basket</a> | 
 <form class="inline" 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" -->" />
-New Search: <input type="text"  size="25" name="search" /></form>
+<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR 
NAME="booksellerid" -->" />
+<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" 
/>
+<label for="acquisearch">New Search:</label> <input type="text"  size="25" 
id="acquisearch" name="search" />
+<input type="submit" value="Search" class="submit" /></form>
 
 
 <h3>You searched for <span class="ex">
@@ -36,15 +57,9 @@
 <!-- TMPL_LOOP name="loopresult" -->
        <tr bgcolor="<!-- TMPL_VAR name="toggle" -->">
                <td>
-                       <!-- TMPL_IF name="testdonation" -->
-                               <a 
href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR name="sub" 
-->&amp;author=<!-- TMPL_VAR name="author2" -->&amp;copyright=<!-- TMPL_VAR 
name="copyright" -->&amp;id=<!-- TMPL_VAR name="id" -->&amp;basket=<!-- 
TMPL_VAR name="basket" -->&amp;biblio=<!-- TMPL_VAR name="biblionumber" 
-->&amp;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" 
-->&amp;copyright=<!-- TMPL_VAR name="copyright" -->&amp;id=<!-- TMPL_VAR 
name="id" -->&amp;basket=<!-- TMPL_VAR name="basket" -->&amp;biblio=<!-- 
TMPL_VAR name="biblionumber" -->&amp;title=<!-- TMPL_VAR name="title2" -->">
-                               <!-- TMPL_VAR name="title" -->
+                       <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>
-                       <!-- /TMPL_IF -->
                </td>
                <td>
                        <a href="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR 
name="word" -->&amp;type=<!-- TMPL_VAR name="type" -->">
@@ -55,10 +70,18 @@
                        <!-- TMPL_VAR name="copyright" -->
                </td>
                <td>
-                       <!-- TMPL_VAR name="itemcount" -->
+                               <!-- TMPL_VAR NAME="itemcount" -->
                </td>
                <td>
-                       <!-- TMPL_VAR name="location" -->
+                               <!-- 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" -->On 
Loan<br><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="lost-p" -->Lost<br><!-- 
/TMPL_IF -->
+                               <!-- TMPL_IF name="mending-p" 
-->Mending<br><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="in-transit-p" -->In 
Transit<br><!-- /TMPL_IF -->
+                               <!-- TMPL_ELSE -->
+                               <!-- TMPL_VAR NAME="location" -->
+                               <!-- /TMPL_IF -->
                </td>
        </tr>
 
@@ -71,4 +94,7 @@
 <!-- /TMPL_IF -->
 </div>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+</dd>
+</dl>
+</body>
+</html>
\ No newline at end of file

Index: acqui/order.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/Attic/order.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
--- acqui/order.tmpl    12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui/order.tmpl    30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -1,6 +1,28 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Supplier Search 
Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="head.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top-acqui.inc" -->
+
+<div id="subTab-1">
+       <a href="/cgi-bin/koha/acqui/acqui-home.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-mainPage-selected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-2">
+       <a href="/cgi-bin/koha/acqui/lateorders.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-lateOrders-unselected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-3">
+       <a href="/cgi-bin/koha/acqui/histsearch.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-historySearch-unselected.png" border="0" />
+       </a>
+</div>
+
+<dl class="bodyPane">
+<dt class="bodyPane">Aquisitions : Supplier Search Results</dt>
+<dd class="bodyPane">
 
 <div id="main"><div class="results">You searched on <span class="ex">supplier 
<!-- TMPL_VAR name="supplier" -->,</span> <!-- TMPL_VAR name="count" --> 
results found</div>
 <table>
@@ -18,9 +40,9 @@
                                <a href="basket.pl?supplierid=<!-- TMPL_VAR 
name="supplierid" -->">Add Order</a><!-- TMPL_ELSE -->      Inactive<!-- 
/TMPL_IF -->
                </td>
                <td>
-                       <a href="recieveorder.pl?id=<!-- TMPL_VAR 
name="supplierid" -->">Receive</a>
+                       <a href="recieveorder.pl?supplierid=<!-- TMPL_VAR 
name="supplierid" -->">Receive</a>
                </td>
-               <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR 
name="supplierid" -->"><!-- TMPL_VAR name="name" --></a></td>
+               <td><a href="supplier.pl?supplierid=<!-- TMPL_VAR 
name="supplierid" -->&amp;op=display"><!-- TMPL_VAR name="name" --></a></td>
                <td>
 <div class="data"><table>
                                        <tr>
@@ -41,10 +63,14 @@
                                                        <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" 
-->">(View)</a>
+                                                                       Closed 
on: <!-- TMPL_VAR NAME="closedate" -->
+                                                                       <a 
href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" 
-->">View</a>
                                                                <!-- TMPL_ELSE 
-->
+                                                                       <!-- 
TMPL_IF name="active" -->
                                                                        <a 
href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" 
-->">Modify</a>
+                                                                       <!-- 
TMPL_ELSE -->
+                                                                               
<a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" 
-->">View</a>
+                                                                       <!-- 
/TMPL_IF -->
                                                                <!-- /TMPL_IF 
-->
                                                        </td>
                                                </tr>
@@ -54,7 +80,12 @@
 <!-- /TMPL_LOOP -->
 </table>
 <form action="supplier.pl" method="get">
-       <input type="hidden" name="id" value="0" />
+       <input type="hidden" name="supplierid" value="0" />
        <input type="submit" class="submit" value="Add Supplier" /> 
 </form>
-</div><!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</div>
+
+</dd>
+</dl>
+</body>
+</html>
\ No newline at end of file

Index: acqui/recieve.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/Attic/recieve.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
--- acqui/recieve.tmpl  12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui/recieve.tmpl  30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -1,74 +1,139 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : 
<!-- TMPL_VAR name="name" -->, Invoice <!-- TMPL_VAR name="invoice" --><!-- 
TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="head.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top-acqui.inc" -->
+
+<div id="subTab-1">
+       <a href="/cgi-bin/koha/acqui/acqui-home.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-mainPage-selected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-2">
+       <a href="/cgi-bin/koha/acqui/lateorders.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-lateOrders-unselected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-3">
+       <a href="/cgi-bin/koha/acqui/histsearch.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-historySearch-unselected.png" border="0" />
+       </a>
+</div>
+
+<dl class="bodyPane">
+<dt class="bodyPane">
+  Aquisitions : Receipt Summary for : <!-- TMPL_VAR name="name" -->, Invoice 
<!-- TMPL_VAR name="invoice" -->
+</dt>
+<dd class="bodyPane">
 
 <div id="main">
 
-<h1>Receipt Summary for : <!-- TMPL_VAR name="name" -->, Invoice <!-- TMPL_VAR 
name="invoice" --></h1>
+       <h1>
+                       Receipt Summary for <i><!-- TMPL_VAR NAME="name" 
--></i> Invoice <i><!-- TMPL_VAR NAME="invoice" --></i>
+       </h1>
+       
 <ul>
 <li>Invoice: <!-- TMPL_VAR name="invoice" --></li>
-<li>Received By: <!-- TMPL_VAR name="user" --></li>
-<li>Date: <!-- TMPL_VAR name="date" --></li>
+<li>Received by: <!-- TMPL_VAR name="user" --></li>
+<li>Date: <!-- TMPL_VAR name="formatteddatereceived"--></li>
 </ul>
 
-<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" 
/><input type="submit" class="submit" value="Search" />
-</form>
-
-<form method="get" name="orderform">
-<table>
+       <h2> Items in parcel</h2>
+       <h5>
+       <!-- TMPL_VAR NAME="countreceived" --> bibliographic record(s) received
+       </h5>
+       <table>
        <tr>
                <th>Basket</th>
                <th>ISBN</th>
                <th>Title</th>
                <th>Author</th>
-               <th>Actual</th>
+                       <th>Est. cost</th>
+                       <th>Qty ordered</th>
                <th>P&amp;P</th>
+                       <th>Actual</th>
                <th>Qty</th>
                <th>Total</th>
        </tr>
-       <!-- TMPL_LOOP name="loop_orders" -->
-               <tr>
-                       <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;gst=<!-- TMPL_VAR 
name="gst" -->&amp;freight=<!-- TMPL_VAR name="freight" -->&amp;id=<!-- 
TMPL_VAR name="id" -->"><!-- TMPL_VAR name="title" --></a></td>
-                       <td><!-- TMPL_VAR name="author" --></td>
-                       <td>$<!-- TMPL_VAR name="unitprice" --></td>
+               <!-- TMPL_LOOP NAME="loop_received" -->
+                       <!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr 
class="highlight"><!-- /TMPL_IF -->
+                               <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;gst=<!-- TMPL_VAR 
NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- 
TMPL_VAR NAME="supplierid" -->&catview=yes&amp;datereceived=<!-- TMPL_VAR 
name="datereceived" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+                               <td><!-- TMPL_VAR NAME="author" --></td>
+                               <td><!-- TMPL_VAR NAME="ecost" --></td>
+                               <td><!-- TMPL_VAR NAME="quantity" --></td>
                        <td>&nbsp;</td>
-                       <td><!-- TMPL_VAR name="quantityrecieved" --></td>
-                       <td>$<!-- TMPL_VAR name="total" --></td>
+                               <td><!-- TMPL_VAR NAME="unitprice" --></td>
+                               <td><!-- TMPL_VAR NAME="quantityrecieved" 
--></td>
+                               <td><!-- TMPL_VAR NAME="total" --></td>
                </tr>
        <!-- /TMPL_LOOP -->
        <tr>
-               <td>&nbsp;</td>
-               <td>&nbsp;</td>
-               <td>&nbsp;</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>
+                       <th>&nbsp;</th>
+                       <th>&nbsp;</th>
+                       <th>&nbsp;</th>
+                       <th>&nbsp;</th>
+                       <th>&nbsp;</th>
+                       <th>&nbsp;</th>
+                       <th>&nbsp;</th>
+                       <th>&nbsp;</th>
+                       <th>&nbsp;</th>
+                       <th><!-- TMPL_VAR NAME="tototal" --></th>
        </tr>
        <tr>
-               <td colspan="5">
-               <b>HELP</b>
-               <p>
-               The total at the bottom of the page should be within a few 
cents of the total for the invoice.</p>
+                       <td colspan="7" rowspan="2">
+                       <div class="help"><h3>HELP</h3>
+                               <p>The total at the bottom of the page should 
be within a few cents of the total for the invoice.</p></div>
                </td>
-               <td colspan="2"><b>GST</b></td>
-               <td>$<!-- TMPL_VAR name="gst" --></td>
+                       <td colspan="2" scope="row">GST</td>
+                       <td><!-- TMPL_VAR NAME="gst" --></td>
        </tr>
        <tr>
-               <td colspan="5">&nbsp;</td>
-               <td colspan="2"><b>TOTAL</b></td>
-               <td>$<!-- TMPL_VAR name="grandtot" --></td>
+                       <td colspan="2" scope="row">FREIGHT</td>
+                       <td><!-- TMPL_VAR NAME="freight" --></td>
        </tr>
-</table>
+               <tr>
+                       <td colspan="2" scope="row">TOTAL</td>
+                       <td><!-- TMPL_VAR NAME="grandtot" --></td>
+               </tr>
+       </table>
+       
+       <div class="data">
+       <h2>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>Search ISBN or Title:</b> <input type="text" 
size="25" name="recieve">
+               </form>
+       </div>
+
+       <table>
+               <tr>
+                       <th>Basket</th>
+                       <th>ISBN</th>
+                       <th>Title</th>
+                       <th>Author</th>
+               </tr>
+               <!-- TMPL_VAR NAME="countpending" -->
+               <!-- TMPL_LOOP NAME="loop_orders" -->
+                       <tr 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" -->&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"-->&amp;catview=yes""><!-- TMPL_VAR NAME="title" --></a></td>
+                               <td><!-- TMPL_VAR NAME="author" --></td>
+                       </tr>
+               <!-- /TMPL_LOOP -->
+       </table>
+       </div>
 
 </div>
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+
+
+</dd>
+</dl>
+</body>
+</html>
\ No newline at end of file

Index: acqui/recieveorder.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/Attic/recieveorder.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
--- acqui/recieveorder.tmpl     12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui/recieveorder.tmpl     30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -1,30 +1,115 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receive Orders From 
Supplier <!-- TMPL_VAR name="name" --><!-- TMPL_INCLUDE 
NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="head.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top-acqui.inc" -->
+
+<div id="subTab-1">
+       <a href="/cgi-bin/koha/acqui/acqui-home.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-mainPage-selected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-2">
+       <a href="/cgi-bin/koha/acqui/lateorders.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-lateOrders-unselected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-3">
+       <a href="/cgi-bin/koha/acqui/histsearch.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-historySearch-unselected.png" border="0" />
+       </a>
+</div>
+
+<dl class="bodyPane">
+<dt class="bodyPane">Aquisitions : Receive Orders From Supplier<!-- TMPL_VAR 
name="name" --></dt>
+<dd class="bodyPane">
 
 <div id="main">
-<h1>Receive Orders From Supplier <a href="whitcoulls.html"><!-- TMPL_VAR 
name="name" --></a></h1>
 
-<form method="get" action="receive.pl">
-<input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
-<div class="data">
-<table>
-<caption>Supplier Invoice Information</caption>
-<tr>
-<th>Supplier Invoice Number</th>
-<td><input type="text" size="20" name="invoice" />
-</td>
-</tr>
-<tr>
-<th>GST</th>
-<td><input type="text" size="20" name="gst" />
-</td>
+<h1>Receive Orders From Supplier <a 
href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR 
NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
+
+<!-- TMPL_IF NAME="count" --><p> <!-- TMPL_VAR NAME="count" --> parcels 
found</p><!--/TMPL_IF-->
+<div id="resultnumber">
+<!-- Row of numbers corresponding to search result pages -->
+<!-- TMPL_IF NAME="displayprev" -->
+       <a href="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">&lt;&lt;</a>
+<!-- /TMPL_IF -->
+<!-- TMPL_LOOP NAME="numbers" -->
+       <!-- TMPL_IF NAME="highlight" --><span class="current"><!-- TMPL_VAR 
NAME="number" --></span><!-- 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"><!-- TMPL_VAR 
NAME="number" --></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">&gt;&gt;
+<!-- /TMPL_IF -->
+</div>
+
+<div id="resultlist">
+<!-- Search Results Table -->
+<!-- TMPL_IF NAME="count" -->
+<form method="post" action="recieveorder.pl">
+       <table>
+               <tr>
+       <th>Number</th><th>Code</th><th>Date Received</th><th>Item 
Count</th><th>Biblio count</th><th>Items expected</th>
 </tr>
-<tr>
-<th>Freight</th>
-<td><input type="text" size="20" name="freight" />
-</td>
+               <tr>
+<th>&nbsp;<input type="hidden" name="supplierid" value="<!-- TMPL_VAR 
NAME="supplierid" -->" /></th><th><input type="text" size="20" name="filter" 
value="<!-- TMPL_VAR NAME="filter" -->" /></th>
+<th>From :<input type="text" size="9" name="datefrom" value="<!-- TMPL_VAR 
NAME="datefrom" -->" /> <p>To :<input type="text" size="9" name="dateto" 
value="<!-- TMPL_VAR NAME="dateto" -->" /></th><th>&nbsp;</th><th>Sort by 
:<select name="orderby">
+<option value="aqorders.booksellerinvoicenumber"> Code</option>
+<option value="datereceived"> Date Received</option>
+<option value="datereceived desc"> Date Received reverse</option>
+<option value="aqorders.booksellerinvoicenumber desc"> Code reverse</option>
+</select><br />
+Results per page :<select name="resultsperpage" value ="<!--TMPL_VAR 
Name="resultsperpage"-->" size="1">
+<option value="20">20</option>
+<option value="30">30</option>
+<option value="50">50</option>
+<option value="100">100</option>
+</select>
+</th><th><input type="submit" class="submit" value="Filter" />
+</th>
 </tr>
-</table><input type="submit"  name="submit" class="submit" value="Save" />
+<!-- Actual Search Results -->
+<!-- TMPL_LOOP NAME="searchresults" -->
+       <!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE 
--><tr><!-- /TMPL_IF -->
+                       <td>
+                               <a 
href="/cgi-bin/koha/acqui/receive.pl?type=intra&amp;supplierid=<!-- TMPL_VAR 
NAME="supplierid" ESCAPE=URL -->&amp;datereceived=<!-- TMPL_VAR 
NAME="datereceived" ESCAPE=URL --><!--TMPL_IF 
Name="code"-->&amp;code=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
+                                       <!-- TMPL_VAR NAME="number" -->
+                               </a>
+                       </td>
+                       <td>
+                               <!--TMPL_IF Name="code"--><!--TMPL_VAR 
Name="code" --><!--/TMPL_IF-->
+                       </td>
+               <td> <!-- TMPL_VAR NAME="datereceived" --> </td>
+               <td> <!-- TMPL_VAR NAME="reccount" --> </td>
+               <td><!-- TMPL_VAR NAME="bibcount" -->
+               </td>
+               <td><!-- TMPL_VAR NAME="itemcount" -->
+               </td>
+       </tr>
+<!-- /TMPL_LOOP -->
+</table>
+</form>
+<!--/TMPL_IF-->
+       <div class="data">
+       <h2> Receive a new Parcel </h2>
+               <form method="get" action="receive.pl">
+               
+                       <table><tr><th><input type="hidden" name="supplierid" 
value="<!-- TMPL_VAR NAME="supplierid" -->" />
+                       <label for="invoice">Parcel Code</label></th>
+                       <td><input type="text" size="20" id="invoice" 
name="invoice" /></td></tr>
+               
+                       <tr><th><label for="gst">GST</label></th>
+               <td>    <input type="text" size="20" id="gst" name="gst" 
/></td></tr>
+               
+                       <tr><th><label for="freight">Freight</label></th>
+                       <td><input type="text" size="20" id="freight" 
name="freight" /></td></tr>
+               </table>
+                       <p><input type="submit" class="submit" value="Save" 
/></p>
+               
+               </form>
+       </div>
+
+
 </div>
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->

Index: acqui/suggestion-select.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/Attic/suggestion-select.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
--- acqui/suggestion-select.tmpl        12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui/suggestion-select.tmpl        30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -1,6 +1,28 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: 
Suggestions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="head.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top-acqui.inc" -->
+
+<div id="subTab-1">
+       <a href="/cgi-bin/koha/acqui/acqui-home.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-mainPage-selected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-2">
+       <a href="/cgi-bin/koha/acqui/lateorders.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-lateOrders-unselected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-3">
+       <a href="/cgi-bin/koha/acqui/histsearch.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-historySearch-unselected.png" border="0" />
+       </a>
+</div>
+
+<dl class="bodyPane">
+<dt class="bodyPane">Acquisitions: Suggestions</dt>
+<dd class="bodyPane">
 
 <div id="main">
        
@@ -19,6 +41,7 @@
                        <th>Suggestion</th>
                        <th>Suggested by</th>
                        <th>Accepted by</th>
+                       <th>Duplicate</th>
                        <th>&nbsp;</th>
                </tr>
                <!-- TMPL_LOOP NAME="suggestions_loop" -->
@@ -41,6 +64,12 @@
                                        <!-- TMPL_VAR NAME="surnamemanagedby" 
--><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR 
NAME="firstnamemanagedby" -->
                                </td>
                                <td>
+                                       <!-- TMPL_IF 
name="duplicateBiblionumber" -->
+                                               <a href="#" 
onclick="window.open('/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR 
name="duplicateBiblionumber" -->')">Duplicate suspected</a>
+                                               <a 
href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR 
name="supplierid" -->&amp;basketno=<!-- TMPL_VAR 
name="basketno"-->&amp;op=connectDuplicate&amp;duplicateNumber=<!-- TMPL_VAR 
name="duplicateBiblionumber" -->&amp;suggestionid=<!-- TMPL_VAR 
name="suggestionid" -->">Connect</a>
+                                       <!-- /TMPL_IF -->
+                               </td>
+                               <td>
                                        <!-- TMPL_IF name="biblionumber" -->
                                                <a 
href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" 
-->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- 
TMPL_VAR NAME="suggestionid" -->&amp;biblio=<!-- TMPL_VAR name="biblionumber" 
-->">Order</a>
                                        <!-- TMPL_ELSE -->
@@ -52,4 +81,8 @@
        </table>
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+
+</dd>
+</dl>
+</body>
+</html>
\ No newline at end of file

Index: acqui/supplier.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui/Attic/supplier.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
--- acqui/supplier.tmpl 12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui/supplier.tmpl 30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -1,9 +1,32 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME=id 
-->Update: <!-- TMPL_VAR name="name" --><!-- TMPL_ELSE -->Add supplier<!-- 
/TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
+<!-- TMPL_INCLUDE NAME="head.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top-acqui.inc" -->
 
-<div id="main"><form action="updatesupplier.pl" method="post">
+<div id="subTab-1">
+       <a href="/cgi-bin/koha/acqui/acqui-home.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-mainPage-selected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-2">
+       <a href="/cgi-bin/koha/acqui/lateorders.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-lateOrders-unselected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-3">
+       <a href="/cgi-bin/koha/acqui/histsearch.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-acquisitions-historySearch-unselected.png" border="0" />
+       </a>
+</div>
 
+<dl class="bodyPane">
+<dt class="bodyPane">Aquisitions; <!-- TMPL_IF NAME=id -->Update: <!-- 
TMPL_VAR name="name" --><!-- TMPL_ELSE -->Add supplier<!-- /TMPL_IF --></dt>
+<dd class="bodyPane">
+
+<div id="main">
+<!--TMPL_IF Name="enter"-->
+<form action="updatesupplier.pl" method="post">
 <input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
 
 <!-- TMPL_IF NAME="id" -->
@@ -12,7 +35,7 @@
        <h1>Add supplier</h1>
 <!-- /TMPL_IF -->
 
-<div class="details"><table>
+<div class="data"><table>
        <caption>Company Details</caption>
        <tr>
                <th><label for="company">Company Name</label></td>
@@ -46,7 +69,7 @@
                </td>
        </tr>
 </table></div>
-<div class="details"><table>
+<div class="data"><table>
 <caption>Contact Details</caption>
        <tr>
                <th><label for="company_contact_name">Contact Name</label></th>
@@ -84,7 +107,7 @@
        </tr>
 </table></div>
 
-<div class="details"><table>
+<div class="data"><table>
        <caption>Current Status</caption>
        <tr>
                <th><label for="status">Supplier is</label></th>
@@ -144,12 +167,138 @@
        </tr>
        <tr>
                <th><label for="discount">Discount</label></th>
-               <td><input type="text" size="3" id="discount" name="discount" 
value="<!-- TMPL_VAR name="discount" -->" /> %
+               <td><input type="text" size="3" id="discount" name="discount" 
value="<!-- TMPL_VAR name="discount" -->" /> %</td>
+       </tr>
+       <tr>
+               <th>
+                       <label for="notes">Notes</label></th><td>
+                       <textarea cols="40" rows="4" name="notes" 
id="notes"><!-- TMPL_VAR NAME="notes" --></textarea>
+</td>
        </tr>
 </table>
 </div>
 <input type="submit" value="Save Changes" class="submit" />
 </form>
+
+<!--TMPL_ELSE-->
+
+       <h1>Information for : <!-- TMPL_VAR NAME="name" --></h1>
+<form class="inline" action="recieveorder.pl" method="get"><input 
type="hidden" name="supplierid" value="<!--TMPL_VAR Name="id"-->" /><input 
type="submit" class="submit" value="Receive Parcel" /></form>
+
+<form class="inline" action="order.pl" method="get"><input type="hidden" 
name="supplier" value="<!--TMPL_VAR Name="name"-->" /><input type="submit" 
class="submit" value="Manage Orders" /></form>
+
+<form class="inline" action="supplier.pl" method="get"><input type="hidden" 
name="supplierid" value="<!--TMPL_VAR Name="id"-->" /><input type="submit" 
class="submit" value="Edit Supplier" /></form>
+
+       <div class="data">
+       <table>
+               <caption>Company Details</caption>
+               <tr><th>
+                       Company Name: </th><td>
+                       <!-- TMPL_VAR NAME="name" -->
+               </td></tr>
+               <tr><th>
+                       Postal Address: </th><td>
+                               <!-- TMPL_VAR NAME="postal" -->
+               </td></tr>
+               <tr><th>
+                       Physical Address: </th><td>
+                       <!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR 
NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR 
NAME="address4" -->
+               </td></tr>
+               <tr><th>
+                       Phone: </th><td>
+                       <!-- TMPL_VAR NAME="phone" -->
+               </td></tr>
+               <tr><th>
+                       Fax: </th><td>
+                       <!-- TMPL_VAR NAME="fax" -->
+               </td></tr>
+               <tr><th>
+                       Website: </th><td>
+                       <!-- TMPL_VAR NAME="url" -->
+               </td></tr>
+               </table>
+               
+                <table><caption>Contact Dtails</caption>
+               <tr><th>
+                       Contact Name: </th><td>
+                       <!-- TMPL_VAR NAME="contact" -->
+               </td></tr>
+               <tr><th>
+                       Position: </th><td>
+                       <!-- TMPL_VAR NAME="contpos" -->
+               </td></tr>
+               <tr><th>
+                       Phone: </th><td>
+                       <!-- TMPL_VAR NAME="contphone" -->
+               </td></tr>
+               <tr><th>
+                       Alternative phone: </th><td>
+                       <!-- TMPL_VAR NAME="contaltphone" -->
+               </td></tr>
+               <tr><th>
+                       Fax: </th><td>
+                       <!-- TMPL_VAR NAME="contfax" -->
+               </td></tr>
+               <tr><th>
+                       E-mail: </th><td>
+                       <!-- TMPL_VAR NAME="contemail" -->
+               </td></tr>
+               <tr><th>
+                       Notes: </th><td>
+                       <!-- TMPL_VAR NAME="contnotes" -->
+               </td></tr>
+               </table>
+               
+                <table><caption>Current Status</caption>
+               <tr><th>
+                       Supplier is: </th><td>
+                               <!-- TMPL_IF name="active" -->
+                                       Active
+                               <!-- TMPL_ELSE -->
+                                       Inactive
+                               <!-- /TMPL_IF -->
+               </td></tr>
+               </table> 
+               
+               <table><caption>Ordering Information</caption>
+               <tr><th>
+                       Publishers and Imprints: </th><td>
+                       <!-- TMPL_VAR NAME="specialty" -->
+               </td></tr>
+               <tr><th>
+                       List Prices are: </th><td><!--TMPL_VAR 
Name="listprice"-->
+               </td></tr>
+               <tr><th>
+                       Invoice Prices are: </th><td><!--TMPL_VAR 
Name="invoiceprice"-->
+               </td></tr>
+               <tr><th>
+                       GST Registered: </th><td>
+                               <!-- TMPL_IF name="gstreg" 
-->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
+               </td></tr>
+               <tr><th>
+                       List Item Price Includes GST: </th><td>
+                               <!-- TMPL_IF name="listincgst" 
-->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
+               </td></tr>
+               <tr><th>
+                       Invoice Item Price Includes GST: </th><td>
+                               <!-- TMPL_IF name= "invoiceincgst" 
-->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
+               </td></tr>
+               <tr><th>
+                       Discount: </th><td>
+                       <!-- TMPL_VAR NAME="discount" --> %
+               </td></tr>
+       <tr>
+               <th>Notes: </th><td>
+               <!-- TMPL_VAR NAME="notes" -->
+</td>
+       </tr>
+       </table>
+</div>
+<!--/TMPL_IF-->
+
 </div>
 
-<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
+</dd>
+</dl>
+</body>
+</html>
\ No newline at end of file

Index: acqui.simple/addbiblio-nomarc.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/Attic/addbiblio-nomarc.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
--- acqui.simple/addbiblio-nomarc.tmpl  12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui.simple/addbiblio-nomarc.tmpl  30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -32,9 +32,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Catalog: Add a Non-MARC Record</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Cataloging: Add a Non-MARC Record</dt>
+<dd class="bodyPane">
 
 <div id="main">
 
@@ -67,7 +67,6 @@
 </form>
 * Required
 
-
 </dd>
 </dl>
 </body>

Index: acqui.simple/addbiblio.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/Attic/addbiblio.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
--- acqui.simple/addbiblio.tmpl 12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui.simple/addbiblio.tmpl 30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -13,437 +13,135 @@
 <div id="subTab-4"> <a href="/cgi-bin/koha/bull/lateissues.pl"> <img src="<!-- 
TMPL_VAR NAME='themelang' -->/images/subTab-catalog-lateIssues-unselected.png" 
border="0" /> </a> </div>
 <div id="subTab-5"> <a href="/cgi-bin/koha/bookshelves/shelves.pl"> <img 
src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-virtualShelves-unselected.png" border="0" /> </a> 
</div>
 <dl>
-  <dt> Cataloging:
-    <!-- TMPL_IF NAME="oldbiblionumtagfield" -->
-    Edit MARC Record Number
-    <!-- TMPL_VAR name="bibid" -->
-    <!-- TMPL_ELSE -->
-    Add MARC Record
-    <!-- /TMPL_IF -->
+  <dt>Cataloging: <!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record 
Number <!-- TMPL_VAR name="bibid" --> <!-- TMPL_VAR name="title" --><!-- 
TMPL_ELSE -->Add MARC Record<!-- /TMPL_IF -->
   </dt>
   <dd>
-    <div id="main">
+<div id="main-compact">
+
       <form method="post" name="f" id="f" action="addbiblio.pl">
-        <h1>
-          <!-- TMPL_IF NAME="oldbiblionumtagfield" -->
-          Edit MARC Record Number
-          <!-- TMPL_VAR name="oldbiblionumber" -->
-          <!-- TMPL_ELSE -->
-          Add MARC Record
-          <!-- /TMPL_IF -->
-          With Framework :
-          <!--TMPL_VAR Name="framework" -->
-        </h1>
-        <div class="tabitem">
+<h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Editing <em><!-- TMPL_VAR 
name="title" --> (<!-- TMPL_VAR name="oldbiblionumber" -->)</em><!-- TMPL_ELSE 
-->Add MARC Record<!-- /TMPL_IF --></h1> <h4>Using Framework : <!--TMPL_VAR 
Name="framework" --></h4>
+
           <input type="hidden" name="op" value="addbiblio" />
           <input type="hidden" name="addfield_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="Save Bibliographic Record and go to 
Items" onclick="Check(this.form)" accesskey="w" class="submit" />
+                       <input type="button" value="Save Bibliographic Record 
and go to Items" onclick="Check(this.form);" accesskey="w" class="submit" />
           <!-- TMPL_ELSE -->
-          <input type="button" value="Add Bibliographic Record and go to 
Items" onclick="Check(this.form)" accesskey="w" class="submit" />
+                       <input type="button" value="Add Bibliographic Record 
and go to Items" onclick="Check(this.form);" accesskey="w" class="submit" />
           <!-- /TMPL_IF -->
-          <input type="button" value="z39.50 Search" class="submit" 
onclick="PopupZ3950(); return false;" / >
+       <input type="button" value="z39.50 Search" class="submit" 
onclick="PopupZ3950(); return false;" />
+
+
+       <div class="tabs">
+        <!-- TMPL_LOOP name="BIG_LOOP" -->
+            <a href="#" class="addbiblioTabOff" onclick="active(<!-- TMPL_VAR 
name="number"-->); return false;" id="link<!-- TMPL_VAR name="number"-->"><!-- 
TMPL_VAR name="number"--></a>
+        <!--  /TMPL_LOOP -->
         </div>
-        <div name="0XX" id="0XX" class="tab" style="visibility:visible">
+
+<!-- RESET PAGINATION -->
+<!-- TMPL_LOOP name="BIG_LOOP" -->
+<!-- hide every tab except the 1st -->
+<!-- TMPL_IF name="number" -->
+    <div id="<!-- TMPL_VAR name="number" -->XX" class="tab" 
style="visibility:hidden">
+<!-- TMPL_ELSE -->
+    <div 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>Is this a duplicate of <a 
href="../MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicatebiblionumber" -->" 
onclick="openWindow('../MARCdetail.pl?bib=<!-- TMPL_VAR 
name="duplicatebiblionumber" -->&amp;popup=1', 'Duplicate biblio'; return 
false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
             <p>You must either :</p>
             <ul>
               <li>If it <em>is</em> a duplicate, <a 
href="additem.pl?biblionumber=<!-- TMPL_VAR name="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>
+                            <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_LOOP NAME="0XX" -->
-          <!-- TMPL_IF name="tag" -->
-          <p class="MARCtag">
-            <!-- 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" -->
-            <!-- TMPL_IF name="repeatable" -->
-            <a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-            <!-- /TMPL_IF -->
-          </p>
-          <!-- /TMPL_IF -->
-          <!-- TMPL_LOOP NAME="subfield_loop" -->
-          <p>
-            <label class="labelsubfield"> <b>
-            <!-- TMPL_VAR NAME="subfield" -->
-            </b>
-            <!-- 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" -->"  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>
-          <!-- /tmpl_loop -->
-          <!-- /tmpl_loop -->
-        </div>
-        <div name="1XX" id="1XX" class="tab">
-          <!-- TMPL_LOOP NAME="1XX" -->
-          <!-- TMPL_IF name="tag" -->
-          <p class="MARCtag">
-            <!-- 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" -->
-            <!-- TMPL_IF name="repeatable" -->
-            <a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-            <!-- /TMPL_IF -->
-          </p>
-          <!-- /TMPL_IF -->
-          <!-- TMPL_LOOP NAME="subfield_loop" -->
-          <p>
-            <label class="labelsubfield"> <b>
-            <!-- TMPL_VAR NAME="subfield" -->
-            </b>
-            <!-- 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" -->" />
-            <input type="hidden" name="kohafield" value="<!-- TMPL_VAR 
NAME="kohafield" -->" />
-            <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR 
NAME="tag_mandatory" -->" /> </p>
-          <!-- /tmpl_loop -->
-          <!-- /tmpl_loop -->
-        </div>
-        <div name="2XX" id="2XX" class="tab">
-          <!-- TMPL_LOOP NAME="2XX" -->
-          <!-- TMPL_IF name="tag" -->
-          <p class="MARCtag">
-            <!-- 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" -->
-            <!-- TMPL_IF name="repeatable" -->
-            <a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-            <!-- /TMPL_IF -->
-          </p>
-          <!-- /TMPL_IF -->
-          <!-- TMPL_LOOP NAME="subfield_loop" -->
-          <p>
-            <label class="labelsubfield"> <b>
-            <!-- TMPL_VAR NAME="subfield" -->
-            </b>
-            <!-- 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" -->" />
-            <input type="hidden" name="kohafield" value="<!-- TMPL_VAR 
NAME="kohafield" -->" />
-            <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR 
NAME="tag_mandatory" -->" /> </p>
-          <!-- /tmpl_loop -->
-          <!-- /tmpl_loop -->
-        </div>
-        <div name="3XX" id="3XX" class="tab">
-          <!-- TMPL_LOOP NAME="3XX" -->
+    <!-- /TMPL_UNLESS -->
+    <!-- TMPL_LOOP NAME="innerloop" -->
+               <div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
           <!-- TMPL_IF name="tag" -->
           <p class="MARCtag">
-            <!-- 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" -->
-            <!-- TMPL_IF name="repeatable" -->
-            <a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-            <!-- /TMPL_IF -->
-          </p>
-          <!-- /TMPL_IF -->
-          <!-- TMPL_LOOP NAME="subfield_loop" -->
-          <p>
-            <label class="labelsubfield"> <b>
-            <!-- TMPL_VAR NAME="subfield" -->
-            </b>
-            <!-- 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" -->" />
-            <input type="hidden" name="kohafield" value="<!-- TMPL_VAR 
NAME="kohafield" -->" />
-            <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR 
NAME="tag_mandatory" -->" /> </p>
-          <!-- /tmpl_loop -->
-          <!-- /tmpl_loop -->
-        </div>
-        <div name="4XX" id="4XX" class="tab">
-          <!-- TMPL_LOOP NAME="4XX" -->
-          <!-- TMPL_IF name="tag" -->
-          <p class="MARCtag">
-            <!-- 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" -->
-            <!-- TMPL_IF name="repeatable" -->
-            <a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-            <!-- /TMPL_IF -->
-          </p>
-          <!-- /TMPL_IF -->
-          <!-- TMPL_LOOP NAME="subfield_loop" -->
-          <p>
-            <label class="labelsubfield"> <b>
-            <!-- TMPL_VAR NAME="subfield" -->
-            </b>
-            <!-- 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" -->" />
-            <input type="hidden" name="kohafield" value="<!-- TMPL_VAR 
NAME="kohafield" -->" />
-            <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR 
NAME="tag_mandatory" -->" /> </p>
-          <!-- /tmpl_loop -->
-          <!-- /tmpl_loop -->
-        </div>
-        <div name="5XX" id="5XX" class="tab">
-          <!-- TMPL_LOOP NAME="5XX" -->
-          <!-- TMPL_IF name="tag" -->
-          <p class="MARCtag">
-            <!-- 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_UNLESS name="hide_marc" -->
+                <a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR 
NAME="tag" --></a>
+                <input tabindex="1" class="indicator" 
onblur="this.className='indicator';" onfocus="this.className='indicatorFocus';" 
type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- 
/TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR 
NAME="indicator" -->" /> -
+            <!-- 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_IF name="repeatable" -->
-            <a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-            <!-- /TMPL_IF -->
+            <!-- /TMPL_UNLESS -->
+            <!-- TMPL_IF name="repeatable" --><a 
href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')" title="Clone this 
Tag">+</a><!-- /TMPL_IF -->
           </p>
           <!-- /TMPL_IF -->
           <!-- TMPL_LOOP NAME="subfield_loop" -->
-          <p>
-            <label class="labelsubfield"> <b>
+            <!-- TMPL_IF NAME="visibility" -->
+                <a tabindex="1" class="unHideSubfield" id="label<!-- TMPL_VAR 
name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" 
--><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')" 
title="Expand this subfield">
             <!-- TMPL_VAR NAME="subfield" -->
-            </b>
-            <!-- 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" -->" />
-            <input type="hidden" name="kohafield" value="<!-- TMPL_VAR 
NAME="kohafield" -->" />
-            <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR 
NAME="tag_mandatory" -->" /> </p>
-          <!-- /tmpl_loop -->
-          <!-- /tmpl_loop -->
-        </div>
-        <div name="6XX" id="6XX" class="tab">
-          <!-- TMPL_LOOP NAME="6XX" -->
-          <!-- TMPL_IF name="tag" -->
-          <p class="MARCtag">
-            <!-- 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" -->
-            <!-- TMPL_IF name="repeatable" -->
-            <a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
+                </a>
             <!-- /TMPL_IF -->
-          </p>
-          <!-- /TMPL_IF -->
-          <!-- TMPL_LOOP NAME="subfield_loop" -->
+            <div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- 
TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->">
           <p>
-            <label class="labelsubfield"> <b>
-            <!-- TMPL_VAR NAME="subfield" -->
-            </b>
-            <!-- TMPL_IF name="mandatory" -->
-            <b>
-            <!-- /TMPL_IF -->
+                <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
+                    <label <!-- TMPL_IF NAME="fixedfield" --> 
style="display:none;" <!-- /TMPL_IF --> class="labelsubfield">
+                <!-- /TMPL_UNLESS -->
+                <!-- TMPL_UNLESS name="hide_marc" -->
+                    <img class="upsubfield" <!-- 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" -->')" alt="Move Subfield Up" title="Move 
Subfield Up" />
+                        <input title="<!-- TMPL_VAR NAME="marc_lib_plain" 
-->"<!-- TMPL_IF NAME="fixedfield" --> style="display : none;"<!-- /TMPL_IF --> 
type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" 
maxlength="1" class="flat" readonly="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 -->
+                    <!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
             </label>
+                <!-- /TMPL_UNLESS -->
             <!-- 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" -->" /> </p>
-          <!-- /tmpl_loop -->
-          <!-- /tmpl_loop -->
-        </div>
-        <div name="7XX" id="7XX" class="tab">
-          <!-- TMPL_LOOP NAME="7XX" -->
-          <!-- TMPL_IF name="tag" -->
-          <p class="MARCtag">
-            <!-- 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" -->
-            <!-- TMPL_IF name="repeatable" -->
-            <a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
+                <!-- TMPL_IF NAME="repeatable" -->
+                    <a class="clonesubfield" 
onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR 
name="index" -->')" title="Clone this Subfield">+</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>
-          <!-- /TMPL_IF -->
-          <!-- TMPL_LOOP NAME="subfield_loop" -->
-          <p>
-            <label class="labelsubfield"> <b>
-            <!-- TMPL_VAR NAME="subfield" -->
-            </b>
-            <!-- 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" -->" />
-            <input type="hidden" name="kohafield" value="<!-- TMPL_VAR 
NAME="kohafield" -->" />
-            <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR 
NAME="tag_mandatory" -->" /> </p>
-          <!-- /tmpl_loop -->
-          <!-- /tmpl_loop -->
         </div>
-        <div name="8XX" id="8XX" class="tab">
-          <!-- TMPL_LOOP NAME="8XX" -->
-          <!-- TMPL_IF name="tag" -->
-          <p class="MARCtag">
-            <!-- 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" -->
-            <!-- TMPL_IF name="repeatable" -->
-            <a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-            <!-- /TMPL_IF -->
-          </p>
-          <!-- /TMPL_IF -->
-          <!-- TMPL_LOOP NAME="subfield_loop" -->
-          <p>
-            <label class="labelsubfield"> <b>
-            <!-- TMPL_VAR NAME="subfield" -->
-            </b>
-            <!-- 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" -->" />
-            <input type="hidden" name="kohafield" value="<!-- TMPL_VAR 
NAME="kohafield" -->" />
-            <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR 
NAME="tag_mandatory" -->" /> </p>
-          <!-- /tmpl_loop -->
-          <!-- /tmpl_loop -->
+        <!-- /TMPL_LOOP -->
         </div>
-        <div name="9XX" id="9XX" class="tab">
-          <!-- TMPL_LOOP NAME="9XX" -->
-          <!-- TMPL_IF name="tag" -->
-          <p class="MARCtag">
-            <!-- 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" -->
-            <!-- TMPL_IF name="repeatable" -->
-            <a href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a>
-            <!-- /TMPL_IF -->
-          </p>
-          <!-- /TMPL_IF -->
-          <!-- TMPL_LOOP NAME="subfield_loop" -->
-          <p>
-            <label class="labelsubfield"> <b>
-            <!-- TMPL_VAR NAME="subfield" -->
-            </b>
-            <!-- 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" -->" />
-            <input type="hidden" name="kohafield" value="<!-- TMPL_VAR 
NAME="kohafield" -->" />
-            <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR 
NAME="tag_mandatory" -->" /> </p>
-          <!-- /tmpl_loop -->
-          <!-- /tmpl_loop -->
+    <!-- /TMPL_LOOP -->
         </div>
-        <div name="hidden" id="hidden" class="tab">
+<!-- /TMPL_LOOP -->
+               <div 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" -->
-          " />
+                               <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 -->
-          <br clear="both" />
         </div>
-        <br clear="both" />
         <!-- 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="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="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="mandatory" value="0">
+                       <input type="hidden" name="kohafield" value="<!-- 
TMPL_VAR NAME="kohafield" -->">
+                       <input type="hidden" name="tag_mandatory" value="<!-- 
TMPL_VAR NAME="tag_mandatory" -->">
         <!-- /TMPL_IF -->
       </form>
+       <br class="clear" />
     </div>
-    <script language="JavaScript" type="text/javascript">
+<script language="JavaScript" type="text/javascript">
 function loading(){
        document.getElementById("loading").style.display = "none";
 }
@@ -460,23 +158,29 @@
                link = "link"+i;
                if (numlayer==i) {
                        with(document){
+                       if (document.getElementById(ong)){
                        document.getElementById(ong).style.visibility="visible";
-                       document.getElementById(link).style.color="#000066";
-                       
document.getElementById(link).style.backgroundColor="white";
+                       }
+                       if(document.getElementById(link)){
+                               
document.getElementById(link).className="addbiblioTabOn";
+                       }
                        }
                } else {
                        with(document){
+                       if (document.getElementById(ong)){
                        document.getElementById(ong).style.visibility="hidden";
+                       }
                        if (document.getElementById(link)) {
-                       document.getElementById(link).style.color="#669999";
-                       
document.getElementById(link).style.backgroundColor="#D8DEB8";
+                               
document.getElementById(link).className="addbiblioTabOff";
                        }
                        }
                }
        }
 }
 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++) {
@@ -497,22 +201,22 @@
                    // 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].className="addbiblioInputFocus";
                        total_missing_mandatory_subfields++;
-                       if 
(document.getElementById("error"+i).parentNode.tagName == "B")
+                       if (f.field_value[i].parentNode.tagName == "B")
                        {
-                               
missing_mandatory_subfields.push(document.getElementById("error"+i).innerHTML + 
" (tab " +  
document.getElementById("error"+i).parentNode.parentNode.parentNode.parentNode.id.substr(0,1)
 + ")");
+                               
missing_mandatory_subfields.push(f.field_value[i].innerHTML + " ( is B tab " +  
f.field_value[i].parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + 
")");
                        }
                        else
                        {
-                               
missing_mandatory_subfields.push(document.getElementById("error"+i).innerHTML + 
" (tab " +  
document.getElementById("error"+i).parentNode.parentNode.parentNode.id.substr(0,1)
 + ")");
+                               
missing_mandatory_subfields.push(f.field_value[i].innerHTML + " field " + 
f.tag[i].value + " $" +f.subfieldYYY[i].value);
                        }
 
                        }
                } else {
-//                     alert("I = "+i);
-                       
document.getElementById("error"+i).style.backgroundColor="white";
+                       f.field_value[i].className="addbiblioInput";
                }
+       document.body.style.cursor ="default";
        }
 
        // Scan for missing mandatory tags
@@ -525,30 +229,31 @@
                if (seen_mandatory_tag_p[j] != 1) {
                    seen_mandatory_tag_p[j] = 1;
                    total_missing_mandatory_tags++;
-                   if (document.getElementById("error"+i).parentNode.tagName 
== "B")
+                   if (f.field_value[i].parentNode.tagName == "B")
                    {
-                               
missing_mandatory_tags.push(document.getElementById("error"+i).innerHTML + " 
(tab " +  
document.getElementById("error"+i).parentNode.parentNode.parentNode.parentNode.id.substr(0,1)
 + ")");
+                               
missing_mandatory_tags.push(f.field_value[i].innerHTML + " (check tab " +  
f.field_value[i].parentNode.parentNode.parentNode.parentNode.id.substr(0,1) + 
")");
                    }
                    else
                    {
-                               
missing_mandatory_tags.push(document.getElementById("error"+i).innerHTML + " 
(tab " +  
document.getElementById("error"+i).parentNode.parentNode.parentNode.id.substr(0,1)
 + ")");
+                               
missing_mandatory_tags.push(f.field_value[i].innerHTML + " field " + 
f.tag[i].value);
+                               //+ " (check tab " +  
f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
                        }
                }
-               
document.getElementById("error"+i).style.backgroundColor="#ffff00";
+               f.field_value[i].className="mandatory";
            }
        }
 
        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)");
+               alertString2  = _("Please fix the following problem(s)");
                alertString2 += 
"\n------------------------------------------------------------------------------------\n";
-               alertString2 += "\n- "+ total_missing_mandatory_tags +_(" 
mandatory tags empty");
+               alertString2 += "\n- "+ total_missing_mandatory_tags +_(" 
mandatory fields empty");
                for (i=0; i<missing_mandatory_tags.length; i++)
                {
                        alertString2 += "\n--->"+ missing_mandatory_tags[i];
                }
-               alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" 
mandatory fields empty (see bold subfields)");
+               alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" 
mandatory subfields empty (see highlighted subfields)");
                for (i=0; i<missing_mandatory_subfields.length; i++)
                {
                        alertString2 += "\n--->"+ 
missing_mandatory_subfields[i];
@@ -608,13 +313,61 @@
   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=550,height=550,toolbar=false,scrollbars=yes');
+}
+
+
 function AddField(field) {
        document.forms['f'].op.value = "addfield";
        document.forms['f'].addfield_field.value=field;
        document.f.submit();
 }
+
+function cloneSubfield(index) {
+ var original = document.getElementById(index);
+ var clone = original.cloneNode(true);
+ clone.setAttribute("id", index + index); 
+// orginput : the value of the original field (in [0] if hide_marc=1, 
otherwise in [1]
+// image : the up button. don't exist is hide_marc=1
+ <!-- TMPL_IF name="hide_marc" -->
+       var orginput = original.getElementsByTagName('input')[0];
+ <!-- TMPL_ELSE -->
+       var orginput = original.getElementsByTagName('input')[1];
+       image = clone.getElementsByTagName('img')[0];
+       image.setAttribute("onclick","upSubfield('" + index + index + "')");
+ <!-- /TMPL_IF -->
+ trigger = original.getElementsByTagName('a')[0];
+ if (trigger) {
+       trigger.parentNode.removeChild(trigger);
+ }
+ clonetrigger = clone.getElementsByTagName('a')[0];
+ clonetrigger.setAttribute("onclick","cloneSubfield('" + index + index + "')");
+ clone.setAttribute("tabindex","1");
+ orginput.value = '';
+ original.parentNode.insertBefore( clone, original.nextSibling); 
+}
+
+function upSubfield(index) {
+var original = document.getElementById(index);
+var previous = original.previousSibling;
+original.parentNode.insertBefore( original, previous );
+}
+
+function unHideSubfield(index,labelindex) {
+       subfield = document.getElementById(index);
+       subfield.style.display = 'block';
+       label = document.getElementById(labelindex);
+       label.style.display='none';     
+}
 </script>
-  </body>
-  </dd>
+
+</body>
+</dd>
 </dl>
-</body></html>
\ No newline at end of file
+</body>
+</html>
\ No newline at end of file

Index: acqui.simple/addbooks.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/Attic/addbooks.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
--- acqui.simple/addbooks.tmpl  18 Sep 2006 19:13:24 -0000      1.1.2.1.2.1
+++ acqui.simple/addbooks.tmpl  30 Nov 2006 15:56:27 -0000      1.1.2.1.2.2
@@ -32,30 +32,31 @@
        </a>
 </div>
 
-<dl>
-<dt>Catalog: Maintenance</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Catalog: Maintenance</dt>
+<dd class="bodyPane">
 
 <div id="main">
+       <h1>Cataloging: Home</h1>
        <!-- TMPL_IF name="noitemsfound" -->
                <font color="red" size="4">No items found</font>
        <!-- /TMPL_IF -->
        
        <div class="data">
-               <form action="isbnsearch.pl">
+               <form action="isbnsearch.pl" name="mainform">
                <table>
                <caption>Search Existing Records</caption>
-               <tr><th><label for="title"><span 
class="accesskey">T</span>itle</label></th>
-               <td><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" accesskey="t" /></td></tr>
                <tr><th><label for="isbn">ISB<span 
class="accesskey">N</span></label></th>
-               <td><input type="hidden" name="marclist" 
value="biblioitems.isbn" />
+               <td>
+                               <input type="text" name="value" id="isbn" 
size="35" accesskey="n" /><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="isbn" 
size="35" accesskey="n" /></td></tr>          
+                               <input type="hidden" name="operator" 
value="start" /></td></tr>         
+               <tr><th><label for="title"><span 
class="accesskey">T</span>itle</label></th>
+               <td>
+                               <input type="text" name="value" id="title" 
size="35" accesskey="t" /><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" /></td></tr>
                </table></div>
                                <p><input type="submit" value="Search" 
class="submit" /></p>
                                <div class="help"><ul class="notes"><li>If the 
ISBN is found into the database, that record will be retrieved and can be 
modified.</li>

Index: acqui.simple/additem-nomarc.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/Attic/additem-nomarc.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
--- acqui.simple/additem-nomarc.tmpl    12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui.simple/additem-nomarc.tmpl    30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -1,7 +1,40 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: Add a items 
for <!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
+<!-- TMPL_INCLUDE NAME="head.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top-catalog.inc" -->
+
+<div id="subTab-1">
+       <a href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-search-unselected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-2">
+       <a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&type=intranet">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-addBiblio-selected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-3">
+       <a href="/cgi-bin/koha/bull-home.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-subscriptions-unselected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-4">
+       <a href="/cgi-bin/koha/bull/lateissues.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-lateIssues-unselected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-5">
+       <a href="/cgi-bin/koha/bookshelves/shelves.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-virtualShelves-unselected.png" border="0" />
+       </a>
+</div>
+
+<dl class="bodyPane">
+<dt class="bodyPane">Cataloging: Add a Non-MARC Item</dt>
+<dd class="bodyPane">
 
 <!-- TMPL_IF NAME="NOBARCODE" -->
 <div class="error">You must give the item a barcode</div>
@@ -116,4 +149,9 @@
 </table>
 <p><input type="submit" name="newgroup" value="Add New Item to New Group" 
class="submit"></p>
 </form>
-<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
+
+
+</dd>
+</dl>
+</body>
+</html>
\ No newline at end of file

Index: acqui.simple/additem.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/Attic/additem.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
--- acqui.simple/additem.tmpl   12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui.simple/additem.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -32,9 +32,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Catalog: Items for Bibliographic Record <!-- TMPL_VAR name="biblionumber" 
--></dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Cataloging: Items for <!-- TMPL_VAR NAME="title" --> 
(<!-- TMPL_VAR name="biblionumber" -->)</dt>
+<dd class="bodyPane">
 <div id="main">
 
 <h1>Items for <em><!-- TMPL_VAR name="title" --></em> <!-- TMPL_IF 
NAME="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --> (Record 
#<!-- TMPL_VAR NAME="biblionumber" -->)</h1>
@@ -80,7 +80,7 @@
                <caption>Edit Item</caption>
        <!-- /TMPL_IF -->       
                <!-- TMPL_LOOP NAME="item" -->
-                       <tr>
+                       <tr style="<!-- TMPL_VAR NAME='hidden' -->;">
                                        <th><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></th>
                                        <td><!-- TMPL_VAR NAME="marc_value" -->
                                        <input type="hidden" name="tag" 
value="<!-- TMPL_VAR NAME="tag" -->">
@@ -93,6 +93,9 @@
        <!-- TMPL_IF name="barcode_not_unique" -->
                <div class="error"><b>ERROR : Barcode already exists !<b></div>
        <!-- /TMPL_IF -->
+       <!-- TMPL_IF name="book_on_loan" -->
+               <div class="error"><b>ERROR : Item on loan : can't delete it 
!<b></div>
+       <!-- /TMPL_IF -->
        <!-- TMPL_IF name="opisadd" -->
        <input type="button" value="Add item" class="submit"  
onClick="Check(this.form)" accesskey="w">
        <!-- TMPL_ELSE -->

Index: acqui.simple/isbnsearch.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/Attic/isbnsearch.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
--- acqui.simple/isbnsearch.tmpl        12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui.simple/isbnsearch.tmpl        30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -32,9 +32,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Catalog: Search Results for <!-- TMPL_IF name="isbn" -->ISBN <!-- TMPL_VAR 
name="isbn" --><!-- /TMPL_IF --><!-- TMPL_IF name="title" -->title <!-- 
TMPL_VAR name="title" --><!-- /TMPL_IF -->
-</dt>
+<dl class="bodyPane">
+<dt class="bodyPane">Cataloging: Search Results for <!-- TMPL_IF name="isbn" 
-->ISBN <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF --><!-- TMPL_IF name="title" 
-->title <!-- TMPL_VAR name="title" --><!-- /TMPL_IF -->
+</dt class="bodyPane">
 <dd>
 
 <div id="main"><h2>Search Results for <span class="ex"><!-- TMPL_IF 
name="isbn" -->ISBN <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF --><!-- TMPL_IF 
name="title" -->title <!-- TMPL_VAR name="title" --><!-- /TMPL_IF 
--></span></h2>

Index: acqui.simple/marcimport.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/acqui.simple/Attic/marcimport.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
--- acqui.simple/marcimport.tmpl        12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ acqui.simple/marcimport.tmpl        30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -1,6 +1,40 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC 
Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
+<!-- TMPL_INCLUDE NAME="head.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top.inc" -->
+<!-- TMPL_INCLUDE NAME="body-top-catalog.inc" -->
+
+<div id="subTab-1">
+       <a href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-search-unselected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-2">
+       <a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&type=intranet">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-addBiblio-selected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-3">
+       <a href="/cgi-bin/koha/bull-home.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-subscriptions-unselected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-4">
+       <a href="/cgi-bin/koha/bull/lateissues.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-lateIssues-unselected.png" border="0" />
+       </a>
+</div>
+
+<div id="subTab-5">
+       <a href="/cgi-bin/koha/bookshelves/shelves.pl">
+               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-virtualShelves-unselected.png" border="0" />
+       </a>
+</div>
+
+<dl class="bodyPane">
+<dt class="bodyPane">Cataloging: MARC Import</dt>
+<dd class="bodyPane">
 
 <form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->" 
enctype="multipart/form-data">
 <table border="0" cellpadding="0" cellspacing="0" align="center" 
class="results" width="80%">
@@ -48,4 +82,9 @@
 
 </td></tr></table></form>
 <!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
+
+
+</dd>
+</dl>
+</body>
+</html>

Index: authorities/auth_finder.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/Attic/auth_finder.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
--- authorities/auth_finder.tmpl        12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ authorities/auth_finder.tmpl        30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,34 +2,64 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-auth.inc" -->
 
-<dl>
-<dt>Authorities: Authority Search</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Authorities</dt>
+<dd class="bodyPane">
 
 
-<div id="main">
-
-<form name="f" method="post">
-       <input type="hidden" name="op" value="do_search">
-       <input type="hidden" name="type" value="intranet">
-       <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR 
NAME="nbstatements" -->">
-       <div id="bloc25">
+<div id="main-compact">
+
+<h1>Authority search</h1>
+
+<form name="f" action="/cgi-bin/koha/authorities/auth_finder.pl" method="post">
+       <input type="hidden" name="op" value="do_search" />
+       <input type="hidden" name="type" value="intranet" />
+       <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR 
NAME="nbstatements" -->" />
+       <div class="details">
                <h2>Search on</h2>
                <p>
-                       <label>Authority type</label>
-                       <!-- TMPL_VAR NAME="category" -->
+                       <label for="authtypecode">Authority type</label>
+                       <!-- TMPL_VAR NAME="authtypecode" -->
+                       <input type="hidden" id="authtypecode" 
name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+               </p>
+               <p>
+                       <label for="mainentryaoperator">Main entry ($a 
only)</label>
+                       <select name="operator" id="mainentryaoperator">
+                               <option value="contains">contains</option>
+                               <option value="start">start by</option>
+                       </select>
+                       <input type="text" name="value" value="<!-- TMPL_VAR 
NAME="value" -->" />
+                       <input type="hidden" name="marclist" value="$a" />
+                       <input type="hidden" name="and_or" value="and" />
+                       <input type="hidden" name="excluding" value="" />
+               </p>
+               <p>
+                       <label for="mainentryoperator">Main entry</label>
+                       <select name="operator" id="mainentryoperator">
+                               <option value="contains">contains</option>
+                               <option value="start">start by</option>
+                       </select>
+                       <input type="text" name="value" value="<!-- TMPL_VAR 
NAME="value" -->" />
+                       <input type="hidden" name="marclist" value="mainentry" 
/>
+                       <input type="hidden" name="and_or" value="and" />
+                       <input type="hidden" name="excluding" value="" />
                </p>
                <p>
-                       <label>Search value</label><input type="text" 
name="value" value="<!-- TMPL_VAR name="resultstring" -->">
-                       <input type="hidden" name="authtypecode" value="<!-- 
TMPL_VAR NAME="category" -->">
-                       <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="index" value="<!-- TMPL_VAR 
NAME="index" -->"
+                       <label for="anywhereoperator">Anywhere</label>
+                       <select name="operator" id="">
+                               <option value="contains">contains</option>
+                               <option value="start">start by</option>
+                       </select>
+                       <input type="text" name="value">
+                       <input type="hidden" name="marclist" value="" />
+                       <input type="hidden" name="and_or" value="and" />
+                       <input type="hidden" name="excluding" value="" />
+                       <input type="hidden" name="index" value="<!-- TMPL_VAR 
NAME="index" -->" />
+                       <input type="hidden" name="tagid" value="<!-- TMPL_VAR 
NAME="tagid" -->" />
                </p>
+        <p>(add % at the end of your word if you want to use right-truncation 
: theor% will find theory &amp; theories)</p>
                <p>
-                       <input type="submit" value="Start search" class="button 
authority">
+                       <input type="submit" value="Start search" 
class="submit" />
                </p>
        </div>
 </form>

Index: authorities/authorities-home.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/Attic/authorities-home.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
--- authorities/authorities-home.tmpl   12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ authorities/authorities-home.tmpl   30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,61 +2,86 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-auth.inc" -->
 
-<dl>
-<dt>Authorities</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Authorities</dt>
+<dd class="bodyPane">
 
 
 <div id="main">
 
-<form name="f" method="post">
+<h1>Authority search</h1>
+
+<form name="f" action="/cgi-bin/koha/authorities/auth_finder.pl" method="post">
        <input type="hidden" name="op" value="do_search" />
        <input type="hidden" name="type" value="intranet" />
        <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR 
NAME="nbstatements" -->" />
-<div class="data"><table>
-<caption>Authority search</caption>
-<tr><th><label for="authtypecode">Authority type</label></th><td><select 
id="authtypecode" name="authtypecode">
+       <div class="details">
+               <h2>Search For: 
+                       <select name="authtypecode">
                        <!-- TMPL_LOOP NAME="authtypesloop" -->
-                               <option value="<!-- TMPL_VAR NAME="value" -->" 
<!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+                               <option value="<!-- TMPL_VAR NAME="value" -->" 
<!-- TMPL_IF name="selected" -->selected="selected"<!-- /TMPL_IF -->>
                                        <!-- TMPL_VAR NAME="authtypetext" -->
                                </option>
                        <!-- /TMPL_LOOP -->
-                       </select></td></tr>
-<tr><th><label id="mainentry">Main entry</label></th><td><select 
name="operator" id="mainentry">
+                       </select>
+               </h2>
+               <p>
+                       <label for="mainentryaoperator">Main entry ($a 
only)</label>
+                       <select name="operator" id="mainentryaoperator">
                                <option value="contains">contains</option>
                                <option value="start">start by</option>
-                       </select> <input type="text" name="value" value="<!-- 
TMPL_VAR NAME="value" -->" />
+                       </select>
+                       <input type="text" name="value" value="<!-- TMPL_VAR 
NAME="value" -->" />
+                       <input type="hidden" name="marclist" value="$a" />
+                       <input type="hidden" name="and_or" value="and" />
+                       <input type="hidden" name="excluding" value="" />
+               </p>
+               <p>
+                       <label for="mainentryoperator">Main entry</label>
+                       <select name="operator" id="mainentryoperator">
+                               <option value="contains">contains</option>
+                               <option value="start">start by</option>
+                       </select>
+                       <input type="text" name="value" value="<!-- TMPL_VAR 
NAME="value" -->" />
                        <input type="hidden" name="marclist" value="mainentry" 
/>
                        <input type="hidden" name="and_or" value="and" />
                        <input type="hidden" name="excluding" value="" />
-                       </td></tr>                      
-<tr><th><label for="anywhere">Anywhere</label></th><td><select name="operator" 
id="anywhere">
+               </p>
+               <p>
+                       <label for="anywhereoperator">Anywhere</label>
+                       <select name="operator" id="">
                                <option value="contains">contains</option>
                                <option value="start">start by</option>
-                       </select> <input type="text" name="value" value="<!-- 
TMPL_VAR NAME="value" -->" />
+                       </select>
+                       <input type="text" name="value">
                        <input type="hidden" name="marclist" value="" />
                        <input type="hidden" name="and_or" value="and" />
                        <input type="hidden" name="excluding" value="" />
-                       </td></tr></table></div>
+                       <input type="hidden" name="index" value="<!-- TMPL_VAR 
NAME="index" -->" />
+                       <input type="hidden" name="tagid" value="<!-- TMPL_VAR 
NAME="tagid" -->" />
+               </p>
+        <p>(add % at the end of your word if you want to use right-truncation 
: theor% will find theory &amp; theories)</p>
                <p>
                        <input type="submit" value="Start search" 
class="submit" />
                </p>
+       </div>
 </form>
-
-<h2>Add authority</h2>
 <div class="details">
+<h2>Add authority</h2>
 <form name="f2" method="post" action="authorities.pl">
-       <label for="authtypecode">Authority type</label>
+       <p><label for="authtypecode">Authority type</label>
        <select name="authtypecode" id="authtypecode">
                <!-- TMPL_LOOP name="authtypesloop" -->
-                       <option value="<!-- TMPL_VAR name="value" -->" <!-- 
TMPL_IF name="selected" -->selected="selected"<!-- /TMPL_IF -->>
+                       <option value="<!-- TMPL_VAR name="value" -->" <!-- 
TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
                                <!-- TMPL_VAR name="authtypetext" -->
                        </option>
                <!-- /TMPL_LOOP -->
        </select>
-       <input type="submit" value="Add Authority" class="submit" />
-       </form>
+       <input type="submit" value="Add" class="submit">
+       </p>
+</form>
 </div>
+
 </div>
 
 

Index: authorities/authorities.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/Attic/authorities.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
--- authorities/authorities.tmpl        12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ authorities/authorities.tmpl        30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,79 +2,68 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-auth.inc" -->
 
-<dl>
-<dt>Authorities</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Authorities</dt>
+<dd class="bodyPane">
 
-<div id="main">
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" 
-->/includes/marc-editor.css">
+<div id="main">
+<form method="post" name="f" id="f" action="authorities.pl?authid=<!-- 
TMPL_VAR NAME="authid" -->&nonav=<!-- TMPL_VAR NAME="nonav" 
-->&linkid="+document.form.f.linkid.value >
 
-<div class="tabbed">
-       <form method="post" action="authorities.pl" name="f">
-       <!-- TMPL_IF name="authid" -->
-               <h1>Modify authority #<!-- TMPL_VAR NAME="authid" --> <!-- 
TMPL_IF NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- 
/TMPL_IF --></h1>
-       <!-- TMPL_ELSE -->
-               <h1>Adding authority <!-- TMPL_IF NAME="authtypetext" -->(<!-- 
TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --></h1>
-       <!-- /TMPL_IF -->
-       <p>
-               <input type="hidden" name="op" value="add" />
-               <input type="hidden" name="addfield_field" />
-               <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR 
NAME="authtypecode" -->" />
-               <input type="hidden" name="authid" value="<!-- TMPL_VAR 
NAME="authid" -->" />
+<div class="tabitem">
+       <h1>Authority number <!-- TMPL_VAR NAME="authid" --></h1>
+       <p><input type="hidden" name="nonav" value="<!-- TMPL_VAR NAME="nonav" 
-->"><input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->">
+               <input type="hidden" name="op" value="add">
+               <input type="hidden" name="addfield_field">
+               <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR 
NAME="authtypecode" -->">
+               <input type="hidden" name="authid" value="<!-- TMPL_VAR 
NAME="authid" -->">
+       <input type="hidden" name="linkid" id="linkid" value="0000">
                <!-- TMPL_IF name="authid" -->
-                       <input type="button" value="Save" 
onClick="Check(this.form)" accesskey="w" class="submit" />
+                       <input type="button" value="Save" 
onClick="Check(this.form)" accesskey="w" class="button authority">
                <!-- TMPL_ELSE -->
-                       <input type="button" value="Add authority" 
onClick="Check(this.form)" accesskey="w" class="submit" />
+                       <input type="button" value="Add authority" 
onClick="Check(this.form)" accesskey="w" class="button authority">
                <!-- /TMPL_IF -->
-<!--           <a href="javascript:PopupZ3950()" class="button 
authority">z3950 search</a> -->
        </p>
 </div>
-
+<div name="0XX" id="0XX" class="tab" style="visibility:visible">
 <!-- TMPL_IF name="duplicateauthid" -->
        <div class="error">
-               <p>Duplicate suspected with <a 
href="javascript:openWindow('detail.pl?authid=<!-- TMPL_VAR 
name="duplicateauthid" -->&amp;popup=1', 'Duplicate Authority')"><!-- TMPL_VAR 
name="duplicateauthvalue" --></a></p>
-               <p>You must either :</p>
+                               <p>Is this a duplicate of <a 
href="detail.pl?authid=<!-- TMPL_VAR name="duplicateauthid" -->&nonav=<!-- 
TMPL_VAR name="nonav" -->" onclick="openWindow('detail.pl?nonav=<!-- TMPL_VAR 
name="nonav" -->&authid=<!-- TMPL_VAR name="duplicateauthid" -->&popup=1', ''; 
return false;)"><!-- TMPL_VAR name="duplicateauthvalue" --></a>?</p>
+                               
                <ul>
-                       <p><input type="checkbox" value="1" 
name="confirm_not_duplicate" />confirm it's not a duplicate (and click on 
<input type="button" value="Add authority" onClick="Check(this.form)" 
accesskey="w" class="button authority"> again)</p>
-                       <p>Go to <a href="authorities.pl?authid=<!-- TMPL_VAR 
name="duplicateauthid" -->" >original authority</a></p>
+                                       
+                                       <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_IF -->
 <!-- TMPL_LOOP NAME="0XX" -->
-       <!-- TMPL_IF name="tag" -->
-               <p class="MARCtag">
-               <!-- TMPL_VAR NAME="tag" -->
+<!-- TMPL_IF name="tag" -->
+<p class="MARCtag">
                <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">
-               <!-- TMPL_IF name="repeatable" -->
-                       <a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" 
-->)">+</a>
-               <!-- /TMPL_IF -->
-               </p>
-       <!-- /TMPL_IF -->
-       <!-- TMPL_LOOP NAME="subfield_loop" -->
-               <p>
-                       <label class="labelsubfield">
-                               <!-- TMPL_UNLESS name="hide_marc" -->
-                                       <a href="#" onclick="upSubfield('<!-- 
TMPL_VAR name="index" -->'); return false;">Previous</a>
-                                               <input type="text" 
name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" 
maxlength="1">
-                               <!-- TMPL_ELSE -->
-                                               <input type="hidden" 
name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
-                               <!-- /TMPL_UNLESS -->
-                               <!-- 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" -->">
-                       <input type="hidden" name="kohafield" value="<!-- 
TMPL_VAR NAME="kohafield" -->">
-                       <input type="hidden" name="tag_mandatory" value="<!-- 
TMPL_VAR NAME="tag_mandatory" -->">
-               </p>
-       <!-- /tmpl_loop -->
-<!-- /tmpl_loop -->
-               
+       <!-- TMPL_UNLESS name="hide_marc" --><a title="<!-- TMPL_VAR 
NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a>
+       <input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" 
onfocus="this.style.backgroundColor='#ffffff;'" type="text" <!-- TMPL_IF 
NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" 
size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> 
-
+<!-- TMPL_ELSE -->
+<input tabindex="1" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> 
style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR 
NAME="indicator" -->"><!-- /TMPL_UNLESS -->
+       <!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR 
NAME="tag_lib" --><!-- /TMPL_UNLESS -->
+       <!-- TMPL_IF name="repeatable" --><a href="javascript:AddField('<!-- 
TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF -->
+</p>
+<!-- /TMPL_IF -->
+<div><!-- TMPL_LOOP NAME="subfield_loop" -->
+<!-- TMPL_IF NAME="visibility" -->
+<a tabindex="1" style="color: grey; font-size: 80%; cursor: se-resize;" 
id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- 
TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR 
name="index" -->')"><!-- TMPL_VAR NAME="subfield" --></a>
+<!-- /TMPL_IF -->
+<div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR 
NAME='tag' --><!-- TMPL_VAR NAME='index' -->"><!-- TMPL_UNLESS 
NAME="advancedMARCEditor" --><label <!-- TMPL_IF NAME="fixedfield" --> 
style="display:none;" <!-- /TMPL_IF --> class="labelsubfield"> <!-- 
/TMPL_UNLESS --><!-- TMPL_UNLESS name="hide_marc" --><img <!-- TMPL_IF 
NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- 
TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- 
TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/><input title="<!-- 
TMPL_VAR NAME="marc_lib_plain" -->" style=" <!-- TMPL_IF NAME="fixedfield" 
-->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="subfield" 
value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" 
DISABLE READONLY tabindex=-1 />
+<!-- TMPL_ELSE --><input type="hidden" name="subfield" value="<!-- TMPL_VAR 
NAME="subfield" -->"/><!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_IF name="mandatory" 
--><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF 
name="mandatory" --> *</b><!-- /TMPL_IF --></label><!-- /TMPL_UNLESS -->
+<!-- TMPL_VAR NAME="marc_value" --><!-- TMPL_IF NAME="repeatable" --><a 
style="cursor: crosshair; color: grey; font-size: 80%;" 
onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR 
name="index" -->')">+</a><!-- /TMPL_IF -->
+<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
+<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" 
-->" size="2" maxlength="1"/>
+<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" 
-->"/>
+<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" 
-->"/>
+<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR 
NAME="tag_mandatory" -->"/>
+</div><!-- /TMPL_LOOP --></div>
+<!-- /TMPL_LOOP -->
+</div> 
                <div name="hidden" id="hidden" class="tab">
                <!-- TMPL_LOOP NAME="hidden_loop" -->
                                <input type="hidden" name="tag" value="<!-- 
TMPL_VAR NAME="tag" -->">
@@ -84,18 +73,16 @@
                                <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="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" -->">
+               <!-- TMPL_IF name="oldauthnumtagfield" -->
+                       <input type="hidden" name="tag" value="<!-- TMPL_VAR 
NAME="oldauthnumtagfield" -->">
+                       <input type="hidden" name="subfield" value="<!-- 
TMPL_VAR NAME="oldauthnumtagsubfield" -->">
+                       <input type="hidden" name="field_value" value="<!-- 
TMPL_VAR NAME="authid" -->">
                        <input type="hidden" name="mandatory" value="0">
                        <input type="hidden" name="kohafield" value="<!-- 
TMPL_VAR NAME="kohafield" -->">
                        <input type="hidden" name="tag_mandatory" value="<!-- 
TMPL_VAR NAME="tag_mandatory" -->">
+                       <input type="hidden" name="tag" value="<!-- TMPL_VAR 
NAME="oldauthtypetagfield" -->">
+                       <input type="hidden" name="subfield" value="<!-- 
TMPL_VAR NAME="oldauthtypetagsubfield" -->">
+                       <input type="hidden" name="field_value" value="<!-- 
TMPL_VAR NAME="authtypecode" -->">
                <!-- /TMPL_IF -->
        </form>
 <script language="JavaScript" type="text/javascript">
@@ -163,54 +150,81 @@
                alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" 
mandatory fields empty (see bold subfields)");
                alert(alertString2);
        } else {
-               document.forms[1].submit();
+               document.forms['f'].submit();
        }
 }
 function Dopop(link,i) {
        defaultvalue=document.forms['f'].field_value[i].value;
-       newin=window.open(link+"&result="+defaultvalue,"value 
builder",'width=550,height=550,toolbar=false,scrollbars=yes');
+       
newin=window.open(link+"&result="+defaultvalue,"",'width=550,height=550,toolbar=false,scrollbars=yes');
 }
-
+function _(s) { return s } // dummy function for gettext
 function PopupZ3950() {
     var strQuery="";
-       for (i=0 ; i<document.forms['f'].field_value.length ; i++) {
-               if (document.forms['f'].kohafield[i].value == 
"biblioitems.isbn" && document.forms['f'].field_value[i].value.length>0) {
-                   strQuery += 
"&isbn="+document.forms['f'].field_value[i].value;
+       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;
                }
-               if (document.forms['f'].kohafield[i].value == "biblio.title" && 
document.forms['f'].field_value[i].value.length>0) {
-                   strQuery += 
"&title="+document.forms['f'].field_value[i].value;
+               if (document.forms[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 == "biblio.author" 
&&document.forms['f'].field_value[i].value.length>0) {
-                   strQuery += 
"&author="+document.forms['f'].field_value[i].value;
+               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['f'].kohafield[i].value == 
"biblioitems.issn" && document.forms['f'].field_value[i].value.length>0) {
-                   strQuery += 
"&issn="+document.forms['f'].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;
                }
        }
        newin=window.open("../z3950/search.pl?bibid=<!-- TMPL_VAR NAME="bibid" 
-->"+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes');
 }
-
+function confirmnotdup(){
+       document.getElementById("confirm_not_duplicate").value = 1;
+       var checkform = document.getElementById("f");
+       Check(checkform);
+}
 function AddField(field) {
-       document.forms[1].op.value = "addfield";
-       document.forms[1].addfield_field.value=field;
+       document.forms['f'].op.value = "addfield";
+       document.forms['f'].addfield_field.value=field;
        document.f.submit();
 }
+function cloneSubfield(index) {
+ var original = document.getElementById(index);
+ var clone = original.cloneNode(true);
+ clone.setAttribute("id", index + index); 
+// orginput : the value of the original field (in [0] if hide_marc=1, 
otherwise in [1]
+// image : the up button. don't exist is hide_marc=1
+ <!-- TMPL_IF name="hide_marc" -->
+       var orginput = original.getElementsByTagName('input')[0];
+ <!-- TMPL_ELSE -->
+       var orginput = original.getElementsByTagName('input')[1];
+       image = clone.getElementsByTagName('img')[0];
+       image.setAttribute("onclick","upSubfield('" + index + index + "')");
+ <!-- /TMPL_IF -->
+ trigger = original.getElementsByTagName('a')[0];
+ if (trigger) {
+       trigger.parentNode.removeChild(trigger);
+ }
+ clonetrigger = clone.getElementsByTagName('a')[0];
+ clonetrigger.setAttribute("onclick","cloneSubfield('" + index + index + "')");
+ clone.setAttribute("tabindex","1");
+ orginput.value = '';
+ original.parentNode.insertBefore( clone, original.nextSibling); 
+}
 
 function upSubfield(index) {
-       temp = document.forms['f'].field_value[index-1].value;
-       
document.forms['f'].field_value[index-1].value=document.forms['f'].field_value[index].value;
-       document.forms['f'].field_value[index].value= temp;
-       temp = document.forms['f'].subfield[index-1].value;
-       
document.forms['f'].subfield[index-1].value=document.forms['f'].subfield[index].value;
-       document.forms['f'].subfield[index].value = temp;
-       temp = document.forms['f'].mandatory[index-1].value;
-       
document.forms['f'].mandatory[index-1].value=document.forms['f'].mandatory[index].value;
-       document.forms['f'].mandatory[index].value = temp;
-       temp = document.forms['f'].kohafield[index-1].value;
-       
document.forms['f'].kohafield[index-1].value=document.forms['f'].kohafield[index].value;
-       document.forms['f'].kohafield[index].value = temp;
+var original = document.getElementById(index);
+var previous = original.previousSibling;
+original.parentNode.insertBefore( original, previous );
 }
 
+function unHideSubfield(index,labelindex) {
+       subfield = document.getElementById(index);
+       
+       subfield.style.display = 'block';
+       label = document.getElementById(labelindex);
+       label.style.display='none';
+       
+       
+}
 </script>
 
 </dd>

Index: authorities/blinddetail-biblio-search.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/Attic/blinddetail-biblio-search.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
--- authorities/blinddetail-biblio-search.tmpl  12 Apr 2006 18:34:05 -0000      
1.1.2.1
+++ authorities/blinddetail-biblio-search.tmpl  30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -11,7 +11,7 @@
 // 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="authid">";
+               opener.opener.document.f.field_value[i].value = "<!-- TMPL_VAR 
NAME="authid" -->";
        }
        <!-- TMPL_LOOP NAME="0XX" -->
                <!-- TMPL_LOOP NAME="subfield" -->

Index: authorities/detail-biblio-search.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/Attic/detail-biblio-search.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
--- authorities/detail-biblio-search.tmpl       12 Apr 2006 18:34:05 -0000      
1.1.2.1
+++ authorities/detail-biblio-search.tmpl       30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,11 +2,10 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-auth.inc" -->
 
-<dl>
-<dt>Authorities</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Authorities</dt>
+<dd class="bodyPane">
 
-<div id="main">
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" 
-->/includes/marc-editor.css">
 <div class="tabbed">
        <h1>Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
@@ -19,7 +18,7 @@
        <a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR 
NAME="authid" -->&index=<!-- TMPL_VAR NAME="index" -->')" class="button 
authority">
                Print
        </a>
-       <a href="javascript:CopyValues()">      <img border="0" src="<!-- 
TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/arrow.gif" 
height="45" width="45" ">
+       <a href="javascript:CopyValues()">      <img border="0" src="<!-- 
TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/arrow.gif" 
height="45" width="45">
 
        </a>
 </div>

Index: authorities/detail.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/Attic/detail.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
--- authorities/detail.tmpl     12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ authorities/detail.tmpl     30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,22 +2,22 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-auth.inc" -->
 
-<dl>
-<dt>Authorities</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Authorities</dt>
+<dd class="bodyPane">
 
 
 <div id="main">
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" 
-->/includes/marc-editor.css">
-<div class="tabbed">
-       <h1>Authority number : <!-- TMPL_VAR NAME="authid" -->  <!-- TMPL_IF 
NAME="authtypetext" -->(<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF 
--></h1>
-       <a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">Edit</a>
-               <!-- TMPL_UNLESS name="count" -->
-               <a href="/authorities-home.pl?op=delete&amp;authid=<!-- 
TMPL_VAR NAME="authid" -->" onclick="confirm_deletion(); return 
false;">Delete</a>
-       <!-- /TMPL_UNLESS -->
-       <a href="detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->" 
onclick="Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->'); return 
false;" class="submit">
-               Print
+<div class="tabbed"><input type="hidden" name="nonav" value="<!-- TMPL_VAR 
NAME="nonav" -->">
+       <h1>Authority number : <!-- TMPL_VAR NAME="authid" --> in <!-- TMPL_VAR 
NAME="authtypetext" --></h1>
+       <a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" 
-->&nonav=<!-- TMPL_VAR NAME="nonav" -->&authtypecode=<!-- TMPL_VAR 
name="authtypecode" -->"">
+               <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- 
TMPL_VAR NAME="theme" -->/images/fileopen.png">
        </a>
+       <!--TMPL_UNLESS NAME="nonav"--><a href="javascript:confirm_deletion()">
+               <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- 
TMPL_VAR NAME="theme" -->/images/edittrash.png">
+       </a>
+       <!--/TMPL_UNLESS--><!--TMPL_IF NAME="count"-->&nbsp;<a 
href="/cgi-bin/koha/catalogue-home.pl?authtype=<!-- TMPL_VAR 
NAME="authtypecode" -->&amp;authnumber=<!-- TMPL_VAR NAME="authid" --> <!-- 
TMPL_VAR NAME="linkid" -->&amp;op=do_search&amp;zoom=1&amp;search_type=precise" 
class="button authority">Used in <!-- TMPL_VAR NAME="count" --> 
biblio(s)</a><!--/TMPL_IF-->
 </div>
 
 <div name="0XX" id="0XX" class="tab" style="visibility:visible">
@@ -28,6 +28,9 @@
                <!-- TMPL_LOOP NAME="subfield" -->
                        <p>
                                <label class="labelsubfield">
+                               <a 
href="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&authtypecode=<!--
 TMPL_VAR NAME="authtypecode" -->&marclist=<!-- TMPL_VAR NAME="marc_tag" 
--><!-- TMPL_VAR NAME="marc_subfield" 
-->&and_or=and&excluding=&operator=all&stype=author&value=<!-- TMPL_VAR 
NAME="marc_value" ESCAPE=URL -->">
+                                       <img border="0" src="<!-- TMPL_VAR 
NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" 
height="15">
+                               </a>
                                <!-- TMPL_VAR NAME="marc_subfield" -->
                                <!-- TMPL_VAR NAME="marc_lib" --></label>
                                <!-- TMPL_VAR NAME="marc_value" -->
@@ -39,9 +42,9 @@
 <script language="JavaScript" type="text/javascript">
 
 function confirm_deletion() {
-       var is_confirmed = confirm('Are you sure you want to delete this 
authority?');
+       var is_confirmed = confirm('Are you sure you want to delete this 
biblio?');
        if (is_confirmed) {
-               window.location="authorities-home.pl?op=delete&amp;authid=<!-- 
TMPL_VAR NAME="authid" -->";
+               window.location="authorities.pl?op=delete&authid=<!-- TMPL_VAR 
NAME="authid" -->&nonav=<!-- TMPL_VAR NAME="nonav" -->";
        }
 }
 function Dopop(link) {

Index: authorities/searchresultlist-auth.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/Attic/searchresultlist-auth.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
--- authorities/searchresultlist-auth.tmpl      12 Apr 2006 18:34:05 -0000      
1.1.2.1
+++ authorities/searchresultlist-auth.tmpl      30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,52 +2,82 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-auth.inc" -->
 
-<dl>
-<dt>Authorities: Search Results</dt>
-<dd>
-
-<div id="main">
-       <div id="bloc25">
-               <form name="f" method="post" action="auth_finder.pl">
-                       <input type="hidden" name="op" value="do_search">
-                       <input type="hidden" name="type" value="intranet">
-                       <input type="hidden" name="nbstatements" value="<!-- 
TMPL_VAR NAME="nbstatements" -->">
-                       <div id="bloc25">
-                               <h2 class="authority">Search on</h2>
-                               <p>
-                                       <label class="label100">Authority 
type</label>
-                                       <!-- TMPL_VAR NAME="category" -->
-                               </p>
-                               <p>
-                                       <label class="label100">Search 
value</label><input type="text" name="value" value="<!-- TMPL_VAR 
name="resultstring" -->">
-                                       <input type="hidden" 
name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
-                                       <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="index" 
value="<!-- TMPL_VAR NAME="index" -->"
-                               </p>
+<dl class="bodyPane">
+<dt class="bodyPane">Authorities: Search Results</dt>
+<dd class="bodyPane">
+
+<div id="main-compact">
+       <h1>Authority search results</h1>
+       <div class="details">
+               <form name="f" 
action="/cgi-bin/koha/authorities/auth_finder.pl" method="post">
+       <input type="hidden" name="op" value="do_search" />
+       <input type="hidden" name="type" value="intranet" />
+       <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR 
NAME="nbstatements" -->" />
+       <div class="details">
+               <h2>Search on</h2>
+               <p>
+                       <label for="authtypecode">Authority type</label>
+                       <!-- TMPL_VAR NAME="authtypecode" -->
+                       <input type="hidden" id="authtypecode" 
name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+               </p>
+               <p>
+                       <label for="mainentryaoperator">Main entry ($a 
only)</label>
+                       <select name="operator" id="mainentryaoperator">
+                               <option value="contains">contains</option>
+                               <option value="start">start by</option>
+                       </select>
+                       <input type="text" name="value" value="<!-- TMPL_VAR 
NAME="value" -->" />
+                       <input type="hidden" name="marclist" value="$a" />
+                       <input type="hidden" name="and_or" value="and" />
+                       <input type="hidden" name="excluding" value="" />
+               </p>
+               <p>
+                       <label for="mainentryoperator">Main entry</label>
+                       <select name="operator" id="mainentryoperator">
+                               <option value="contains">contains</option>
+                               <option value="start">start by</option>
+                       </select>
+                       <input type="text" name="value" value="<!-- TMPL_VAR 
NAME="value" -->" />
+                       <input type="hidden" name="marclist" value="mainentry" 
/>
+                       <input type="hidden" name="and_or" value="and" />
+                       <input type="hidden" name="excluding" value="" />
+               </p>
+               <p>
+                       <label for="anywhereoperator">Anywhere</label>
+                       <select name="operator" id="">
+                               <option value="contains">contains</option>
+                               <option value="start">start by</option>
+                       </select>
+                       <input type="text" name="value">
+                       <input type="hidden" name="marclist" value="" />
+                       <input type="hidden" name="and_or" value="and" />
+                       <input type="hidden" name="excluding" value="" />
+                       <input type="hidden" name="index" value="<!-- TMPL_VAR 
NAME="index" -->" />
+                       <input type="hidden" name="tagid" value="<!-- TMPL_VAR 
NAME="tagid" -->" />
+               </p>
+        <p>(add % at the end of your word if you want to use right-truncation 
: theor% will find theory &amp; theories)</p>
                                <p>
-                               <input type="submit" value="Start search" 
class="button authority">
+                       <input type="submit" value="Start search" 
class="submit" />
                                </p>
                        </div>
-               </form>
+</form>
        </div>
-       <div id="bloc25">
-               <div id="resultnumber">
+
+               <div class="results">
                        <p>
                                <!-- TMPL_IF name="displayprev" -->
-                                       <a class="pages" 
href="auth_finder.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;authtypecode=<!-- TMPL_VAR name="authtypecode" 
-->&amp;op=do_search&amp;type=intranet">&lt;&lt;</a>
+                                       <a href="auth_finder.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR 
name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR 
name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP 
-->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- 
TMPL_VAR name="tagid" -->">&lt;&lt;Prev</a>
                                <!-- /TMPL_IF -->
                                <!-- TMPL_LOOP NAME="numbers" -->
                                        <!-- TMPL_IF name="highlight" -->
-                                               <span class="current"><!-- 
TMPL_VAR NAME="number" --></span>
+                                               <span class="highlight"><!-- 
TMPL_VAR NAME="number" --></span>
                                        <!-- TMPL_ELSE -->
-                                               <a class="pages" 
href="auth_finder.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;authtypecode=<!-- TMPL_VAR name="authtypecode" 
-->&amp;op=do_search&amp;type=intranet"><!-- TMPL_VAR NAME="number" --></a>
+                                               <a 
href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" 
-->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" --><!-- TMPL_LOOP 
name="searchdata"-->&<!-- TMPL_VAR name="term" -->=<!-- TMPL_VAR 
name="val"--><!-- /TMPL_LOOP -->&op=do_search&type=intranet&index=<!-- TMPL_VAR 
name="index" -->&tagid=<!-- TMPL_VAR name="tagid" -->"><!-- TMPL_VAR 
NAME="number" --></a>
                                        <!-- /TMPL_IF -->
                                <!-- /TMPL_LOOP -->
                                <!-- TMPL_IF name="displaynext" -->
-                                       <a class="pages" 
href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- 
TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR 
NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR 
NAME="resultsperpage" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" 
-->&amp;op=do_search&amp;type=intranet">&gt;&gt;</a>
+                                       <a href="auth_finder.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR 
name="authtypecode" --><!-- TMPL_LOOP name="searchdata"-->&<!-- TMPL_VAR 
name="term" -->=<!-- TMPL_VAR name="val"--><!-- /TMPL_LOOP 
-->&op=do_search&type=intranet&index=<!-- TMPL_VAR name="index" -->&tagid=<!-- 
TMPL_VAR name="tagid" -->">
+                                               Next &gt;&gt;</a>
                                <!-- /TMPL_IF -->
                        </p>
                        <p>
@@ -61,59 +91,49 @@
                <div id="resultlist">
                        <table>
                                <tr>
-                                       <th class="authority">Summary</th>
-                                       <th class="authority">Used</th>
-                                       <th class="authority">Get It!</th>
+                                       <th width="80%">Authorized Headings</th>
+                                       <th width="10%"># of Records</th>
+                                       <th width="10%">Full Authorized 
Heading</th>
                                </tr>
                                <tr>
                                        <td>&nbsp;</td>
                                        <td>&nbsp;</td>
                                        <td>
-                                               <a 
href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=0&amp;index=<!-- 
TMPL_VAR NAME="index" -->')" class="button authority">
-                                                       Clear
-                                               </a>
+                                               <a 
href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=0&amp;index=<!-- 
TMPL_VAR NAME="index" -->&amp;tagid=<!-- TMPL_VAR NAME="tagid" -->')" 
class="button authority">Clear</a>
                                        </td>
                                <!-- TMPL_LOOP NAME="result" -->
                                        <tr>
                                                <td><!-- TMPL_VAR 
NAME="summary" --></td>
-                                               <td><!-- TMPL_VAR NAME="used" 
--> times</td>
+                                               <td><!-- TMPL_VAR NAME="used" 
--></td>
                                                <td>
-                                                       <a 
href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=<!-- TMPL_VAR 
NAME="authid" -->&amp;index=<!-- TMPL_VAR NAME="index" -->')"><img src="<!-- 
TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/arrow.gif" 
width="32" hspace="0" vspace="0" border="0"></a>
+                                               <a 
href="/cgi-bin/koha/authorities/detail.pl?authid=<!-- TMPL_VAR NAME=authid 
-->">View Full Heading</a>
                                                </td>
                                        </tr>
                                <!-- /TMPL_LOOP -->
                        </table>
        
                </div>
-               <div id="resultnumber">
-                       <p>
+               <div class="results">
                                <!-- TMPL_IF name="displayprev" -->
-                                       <a href="auth_finder.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromprev" -->&amp;&amp;authtypecode=<!-- TMPL_VAR 
name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR 
NAME="resultstring" -->&op=do_search&type=intranet">
-                                               <img 
src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
-                                       </a>
+                                       <a href="auth_finder.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;authtypecode=<!-- TMPL_VAR name="authtypecode" 
-->&op=do_search&type=intranet">&lt;&lt; Prev</a>
                                <!-- /TMPL_IF -->
                                <!-- TMPL_LOOP NAME="numbers" -->
                                        <!-- TMPL_IF name="highlight" -->
-                                               <img 
src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" 
-->-highlight.gif">
+                                               <span class="highlight"><!-- 
TMPL_VAR NAME="number" --></span>
                                        <!-- TMPL_ELSE -->
-                                               <a 
href="auth_finder.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" 
-->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" 
-->&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="resultstring" 
-->&op=do_search&type=intranet">
-                                                       <img 
src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" 
border="0"></a>
+                                               <a 
href="auth_finder.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;authtypecode=<!-- TMPL_VAR name="authtypecode" 
-->&op=do_search&type=intranet"><!-- TMPL_VAR NAME="number" --></a>
                                        <!-- /TMPL_IF -->
                                <!-- /TMPL_LOOP -->
                                <!-- TMPL_IF name="displaynext" -->
-                                       <a href="auth_finder.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromnext" -->&amp;&amp;authtypecode=<!-- TMPL_VAR 
name="authtypecode" -->&and_or=and&operator=contains&value=<!-- TMPL_VAR 
NAME="resultstring" -->&op=do_search&type=intranet">
-                                               <img 
src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
+                                       <a href="auth_finder.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- 
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- 
/TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" 
-->&op=do_search&type=intranet">Next &gt;&gt;</a>
                                <!-- /TMPL_IF -->
-                       </p>
-               </div>  
-       </div>
 </div>
 
 <script language="JavaScript" type="text/javascript">
 
 function jumpfull(page)
 {      
-       window.open(page,'','fullscreen,scrollbars');
+       window.open(page,'','width=10,height=10');
 }
 </script>
 

Index: authorities/searchresultlist.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/authorities/Attic/searchresultlist.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
--- authorities/searchresultlist.tmpl   12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ authorities/searchresultlist.tmpl   30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,46 +2,44 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-auth.inc" -->
 
-<dl>
-<dt>Authorities: Search Results</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Authorities: Search Results</dt>
+<dd class="bodyPane">
 
 <div id="main">
-       <div id="resultnumber">
-               <p>
+       <h1>Authority search results</h1>
+       <div id="pages">
                        <!-- TMPL_IF name="displayprev" -->
-                               <a href="authorities-home.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- 
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- 
/TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR 
name="authtypecode" -->">
-                                       <img 
src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
+                               <a href="authorities-home.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- 
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- 
/TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search&authtypecode=<!-- TMPL_VAR 
name="authtypecode" -->">
+                                       &lt;&lt;
                                </a>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_LOOP NAME="numbers" -->
                                <!-- TMPL_IF name="highlight" -->
-                                       <img 
src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" 
-->-highlight.gif">
+                                       <span class="current"><!-- TMPL_VAR 
NAME="number" --></span>
                                <!-- TMPL_ELSE -->
-                                       <a 
href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- 
TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR 
NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR 
NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR 
name="authtypecode" -->">
-                                               <img 
src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" 
border="0">
-                                       </a>
+                                       <a 
href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- 
TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR 
NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR 
NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&authtypecode=<!-- 
TMPL_VAR name="authtypecode" -->"><!-- TMPL_VAR NAME="number" --></a>
                                <!-- /TMPL_IF -->
                        <!-- /TMPL_LOOP -->
                        <!-- TMPL_IF name="displaynext" -->
-                               <a href="authorities-home.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- 
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- 
/TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR 
name="authtypecode" -->">
-                                       <img 
src="/intranet-tmpl/default/images/numbers/next.gif" border="0">
-                               </a>
+                               <a href="authorities-home.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- 
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- 
/TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search&authtypecode=<!-- TMPL_VAR 
name="authtypecode" -->">&gt;&gt;</a>
                                <!-- /TMPL_IF -->
-               </p>
-               <p>
+               </div>
+               <div id="results">
                        <!-- TMPL_IF name="total" -->
                        &nbsp;<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- 
TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br><br>
                        <!-- TMPL_ELSE -->
                        &nbsp;No results found.<br>
                        <!-- /TMPL_IF -->
-               </p>
        </div>
-       <div id="resultlist">
+
+<div class="searchresults">
                <table>
                        <tr>
-                               <th>Summary</th>
-                               <!-- TMPL_UNLESS name="isEDITORS" --><th>Used 
in</th><!-- /TMPL_UNLESS -->
+                               <th>Authorized Headings</th>
+                               <!-- TMPL_UNLESS name="isEDITORS" -->
+                                       <th>Used in</th>
+                               <!-- /TMPL_UNLESS -->
                                <th>View</th>
                                <th>Delete</th>
                        </tr>
@@ -50,15 +48,15 @@
                                        <td><!-- TMPL_VAR NAME="summary" 
--></td>
                                                <!-- TMPL_UNLESS 
name="isEDITORS" -->
                                                <td>
-                                                       <a 
href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- 
TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR 
NAME="authid" -->&amp;and_or=and&amp;excluding="><!-- TMPL_VAR NAME="used" --> 
biblio(s)</a>
+                                                       <a 
href="/cgi-bin/koha/search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!--
 TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR 
NAME="authid" -->&amp;and_or=and&amp;excluding="><!-- TMPL_VAR NAME="used" --> 
biblio(s)</a>
                                                </td>
                                        <!-- /TMPL_UNLESS -->
                                        <td>
-                                               <a href="detail.pl?authid=<!-- 
TMPL_VAR NAME="authid" -->">Edit</a>
+                                               <a href="detail.pl?authid=<!-- 
TMPL_VAR NAME="authid" -->">Edit Authority No. <!-- TMPL_VAR NAME="authid" 
--></a>
                                        </td>
                                        <td>
                                                <!-- TMPL_UNLESS name="used" -->
-                                               <a 
href="javascript:do_delete('authorities-home.pl?op=delete&authid=<!-- TMPL_VAR 
NAME="authid" -->')">Delete</a>
+                                                       <a 
href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="authid" -->)">Delete</a>
                                                <!-- /TMPL_UNLESS -->
                                        </td>
                                </tr>
@@ -68,36 +66,32 @@
        <div id="resultnumber">
                <p>
                        <!-- TMPL_IF name="displayprev" -->
-                               <a href="authorities-home.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- 
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- 
/TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR 
name="authtypecode" -->">
-                                       <img 
src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
-                               </a>
+                               <a href="authorities-home.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- 
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- 
/TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search&authtypecode=<!-- TMPL_VAR 
name="authtypecode" -->">&lt;&lt;</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="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- 
TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR 
NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR 
NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR 
name="authtypecode" -->">
-                                               <img 
src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" 
border="0">
-                                       </a>
+                               <!-- TMPL_IF name="highlight" --><span 
class="current"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE -->
+                                       <a 
href="authorities-home.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- 
TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR 
NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR 
NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&authtypecode=<!-- 
TMPL_VAR name="authtypecode" -->"><!-- TMPL_VAR NAME="number" --></a>
                                <!-- /TMPL_IF -->
                        <!-- /TMPL_LOOP -->
                        <!-- TMPL_IF name="displaynext" -->
-                               <a href="authorities-home.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- 
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- 
/TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR 
name="authtypecode" -->">
-                                       <img 
src="/intranet-tmpl/default/images/numbers/next.gif" border="0">
-                               </a>
+                               <a href="authorities-home.pl?startfrom=<!-- 
TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- 
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- 
/TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search&amp;authtypecode=<!-- TMPL_VAR 
name="authtypecode" -->">&gt;&gt;</a>
                                <!-- /TMPL_IF -->
                </p>
        </div>  
 </div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
+<script language="JavaScript" type="text/javascript" >
+function confirm_deletion(id) {
+       var is_confirmed = confirm('Are you sure you want to delete this 
authority?');
+       if (is_confirmed) {
+               window.location="authorities-home.pl?op=delete&amp;authid="+id;
+       }
+}
+</script>
+
 
 </dd>
 </dl>
 </body>
 </html>
-
-<script language="JavaScript" type="text/javascript" >
-function do_delete(page)
-{
-window.location = page;
-}
-</script>
\ No newline at end of file

Index: bookshelves/addbookbybiblionumber.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/bookshelves/Attic/addbookbybiblionumber.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
--- bookshelves/addbookbybiblionumber.tmpl      12 Apr 2006 18:34:05 -0000      
1.1.2.1
+++ bookshelves/addbookbybiblionumber.tmpl      30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -32,9 +32,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Virtual Shelves: Add to Virtual Shelf</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Virtual Shelves: Add to Virtual Shelf</dt>
+<dd class="bodyPane">
 
 <div id="main-compact">
 <h3>Add <i><!-- TMPL_VAR NAME="title" --></i> <!-- TMPL_IF NAME="author" -->by 
<!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> to a Virtual Shelf</h3>

Index: bookshelves/shelves.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/bookshelves/Attic/shelves.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
--- bookshelves/shelves.tmpl    12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ bookshelves/shelves.tmpl    30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,40 +2,6 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-catalog.inc" -->
 
-<div id="subTab-1">
-       <a href="/cgi-bin/koha/loadmodules.pl?module=search&type=intranet">
-               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-search-unselected.png" border="0" />
-       </a>
-</div>
-
-<div id="subTab-2">
-       <a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&type=intranet">
-               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-addBiblio-unselected.png" border="0" />
-       </a>
-</div>
-
-<div id="subTab-3">
-       <a href="/cgi-bin/koha/bull-home.pl">
-               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-subscriptions-unselected.png" border="0" />
-       </a>
-</div>
-
-<div id="subTab-4">
-       <a href="/cgi-bin/koha/bull/lateissues.pl">
-               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-lateIssues-unselected.png" border="0" />
-       </a>
-</div>
-
-<div id="subTab-5">
-       <a href="/cgi-bin/koha/bookshelves/shelves.pl">
-               <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/subTab-catalog-virtualShelves-selected.png" border="0" />
-       </a>
-</div>
-
-<dl>
-<dt>Virtual Shelves</dt>
-<dd>
-
 <div id="main">
 
 <!-- TMPL_IF name="edit" -->
@@ -84,7 +50,7 @@
                                </tr><!-- TMPL_LOOP Name="itemsloop" --><!-- 
TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- 
/TMPL_IF --><!-- TMPL_IF name="manageshelf" --><td><input type="checkbox" 
name="REM-<!-- TMPL_VAR NAME="itemnumber" -->" /></td><!-- /TMPL_IF -->
                                                <td><a 
href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- 
TMPL_VAR NAME="title" --></a></td>
                                                <td><!-- TMPL_VAR NAME="author" 
--></td> 
-                                               <td><!-- TMPL_VAR 
NAME="itemtype" --></td>
+                                               <td><!-- TMPL_VAR NAME="ccode" 
--></td>
                                                <td><!-- TMPL_VAR 
NAME="publicationyear" --></td>
                                                <td><a 
href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
-->">Reserves</a></td>
                                        </tr>
@@ -146,10 +112,12 @@
                                        <td><select name="category">
                                                <option 
value="1">Private</option>
                                                <option 
value="2">Public</option>
+                                               <option value="3">Free</option>
                                        </select></td></tr>
 </table></div>
 <ul><li>A private bookshelf is managed by you and can be seen only by you.</li>
-                                       <li> A public shelf can be seen by 
everybody, but managed only by you.</li></ul>
+                                       <li> A public shelf can be seen by 
everybody, but managed only by you.</li>
+                                       <li> A free can be managed by any 
user.</li></ul>
                                        <input type="submit" value="Add New 
Shelf" class="submit" /></form>
                                        <form action="shelves.pl" method="get" 
class="inline"><input type="submit" class="submit" value="Back to Shelf List" 
/></form>
        <!-- TMPL_ELSE -->

Index: circ/branchtransfers.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/Attic/branchtransfers.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
--- circ/branchtransfers.tmpl   12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ circ/branchtransfers.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -26,12 +26,13 @@
        </a>
 </div>
 
-<dl>
-<dt>Circulation: Transfers</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Circulation: Transfers</dt>
+<dd class="bodyPane">
        <br />
 
 <div id="main">
+<h1>Circulation: Transfers</h1>
 
 <!-- TMPL_IF Name="found" -->
 <h3 class="alert">Reserve Found<!-- TMPL_IF Name="waiting" --> (item is 
already <em>consigned</em>) <!-- /TMPL_IF --></h3>
@@ -144,7 +145,7 @@
        <!-- /TMPL_LOOP -->
        </ul></div><!-- /TMPL_IF -->
        <form method="post" name="mainform" id="mainform" 
action="/cgi-bin/koha/circ/branchtransfers.pl">
-       <h3>Transfer</h3><div class="data">
+       <div class="data">
        <table>
 <tr><th>Enter Item Barcode</th><td><input name="barcode" size="14" 
maxlength="14" class="unfocus" onfocus="this.className='focus'" 
onblur="this.className='unfocus'" /></td></tr>
 <tr><th>Destination Branch:</th><td><select name="tobranchcd">
@@ -170,7 +171,7 @@
                        <td><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR 
Name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR Name="barcode" 
--></a></td>
                        <td><!-- TMPL_VAR Name="title" --></td>
                        <td><!-- TMPL_VAR Name="author" --></td>
-                       <td><!-- TMPL_VAR Name="itemtype" --></td>
+                       <td><!-- TMPL_VAR Name="ccode" --></td>
                        <td><!-- TMPL_VAR Name="frbrname" --></td>
                        <td><!-- TMPL_VAR Name="tobrname" --></td>
                        </tr>

Index: circ/circulation.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/Attic/circulation.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
--- circ/circulation.tmpl       18 Sep 2006 19:13:24 -0000      1.1.2.1.2.1
+++ circ/circulation.tmpl       30 Nov 2006 15:56:27 -0000      1.1.2.1.2.2
@@ -26,15 +26,16 @@
        </a>
 </div>
 
-<dl>
-<dt>Circulation: Issues</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Circulation: Issues</dt>
+<dd class="bodyPane">
        <br />
        <div id="main">
+       <h1>Circulation: Issues</h1>
        
-       <!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
-       <!-- see selectbranchprinter.pl         <div class="details">
-                       Parameters
+<!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
+<!-- see selectbranchprinter.pl        <div class="details">
+               <h2>Parameters</h2>
                        <p>
                                <b>Branch:</b> <!-- TMPL_VAR NAME="branchname" 
-->, 
                                <b>Printer:</b> <!-- TMPL_VAR 
NAME="printername" --> 
@@ -48,6 +49,12 @@
                        <div class="error">
                        <h3>Error Issuing Item:</h3>
                                <ul>
+                       <!-- TMPL_IF NAME="NOTSAMEBRANCH" -->
+                       <li>It is not possible to issue a book which does not 
belong to your branch.</li>
+                       <!-- /TMPL_IF -->
+                       <!-- TMPL_IF NAME="DEBT" -->
+                               <p>The patron's debt of $<!-- TMPL_VAR 
name="DEBT" --> exceeds designated limits</p>
+                       <!-- /TMPL_IF -->
                                <!-- TMPL_IF NAME="INVALID_DATE" -->
                                        <li>The due date is invalid</li>
                                <!-- /TMPL_IF -->
@@ -137,7 +144,7 @@
                <label for="borrnumber">Select a borrower: </label>
                        <style type="text/css">
                        option:hover {
-                               background-color : #CCCCCC;
+                       background-color : #f0f0f0;
                                color : #000099;
                        }
                </style>
@@ -148,54 +155,65 @@
                <!-- TMPL_ELSE -->
                        <!-- TMPL_IF NAME="borrowernumber" -->
                <div id="notes">
+       <!-- TMPL_IF NAME="patronimages" --><img src="/patronimages/<!-- 
TMPL_VAR NAME="cardnumber" -->.<!-- TMPL_VAR NAME="patronimages" -->" alt="" 
border="0" /><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
                <ul>
-               <li><!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR 
NAME="city" --></li>
+       <li><!-- TMPL_VAR NAME="streetaddress" --><br /> <!-- TMPL_VAR 
NAME="city" --></li>
                <li><!-- TMPL_VAR NAME="phone" --></li>
                <!-- TMPL_IF NAME="emailaddress" --><li><a href="mailto:<!-- 
TMPL_VAR NAME="emailaddress" -->"><!-- TMPL_VAR NAME="emailaddress" 
--></a></li><!-- /TMPL_IF -->
                <li>Category: <!-- TMPL_VAR name="categorycode" --></li>
-               <li>(<a 
href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR 
name="borrowernumber" -->">details</a> / <a 
href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR 
name="borrowernumber" -->&amp;modify=edit&amp;destination=circ">edit</a>)</li>
-               </ul>
+       <li>(<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
name="borrowernumber" -->">details</a> / <a 
href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR 
name="borrowernumber" -->&amp;modify=edit&amp;destination=circ">edit</a>)</li>
+</ul>
                </div>
-               <h3<!--TMPL_IF Name="warndeparture"--> 
class="error"<!--/TMPL_IF-->><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR 
name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!--TMPL_IF 
Name="warndeparture"--><br /> Borrower's Card will Expire 
Soon.<!--/TMPL_IF--></h3>
-       <h4> &nbsp; &nbsp; <!-- TMPL_VAR NAME="issuecount" --> out<!-- TMPL_IF 
NAME="overduecount" -->, <span class="error"><!-- TMPL_VAR name="overduecount" 
--> overdue</span><!-- /TMPL_IF --></h4> <br clear="right" />
        
-       <!-- TMPL_IF NAME="flagged" -->
-       </div><div class="details">
-       <ul>
-       <!-- TMPL_IF NAME="gna" -->
-       <li><span class="error">Address:</span> Patron's address in doubt</li>
-       <!-- /TMPL_IF -->
-       <!-- TMPL_IF NAME="lost" -->
-       <li><span class="error">Lost:</span> Patron's card is lost</li>
-       <!-- /TMPL_IF -->
-       <!-- TMPL_IF NAME="dbarred" -->
-       <li><span class="error">Debarred:</span> Patron is debarred <form 
class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" 
method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR 
NAME="borrowernumber" -->" /><input type="hidden" name="cardnumber" value="<!-- 
TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" value="circ" 
name="destination" /><input type="hidden" name="status" value="0" /><input 
type="submit" class="submit" value="Lift Debarment" /></form></li>
-       <!-- /TMPL_IF -->
-       <!-- TMPL_IF name="odues" -->   <li><!-- TMPL_IF name="nonreturns" -->
+       <h3><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> 
(<!-- TMPL_VAR NAME="cardnumber" -->)</h3>
+<h4> &nbsp; &nbsp; <!-- TMPL_VAR NAME="issuecount" --> out<!-- TMPL_IF 
NAME="overduecount" -->, <span class="error"><!-- TMPL_VAR name="overduecount" 
--> overdue</span><!-- /TMPL_IF --></h4> 
+
+
+<!-- TMPL_IF NAME="flagged" -->
+</div><div class="details">
+<ul>
+<!-- TMPL_LOOP NAME="issued_itemtypes_count_loop" -->
+<!-- TMPL_IF NAME="flag" --><li>Patron has reached the <span 
class="error"><!-- TMPL_VAR NAME="description" --> issue limit</span></li><!-- 
/TMPL_IF -->
+<!-- /TMPL_LOOP -->
+<!--TMPL_IF Name="warndeparture"--><li><span class="error">Patron 
Expiration:</span> Patron Expires on <!-- TMPL_VAR NAME="expiry" --> <form 
class="inline compact" action="/cgi-bin/koha/members/setstatus.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="renewaldate" value="<!-- 
TMPL_VAR NAME="renewaldate" -->" /><input type="submit" class="submit" 
value="Renew" /></form> <form class="inline compact" 
action="/cgi-bin/koha/members/memberentry.pl" method="get"><input type="hidden" 
name="modify" value="edit" /><input type="hidden" name="destination" 
value="circ" /><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR 
NAME="borrowernumber" -->" /><input type="submit" class="submit" value="Edit 
Details" /></form></li><!--/TMPL_IF-->
+<!-- TMPL_IF NAME="gna" -->
+<li><span class="error">Address:</span> Patron's address in doubt</li>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="lost" -->
+<li><span class="error">Lost:</span> Patron's card is lost</li>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="dbarred" -->
+<li><span class="error">Debarred:</span> Patron is debarred <form 
class="inline compact" action="/cgi-bin/koha/members/setstatus.pl" 
method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR 
NAME="borrowernumber" -->" /><input type="hidden" name="cardnumber" value="<!-- 
TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" value="circ" 
name="destination" /><input type="hidden" name="status" value="0" /><input 
type="submit" class="submit" value="Lift Debarment" /></form></li>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="odues" -->  <li><!-- TMPL_IF name="nonreturns" -->
                                                <span 
class="error">Overdues:</span> Patron has <span class="error">ITEMS 
OVERDUE</span> See highlighted items <a href="#previous">below</a>
                                        <!-- /TMPL_IF --></li><!-- /TMPL_IF -->
-       <!-- TMPL_IF NAME="noissues" -->
-       <!-- TMPL_IF NAME="charges" --><li><span class="error">Fines:</span> 
Patron has <a href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR 
name="borrowernumber" -->">outstanding fines</a>. Make <a 
href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" 
-->">Payment</a></li><!-- /TMPL_IF -->
-       <!-- TMPL_ELSE -->
-               <!-- TMPL_IF name="charges" --><li><font size="+2" 
color="red">Fines:</font> Patron has <a 
href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" 
-->">outstanding fines</a>. Make <a href="/cgi-bin/koha/pay.pl?bornum=<!-- 
TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
-       <!-- /TMPL_IF -->
-       </ul>
+<!-- TMPL_IF NAME="noissues" -->
+<!-- TMPL_IF NAME="charges" --><li><span class="error">Fines:</span> Patron 
has <a href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR 
name="borrowernumber" -->">outstanding fines</a>. Make <a 
href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" 
-->">Payment</a></li><!-- /TMPL_IF -->
+<!-- TMPL_ELSE -->
+       <!-- TMPL_IF name="charges" --><li>Fines: Patron has <a 
href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" 
-->">outstanding fines</a>. Make <a href="/cgi-bin/koha/pay.pl?bornum=<!-- 
TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+</ul>
        
-       <dl>
+<dl>
                        
-       <!-- TMPL_IF name="waiting" -->
+<!-- TMPL_IF name="waiting" -->
                        <dt>Reserves waiting:</dt>
                                <dd><ul><!-- TMPL_LOOP name="itemswaiting" -->
                                        <li><a 
href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" 
-->&amp;type=intra"><!-- TMPL_VAR name="title" --></a> (<!-- TMPL_VAR 
name="barcode" --> -- <!-- TMPL_VAR name="branchname" -->)</li>
                                <!-- /TMPL_LOOP -->
                                </ul></dd>
                        <!-- /TMPL_IF -->
-       </dl>
+
+               <!-- TMPL_IF name="notes" -->
+                                       <dt>Notes:</dt> <dd class="error"><!-- 
TMPL_VAR name="notesmsg" --></dd>
        <!-- /TMPL_IF -->
+</dl>
+<!-- /TMPL_IF -->
                <!-- TMPL_ELSE -->
                <!-- No card entered yet -->
                <form method="post" action="/cgi-bin/koha/circ/circulation.pl" 
name="mainform" id="mainform">
-       <label for="findborrower">Enter borrower card number or partial last 
name: </label>
+<label for="findborrower">Enter borrower card number or partial last name: 
</label>
                                        <input name="findborrower" type="text" 
size="40" />
                                                <input type="hidden" 
name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />
                                                <input type="hidden" 
name="printer" value="<!-- TMPL_VAR NAME="printer" -->" />
@@ -205,15 +223,13 @@
                <!-- /TMPL_IF -->
                </div>
                
-<!-- TMPL_IF name="notes" --><table border=0><th>Notes:</th><td><div 
class="error"><!-- TMPL_VAR name="notesmsg" --></div></td><!-- /TMPL_IF -->
-
-       <!-- BARCODE ENTRY -->
+<!-- BARCODE ENTRY -->
        
-       <!-- TMPL_IF NAME="borrowernumber" -->
+<!-- TMPL_IF NAME="borrowernumber" -->
                <div class="details">
                <form method="post" action="/cgi-bin/koha/circ/circulation.pl" 
name="mainform">
-       <label for="barcode">Enter Item Barcode: </label><input name="barcode" 
size="14" maxlength="14"class="unfocus" onfocus="this.className='focus'" 
onblur="this.className='unfocus'" /> <input type="submit" value="Issue" 
class="submit" />
-               <p class="date-select">
+<label for="barcode">Enter Item Barcode: </label><input name="barcode" 
size="14" maxlength="14" class="unfocus" onfocus="this.className='focus'" 
onblur="this.className='unfocus'" /> <input type="submit" value="Issue" 
class="submit" />
+<!-- TMPL_IF NAME="SpecifyDueDate" --><p class="date-select">
                                <label for="month">Specify Due Date: </label>
                                <select name="month" id="month">
                                        <option value="0">Month</option>
@@ -266,14 +282,14 @@
                                </select>
                                <select name="year">
                                        <option value="0">Year</option>
-                                       <option value="2005"<!-- TMPL_IF 
NAME="year2004" --> selected="selected"<!-- /TMPL_IF -->>2004</option>
-                                       <option value="2006"<!-- TMPL_IF 
NAME="year2005" --> selected="selected"<!-- /TMPL_IF -->>2005</option>
-                                       <option value="2007"<!-- TMPL_IF 
NAME="year2006" --> selected="selected"<!-- /TMPL_IF -->>2006</option>
-                                       <option value="2008"<!-- TMPL_IF 
NAME="year2007" --> selected="selected"<!-- /TMPL_IF -->>2007</option>
-                                       <option value="2009"<!-- TMPL_IF 
NAME="year2008" --> selected="selected"<!-- /TMPL_IF -->>2008</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>
-       <label for="stickyduedate">Remember for Session:</label><input 
type="checkbox" id="stickyduedate" name="stickyduedate" <!-- TMPL_VAR 
NAME="selected" --> />
-                       <input type="hidden" name="borrnumber" value="<!-- 
TMPL_VAR NAME="borrowernumber" -->" />
+<label for="stickyduedate">Remember for Session:</label><input type="checkbox" 
id="stickyduedate" name="stickyduedate" <!-- TMPL_VAR NAME="selected" --> />
+               </p><!-- TMPL_ELSE --><input type="hidden" name="day" value="0" 
/><input type="hidden" name="month" value="0" /><input type="hidden" 
name="year" value="0" /><!-- /TMPL_IF --><input type="hidden" name="borrnumber" 
value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
                        <input type="hidden" name="branch" value="<!-- TMPL_VAR 
NAME="branch" -->" />
                        <input type="hidden" name="printer" value="<!-- 
TMPL_VAR NAME="printer" -->" />
                        <input type="hidden" name="print" value="maybe" />
@@ -281,18 +297,16 @@
                                <input type="hidden" name="charges" value="yes" 
/>
                                <input type="hidden" name="oldamount" 
value="<!-- TMPL_VAR NAME="amountold" -->" />
                        <!-- /TMPL_IF -->
-                       </p>
-               </form>
                </div>
        
+</form>
+<!-- /TMPL_IF -->
        
-       <!-- /TMPL_IF -->
        
        
-       
-       <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
-       <!-- TMPL_IF NAME="borrowernumber" -->
-       <div class="table"><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" -->" />
+<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
+<!-- TMPL_IF NAME="borrowernumber" -->
+<div class="table"><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>
                        <caption>Issues <span class="print"><a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
NAME="borrowernumber" -->&amp;print=page">(Print Page)</a> <a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
NAME="borrowernumber" -->&amp;print=slip">(Print Slip)</a></span></caption>
                        <tr>
@@ -302,43 +316,45 @@
                                <th>Call No</th>
                                <th>Barcode</th>
                                <th>Renew?</th>
+                       <th>Return?</th>
                        </tr>
                <!-- TMPL_IF NAME="todayissues" -->
                        <!-- TMPL_LOOP NAME="todayissues" -->
-                       <tr>
+               <!-- TMPL_IF NAME="togglecolor" --><tr><!-- TMPL_ELSE --><tr 
class="highlight"><!-- /TMPL_IF -->
                                <td><!-- TMPL_VAR NAME="dd" --></td>
                                <td><a href="/cgi-bin/koha/detail.pl?bib=<!-- 
TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" 
--></a><br/><i><!-- TMPL_VAR name="itemnotes" --></i></td>
                                <td><!-- TMPL_VAR NAME="author" --></td>
                                <td><!-- TMPL_VAR NAME="classification" --></td>
                                <td><!-- TMPL_VAR NAME="barcode" --></td>
                                <td><input type="checkbox" 
name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF 
NAME="od" --> checked="checked"<!-- /TMPL_IF --> /></td>
+                       <td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- 
TMPL_VAR name="barcode" -->">Return</a></td>
                        </tr>
                        <!-- /TMPL_LOOP -->
-       <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
        
-       <!-- TMPL_IF NAME="previssues" -->
-                       <tr><th colspan="6"><a name="previous" 
id="previous">Previous Issues</a></th></tr>
+<!-- TMPL_IF NAME="previssues" -->
+               <tr><th colspan="7"><a name="previous" id="previous">Previous 
Issues</a></th></tr>
                        <!-- TMPL_LOOP NAME="previssues" -->
-                               <tr>
+                       <!-- TMPL_IF NAME="togglecolor" --><tr><!-- TMPL_ELSE 
--><tr class="highlight"><!-- /TMPL_IF -->
                                <td><!-- TMPL_IF NAME="od" --><span 
class="error"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="dd" --><!-- TMPL_IF 
NAME="od" --></span><!-- /TMPL_IF --></td>
                                <td><a href="/cgi-bin/koha/detail.pl?bib=<!-- 
TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" 
--></a><br/><i><!-- TMPL_VAR name="itemnotes" --></i></td>
                                <td><!-- TMPL_VAR NAME="author" --></td>
                                <td><!-- TMPL_VAR NAME="classification" --></td>
                                <td><!-- TMPL_VAR NAME="barcode" --></td>
-                               <td><input type="checkbox" 
name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF 
NAME="od" --> checked="checked"<!-- /TMPL_IF --> /></td></tr>
+                       <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>
                
                <p><input type="submit" class="submit" value="Renew Checked 
Items" /></p>
-       </form>
-       
-       <!-- TMPL_IF name="previssues" --><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" -->" /><!-- TMPL_LOOP 
NAME="previssues" --><input type="hidden" name="renew_item_<!-- TMPL_VAR 
NAME="itemnumber" -->" value="y" /><!-- /TMPL_LOOP --><input type="submit" 
class="submit" value="Renew All" /></form><!-- /TMPL_IF -->
+</form>
                
-       </div>
-       <!-- /TMPL_IF -->
-       <!-- /TMPL_IF -->
-       </div>
+<!-- TMPL_IF name="previssues" --><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" -->" /><!-- TMPL_LOOP 
NAME="previssues" --><input type="hidden" name="renew_item_<!-- TMPL_VAR 
NAME="itemnumber" -->" value="y" /><!-- /TMPL_LOOP --><input type="submit" 
class="submit" value="Renew All" /></form><!-- /TMPL_IF -->
 
+</div>
+<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+</div>
 </dd>
 </dl>
 </body>

Index: circ/reserve.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/Attic/reserve.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
--- circ/reserve.tmpl   12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ circ/reserve.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -26,9 +26,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Circulation: Reserves</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Circulation: Reserves</dt>
+<dd class="bodyPane">
 
 <div id="main">
        <h1>Items Reserved as of <!-- TMPL_VAR NAME="todaysdate" --></h1>
@@ -71,6 +71,7 @@
        </div>
 </div>
 
+
 <br /><br /><br /><br /><br /><br />
 </dd>
 </dl>

Index: circ/returns.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/Attic/returns.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
--- circ/returns.tmpl   18 Sep 2006 19:13:24 -0000      1.1.2.1.2.1
+++ circ/returns.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.2
@@ -26,9 +26,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Circulation: Returns</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Circulation: Returns</dt>
+<dd class="bodyPane">
        <br />
 
 <div id="main">
@@ -45,13 +45,16 @@
                        <li><!-- TMPL_VAR Name="borstraddress" --><br />
                        <!-- TMPL_VAR Name="borcity" -->  <!-- TMPL_VAR 
NAME="borzip" --></li>
                        <li><!-- TMPL_VAR Name="borphone" --></li>
-                       <!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS 
NAME="intransit" --><a href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!-- 
/TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS 
NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS NAME="intransit" --><a 
id="reserveemail" href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!-- 
/TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS 
NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="debarred" --><li class="error">Patron is DEBARRED</li><!-- 
/TMPL_IF -->
 <!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in 
doubt</li><!-- /TMPL_IF -->
                        </ul></td></tr>
-       <tr><!-- TMPL_IF NAME="intransit" 
--><th>&nbsp;</th><td><strong>Transfer</strong> to <!-- TMPL_VAR 
Name="branchname" --> </td><!-- TMPL_ELSE 
--><th>&nbsp;</th><td><strong>Hold</strong> in <!-- TMPL_VAR Name="branchname" 
--></td><!-- /TMPL_IF --></tr>
+       <tr><!-- TMPL_IF NAME="intransit" 
--><th>&nbsp;</th><td><strong>Transfer</strong> to <!-- TMPL_VAR 
Name="tobranchname" --> </td><!-- TMPL_ELSE 
--><th>&nbsp;</th><td><strong>Hold</strong> in <!-- TMPL_VAR 
Name="tobranchname" --></td><!-- /TMPL_IF --></tr>
                </table></div><form method="post" action="returns.pl" 
name="mainform" id="mainform">
-                       <input type="submit" value="Confirm" class="submit" 
/><!-- TMPL_LOOP Name="inputloop" -->
+                       <input type="submit" value="Confirm" class="submit" />
+                       <input type="hidden" name="bornum" id="bornum" 
value="<!-- TMPL_VAR name="bornum" -->" />
+                       <input type="hidden" name="itembiblionumber" 
id="itembiblionumber" value="<!-- TMPL_VAR name="itembiblionumber" -->" /><!-- 
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" -->" />
@@ -92,13 +95,15 @@
                        <li><!-- TMPL_VAR Name="borstraddress" --><br />
                        <!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR 
NAME="borzip" --></li>
                        <li><!-- TMPL_VAR Name="borphone" --></li>
-                       <!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS 
NAME="intransit" --><a href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!-- 
/TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS 
NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF -->
+                       <!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS 
NAME="intransit" --><a id="reserveemail" href="mailto:<!-- TMPL_VAR 
Name="boremail" -->"><!-- /TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!-- 
TMPL_UNLESS NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="debarred" --><li class="error">Patron is DEBARRED</li><!-- 
/TMPL_IF -->
 <!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in 
doubt</li><!-- /TMPL_IF -->
                        </ul></td></tr>
-                       <tr><!-- TMPL_IF NAME="intransit" 
--><th>&nbsp;</th><td><strong>Transfer</strong> to <!-- TMPL_VAR 
Name="branchname" --> </td><!-- TMPL_ELSE 
--><th>&nbsp;</th><td><strong>Hold</strong> in <!-- TMPL_VAR Name="branchname" 
--></td><!-- /TMPL_IF --></tr></table>
+                       <tr><!-- TMPL_IF NAME="intransit" 
--><th>&nbsp;</th><td><strong>Transfer</strong> to <!-- TMPL_VAR 
Name="tobranchname" --> </td><!-- TMPL_ELSE 
--><th>&nbsp;</th><td><strong>Hold</strong> in <!-- TMPL_VAR 
Name="tobranchname" --></td><!-- /TMPL_IF --></tr></table>
                        </div> <form method="post" action="returns.pl" 
name="mainform" id="mainform">
                        <input type="submit" class="submit" value="Confirm" />
+                       <input type="hidden" name="bornum" id="bornum" 
value="<!-- TMPL_VAR name="bornum" -->" />
+                       <input type="hidden" name="itembiblionumber" 
id="itembiblionumber" value="<!-- TMPL_VAR name="itembiblionumber" -->" />
                        <!-- 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" -->" />
@@ -173,7 +178,7 @@
                        <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR 
Name="itembiblionumber" -->&type=intra"><!-- TMPL_VAR Name="barcode" 
--></a></td>
                        <td><!-- TMPL_VAR Name="itemtitle" --></td>
                        <td><!-- TMPL_VAR Name="itemauthor" --></td>
-                       <td><!-- TMPL_VAR Name="itemtype" --></td>
+                       <td><!-- TMPL_VAR Name="ccode" --></td>
                        <td>
                        <!-- TMPL_IF Name="duedate" -->
                                <a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" 
-->">
@@ -189,6 +194,8 @@
 <!-- /TMPL_IF -->
 
 </div>
+
+</div>
 </dd>
 </dl>
 </body>

Index: circ/selectbranchprinter.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/Attic/selectbranchprinter.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
--- circ/selectbranchprinter.tmpl       12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ circ/selectbranchprinter.tmpl       30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -26,9 +26,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Circulation: Select Your Home Branch & Printer</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Circulation: Select Your Home Branch & Printer</dt>
+<dd class="bodyPane">
 
 <div id="main">
 <h1>Circulation: Select Your Home Branch</h1>
@@ -45,18 +45,21 @@
        </select>
 </div>
 <div class="details">
-<!-- <label for="printer">Choose a Network Printer:</label> -->
+<label for="printer">Choose a Network Printer:</label>
 <!--printerselection-->
-<!--   <select name="printer" id="printer">
+<select name="printer" id="printer">
        <!-- TMPL_LOOP Name="printerloop" -->
                <option value="<!-- TMPL_VAR Name="value" -->"<!-- TMPL_IF 
Name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR 
Name="name" -->
        <!-- /TMPL_LOOP -->
        </select>
- --><input type="hidden" name="setcookies" value="1" />
+<input type="hidden" name="setcookies" value="1" />
 <p><input type="submit" class="submit" value="Submit" name="changesettings" 
/></p></div>
 </form>
 
 
 </div>
+
+
+</div>
 <!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->
 

Index: export/marc.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/export/Attic/marc.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
--- export/marc.tmpl    12 Apr 2006 18:34:05 -0000      1.1.2.1
+++ export/marc.tmpl    30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,9 +2,9 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-catalog.inc" -->
 
-<dl>
-<dt>Cataloging: MARC Export</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Cataloging: MARC Export</dt>
+<dd class="bodyPane">
 
 <div id="main"><h1>MARC Export</h1>
 <div class="data">
@@ -25,14 +25,12 @@
 <tr><th scope="row">...to itemcallnumber:</th><td><input type="text" 
name="end_callnumber"></td></tr>
 <tr><th scope="row">Limit to: </th><td><input type="text" name="limit"> first 
biblio</td></tr>
 </table></div>
-<p>Note: the items are NOT exported by this tool</p>
 <p>                    <input type="hidden" name="op" value="export">
                        <input type="submit" value="Export" class="submit"></p>
                </form>
 
 </div>
 
-
 </dd>
 </dl>
 </body>

Index: import/breeding.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/import/Attic/breeding.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
--- import/breeding.tmpl        12 Apr 2006 18:34:06 -0000      1.1.2.1
+++ import/breeding.tmpl        30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,9 +2,9 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-catalog.inc" -->
 
-<dl>
-<dt>Cataloging: MARC Import</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Cataloging: MARC Import</dt>
+<dd class="bodyPane">
 
 <div id="main">
 <h1>MARC acquisition system</h1>
@@ -59,7 +59,6 @@
 
 </div>
 
-
 </dd>
 </dl>
 </body>

Index: includes/body-top.inc
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/includes/Attic/body-top.inc,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
--- includes/body-top.inc       12 Apr 2006 18:34:06 -0000      1.1.2.1
+++ includes/body-top.inc       30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -1,7 +1,9 @@
 <body onload="document.forms['mainform'].elements[0].focus();">
 
        <div id="logo">
-               <img src="<!-- TMPL_VAR NAME='themelang' -->/images/logo.png" 
width="485" height="70" />
+               <a href="/cgi-bin/koha/mainpage.pl">
+                       <img src="<!-- TMPL_VAR NAME='themelang' 
-->/images/logo.png" width="485" height="70" border="0"/>
+               </a>
        </div>
 
        <map name="tabsMap" id="tabsMap">

Index: includes/styles.css
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/includes/Attic/styles.css,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
--- includes/styles.css 12 Apr 2006 18:34:06 -0000      1.1.2.1
+++ includes/styles.css 30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -124,24 +124,24 @@
        font-size: small;
 }
 
-dl { /* block position that can be changed at will */
+dl.bodyPane { /* block position that can be changed at will */
 position: absolute;
 left: 125px;
 top: 150px;
 width: 872px; /* width of block according to your background image */
 }
 
-dl, dt, dd { /* suppression of all margins and paddings */
+dl.bodyPane, dt, dd { /* suppression of all margins and paddings */
 margin: 0;
 padding: 0;
 }
 
-dl { /* by default background on the entire block */
+dl.bodyPane { /* by default background on the entire block */
 background: url(/intranet-tmpl/ccfls/en/images/bodyTable_bottom.gif) bottom 
left no-repeat;
 padding-bottom: 40px; /* so that text will not appear on the bottom rounded 
edge */
 }
 
-dt { /* bloc title definition */
+dt.bodyPane { /* bloc title definition */
 height: 40px;
 background: url(/intranet-tmpl/ccfls/en/images/bodyTable_top.gif) top left 
no-repeat;
 font-size: 1.3em;
@@ -149,7 +149,7 @@
 text-align: center;
 }
 
-dd {
+dd.bodyPane {
 padding: 0 20px 0 10px; /* internal block spaces administration */
 /*text-align: justify;*/
 background: url(/intranet-tmpl/ccfls/en/images/bodyTable_middle.gif) top left 
repeat-y; /* internal background */

Index: members/imemberentry.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/Attic/imemberentry.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
--- members/imemberentry.tmpl   12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ members/imemberentry.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -4,7 +4,7 @@
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">
-<form action="/cgi-bin/koha/newimember.pl" method="post">
+<form action="/cgi-bin/koha/members/newimember.pl" method="post">
 <!-- TMPL_IF name="surname" -->
        <h1>Edit Institution</h1>
 <!-- TMPL_ELSE -->

Index: members/jmemberentry.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/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
--- members/jmemberentry.tmpl   12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ members/jmemberentry.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -20,11 +20,11 @@
        </a>
 </div>
 
-<dl>
-       <dt>
+<dl class="bodyPane">
+       <dt class="bodyPane">
                Patrons: Add Child for  <!-- TMPL_VAR NAME="surname" -->, <!-- 
TMPL_VAR NAME="firstname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)
        </dt>
-<dd>
+<dd class="bodyPane">
 
 <div id="main"><form action="/cgi-bin/koha/members/newjmember.pl" 
method="post">
        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR 
NAME="member" -->" />
@@ -66,8 +66,8 @@
                        <input type="radio" id="sex_child_<!-- TMPL_VAR 
NAME="i" -->" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="F" />F
                        <input type="radio" name="sex_child_<!-- TMPL_VAR 
NAME="i" -->" value="M" />M
                </td></tr>
-<!--           <tr><td>School</td><td><input type="text" 
name="school_child_<!-- TMPL_VAR NAME="i" -->" size="20" ></td>
-       </tr> -->
+               <tr><td><label for="school_child_<!-- TMPL_VAR NAME="i" 
-->">School</label></td><td><input type="text" id="school_child_<!-- TMPL_VAR 
NAME="i" -->" name="school_child_<!-- TMPL_VAR NAME="i" -->" size="20" ></td>
+       </tr>
        <tr>
                <td><label for="altnotes_child_<!-- TMPL_VAR NAME="i" 
-->">Notes</label></td><td><textarea name="altnotes_child_<!-- TMPL_VAR 
NAME="i" -->" id="altnotes_child_<!-- TMPL_VAR NAME="i" -->" cols="40" 
rows="3"></textarea></td>
        </tr>

Index: members/member-flags.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/Attic/member-flags.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
--- members/member-flags.tmpl   12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ members/member-flags.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -20,9 +20,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Patrons: Set Privileges</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Patrons: Set Privileges for <!-- TMPL_VAR NAME="surname" 
-->, <!-- TMPL_VAR NAME="firstname" --></dt>
+<dd class="bodyPane">
 
 <div id="main">
 <form method="post" action="/cgi-bin/koha/members/member-flags.pl">
@@ -34,10 +34,10 @@
        <!-- TMPL_LOOP NAME="loop" -->
                <tr>
                        <td>
-                               <input type="checkbox" name="flag-<!-- TMPL_VAR 
NAME="bit" -->" <!-- TMPL_VAR NAME="checked" --> />
+                               <input type="checkbox" id="flag-<!-- TMPL_VAR 
NAME="bit" -->" name="flag-<!-- TMPL_VAR NAME="bit" -->" <!-- TMPL_VAR 
NAME="checked" --> />
                        </td>
                        <td>
-                               <!-- TMPL_VAR NAME="flag" -->
+                               <label for="flag-<!-- TMPL_VAR NAME="bit" 
-->"><!-- TMPL_VAR NAME="flag" --></label>
                        </td>
                        <td>
                                <!-- TMPL_VAR NAME="flagdesc" -->

Index: members/member-password.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/Attic/member-password.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
--- members/member-password.tmpl        12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ members/member-password.tmpl        30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -20,10 +20,10 @@
        </a>
 </div>
 
-<dl>
-<dt>Patrons: <!-- TMPL_IF NAME="newpassword" -->Password Updated <!-- 
TMPL_ELSE -->Update Password for <!-- TMPL_VAR NAME="surname" -->, <!-- 
TMPL_VAR NAME="firstname" --><!-- /TMPL_IF -->
+<dl class="bodyPane">
+<dt class="bodyPane">Patrons: <!-- TMPL_IF NAME="newpassword" -->Password 
Updated <!-- TMPL_ELSE -->Update Password for <!-- TMPL_VAR NAME="surname" -->, 
<!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF -->
 </dt>
-<dd>
+<dd class="bodyPane">
 
 <div id="main">
 <!-- TMPL_IF NAME="newpassword" -->
@@ -37,7 +37,7 @@
        <!-- TMPL_IF NAME="warn" --><div class="error">
                You have entered a User ID that already exists.  Please choose 
another one.</div>
        <!-- /TMPL_IF -->
-<div class="details">
+<div class="data">
 <table><tr><th>New UserID:</th><td><input type="hidden" name="member" 
value="<!-- TMPL_VAR NAME="member" -->" />
        
 <input name="newuserid" size="20" value="<!-- TMPL_VAR NAME=userid -->" 
/></td></tr>

Index: members/member.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/Attic/member.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
--- members/member.tmpl 18 Sep 2006 19:13:24 -0000      1.1.2.1.2.1
+++ members/member.tmpl 30 Nov 2006 15:56:27 -0000      1.1.2.1.2.2
@@ -20,9 +20,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Patrons: Search Results</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Patrons: Search Results</dt>
+<dd class="bodyPane">
 
 <div id="main">
     <h3>Results for Search: <span class="ex"><!-- TMPL_VAR NAME="member" 
--></span></h3>
@@ -35,7 +35,8 @@
     <th>Cat</th>
        <th>Branch</th>
     <th>Address</th>
-    <th>OD/Issues</th><th>Charges</th>
+    <th>OD/Issues</th>
+       <th>Charges</th>
     <th>Notes</th>
        <th>&nbsp;</th>
   </tr>
@@ -52,7 +53,7 @@
       <td><!-- TMPL_VAR NAME="categorycode" --></td>
          <td><!-- TMPL_VAR name="branchcode" --></td>
       <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city 
--></td>
-      <td><!-- TMPL_VAR NAME="odissue" --></td>
+      <td><!-- TMPL_IF NAME="overdues" --><span class="overdue"><!-- TMPL_VAR 
NAME="overdues" --></span><!-- TMPL_ELSE -->0<!-- /TMPL_IF -->/<!-- TMPL_VAR 
NAME="issues" --></td>
                <td><!-- TMPL_VAR NAME="fines" --></td>
       <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
          <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- 
TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
@@ -67,6 +68,7 @@
        </div>
 </div>
 
+
 </dd>
 </dl>
 </body>

Index: members/memberentry.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/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
--- members/memberentry.tmpl    12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ members/memberentry.tmpl    30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -40,10 +40,10 @@
        </div>
 <!-- /TMPL_IF -->
 
-<dl>
-<dt>Patrons: <!-- TMPL_IF NAME="modify" -->Edit Record for  <!-- TMPL_VAR 
NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> (<!-- TMPL_VAR 
NAME="cardnumber" -->)<!-- TMPL_ELSE -->Add New <!-- TMPL_IF NAME="institution" 
-->Institutional <!-- /TMPL_IF -->Patron<!-- /TMPL_IF -->
+<dl class="bodyPane">
+<dt class="bodyPane">Patrons: <!-- TMPL_IF NAME="modify" -->Edit Record for  
<!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> (<!-- 
TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_ELSE -->Add New <!-- TMPL_IF 
NAME="institution" -->Institutional <!-- /TMPL_IF -->Patron<!-- /TMPL_IF -->
 </dt>
-<dd>
+<dd class="bodyPane">
 
 <div id="main">
        <!-- TMPL_IF NAME="addAction" -->
@@ -85,20 +85,14 @@
                        <!-- TMPL_IF NAME="ERROR_branch" -->
                                <li><a href="#branch">Patron must be at the 
same branch as you</a></li>
                        <!-- /TMPL_IF -->
+                       <!-- TMPL_IF NAME="ERROR_date" -->
+                               <li><a href="#expiry">Expiration date must fall 
AFTER enrollment date</a></li>
+                       <!-- /TMPL_IF -->
                        </ul>
                </div>
        <!-- /TMPL_IF -->
-       <form action="/cgi-bin/koha/members/memberentry.pl" method="post">
-               <input type="hidden" name="destination" value="<!-- TMPL_VAR 
NAME="destination" -->" />
-               <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" -->">
-               <!-- TMPL_IF NAME="addAction" -->
-                       <input type="hidden" name="op" value="add">
-               <!-- TMPL_ELSE -->
-                       <input type="hidden" name="op" value="modify">
-               <!-- /TMPL_IF -->
+       <form action="/cgi-bin/koha/members/memberentry.pl" method="post" 
name="mainform">
+
 <div class="table members"><table>
 
        <!-- TMPL_UNLESS name="institution" --><tr><th><label 
for="title">Salutation:</label></th><td colspan="4"><!-- TMPL_VAR NAME="Mr" -->
@@ -110,25 +104,40 @@
                                        <option <!-- TMPL_VAR NAME="title_Mr" 
--> value="Mr" >Mr</option>
                                        <option value="Dr" <!-- TMPL_VAR 
NAME="title_Dr" -->>Dr</option>
                                        <option value="Sir" <!-- TMPL_VAR 
NAME="title_Sir" -->>Sir</option>
-                               </select>
+                               </select>               <input type="hidden" 
name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
+               <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" -->">
+               <!-- TMPL_IF NAME="addAction" -->
+                       <input type="hidden" name="op" value="add">
+               <!-- TMPL_ELSE -->
+                       <input type="hidden" name="op" value="modify">
+               <!-- /TMPL_IF -->
                                </td></tr><!-- /TMPL_UNLESS -->
        <!-- TMPL_UNLESS name="institution" --><tr><th><label 
for="initials">Initials:</label></th><td colspan="4"><input type="text" 
id="initials" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" 
-->"></td></tr><!-- /TMPL_UNLESS -->
 
-       <tr><th><label for="surname"<!-- TMPL_IF NAME="ERROR_surname" --> 
class="focus"<!-- /TMPL_IF -->><a name="lastname" id="lastname"><!-- TMPL_IF 
NAME="institution" -->Institution name:<!-- TMPL_ELSE -->Last Name: <!-- 
/TMPL_IF --></a></label></th><td><input type="text" id="surname" name="surname" 
size="20" value="<!-- TMPL_VAR NAME="surname" -->"<!-- TMPL_IF 
NAME="ERROR_surname" --> class="focus"<!-- /TMPL_IF -->></td>
+       <tr><th><!-- TMPL_IF NAME="ERROR_surname" --><label for="surname" 
class="focus"><!-- TMPL_ELSE --><label for="surname"><!-- /TMPL_IF --><a 
name="lastname" id="lastname"><!-- TMPL_IF NAME="institution" -->Institution 
name:<!-- TMPL_ELSE -->Last Name: <!-- /TMPL_IF --></a></label></th><td><input 
type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR 
NAME="surname" -->"<!-- TMPL_IF NAME="ERROR_surname" --> class="focus"<!-- 
/TMPL_IF -->></td>
 
-<!-- TMPL_UNLESS name="institution" --><th><label for="sex"<!-- TMPL_IF 
NAME="ERROR_gender" --> class="focus"<!-- /TMPL_IF -->><a name="sex" 
id="sex">Sex:</a> </label></th><td><input type="radio" id="sex" name="sex" 
value="F"<!-- TMPL_IF NAME="female" --> checked="checked"<!-- /TMPL_IF --><!-- 
TMPL_IF NAME="ERROR_gender" --> class="focus"<!-- /TMPL_IF -->>F        <input 
type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> 
checked="checked"<!-- /TMPL_UNLESS --><!-- TMPL_IF NAME="ERROR_gender" --> 
class="focus"<!-- /TMPL_IF -->> M</td><!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS name="institution" --><th><!-- TMPL_IF NAME="ERROR_gender" 
--><label for="sex" class="focus"><!-- TMPL_ELSE --><label for="sex"><!-- 
/TMPL_IF --><a name="sex" id="sex">Sex:</a> </label></th><td><input 
type="radio" id="sex" name="sex" value="F"<!-- TMPL_IF NAME="female" --> 
checked="checked"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_gender" --> 
class="focus"<!-- /TMPL_IF -->>F     <input type="radio" name="sex" 
value="M"<!-- TMPL_UNLESS name="female" --> checked="checked"<!-- /TMPL_UNLESS 
--><!-- TMPL_IF NAME="ERROR_gender" --> class="focus"<!-- /TMPL_IF -->> 
M</td><!-- /TMPL_UNLESS -->
 </tr>
 
-       <!-- TMPL_UNLESS name="institution" --><tr><th><label 
for="firstname"<!-- TMPL_IF NAME="ERROR_firstname" --> class="focus"<!-- 
/TMPL_IF -->><a name="firstname" id="firstname">First Name:</a></label> 
</th><td><input type="text" id="firstname" name="firstname" size="20" 
value="<!-- TMPL_VAR NAME="firstname" -->"<!-- TMPL_IF NAME="ERROR_firstname" 
--> class="focus"<!-- /TMPL_IF -->></td>
+       <!-- TMPL_UNLESS name="institution" --><tr><th><!-- TMPL_IF 
NAME="ERROR_firstname" --><label for="firstname" class="focus"><!-- TMPL_ELSE 
--><label for="firstname"><!-- /TMPL_IF --><a name="firstname" 
id="firstname">First Name:</a></label> </th><td><input type="text" 
id="firstname" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" 
-->"<!-- TMPL_IF NAME="ERROR_firstname" --> class="focus"<!-- /TMPL_IF -->></td>
 
 <!-- TMPL_UNLESS name="institution" --><th><label for="dateofbirth">Date of 
Birth: </label></th><td><input type="text" id="dateofbirth" name="dateofbirth" 
size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->"> (<!-- TMPL_VAR 
NAME="dateformat" -->)</td><!-- /TMPL_UNLESS -->
 </tr><!-- /TMPL_UNLESS -->
                                        
-       <!-- TMPL_UNLESS name="institution" --><tr><th><label 
for="othernames">Prefered Name:</label></th><td colspan="4"><input type="text" 
id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR 
NAME="othernames" -->"></td></tr><!-- /TMPL_UNLESS -->
+       <!-- TMPL_UNLESS name="institution" --><tr><th><label 
for="othernames">Preferred Name:</label></th><td colspan="4"><input type="text" 
id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR 
NAME="othernames" -->"></td></tr><!-- /TMPL_UNLESS -->
+
+       <tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing 
Address</legend><!-- TMPL_IF NAME="ERROR_address" --><label for="streetaddress" 
class="focus"><!-- TMPL_ELSE --><label for="streetaddress"><!-- /TMPL_IF --><a 
name="address" id="address">Address:</a> </label>
+<!-- TMPL_IF NAME="ERROR_address" -->
+<input type="text" id="streetaddress" name="streetaddress" size="25" 
value="<!-- TMPL_VAR NAME="address" -->" class="focus" /><!-- TMPL_ELSE 
--><input type="text" id="streetaddress" name="streetaddress" size="25" 
value="<!-- TMPL_VAR NAME="address" -->" /><!-- /TMPL_IF -->
+
+<br><!-- TMPL_IF NAME="ERROR_city" --><label for="city" class="focus"><!-- 
TMPL_ELSE --><label for="city"><!-- /TMPL_IF --><a name="#city" 
id="#city">City, State:</a></label>
+<!-- TMPL_IF NAME="ERROR_city" -->
+<input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR 
NAME="city" -->" class="focus" /><!-- TMPL_ELSE --><input type="text" id="city" 
name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->" /><!-- /TMPL_IF -->
 
-       <tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing 
Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> 
class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> 
</label><input type="text" id="streetaddress" name="streetaddress" size="25" 
value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> 
class="focus"<!-- /TMPL_IF -->>
-<br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- 
/TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input 
type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" 
-->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF --> />
-<br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" 
name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" 
-->"></fieldset>
+<br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" 
name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" 
-->" /></fieldset>
 
 <fieldset><legend>Street Address (if different)</legend>
 <label for="physstreet">Address:</label><input type="text" id="physstreet" 
name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->" />
@@ -155,7 +164,7 @@
                                <!-- /TMPL_IF -->
                        </tr>
                        <tr>
-                               <th>Expiry date (leave blank for auto calc): 
</th>
+                               <th><a name="expiry" id="expiry">Expiry date 
(leave blank for auto calc): </a></th>
                                <td><input type="text" name="expiry" size="12" 
maxlength="10" value="<!-- TMPL_VAR name="expiry" -->" /></td>
                        </tr>
 
@@ -182,14 +191,7 @@
                                <!-- /TMPL_LOOP -->
 </table></div>
 
-<div class="table members"><table>
-<caption>Patron Details</caption>
-       <!-- TMPL_UNLESS NAME="addAction" --><tr><th><label>Member 
Number:</label></th><td><span class="ex"><!-- TMPL_VAR NAME="member" 
--></span></td></tr><!-- /TMPL_UNLESS -->
-       <tr><th><label for="categorycode">Category:</label> </th><td><!-- 
TMPL_VAR NAME="catcodepopup" --></td></tr>
-       <tr><th><label for="branchcode"><a name="branch" 
id="branch">Branch:</a></label></th><td><!-- TMPL_VAR NAME="CGIbranch" 
--></td></tr>   
-       <tr><th><label for="cardnumber"<!-- TMPL_IF NAME="ERROR_cardnumber" --> 
class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> 
class="focus"<!-- /TMPL_IF -->><a name="cardnumber" id="cardnumber">Card 
Number</a></label></th><td><input id="cardnumber" type="text" name="cardnumber" 
size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"<!-- TMPL_IF 
NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF 
NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->></td></tr>
-</table>
-<table><caption>Additional Fields</caption>
+<div class="table members"><table><caption>Additional Fields</caption>
        <tr><th><label for="sort1">Sorting field 1</label></th><td><!-- TMPL_IF 
Name="CGIsort1" -->
                                                <!-- TMPL_VAR Name="CGIsort1" 
-->
                                        <!-- TMPL_ELSE -->
@@ -200,14 +202,23 @@
                                        <!-- TMPL_ELSE -->
                                                <input type="text" name="sort2" 
id="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
                                        <!--/TMPL_IF --></td></tr>
+</table></div>
+
+<div class="table members"><table>
+<caption>Patron Details</caption>
+       <!-- TMPL_UNLESS NAME="addAction" --><tr><th><label>Member 
Number:</label></th><td><span class="ex"><!-- TMPL_VAR NAME="member" 
--></span></td></tr><!-- /TMPL_UNLESS -->
+       <tr><th><label for="categorycode">Category:</label> </th><td><!-- 
TMPL_VAR NAME="catcodepopup" --></td></tr>
+       <tr><th><label for="branchcode"><a name="branch" 
id="branch">Branch:</a></label></th><td><!-- TMPL_VAR NAME="CGIbranch" 
--></td></tr>   
+       <tr><th><label for="cardnumber"<!-- TMPL_IF NAME="ERROR_cardnumber" --> 
class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> 
class="focus"<!-- /TMPL_IF -->><a name="cardnumber" id="cardnumber">Card 
Number</a></label></th><td><input id="cardnumber" type="text" name="cardnumber" 
size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"<!-- TMPL_IF 
NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF 
NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->></td></tr>
 </table>
 </div>
 
-<p>    <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
-       <input name="submit" type="submit" class="submit" value="<!-- TMPL_IF 
NAME="modify" -->Update<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> This Patron" 
/></p>
+<p>    <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" 
-->"><!-- TMPL_IF NAME="addAction" -->
+       <input name="submit" type="submit" class="submit" value="Add This 
Patron" /><!-- TMPL_ELSE --><input name="submit" type="submit" class="submit" 
value="Update This Patron" /><!-- /TMPL_IF --></p>
        </form>
 </div>
 
+
 </dd>
 </dl>
 </body>

Index: members/members-home.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/Attic/members-home.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
--- members/members-home.tmpl   12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ members/members-home.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -20,19 +20,22 @@
        </a>
 </div>
 
+<dl class="bodyPane">
+<dt class="bodyPane">Patron Search</dt>
+<dd class="bodyPane">
+
 <div id="main">
-<dl><dt>Patron Search</dt>
+<div id="menu">
+<dl>
        <dd>Start with a search to add, update, or delete a record, check 
accounts, &amp; renew items.
-               <form action="/cgi-bin/koha/members/member.pl" method="post">
+       <form action="/cgi-bin/koha/members/member.pl" method="post" 
name="mainform">
                <label for="member">Enter Name or Barcode</label><input 
id="member" type="text" size="25" name="member" />  <select name="orderby" 
id="orderby">
                                <option value="surname,firstname">Order by Last 
Name</option>
                                <option value="cardnumber">Order by Card 
Number</option>
                        </select><br />
                <input type="submit" value="Search" class="submit" />
-               </form>
-</dd>
-
-<dd>Browse Patrons</dd>
+       </form></dd>
+<dt>Browse Patrons</dt>
 <dd>
 <a class="nav" href="/cgi-bin/koha/members/member.pl?member=a">A</a>
 <a class="nav" href="/cgi-bin/koha/members/member.pl?member=b">B</a>
@@ -62,11 +65,11 @@
 <a class="nav" href="/cgi-bin/koha/members/member.pl?member=x">X</a>
 <a class="nav" href="/cgi-bin/koha/members/member.pl?member=y">Y</a>
 <a class="nav" href="/cgi-bin/koha/members/member.pl?member=z">Z</a>
-
 </dd>
 <!-- <dt><a 
href="/cgi-bin/koha/simpleredirect.pl?type=Add&amp;chooseform=adult">Add 
Patron</a></dt><dd>&nbsp;</dd> -->
 </dl>
 </div>
+</div>
 
 </body>
 </html>

Index: members/moremember-receipt.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/Attic/moremember-receipt.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
--- members/moremember-receipt.tmpl     12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ members/moremember-receipt.tmpl     30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -1,15 +1,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Print Receipt for <!-- TMPL_VAR 
NAME="cardnumber" --><!-- TMPL_INCLUDE NAME="doc-head-close-receipt.inc" -->
 
 <!-- main site -->
-<div id="main">
+<div id="receipt">
+<h3><!-- TMPL_VAR name="LibraryName" --></h3>
 <!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><br><!-- 
/TMPL_IF -->
 Issued To <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- 
TMPL_VAR NAME="cardnumber">"><!-- TMPL_VAR NAME="cardnumber" --></a><br>
 <!-- TMPL_VAR NAME="todaysdate" --><br>
 <table>
        <caption>Issues</caption>
-       <tr>
-               <th>Date Due</th>
-               <th>Title</th>
+       <tr><th>Date Due</th><th>Title</th>
        </tr>
 
        <!-- TMPL_loop name="issueloop" -->
@@ -24,10 +23,7 @@
        
        <table>
        <caption>Overdues</caption>
-       <tr>
-       <th>Date Due</th>
-       <th>Title</th>
-       </tr>
+       <tr><th>Date Due</th><th>Title</th></tr>
        <!-- TMPL_LOOP NAME="issueloop" -->
        <!-- TMPL_IF NAME="red" --><tr>
        <td><!-- TMPL_VAR NAME="date_due" --></td>

Index: members/moremember.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/Attic/moremember.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
--- members/moremember.tmpl     18 Sep 2006 19:13:24 -0000      1.1.2.1.2.1
+++ members/moremember.tmpl     30 Nov 2006 15:56:27 -0000      1.1.2.1.2.2
@@ -20,17 +20,18 @@
        </a>
 </div>
 
-<dl>
-<dt>Patrons: Details for <!-- TMPL_VAR name="surname" -->, <!-- TMPL_VAR 
name="firstname" --> (<!-- TMPL_VAR name="cardnumber" -->)
+<dl class="bodyPane">
+<dt class="bodyPane">Patrons: Details for <!-- TMPL_VAR name="surname" -->, 
<!-- TMPL_VAR name="firstname" --> (<!-- TMPL_VAR name="cardnumber" -->)
 </dt>
-<dd>
+<dd class="bodyPane">
 
 <!-- main site -->
 <div id="main">
 <h1><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- 
TMPL_VAR name="cardnumber" -->) <span class="print"><a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
name="borrowernumber" -->&amp;print=page">(Print Page)</a> <a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
name="borrowernumber" -->&amp;print=slip">(Print Slip)</a></span></h1>
 <div class="tabitem">
                         <form method="post" 
action="/cgi-bin/koha/circ/circulation.pl"><input name="findborrower" 
type="hidden" value="<!-- TMPL_VAR name="cardnumber" -->" /><input 
type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" /><input 
type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" /> <input 
type="submit" class="submit" value="Issue" /></form>
-<!-- TMPL_IF name="IS_ADULT" --> <!-- TMPL_UNLESS 
NAME="unvalidlibrarian"--><form action="/cgi-bin/koha/members/jmemberentry.pl" 
method="post"> <input type="submit" name="submit" value="Add Child" 
class="submit" alt="Add Child" /><input type="hidden" name="type" value="add" 
/><input type="hidden" name="bornum" value="<!-- TMPL_VAR name="borrowernumber" 
-->" /></form><!-- /TMPL_UNLESS --><!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="IS_ADULT" --> <!-- TMPL_UNLESS 
NAME="unvalidlibrarian"--><form action="/cgi-bin/koha/members/jmemberentry.pl" 
method="post"> <input type="submit" name="submit" value="Add Child" 
class="submit" alt="Add Child" /><input type="hidden" name="type" value="add" 
/><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR 
name="borrowernumber" -->" /></form><!-- /TMPL_UNLESS --><!-- /TMPL_IF -->
 
 <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><!-- TMPL_IF name="I" --> <form 
action="/cgi-bin/koha/members/imemberentry.pl" method="post"><input 
type="hidden" name="borrowernumber" value="<!-- TMPL_VAR name="bornum" -->" /> 
<input type="submit" name="modify" class="submit" value="Edit" /></form>
 <!-- TMPL_ELSE --> <form action="/cgi-bin/koha/members/memberentry.pl" 
method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR 
name="bornum" -->" /> <input type="submit" class="submit" name="modify" 
value="Edit" /></form>
@@ -38,7 +39,7 @@
 
 <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><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="submit" value="Change Password" /></form><!-- /TMPL_UNLESS 
-->
 
- <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><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="submit" value="Modify Privileges" /></form><!-- 
/TMPL_UNLESS -->
+ <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><!-- TMPL_IF 
NAME="CAN_user_permission" --><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="submit" value="Modify Privileges" /></form><!-- /TMPL_IF 
--><!-- /TMPL_UNLESS -->
 
 
 <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><form 
action="/cgi-bin/koha/members/deletemem.pl?member=<!-- TMPL_VAR name="bornum" 
-->" onclick="confirm_deletion(); return false;"><input type="hidden" 
name="borrowernumber" value="<!-- TMPL_VAR name="bornum" -->"><input 
type="submit" class="cancel" value="Delete"></form><!-- /TMPL_UNLESS -->
@@ -50,14 +51,12 @@
                <!-- TMPL_IF NAME="gonenoaddress" --><li>Patron's <span 
class="error">address is in doubt</span>.</li><!-- /TMPL_IF -->
                <!-- TMPL_IF NAME="lost" --><li>Patron's card has been reported 
<span class="error">lost</span>.</li><!-- /TMPL_IF -->
        </ul>
-</div>
+<!-- TMPL_IF name="borrowernotes" --><dl><dt>Notes:</dt> <dd 
class="error"><!-- TMPL_VAR name="borrowernotes" --></dd></dl><!-- /TMPL_IF 
--></div>
 <!-- /TMPL_IF -->
 
 <div class="compact">
 <table>
-<!-- TMPL_IF name="borrowernotes" --><tr><th>Notes:</th> <td 
class="error"><strong><!-- TMPL_VAR name="borrowernotes" 
--></strong></td></tr><!-- /TMPL_IF -->
-
-<tr><th>Name:</th><td><!-- TMPL_IF name="IS_ADULT" --><!-- TMPL_IF 
NAME="title" -->[<!-- TMPL_VAR name="title" -->]. <!-- /TMPL_IF --><!-- 
TMPL_VAR name="firstname" --> <!-- TMPL_IF NAME="othernames" -->"<!-- TMPL_VAR 
name="othernames" -->" <!-- /TMPL_IF --><!-- TMPL_VAR name="surname" --> <!-- 
TMPL_IF NAME="initials" -->(<!-- TMPL_VAR name="initials" -->)<!-- /TMPL_IF 
--><!-- /TMPL_IF --></td></tr>
+<tr><th>Name:</th><td><!-- TMPL_IF name="IS_ADULT" --><!-- TMPL_IF 
NAME="title" -->[<!-- TMPL_VAR name="title" -->]. <!-- /TMPL_IF --><!-- 
TMPL_VAR name="firstname" --> <!-- TMPL_IF NAME="othernames" -->"<!-- TMPL_VAR 
name="othernames" -->" <!-- /TMPL_IF --><!-- TMPL_VAR name="surname" --> <!-- 
TMPL_IF NAME="initials" -->(<!-- TMPL_VAR name="initials" -->)<!-- /TMPL_IF 
--><!-- /TMPL_IF --></td><td rowspan="6"><!-- TMPL_IF NAME="patronimages" 
--><img src="/patronimages/<!-- TMPL_VAR NAME="cardnumber" -->.<!-- TMPL_VAR 
NAME="patronimages" -->" alt="" border="0" /><!-- TMPL_ELSE -->&nbsp;<!-- 
/TMPL_IF --></td></tr>
                <tr><th>Mailing Address:</th><td><!-- TMPL_IF 
NAME="streetaddress" --><!-- TMPL_VAR name="streetaddress" --><br /><!-- 
/TMPL_IF -->
 <!-- TMPL_VAR name="city" -->, <!-- TMPL_VAR name="zipcode" --></td></tr>
                <!-- TMPL_IF NAME="physstreet" --><tr><th>Street 
Address:</th><td><!-- TMPL_VAR name="physstreet" --><br /><!-- TMPL_VAR 
name="streetcity" -->, <!-- TMPL_VAR name="homezipcode" --></td></tr><!-- 
/TMPL_IF -->
@@ -157,7 +156,7 @@
                <th>Title</th>
                <th>Due</th>
                <th>Itemtype</th>
-               <th>Charge</th>
+               <!-- Hide from NPL --><th>Charge</th><!-- /Hide from NPL -->
                <th>Price</th>
                <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><th>Renew</th><!-- 
/TMPL_UNLESS -->
                <th>Return</th>
@@ -229,8 +228,8 @@
                        <!-- TMPL_UNLESS NAME="unvalidlibrarian"--><p><input 
type="submit" class="cancel" name="submit" value="Cancel Marked Requests" 
/></p><!-- /TMPL_UNLESS -->
                <!-- /TMPL_IF --></form>
 
-<h1>Reading Record</h1>
-<form class="inline" action="/cgi-bin/koha/readingrec.pl" method="get"><input 
type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" /> <input 
type="submit" class="submit" value="View Patron's Reading Record" /></form>
+<!-- TMPL_IF NAME="intranetreadinghistory" --><h1>Reading Record</h1>
+<form class="inline" action="/cgi-bin/koha/readingrec.pl" method="get"><input 
type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" /> <input 
type="submit" class="submit" value="View Patron's Reading Record" /></form><!-- 
/TMPL_IF -->
 
 </div>
 
@@ -243,7 +242,6 @@
 }
 </script>
 
-
 </dd>
 </dl>
 </body>

Index: members/newimember.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/Attic/newimember.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
--- members/newimember.tmpl     12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ members/newimember.tmpl     30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -11,7 +11,7 @@
 <div class="details">
        <h3>Valid values</h3>
        <p>Click below to confirm this new borrower.</p>
-               <form action="/cgi-bin/koha/insertidata.pl" method="post">
+               <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 -->

Index: members/newjmember.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/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
--- members/newjmember.tmpl     12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ members/newjmember.tmpl     30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -20,20 +20,27 @@
        </a>
 </div>
 
-<dl>
-       <dt>
+<dl class="bodyPane">
+       <dt class="bodyPane">
                Patrons: Add Child: Confirm Details
        </dt>
-<dd>
+<dd class="bodyPane">
                <div id="main"> 
-<!-- TMPL_IF Name="NOK" -->
-       <div class="details"><h3>Error Completing Form</h3>
-       <p><!-- TMPL_VAR Name="string" --></p></div>
-<!-- TMPL_ELSE -->
+       <!-- TMPL_IF Name="NOK" -->
+       <div class="error">
+       <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></div>
+       <!-- TMPL_ELSE -->
        
        <!-- TMPL_LOOP Name="identsloop" -->
                <!-- TMPL_IF Name="cardchild" -->
-<div class="form">
+<div class="data">
                                <table>
                                <caption>Confirm Details for <!-- TMPL_VAR 
Name="name" --></caption>
                                <tr>
@@ -45,7 +52,7 @@
                                </tr>
                                <tr>
                                        <th>Barcode Number</th>
-                                       <td><!-- TMPL_VAR NAME="cardnumber" 
--></td>
+                                       <td><!-- TMPL_VAR NAME="cardchild" 
--></td>
                                </tr>
                                <tr>
                                        <th>Date Of Birth</th>
@@ -55,10 +62,10 @@
                                        <th>Sex</th>
                                        <td><!-- TMPL_VAR Name="sex" --></td>
                                </tr>
-<!--                           <tr>
+                               <tr>
                                        <th>School</td>
                                        <td><!-- TMPL_VAR Name="school" --></td>
-                               </tr> -->
+                               </tr>
 <!-- TMPL_IF NAME="notes" -->
                                <tr>
                                        <th>General Notes</th>

Index: members/newmember.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/Attic/newmember.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
--- members/newmember.tmpl      12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ members/newmember.tmpl      30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -1,6 +1,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm Record<!-- 
TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->
+<!-- TMPL_INCLUDE NAME="members-topmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">

Index: members/pay.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/Attic/pay.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
--- members/pay.tmpl    12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ members/pay.tmpl    30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -20,9 +20,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Patrons: Pay Fines for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR 
NAME="firstname" --></dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Patrons: Pay Fines for  <!-- TMPL_VAR NAME="surname" -->, 
<!-- TMPL_VAR NAME="firstname" --></dt>
+<dd class="bodyPane">
 
 <div id="main">
        <form class="inline" action="/cgi-bin/koha/pay.pl" method="post"><input 
type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" />
@@ -67,6 +67,7 @@
 <div class="tabitem"><form action="/cgi-bin/koha/members/moremember.pl" 
method="get"><input type="hidden" value="<!-- TMPL_VAR name="bornum" -->" 
name="bornum" /> <input type="submit" class="submit" value="Return to Patron 
Record" /></form> <form action="/cgi-bin/koha/boraccount.pl" 
method="get"><input type="hidden" value="<!-- TMPL_VAR name="bornum" -->" 
name="bornum" /><input type="submit" value="View Patron Account" class="submit" 
/></form></div>
 </div>
 
+
 </dd>
 </dl>
 </body>

Index: members/readingrec.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/members/Attic/readingrec.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
--- members/readingrec.tmpl     12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ members/readingrec.tmpl     30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -20,11 +20,11 @@
        </a>
 </div>
 
-<dl>
-       <dt>
+<dl class="bodyPane">
+       <dt class="bodyPane">
                Patrons: Reading Record for <!-- TMPL_VAR NAME="firstname" --> 
<!-- TMPL_VAR NAME="surname" -->
        </dt>
-<dd>
+<dd class="bodyPane">
 
 
 <div id="main"><div class="table">
@@ -46,24 +46,25 @@
        </th>
 </tr>
 <!-- TMPL_LOOP name="loop_reading" -->
-<tr<!-- TMPL_IF NAME="toggle" --><!-- TMPL_ELSE --> class="highlight"<!-- 
/TMPL_IF -->>
-       <td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> 
class="onissue"<!-- /TMPL_IF -->>
+<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- 
/TMPL_IF -->
+       <!-- TMPL_IF NAME="returndate" --><td><!-- TMPL_ELSE --><td 
class="onissue"><!-- /TMPL_IF -->
                <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR 
NAME="biblionumber" -->"><!-- TMPL_VAR name="title" --></a>&nbsp;
        </td>
-       <td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> 
class="onissue"<!-- /TMPL_IF -->>
+       <!-- TMPL_IF NAME="returndate" --><td><!-- TMPL_ELSE --><td 
class="onissue"><!-- /TMPL_IF -->
                <!-- TMPL_VAR name="author" -->&nbsp;
        </td>
-       <td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> 
class="onissue"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="classification" --></td>
-       <td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> 
class="onissue"<!-- /TMPL_IF -->><!-- TMPL_IF NAME="returndate" --><!-- 
TMPL_VAR name="returndate" --><!-- TMPL_ELSE -->Checked Out<!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="returndate" --><td><!-- TMPL_ELSE --><td 
class="onissue"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="classification" --></td>
+       <!-- TMPL_IF NAME="returndate" --><td><!-- TMPL_ELSE --><td 
class="onissue"><!-- /TMPL_IF --><!-- TMPL_IF NAME="returndate" --><!-- 
TMPL_VAR name="returndate" --><!-- TMPL_ELSE -->Checked Out<!-- /TMPL_IF -->
        </td>
 <!-- /TMPL_LOOP -->
 </table>
 
-<p><form action="moremember.pl" method="post"><input type="hidden" 
name="bornum" value="<!-- TMPL_VAR name="bornum" -->"><input type="submit" 
class="submit" value="Return to Member Record" /></form></p>
+<p><form action="/cgi-bin/koha/members/moremember.pl" method="post"><input 
type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->"><input 
type="submit" class="submit" value="Return to Member Record" /></form></p>
 
 </div></div>
 
 
+
 </dd>
 </dl>
 </body>

Index: parameters/admin-home.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/admin-home.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
--- parameters/admin-home.tmpl  12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/admin-home.tmpl  30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,113 +2,124 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-<dt>System Administration</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">System Administration</dt>
+<dd class="bodyPane">
 
 <div id="main">
+<h1>Koha Administration</h1>
+
+<!-- TMPL_IF name="CAN_user_parameters" -->
+<div class="menu">
+<h2>System Preferences</h2>
+<dl>
+       <dt><a href="/cgi-bin/koha/admin/systempreferences.pl">System 
preferences</a></dt>
+       <dd>Change essential system preferences like MARC flavor, date format, 
administrator e-mail, and templates.</dd>
+</dl>
+</div>
+<!-- /TMPL_IF -->
+
+<div class="menu">
+<h2>System parameters</h2>
+<div class="help"><p>For best results, configure these parameters in the order 
they appear</p></div>
+<dl>
+<!-- TMPL_IF name="CAN_user_parameters" -->    
+       <dt><a href="/cgi-bin/koha/admin/branches.pl">Library branches</a></dt>
+       <dd>The different branches you manage with this Koha server.</dd>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="CAN_user_management" -->
+       <dt><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></dt>
+       <dd>Book fund administration. Remember to edit your book funds before 
you start editing the budgets.</dd>
+       
+       <dt><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></dt>
+       <dd>Define exchange rates.</dd>
+       
+       <dt><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></dt>
+       <dd>Define item types.</dd>
+       
+       <dt><a href="/cgi-bin/koha/admin/categorie.pl">Borrower 
categories</a></dt>
+       <dd>Define the categories of borrowers.</dd>
+       
+       <dt><a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></dt>
+       <dd>Define issuing rules for branches / borrowers / item types (nb of 
issues, duration, cost...)</dd>
+       
+       <dt><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised 
values</a></dt>
+       <dd>Define categories and authorised values for them. Authorised values 
are used in MARC form to limit and help editing MARC biblios.</dd>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF name="CAN_user_parameters" -->    
+       <dt><a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus 
Structure</a></dt>
+       <dd>Define categories and thesaurus/authority MARC structure.</dd>
+       
+       <dt><a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio framework 
(MARC structure)</a></dt>
+       <dd>The frameworks defined for the MARC editor. Create frameworks, then 
define the MARC structure (fields &amp; subfields)</dd>
+       
+       <dt><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links Koha - MARC 
DB</a></dt>
+       <dd>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.</dd>
+       
+       <dt><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></dt>
+       <dd>Checks the MARC structure. USE IT before working with real data. It 
will show mistakes that can BREAK Koha's database!</dd>
+<!-- /TMPL_IF -->
+</dl>
+</div>
+
+<div class="menu">
+<h3>Various parameters</h3>
+<dl>
+       <!-- TMPL_IF name="CAN_user_parameters" -->
+       <dt><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></dt>
+       <dd>Printers (UNIX paths).</dd>
+       <!-- /TMPL_IF -->       
+       <!-- TMPL_IF name="CAN_user_management" -->
+       <dt><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></dt>
+       <dd>Words ignored during searches.      <!-- TMPL_UNLESS 
name="stopwords" --><span class="error">WARNING: You must define at least one 
stop word to avoid errors</span><!-- /TMPL_UNLESS --></dd>
+<!-- /TMPL_IF -->      
+       <!-- TMPL_IF name="CAN_user_parameters" -->
+       <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 
Servers</a></dt>
+       <dd>Servers to query for MARC data.</dd>
+<!-- /TMPL_IF -->
+</dl>
+</div>
+
+<!-- TMPL_IF name="CAN_user_tools" -->
 <div class="menu">
-<table>
-<caption>System Preferences</caption>
-<tr>
-       <th><a href="/cgi-bin/koha/admin/systempreferences.pl">System 
preferences</a></th>
-       <td>Change essential system preferences like MARC flavor, date format, 
administrator e-mail, and templates.</td>
-</tr>
-</table>
-<table>
-<caption>System parameters </caption>
-<tr>
-<th class="header" colspan="2">For best results, configure these parameters in 
the order they appear</th>
-</tr>
-<tr>
-       <th><a href="/cgi-bin/koha/admin/branches.pl">Library branches</a></th>
-       <td>The different branches you manage with this Koha server.</td>
-</tr>
-<tr>
-       <th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></th>
-       <td>Book fund administration. Remember to edit your book funds before 
you start editing the budgets.</td>
-</tr>
-<tr>
-       <th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
-       <td>Define exchange rates.</td>
-</tr>
-<tr>
-       <th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
-       <td>Define item types.</td>
-</tr>
-<tr>
-       <th><a href="/cgi-bin/koha/admin/categorie.pl">Borrower 
categories</a></th>
-       <td>Define the categories of borrowers.</td>
-</tr>
-<tr>
-       <th><a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></th>
-       <td>Define issuing rules for branches / borrowers / item types (nb of 
issues, duration, cost...)</td>
-</tr>
-<tr>
-       <th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised 
values</a></th>
-       <td>Define categories and authorised values for them. Authorised values 
are used in MARC form to limit and help editing MARC biblios.</td>
-</tr>
-<tr>
-       <th><a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus 
Structure</a></th>
-       <td>Define categories and thesaurus/authority MARC structure.</td>
-</tr>
-<tr>
-       <th><a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio framework 
(MARC structure)</a></th>
-       <td>the frameworks defined for the MARC editor. Create frameworks, then 
define the MARC structure (fields &amp; subfields)</td>
-</tr>
-<tr>
-       <th><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links Koha - MARC 
DB</a></th>
-       <td>Define links between the Koha standard DB and the MARC one. Note 
those links can be defined through MARC structure. This tool is just a shortcut 
to speed up linkage.</td>
-</tr>
-<tr>
-       <th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th>
-       <td>Checks the MARC structure. USE IT before working with real data. It 
will show mistakes that can BREAK Koha's database!</td></tr>
-
-<tr>
-<th colspan="2" class="header">Various parameters</th>
-</tr>
-<tr>
-       <th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
-       <td>Printers (UNIX paths).</td>
-</tr>
-<tr>
-       <th><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></th>
-       <td>Words ignored during searches.      <p class="error">WARNING: You 
must define at least one stop word to avoid errors</p></td>
-</tr>
-<tr>
-       <th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 
Servers</a></th>
-       <td>Servers to query for MARC data.</td>
-</tr>
-</table>
-
-<table>
-       <caption>Tools</caption>
-       <tr>
-       <th colspan="2" class="header">Export</th>
-       </tr>
-       <tr>
-               <th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio 
export</a></th>
-               <td> Exporting in MARC format.</td>
-       </tr>
-       <tr>
-       <th colspan="2" class="header">Import</th>
-       </tr>
-       <tr>
-               <th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC 
records to the reservoir</a></th>
-               <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>
-       <th colspan="2" class="header">Barcode generator</th>
-       </tr>
-       <tr>
-               <th><a href="/cgi-bin/koha/barcodes/barcodes.pl">Generate 
barcodes</a></th>
-               <td>the barcode generator deals with generating barcodes for 
items you acquire
-               </td>
-       </tr>
-</table>
+<h2>Tools</h2>
+<h3>Export</h3>
+
+<dl>
+       <dt><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></dt>
+       <dd>Exporting in MARC format.</dd>
+</dl>
 </div>
+
+<div class="menu">
+<h3>Import</h3>
+
+<dl>
+       <dt><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records to 
the reservoir</a></dt>
+       <dd>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.</dd>
+</dl>
+</dl>
 </div>
 
+<div class="menu">
+<h3>Barcode generator</h3>
+<dl>
+       <dt><a href="/cgi-bin/koha/barcodes/barcodes.pl">Generate 
barcodes</a></dt>
+       <dd>The barcode generator deals with generating barcodes for items you 
acquire</dd>
+</dl>
+<dl>
+        <dt><a href="/cgi-bin/koha/label-home.pl">Spine and Barcode label 
generator</a></dt>
+        <dd>This is a newer barcode generator, that also generates spine 
labels.</dd>
+</dl>
+
+
+<br clear="all" />
+</div>
+<!-- /TMPL_IF -->
+
+</div>
+
+
 
 </dd>
 </dl>

Index: parameters/aqbookfund.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/aqbookfund.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
--- parameters/aqbookfund.tmpl  12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/aqbookfund.tmpl  30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,10 +2,15 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-<dt>
-Book Funds</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">
+System Administration: <!-- TMPL_IF name="else" -->Book Funds<!-- /TMPL_IF -->
+<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="header" --><!-- /TMPL_IF 
-->
+<!-- TMPL_IF name="add_validate" -->Data Recorded<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Fund '<!-- TMPL_VAR 
name="bookfundname" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
+</dt>
+<dd class="bodyPane">
 
 <div id="main"><!-- TMPL_IF name="else" -->
 <h1>Book Fund Administration</h1>
@@ -58,9 +63,9 @@
        <!-- /TMPL_LOOP -->
 <!-- /TMPL_LOOP -->
 </table><!-- /TMPL_IF -->
-<form action="<!-- TMPL_VAR name=scriptname -->" method="post">
+<form action="<!-- TMPL_VAR name="scriptname" -->" method="post">
        <p><input type="hidden" name="op" value="add_form" /></p>
-<input type="submit"value="Add bookfund" class="submit" /></form>
+<input type="submit" value="Add bookfund" class="submit" /></form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="add_form" -->

Index: parameters/aqbudget.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/aqbudget.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
--- parameters/aqbudget.tmpl    12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/aqbudget.tmpl    30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,19 +2,19 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-<dt>Budget Administration</dt>
-<dd>
-
-<!-- TMPL_IF name="else" -->Budget admin<!-- /TMPL_IF -->
+<dl class="bodyPane">
+<dt class="bodyPane">
+System Administration: <!-- TMPL_IF name="else" -->Budget admin<!-- /TMPL_IF 
-->
 <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR NAME="header" --><!-- /TMPL_IF 
-->
 <!-- TMPL_IF name="add_validate" -->Budget Data Recorded<!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" -->Delete Book Fund '<!-- TMPL_VAR 
NAME="bookfundid" -->'<!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirmed" -->Book fund deleted<!-- /TMPL_IF -->
+</dt>
+<dd class="bodyPane">
 
 <div id="main">
 <!-- TMPL_IF name="else" -->
-<form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
+<h1>Budget admin</h1><form action="/cgi-bin/koha/admin/aqbudget.pl" 
method="post">
        <input type="text" name="searchfield" value="" /> <input type="submit" 
name="search" value="Search" class="submit" /></form>
        <!-- TMPL_IF name="search" -->
        <div id="results">You Searched for <span class="ex"><!-- TMPL_VAR 
NAME="searchfield" --></span></div>
@@ -109,10 +109,6 @@
 <tr><th><label for="startdate">Start date (<!-- TMPL_VAR NAME="dateformat" 
-->)</label></th><td><input type="text" id="startdate" name="startdate" 
value="<!-- TMPL_VAR NAME="startdate" -->" />&nbsp;</td></tr>
 <tr><th><label for="enddate">End date (<!-- TMPL_VAR NAME="dateformat" 
-->)</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- 
TMPL_VAR NAME="enddate" -->" /></td></tr>
 <tr><th><label for="budgetamount">Budget amount</label></th><td><input 
type="text" name="budgetamount" id="budgetamount" value="<!-- TMPL_VAR 
NAME="budgetamount" -->" /></td></tr>
-<tr><th><label for="branch">Branch</label></th><td>    
-                       <!--TMPL_VAR Name="CGIbranch" -->
-                       <p>If budget is specifically allowed to a branch, 
select it here, otherwise leave it empty.</p></td></tr>
-<tr><th><label>Branch</label></th><td> <!--TMPL_VAR Name="CGIbranch" --> If 
budget is exclusive to a specific branch, select it here.  Otherwise leave it 
empty.</td></tr>
 </table></div>
 <input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" 
-->" /><input type="button" value="<!-- TMPL_VAR NAME="header" -->" 
class="submit" onclick="Check(this.form)" /> <input type="button" 
class="cancel" value="Cancel" 
onclick="location.href='/cgi-bin/koha/admin/aqbudget.pl'; return false;" 
/></form>
 <!-- /TMPL_IF -->

Index: parameters/auth_subfields_structure.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/auth_subfields_structure.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
--- parameters/auth_subfields_structure.tmpl    12 Apr 2006 18:34:07 -0000      
1.1.2.1
+++ parameters/auth_subfields_structure.tmpl    30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,17 +2,19 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-<dt>
-       <!-- TMPL_IF NAME="use-heading-flags-p" -->
-       <!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit subfields<!-- 
/TMPL_IF -->
-       <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
+<dl class="bodyPane">
+<dt class="bodyPane">
+System Administration: Auth Subfields Structure
 </dt>
-<dd>
+<dd class="bodyPane">
 
 <div id="main">
 <!-- TMPL_IF NAME="add_form" -->
-
+       <h1>
+       <!-- TMPL_IF NAME="use-heading-flags-p" -->
+       <!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit subfields<!-- 
/TMPL_IF -->
+       <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
+       </h1>
        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" 
method="post">
        <input type="hidden" name="op" value="add_validate" />
        <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR 
NAME="authtypecode" -->" />
@@ -34,14 +36,10 @@
                        <p> 
                                <label>Text for librarian</label>
                                <input type="text" name="liblibrarian" 
value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" />
-                       </p>
-                       <p>
                                
-                               <label>Text for OPAC</label> <input type="text" 
name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" 
maxlength="80" />
+                               
                        </p>
                        <p><label>Managed</label> <!-- TMPL_VAR NAME="tab" 
--></p>
-                       <p><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is 
managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
-                       <p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it 
means that the subfield is an URL and can be clicked</p>
                        <p>
                                <label>Auth value:</label> <!-- TMPL_VAR 
NAME="authorised_value" -->
                                or thesaurus: <!-- TMPL_VAR 
NAME="thesaurus_category" -->
@@ -135,7 +133,6 @@
 
 </div>
 
-
 </dd>
 </dl>
 </body>

Index: parameters/auth_tag_structure.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/auth_tag_structure.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
--- parameters/auth_tag_structure.tmpl  12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/auth_tag_structure.tmpl  30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,13 +2,14 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-<dt>
-Authority MARC framework for <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR 
NAME="authtypecode" --><!-- TMPL_ELSE -->default framework<!-- /TMPL_IF -->
+<dl class="bodyPane">
+<dt class="bodyPane">
+System Administration: Auth Tag Structure
 </dt>
-<dd>
+<dd class="bodyPane">
 
 <div id="main">
+<h1>Authority MARC framework for <!-- TMPL_IF NAME="authtypecode" --><!-- 
TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE -->default framework<!-- 
/TMPL_IF --></h1>
 <script language="javascript" type="text/javascript">
        function _(s) { return s } // dummy function for gettext
        
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -171,10 +172,10 @@
                <input type="hidden" name="op" value="add_form" />
                <input type="submit" class="submit" value="Add Tag" />
                <!-- TMPL_IF NAME="isprevpage" -->
-                       <a href="<!-- TMPL_VAR NAME="script_name" 
-->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR 
NAME="searchfield" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" 
-->">Previous Page</a>
+                       <a href="<!-- TMPL_VAR NAME="script_name" 
-->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR 
NAME="searchfield" -->">Previous Page</a>
                <!-- /TMPL_IF -->
                <!-- TMPL_IF NAME="nextpage" -->
-                       <a href="<!-- TMPL_VAR NAME="script_name" 
-->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR 
NAME="searchfield" -->&amp;authtypecode=<!-- TMPL_VAR name="authtypecode" 
-->">Next Page</a>
+                       <a href="<!-- TMPL_VAR NAME="script_name" 
-->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR 
NAME="searchfield" -->">Next Page</a>
                <!-- /TMPL_IF -->
        </form>
 </div>

Index: parameters/authorised_values.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/authorised_values.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
--- parameters/authorised_values.tmpl   12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/authorised_values.tmpl   30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,9 +2,13 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-<dt>Authorised Values Administration</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">
+System Administration: <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR 
name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->Authorised values admin<!-- /TMPL_IF -->
+</dt>
+<dd class="bodyPane">
 
 <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF 
-->
 <!-- TMPL_IF name="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
@@ -45,9 +49,9 @@
        </tr>
        <tr><td>Value</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
        </table>
-<div class="tabitem">  <form action="<!-- TMPL_VAR name=" script_name " -->" 
method="post">
+<div class="tabitem">  <form action="<!-- TMPL_VAR name="script_name" -->" 
method="post">
                <input type="hidden" name="op" value="delete_confirmed" />
-               <input type="hidden" name="id" value="<!-- TMPL_VAR name=" id " 
-->" />
+               <input type="hidden" name="id" value="<!-- TMPL_VAR name="id" 
-->" />
                <input type="hidden" name="searchfield" value="<!-- TMPL_VAR 
name="searchfield" -->" /><input type="submit" class="cancel" value="Confirm 
Deletion" /></form> <form class="inline" action="<!-- TMPL_VAR 
name="script_name" -->" method="post"><input type="submit" class="submit" 
value="Do Not Delete" /></form>
 </div><!-- /TMPL_IF -->
 

Index: parameters/authtypes.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/authtypes.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
--- parameters/authtypes.tmpl   12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/authtypes.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,9 +2,9 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-<dt>Authority Types Administration</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Authority Types Administration</dt>
+<dd class="bodyPane">
 
 <script language="javascript" type="text/javascript">
 function _(s) { return s } // dummy function for gettext
@@ -62,45 +62,62 @@
 </script>
 <div id="main">
 <!-- TMPL_IF NAME="add_form" -->
-
        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" 
method="post">
-       <table>
+<div class="data"><table>
                <!-- TMPL_IF NAME="authtypecode" -->
                <caption>Modify authority type</caption>
        <!-- TMPL_ELSE -->
                <caption>Add authority type</caption>
        <!-- /TMPL_IF -->
+       
+               <input type="hidden" name="op" value="add_validate" />
+               <input type="hidden" name="checked" value="0" />
                        <!-- TMPL_IF NAME="authtypecode" -->
-                               <tr><td><label for="authtypecode">Authority 
type<label></td><td><input type="hidden" name="op" value="add_validate" />
-               <input type="hidden" name="checked" value="0" /><input 
type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" 
/><!-- TMPL_VAR NAME="authtypecode" --></td></tr>
+                               <tr><th><label for="authtypecode">Authority 
type<label><input type="hidden" id="authtypecode" name="authtypecode" 
value="<!-- TMPL_VAR NAME="authtypecode" -->" /></th><td><!-- TMPL_VAR 
NAME="authtypecode" --></td></tr>
                        <!-- TMPL_ELSE -->
-                               <tr><td><label for="authtypecode">Authority 
type<label></td><td><input id="authtypecode" type="text" name="authtypecode" 
size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
+                               <tr><th><label for="authtypecode">Authority 
type<label></th><td><input type="text" id="authtypecode" name="authtypecode" 
size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
                        <!-- /TMPL_IF -->
-               <tr><td><label 
for="authtypetext">Description</label></td><td><input type="text" 
id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- 
TMPL_VAR NAME="authtypetext" escape=HTML -->" /></td></tr>
-               <tr><td><label for="summary">Summary</label></td><td><textarea 
id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" 
--></textarea></td></tr>
-               <tr><td><label for="auth_tag_to_report">Report 
tag</label></td><td><input type="text" id="auth_tag_to_report" 
name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR 
NAME="auth_tag_to_report">" />Enter here the number of the tag that will be 
reported in the biblio (subfield by subfield). For example, in UNIMARC, enter 
200 to report every 200 subfield in the 70x biblio</td></tr></table>
-       <p><input type="submit" value="OK" class="submit" 
onclick="Check(this.form); return false;" />
+                       <tr><th>
+                               <label 
for="authtypetext">Description</label></th><td>
+                               <input type="text" id="authtypetext" 
name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR 
NAME="authtypetext" escape=HTML -->" />
+                       </td></tr>
+                       <tr><th>
+                               <label for="summary">Summary</label></th><td>
+                               <textarea id="summary" name="summary" cols="40" 
rows="10"><!-- TMPL_VAR NAME="summary" --></textarea>
+                       </td></tr>
+                       <tr><th><label for="auth_tag_to_report">Report 
tag</label></th><td>
+                               <input type="text" id="auth_tag_to_report" 
name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR 
NAME="auth_tag_to_report">" />
+                               <div class="help">Enter here the number of the 
tag that will be reported in the biblio (subfield by subfield). For example, in 
UNIMARC, enter 200 to report every 200 subfield in the 70x 
biblio</div></td></tr>
+                       </td></tr></table>
+                       <p>
+                               <!-- TMPL_IF NAME="authtypecode" -->
+               <input type="submit" value="Update Authority Type" 
class="submit" onclick="Check(this.form); return false;" />
+       <!-- TMPL_ELSE -->
+               <input type="submit" value="Add Authority Type" class="submit" 
onclick="Check(this.form); return false;" />
+       <!-- /TMPL_IF -->
+                               
                        </p>
+                       </div>
        </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="delete_confirm" -->
-<div>
+<div class="details">
        <h2>Authority structure definition for <!-- TMPL_VAR 
NAME="authtypetext" --> (<!-- TMPL_VAR NAME="authtypecode" -->)</h2>
        <!-- TMPL_IF NAME="total" -->
                <p>
                        <b>This record is used <!-- TMPL_VAR NAME="total" --> 
times</b>
                </p>
        <!-- /TMPL_IF -->
-       <p>CONFIRM DELETION</p>
+       <h3>Are you sure you want to delete this Authority Type?</h3>
        <p>
-               <form action="<!-- TMPL_VAR NAME="script_name" -->" 
method="post">
+               <form class="inline" action="<!-- TMPL_VAR NAME="script_name" 
-->" method="post">
                        <input type="hidden" name="op" value="delete_confirmed" 
/>
                        <input type="hidden" name="authtypecode" value="<!-- 
TMPL_VAR NAME="authtypecode" -->" />
-                       <input type="submit" value="YES" class="submit" />
+                       <input type="submit" value="Yes, Delete It" 
class="cancel" />
                </form>
-               <form action="<!-- TMPL_VAR NAME="script_name" -->" 
method="post">
-                       <input type="submit" value="NO" class="submit" />
+               <form class="inline" action="<!-- TMPL_VAR NAME="script_name" 
-->" method="post">
+                       <input type="submit" value="No, Don't Delete It" 
class="submit" />
                </form>
        </p>
 </div>
@@ -143,10 +160,10 @@
 </table>
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
        <input type="hidden" name="op" value="add_form" />
-       <input type="submit" class="submit" value="Add authority type" 
title="Add authority type" alt="Add authority type" />
-       <td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR 
NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
-       <td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR 
NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
+       <input type="submit" class="submit" value="Add authority type" />
 </form>
+       <!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" 
-->">&lt;&lt; Previous</a><!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" 
-->">Next &gt;&gt;</a><!-- /TMPL_IF -->
 </div>
 <!-- /TMPL_IF -->
 

Index: parameters/biblio_framework.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/biblio_framework.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
--- parameters/biblio_framework.tmpl    12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/biblio_framework.tmpl    30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,11 +2,11 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-       <dt>
-               <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF 
NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add 
framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" 
-->Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR 
NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio 
Framework<!-- /TMPL_IF -->
+<dl class="bodyPane">
+       <dt class="bodyPane">
+               System Administration: <!-- TMPL_IF NAME="add_form" --><!-- 
TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add 
framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" 
-->Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR 
NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio 
Framework<!-- /TMPL_IF -->
        </dt>
-<dd>
+<dd class="bodyPane">
 
 <script language="javascript" type="text/javascript">
 function _(s) { return s } // dummy function for gettext
@@ -78,9 +78,9 @@
                        </tr>
                        <tr>
                                <td><label 
for="description">Description</label></td><td>
-                               <input type="text" name="frameworktext" 
size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" escape=HTML 
-->" /></td>
+                               <input type="text" name="frameworktext" 
size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" 
escape="HTML" -->" /></td>
 </tr></table>
-                       <p>     <input type="button" 
value="Submit"class="submit" onclick="Check(this.form)" /></p>
+                       <p>     <input type="button" value="Submit" 
class="submit" onclick="Check(this.form)" /></p>
        </form>
 <!-- /TMPL_IF -->
 

Index: parameters/branches.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/branches.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
--- parameters/branches.tmpl    12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/branches.tmpl    30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,14 +2,14 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-<dt>
-       <!-- TMPL_IF name="add" --><!-- TMPL_VAR name="head" --><!-- /TMPL_IF 
-->
-       <!-- TMPL_IF name="delete_confirm" -->Confirm deletion of branch '<!-- 
TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF -->
-       <!-- TMPL_IF name="else" --><!-- TMPL_VAR name="head" --><!-- /TMPL_IF 
-->
-       <!-- TMPL_IF name="delete_category" -->Confirm deletion of category<!-- 
/TMPL_IF -->
+<dl class="bodyPane">
+<dt class="bodyPane">
+System Administration: <!-- TMPL_IF name="add" --><!-- TMPL_VAR name="head" 
--><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm deletion of branch '<!-- 
TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" --><!-- TMPL_VAR name="head" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_category" -->Confirm deletion of category<!-- 
/TMPL_IF -->
 </dt>
-<dd>
+<dd class="bodyPane">
 
 <div id="main"><!-- TMPL_IF name="add" -->
        <h1>
@@ -265,6 +265,7 @@
 <!-- /TMPL_IF --></div>
 
 
+
 </dd>
 </dl>
 </body>

Index: parameters/categorie.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/categorie.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
--- parameters/categorie.tmpl   12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/categorie.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,15 +2,15 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-       <dt>
-               <!-- TMPL_IF NAME=add_form --><!-- TMPL_IF NAME="categorycode" 
-->Modify category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- TMPL_ELSE -->Add 
category<!-- /TMPL_IF --><!-- /TMPL_IF -->
-               <!-- TMPL_IF NAME="add_validate" -->Data recorded<!-- /TMPL_IF 
-->
-               <!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of 
Category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- /TMPL_IF -->
-               <!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- 
/TMPL_IF -->
-               <!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF -->
+<dl class="bodyPane">
+       <dt class="bodyPane">
+               System Administration: <!-- TMPL_IF NAME=add_form --><!-- 
TMPL_IF NAME="categorycode" -->Modify category '<!-- TMPL_VAR 
NAME="categorycode" -->'<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- 
/TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" -->Data recorded<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Category '<!-- 
TMPL_VAR NAME="categorycode" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF -->
        </dt>
-<dd>
+<dd class="bodyPane">
 
        <div id="main">
 <!-- TMPL_IF NAME=add_form -->

Index: parameters/categoryitem.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/categoryitem.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
--- parameters/categoryitem.tmpl        12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/categoryitem.tmpl        30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,11 +2,11 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-       <dt>
+<dl class="bodyPane">
+       <dt class="bodyPane">
                <!-- TMPL_IF NAME="categorycode" -->Modify category<!-- 
TMPL_ELSE -->Add category<!-- /TMPL_IF -->
        </dt>
-<dd>
+<dd class="bodyPane">
 
 <!-- TMPL_IF NAME="add_form" -->
         <script language="JavaScript" type="text/javascript">
@@ -72,7 +72,7 @@
                 <h1>Add category</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">
         <input type="hidden" name="op" value="add_validate">
         <input type="hidden" name="checked" value=0>
                         
@@ -81,7 +81,7 @@
                 <tr>
                         <td>Category code</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 -->
@@ -95,62 +95,62 @@
                 <tr>
                         <td>Description</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" -->">
                                 &nbsp;
                         </td>
                 </tr>
                 <tr>
                         <td>Enrolment period</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>
-                                <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>
-                                <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>
-                                <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>
-                                <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>
-                                <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>
-                                <input type="text" name="issuelimit" 
value="<!-- TMPL_VAR NAME="issuelimit" -->">
+                                <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>
@@ -164,12 +164,12 @@
 
 <!-- TMPL_IF NAME="add_validate" -->
         Data recorded
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
                 <input type="submit" value="OK" class="submit">
         </form>
 <!-- /TMPL_IF -->
 
-        TOTAL : <!-- TMPL_VAR NAME="categorycode" --> : <!-- TMPL_VAR 
NAME="total" --><br />
+        TOTAL : <!-- TMPL_VAR name="categorycode" --> : <!-- TMPL_VAR 
name="total" --><br />
                     
         <table>
                 <tr>
@@ -177,59 +177,59 @@
                                 <b>Category code</b>
                         </td>
                         <td>
-                                <!-- TMPL_VAR NAME="categorycode" -->
+                                <!-- TMPL_VAR name="categorycode" -->
                         </td>
                 </tr>
-                <form action="<!-- TMPL_VAR NAME=script_name -->" 
method="post">
+                <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" -->">
+                        <input type="hidden" name="categorycode" value="<!-- 
TMPL_VAR name="categorycode" -->">
                 <tr>
                         <td>Description</td>
-                        <td><!-- TMPL_VAR NAME="description" --></td>
+                        <td><!-- TMPL_VAR name="description" --></td>
                 </tr>
                 <tr>
                         <td>Enrolment period</td>
-                        <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
+                        <td><!-- TMPL_VAR name="enrolmentperiod" --></td>
                 </tr>
                 <tr>
                         <td>Upperage limit</td>
-                        <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
+                        <td><!-- TMPL_VAR name="upperagelimit" --></td>
                 </tr>
                 <tr>
                         <td>Age Required</td>
-                        <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
+                        <td><!-- TMPL_VAR name="dateofbirthrequired" --></td>
                 </tr>
                 <tr>
                         <td>Fine type</td>
-                        <td><!-- TMPL_VAR NAME="finetype" --></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><!-- TMPL_VAR name="enrolmentfee" --></td>
                 </tr>
                 <tr>
                         <td>Overdue notice required</td>
-                        <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
+                        <td><!-- TMPL_VAR name="overduenoticerequired" --></td>
                 </tr>
                 <tr>
                         <td>Issue limit</td>
-                        <td><!-- TMPL_VAR NAME="issuelimit" --></td>
+                        <td><!-- TMPL_VAR name="issuelimit" --></td>
                 </tr>
                 <tr>
                         <td>Reserve fee</td>
-                        <td><!-- TMPL_VAR NAME="reservefee" --></td>
+                        <td><!-- TMPL_VAR name="reservefee" --></td>
                 </tr>
                 <!-- TMPL_IF NAME="totalgtzero" -->
                 <tr>
-                        <td colspan="2"><b>This record is used <!-- TMPL_VAR 
NAME="total" --> times. Deletion not possible</b></td>
+                        <td colspan="2"><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">
+                                </form><form action="<!-- TMPL_VAR 
name="script_name" -->" method="post">
                                 <input type="submit" value="OK" class="submit">
                                 </form>
                         </td>
@@ -240,7 +240,7 @@
                 </tr>
                 <tr>
                         <td><input type="submit" value="YES"></form></td>
-                        <td><form action="<!-- TMPL_VAR NAME=script_name -->" 
method="post"><input type="submit" value="NO" class="submit"></form></td>
+                        <td><form action="<!-- TMPL_VAR name=script_name -->" 
method="post"><input type="submit" value="NO" class="submit"></form></td>
                 </tr>
                 <!-- /TMPL_IF -->
 
@@ -248,7 +248,7 @@
 
 <!-- TMPL_IF NAME=delete_confirmed -->
         data deleted
-        <form action="<!-- TMPL_VAR NAME=script_name -->" method="post">
+        <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
         <input type="submit" value="OK" class="submit">
         </form>
 
@@ -257,11 +257,11 @@
 <!-- TMPL_IF NAME="else" -->
         <h2>Category admin</h2>
         <!-- TMPL_IF NAME="searchfield" -->
-                You Searched for <!-- TMPL_VAR 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 -->">
+        <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" class="submit">
         </form>
 
@@ -282,24 +282,24 @@
                         <th>&nbsp;</th>
                 </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&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" 
-->">Edit</a></td>
-                        <td><a href="<!-- TMPL_VAR NAME="script_name" 
-->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" 
-->">Delete</a></t$                </tr>
+                <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&amp;categorycode=<!-- TMPL_VAR name="categorycode" 
-->">Edit</a></td>
+                        <td><a href="<!-- TMPL_VAR name="script_name" 
-->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR name="categorycode" 
-->">Delete</a></td></tr>
                 <!-- /TMPL_LOOP -->
 
         </table>
-        <p><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="submit" class="button" value="Add 
Category"></a><br />
         </form></p>

Index: parameters/charges.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/charges.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
--- parameters/charges.tmpl     12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/charges.tmpl     30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,13 +2,14 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-       <dt>
-               Calculating Fines
+<dl class="bodyPane">
+       <dt class="bodyPane">
+               System Administration: Fines
        </dt>
-<dd>
+<dd class="bodyPane">
 
 <div id="main">
+<h2>Calculating Fines</h2>
 <p>Each box needs to be filled in with fine,time to start charging,charging 
cycle</p>
 <p>eg 1,7,7 = $1 fine, after 7 days, every 7 days</p>
 <p>Note : fines are calculated by the <span class="ex">fines2.pl</span> 
script, located in <span class="ex">misc</span> directory. Ask your 
administrator to put this script in crontab (after midnight) to have fines 
calculated every night</p>
@@ -33,4 +34,8 @@
 <input type="submit" class="submit" value="Submit Changes">
 </form>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
+</dd>
+</dl>
+</body>
+</html>
\ No newline at end of file

Index: parameters/checkmarc.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/checkmarc.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
--- parameters/checkmarc.tmpl   12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/checkmarc.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,17 +2,16 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-       <dt>
-               MARC Checks
-       </dt>
-<dd>
-
-MARC Check: 
+<dl class="bodyPane">
+       <dt class="bodyPane">
+               System Administration: MARC Check: 
 <!-- TMPL_IF name="total" --><!-- TMPL_VAR name="total" --> errors found<!-- 
TMPL_ELSE -->Configuration OK!<!-- /TMPL_IF -->
+       </dt>
+<dd class="bodyPane">
 
 
 <div id="main">
+<h1>MARC Checks</h1>
 <table>
        <tr>
                <th>Test</th>
@@ -72,6 +71,20 @@
        </tr>
 <!-- /TMPL_IF -->
 <!-- -->
+<!-- TMPL_IF name="itemtypes_empty" -->
+        <tr>
+                <td>itemtypes are empty</td>
+                <td>the itemtypes MUST<br />
+                        <ul><li>be filled</li>
+        </tr>
+<!-- TMPL_ELSE -->
+        <tr>
+                <td>OK</td>
+                <td>itemtypes defined</td>
+        </tr>
+<!-- /TMPL_IF -->
+<!-- -->
+
 <!-- TMPL_IF name="branch" -->
        <tr>
                <td>homebranch NOT mapped</td>

Index: parameters/currency.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/currency.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
--- parameters/currency.tmpl    12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/currency.tmpl    30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,15 +2,16 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-       <dt>
-               <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" 
-->Modify currency '<!-- TMPL NAME="searchfield" -->'<!-- TMPL_ELSE -->Add 
currency<!-- /TMPL_IF --><!-- /TMPL_IF -->
-               <!-- TMPL_IF NAME="add_validate" -->Data Recorded<!-- /TMPL_IF 
-->
-               <!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of 
Currency '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
-               <!-- TMPL_IF NAME="delete_confirmed" -->Currency Deleted<!-- 
/TMPL_IF -->
-               <!-- TMPL_IF NAME="else" -->Currencies<!-- /TMPL_IF -->
+<dl class="bodyPane">
+       <dt class="bodyPane">
+               System Administration: 
+<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify 
currency '<!-- TMPL NAME="searchfield" -->'<!-- TMPL_ELSE -->Add currency<!-- 
/TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" -->Data Recorded<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Currency '<!-- 
TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" -->Currency Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="else" -->Currencies<!-- /TMPL_IF -->
        </dt>
-<dd>
+<dd class="bodyPane">
 
 
 
@@ -189,7 +190,6 @@
 <!-- /TMPL_IF --></div>
 
 
-
 </dd>
 </dl>
 </body>

Index: parameters/issuingrules.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/issuingrules.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
--- parameters/issuingrules.tmpl        12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/issuingrules.tmpl        30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,9 +2,9 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-<dt>Issuing Rules</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">System Administration: Issuing Rules</dt>
+<dd class="bodyPane">
 <div id="main">
        <h1>Defining <!-- TMPL_IF NAME="branch" -->issuing rules for <!-- 
TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default issuing rules<!-- /TMPL_IF 
--></h1>
        <div class="help">

Index: parameters/itemtypes.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/itemtypes.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
--- parameters/itemtypes.tmpl   18 Sep 2006 19:13:24 -0000      1.1.2.1.2.1
+++ parameters/itemtypes.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.2
@@ -2,14 +2,15 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-       <dt>
-               <!-- TMPL_IF name="add_form" --><!-- TMPL_IF name="itemtype" 
-->Modify item type '<!-- TMPL_VAR name="itemtype" -->'<!-- TMPL_ELSE -->Add 
item type<!-- /TMPL_IF --><!-- /TMPL_IF -->
-               <!-- TMPL_IF name="delete_confirm" --><!-- TMPL_IF name="total" 
-->Cannot Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'<!-- TMPL_ELSE 
-->Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'?<!-- /TMPL_IF --><!-- 
/TMPL_IF -->
-               <!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- 
/TMPL_IF -->
-               <!-- TMPL_IF name="else" -->Item Types Administration<!-- 
/TMPL_IF -->
+<dl class="bodyPane">
+       <dt class="bodyPane">
+               System Administration: 
+<!-- TMPL_IF name="add_form" --><!-- TMPL_IF name="itemtype" -->Modify item 
type '<!-- TMPL_VAR name="itemtype" -->'<!-- TMPL_ELSE -->Add item type<!-- 
/TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" --><!-- TMPL_IF name="total" -->Cannot 
Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'<!-- TMPL_ELSE -->Delete 
Item Type '<!-- TMPL_VAR name="itemtype" -->'?<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->Item Types Administration<!-- /TMPL_IF -->
        </dt>
-<dd>
+<dd class="bodyPane">
 
 <div id="main">
 <!-- TMPL_IF name="add_form" -->
@@ -35,7 +36,9 @@
                        </tr>
                        <tr>
                                <th><label for="notforloan">Not for 
loan</label></th>
-                               <td><input type="checkbox" id="notforloan" 
name="notforloan"<!-- TMPL_IF name="notforloan" --> checked="checked"<!-- 
/TMPL_IF --> value="1"> (if checked, no item of this type can be issued. If not 
checked, every item of this type can be issued unless notforloan is set for a 
specific item)</td>
+                               <td>
+                               <!-- TMPL_IF name="notforloan" --><input 
type="checkbox" id="notforloan" name="notforloan" checked="checked" value="1" 
/><!-- TMPL_ELSE --><input type="checkbox" id="notforloan" name="notforloan" 
value="1" /><!-- /TMPL_IF -->
+ (if checked, no item of this type can be issued. If not checked, every item 
of this type can be issued unless notforloan is set for a specific item)</td>
                        </tr>
                        <tr>
                        <tr>
@@ -61,7 +64,8 @@
 
        <tr><th>Description</th><td><!-- TMPL_VAR name="description" 
--></td></tr>
        <tr><th>Loan length</th><td><!-- TMPL_VAR name="loanlength" 
--></td></tr>
-       <tr><th>Renewals</th><td><!-- TMPL_IF name="renewalsallowed" 
-->Allowed<!-- TMPL_ELSE -->Not allowed<!-- /TMPL_IF 
--></td></tr><tr><th>Rental charge</th><td><!-- TMPL_VAR name="rentalcharge" 
--></td></tr></table></div>
+       <tr><th>Renewals</th><td><!-- TMPL_IF name="renewalsallowed" 
-->Allowed<!-- TMPL_ELSE -->Not allowed<!-- /TMPL_IF --></td></tr>
+<tr><th>Rental charge</th><td><!-- TMPL_VAR name="rentalcharge" 
--></td></tr></table></div>
                <div class="tabitem"><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" 
-->" /><!-- TMPL_IF name="total" -->
                </form><form action="<!-- TMPL_VAR name="script_name" -->" 
method="post"><input type="submit" value="OK" class="submit" /></form>
@@ -171,4 +175,8 @@
        }
 }
 </script>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
+</dd>
+</dl>
+</body>
+</html>

Index: parameters/koha2marclinks.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/koha2marclinks.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
--- parameters/koha2marclinks.tmpl      12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/koha2marclinks.tmpl      30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,13 +2,13 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-       <dt>
+<dl class="bodyPane">
+       <dt class="bodyPane">
        System Administration: 
-       <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- 
/TMPL_IF -->
-       <!-- TMPL_IF name="else" -->MARC links <!-- TMPL_VAR name="tagfield" 
--><!-- /TMPL_IF -->
+<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF 
-->
+<!-- TMPL_IF name="else" -->MARC links <!-- TMPL_VAR name="tagfield" --><!-- 
/TMPL_IF -->
        </dt>
-<dd>
+<dd class="bodyPane">
 
 
 
@@ -144,7 +144,6 @@
 </table>
 <!-- /TMPL_IF --></div>
 
-
 </dd>
 </dl>
 </body>

Index: parameters/marc_subfields_structure.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/marc_subfields_structure.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
--- parameters/marc_subfields_structure.tmpl    12 Apr 2006 18:34:07 -0000      
1.1.2.1
+++ parameters/marc_subfields_structure.tmpl    30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,13 +2,13 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-       <dt>
+<dl class="bodyPane">
+       <dt class="bodyPane">
                System Administration: 
-               <!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" 
-->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- 
TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- 
TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
-               <!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of 
Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF 
name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF 
name="else" -->Preferences<!-- /TMPL_IF -->
+<!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system 
preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system 
preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" 
-->Data Added<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- 
TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF 
name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF 
name="else" -->Preferences<!-- /TMPL_IF -->
        </dt>
-<dd>
+<dd class="bodyPane">
 
 <div id="main">
 <!-- TMPL_IF NAME="add_form" -->
@@ -33,7 +33,9 @@
        <tr><th><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for 
librarian:</label></th><td><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" 
type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" 
size="40" maxlength="80" /></td></tr>
        <tr><th><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for 
OPAC:</label></th><td><input type="text" id="libopac<!-- TMPL_VAR NAME="row" 
-->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" 
maxlength="80" /></td></tr>
        <tr><th><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in 
tab:</label></th><td><!-- TMPL_VAR NAME="tab" --> (ignore means that the 
subfield is NOT managed by Koha)</td></tr>
-       <tr><th><label for="hidden<!-- TMPL_VAR NAME="row" -->">Hidden: 
</label></th><td><!-- TMPL_VAR NAME="hidden" --> (subfield is managed, but 
hidden. -should be filled by a plugin or thesaurus-)</td></tr>
+
+       <tr><th><label for="hidden<!-- TMPL_VAR NAME="row" 
-->">Hidden:</label></th><td><input type="text" id="hidden<!-- TMPL_VAR 
NAME="row" -->" name="hidden" value="<!-- TMPL_VAR name="hidden" -->" size="2" 
/> (see online help)</td></tr>
+
        <tr><th><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL: 
</label></th><td><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the 
subfield is an URL and can be clicked</td></tr>
 <tr><th><label>Default Options: <p>(choose one)</p></label></th><td>
 <ul>
@@ -136,4 +138,6 @@
 <!-- /TMPL_IF -->
 
 </div>
+
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: parameters/marctagstructure.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/marctagstructure.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
--- parameters/marctagstructure.tmpl    12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/marctagstructure.tmpl    30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,15 +2,15 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-       <dt>
+<dl class="bodyPane">
+       <dt class="bodyPane">
        System Administration: 
-       <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- 
/TMPL_IF -->
-       <!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Tag '<!-- 
TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
-       <!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
-       <!-- TMPL_IF name="else" -->MARC tag Structure<!-- /TMPL_IF -->
+<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF 
-->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Tag '<!-- TMPL_VAR 
name="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->MARC tag Structure<!-- /TMPL_IF -->
        </dt>
-<dd>
+<dd class="bodyPane">
 
 <div id="main">
 <h1>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>
@@ -132,7 +132,7 @@
                <p><!-- TMPL_IF Name="select_display"-->
                                <label for="onlyused">Display only used 
Tags/Subfields</label><input type="checkbox" name="select_display" 
id="onlyused" value="True" checked="checked" onchange="document.f.submit()" />
                        <!-- TMPL_ELSE -->
-                               <label for="onlyused">Display only used 
Tags/Subfields</label><input type="checkbox" name="select_display"  
id="onlyused"value="True" onchange="document.f.submit()" />
+                               <label for="onlyused">Display only used 
Tags/Subfields</label><input type="checkbox" name="select_display"  
id="onlyused" value="True" onchange="document.f.submit()" />
                        <!--/TMPL_IF --> 
                </p>
        </form>

Index: parameters/printers.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/printers.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
--- parameters/printers.tmpl    12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/printers.tmpl    30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,8 +2,8 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-       <dt>
+<dl class="bodyPane">
+       <dt class="bodyPane">
 System Administration: 
 <!-- TMPL_IF NAME=add_form --><!-- TMPL_IF NAME="searchfield" -->Modify 
printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add printer<!-- 
/TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="add_validate" -->Printer Added<!-- /TMPL_IF -->
@@ -11,7 +11,7 @@
 <!-- TMPL_IF NAME="delete_confirmed" -->Printer Deleted<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="else" -->Printers<!-- /TMPL_IF -->
        </dt>
-<dd>
+<dd class="bodyPane">
 
 <div id="main"><!-- TMPL_IF NAME=add_form -->
         <script language="JavaScript" type="text/javascript">
@@ -160,7 +160,7 @@
                <div id="results">You searched for <span class="ex"><!-- 
TMPL_VAR NAME="searchfield" --></span></div>
        <!-- /TMPL_IF -->
 <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-                <input type="text" name="description" value="<!-- TMPL_VAR 
NAME="searchfield" -->" />
+                <input type="text" name="searchfield" value="<!-- TMPL_VAR 
NAME="searchfield" -->" />
                 <input type="submit" name="submit" value="Search" 
class="submit" />
         </form>
 <table>

Index: parameters/stopwords.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/stopwords.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
--- parameters/stopwords.tmpl   12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/stopwords.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,16 +2,16 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-       <dt>
+<dl class="bodyPane">
+       <dt class="bodyPane">
                System Administration: 
-               <!-- TMPL_IF NAME="else" -->Stop Words Administration<!-- 
/TMPL_IF -->
-               <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" 
-->Modify Stop Word<!-- TMPL_ELSE -->Add Stop Word<!-- /TMPL_IF --><!-- 
/TMPL_IF --> 
-               <!-- TMPL_IF NAME="add_validate" -->Stop Word Added<!-- 
/TMPL_IF --> 
-               <!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Stop 
Word '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF --> 
-               <!-- TMPL_IF NAME="delete_confirmed" -->Stop Word Deleted<!-- 
/TMPL_IF --> 
+<!-- TMPL_IF NAME="else" -->Stop Words Administration<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify Stop 
Word<!-- TMPL_ELSE -->Add Stop Word<!-- /TMPL_IF --><!-- /TMPL_IF --> 
+<!-- TMPL_IF NAME="add_validate" -->Stop Word Added<!-- /TMPL_IF --> 
+<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Stop Word '<!-- 
TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF --> 
+<!-- TMPL_IF NAME="delete_confirmed" -->Stop Word Deleted<!-- /TMPL_IF --> 
        </dt>
-<dd>
+<dd class="bodyPane">
 
 <div id="main">
 <!-- TMPL_IF NAME="add_form" -->

Index: parameters/systempreferences.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/systempreferences.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
--- parameters/systempreferences.tmpl   12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/systempreferences.tmpl   30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,13 +2,13 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-       <dt>
+<dl class="bodyPane">
+       <dt class="bodyPane">
                System Administration: 
-               <!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" 
-->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- 
TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- 
TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
-               <!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of 
Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF 
name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF 
name="else" -->Preferences<!-- /TMPL_IF -->
+<!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system 
preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system 
preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" 
-->Data Added<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- 
TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF 
name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF 
name="else" -->Preferences<!-- /TMPL_IF -->
        </dt>
-<dd>
+<dd class="bodyPane">
 
 <script language="JavaScript" type="text/javascript">
                function _(s) { return s } // dummy function for gettext
@@ -55,7 +55,7 @@
                                _alertString += "\n- " + _("value missing");
                        }
                        if (_alertString.length==0) {
-                               document.Aform.submit();
+                               document.mainform.submit();
                        } else {
                                alertString2  = _("Form not submitted because 
of the following problem(s)");
                                alertString2 += 
"\n------------------------------------------------------------------------------------\n";
@@ -72,7 +72,7 @@
                <!-- TMPL_ELSE -->
                        <h1>Add a system preference</h1>
                <!-- /TMPL_IF -->
-               <form action="<!-- TMPL_VAR NAME="script_name" -->" 
name="Aform" method="post">
+               <form action="<!-- TMPL_VAR NAME="script_name" -->" 
name="mainform" method="post">
                <div class="details">
                
                <table>
@@ -88,7 +88,11 @@
                                <!-- TMPL_IF NAME="type-choice" -->
                                        <select name="value" id="value">
                                                <!-- TMPL_LOOP NAME="options" 
-->
-                                                       <option value="<!-- 
TMPL_VAR NAME="option" -->"<!-- TMPL_IF NAME="selected" 
-->selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="option" --></option>
+<!-- TMPL_IF NAME="selected" -->
+                                                       <option value="<!-- 
TMPL_VAR NAME="option" -->" selected="selected"><!-- TMPL_VAR NAME="option" 
--></option>
+<!-- TMPL_ELSE -->
+                                                       <option value="<!-- 
TMPL_VAR NAME="option" -->"><!-- TMPL_VAR NAME="option" --></option>
+<!-- /TMPL_IF -->
                                                <!-- /TMPL_LOOP -->
                                        </select>
                                <!-- /TMPL_IF -->
@@ -99,7 +103,13 @@
                                        <input type="radio" name="value" 
value="0" checked="checked" /><!-- TMPL_ELSE --><input type="radio" 
name="value" value="0" /><!-- /TMPL_IF -->No<!-- /TMPL_IF -->
                                </td></tr>
                </table></div>
-               <p><input type="submit" value="<!-- TMPL_IF NAME="modify" 
-->Save Changes<!-- TMPL_ELSE -->Add this Preference<!-- /TMPL_IF -->" 
class="submit"> <input type="button" class="cancel" value="Cancel" 
onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" 
/></p>
+               <p>
+               <!-- TMPL_IF NAME="modify" -->
+               <input type="submit" value="Save Changes" class="submit" />
+       <!-- TMPL_ELSE -->
+               <input type="submit" value="Add this Preference" class="submit" 
/>
+       <!-- /TMPL_IF -->
+<input type="button" class="cancel" value="Cancel" 
onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" 
/></p>
                
 <h3>Koha internal</h3>         
                <div class="details"><span class="note">Note: you should have 
no reasons to modify the following default values</span>
@@ -192,6 +202,11 @@
                                        </a>
                                <!--/TMPL_IF-->
                        </li>
+       <!--TMPL_IF Name="Librarian"-->
+                       <li><a 
href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet" 
class="here">Intranet</a></li>
+       <!--TMPL_ELSE-->
+                       <li><a 
href="/cgi-bin/koha/admin/systempreferences.pl?tab=Intranet">Intranet</a></li>
+       <!--/TMPL_IF-->
                        <li>
                                <!--TMPL_IF Name="Members"-->
                                        <a 
href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="here">Members
@@ -225,14 +240,13 @@
        <table>
        <tr>
                <th>Variable</th>
-               <th>Value</th>
-               <th colspan="3">Explanation</th>
+               <th>Value/Explanation</th>
+               <th colspan="2"></th>
        </tr>
        <!-- TMPL_LOOP NAME="loop" -->
        <tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
-               <td><!-- TMPL_VAR NAME="variable" --></td>
-               <td><!-- TMPL_VAR NAME="value" --></td>
-               <td><!-- TMPL_VAR NAME="explanation" --></td>
+               <td><a href="<!-- TMPL_VAR NAME="edit" -->"><!-- TMPL_VAR 
NAME="variable" --></a></td>
+               <td><strong><!-- TMPL_VAR NAME="value" --></strong><br><!-- 
TMPL_VAR NAME="explanation" --></td>
                <td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
                <td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
        </tr>
@@ -248,6 +262,7 @@
        <!-- /TMPL_IF -->
 </div>
 
+
 </dd>
 </dl>
 </body>

Index: parameters/thesaurus.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/thesaurus.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
--- parameters/thesaurus.tmpl   12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/thesaurus.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,11 +2,11 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-       <dt>
+<dl class="bodyPane">
+       <dt class="bodyPane">
                System Administration: Thesaurus Management
        </dt>
-<dd>
+<dd class="bodyPane">
 
 <div id="main">
 <!-- TMPL_IF name="detail_form" -->
@@ -155,6 +155,7 @@
 </div>
 
 
+
 </dd>
 </dl>
 </body>

Index: parameters/z3950servers.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/parameters/Attic/z3950servers.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
--- parameters/z3950servers.tmpl        12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ parameters/z3950servers.tmpl        30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,15 +2,15 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-param.inc" -->
 
-<dl>
-       <dt>
+<dl class="bodyPane">
+       <dt class="bodyPane">
                System Administration: <!-- TMPL_IF NAME="else" -->z39.50 
Servers<!-- /TMPL_IF -->
-               <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME=searchfield 
-->Modify z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE 
-->Add z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
-               <!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion<!-- 
/TMPL_IF -->
-               <!-- TMPL_IF NAME="add_validate" -->z39.50 Server Added<!-- 
/TMPL_IF -->
-               <!-- TMPL_IF NAME="delete_confirmed" -->z39.50 Server 
Deleted<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME=searchfield -->Modify z39.50 
Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Add z39.50 
Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" -->z39.50 Server Added<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" -->z39.50 Server Deleted<!-- /TMPL_IF -->
        </dt>
-<dd>
+<dd class="bodyPane">
 
 <div id="main"><!-- TMPL_IF NAME="add_form" -->
         <script language="JavaScript" type="text/javascript">

Index: reports/acquisitions_stats.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/Attic/acquisitions_stats.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
--- reports/acquisitions_stats.tmpl     12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ reports/acquisitions_stats.tmpl     30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,14 +2,15 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-reports.inc" -->
 
-<dl>
-<dt>Reports : Acquisitions statistics</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Reports : Acquisitions statistics</dt>
+<dd class="bodyPane">
 
 <div id="main" >
 
 <!-- TMPL_IF NAME="do_it" -->
        <!-- TMPL_LOOP NAME="mainloop" -->
+               <h1>Koha : Acquisitions statistics </h1>
                <!-- TMPL_IF NAME="loopfilter"-->
                        <p>Filtered on</p>
                        <!-- TMPL_LOOP NAME="loopfilter" -->

Index: reports/bor_issues_top.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/Attic/bor_issues_top.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
--- reports/bor_issues_top.tmpl 12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ reports/bor_issues_top.tmpl 30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,9 +2,9 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-reports.inc" -->
 
-<dl>
-<dt>Reports : List borrowers for Issues</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Reports : List borrowers for Issues</dt>
+<dd class="bodyPane">
 
 <div id="main" >
 
@@ -19,12 +19,12 @@
                <!-- TMPL_IF NAME="loopfilter"-->
                        <p>Filtered on</p>
                        <!-- TMPL_LOOP NAME="loopfilter" -->
-                                       <p><!-- TMPL_IF NAME="err" --> <font 
color="red"> <b><!--/TMPL_IF --><label class="label100"> <!-- TMPL_VAR 
NAME="crit"--> =</label><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" 
--> </font> </b><!--/TMPL_IF --></p>
+                                       <p><!-- TMPL_IF NAME="err" --> <span 
class="error"> <b><!--/TMPL_IF --><strong><!-- TMPL_VAR NAME="crit"--> 
=</strong><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </span> 
</b><!--/TMPL_IF --></p>
                        <!-- /TMPL_LOOP -->
                <!-- /TMPL_IF NAME="loopfilter"-->
                <br>
                <table>
-                       <tr >
+                       <tr>
                                <th>Rank/Borrowers</th>
                                <!-- TMPL_LOOP NAME="loopcol" -->
                                        <th colspan="2"><!-- TMPL_VAR 
NAME="coltitle" --></th>
@@ -314,6 +314,7 @@
 </div>
 
 
+
 </dd>
 </dl>
 </body>

Index: reports/borrowers_out.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/Attic/borrowers_out.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
--- reports/borrowers_out.tmpl  12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ reports/borrowers_out.tmpl  30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,13 +2,14 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-reports.inc" -->
 
-<dl>
-<dt>Reports : Borrowers with No Issues</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Reports : Borrowers with No Issues</dt>
+<dd class="bodyPane">
 <div id="main">
 
 <!-- TMPL_IF NAME="do_it" -->
        <!-- TMPL_LOOP NAME="mainloop" -->
+               <h1>Koha : Borrowers with No Issues </h1>
                <!-- TMPL_IF NAME="loopfilter"-->
                        <p>Filtered on</p>
                        <!-- TMPL_LOOP NAME="loopfilter" -->

Index: reports/borrowers_stats.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/Attic/borrowers_stats.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
--- reports/borrowers_stats.tmpl        12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ reports/borrowers_stats.tmpl        30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,14 +2,15 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-reports.inc" -->
 
-<dl>
-<dt>Reports : Patron Statistics</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Reports : Patron Statistics</dt>
+<dd class="bodyPane">
 
 <div id="main" >
 
 <!-- TMPL_IF NAME="do_it" -->
        <!-- TMPL_LOOP NAME="mainloop" -->
+               <h1>Patron Statistics Report</h1>
                <!-- TMPL_IF NAME="loopfilter"-->
                        <p>Showing patron counts by category where 
                        <!-- TMPL_LOOP NAME="loopfilter" -->

Index: reports/cat_issues_top.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/Attic/cat_issues_top.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
--- reports/cat_issues_top.tmpl 12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ reports/cat_issues_top.tmpl 30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,9 +2,9 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-reports.inc" -->
 
-<dl>
-<dt>Reports : List On Catalogue Issues</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Reports : List On Catalogue Issues</dt>
+<dd class="bodyPane">
 
 <div id="main">
 

Index: reports/catalogue_out.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/Attic/catalogue_out.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
--- reports/catalogue_out.tmpl  12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ reports/catalogue_out.tmpl  30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,14 +2,15 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-reports.inc" -->
 
-<dl>
-<dt>Reports : Items with No Issues</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Reports : Items with No Issues</dt>
+<dd class="bodyPane">
 
 <div id="main">
 
 <!-- TMPL_IF NAME="do_it" -->
        <!-- TMPL_LOOP NAME="mainloop" -->
+               <h1>Koha : Items with no Issues </h1>
                <!-- TMPL_IF NAME="loopfilter"-->
                        <p>Filtered on</p>
                        <!-- TMPL_LOOP NAME="loopfilter" -->
@@ -120,4 +121,8 @@
 <!-- /TMPL_IF -->
 
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+
+</dd>
+</dl>
+</body>
+</html>
\ No newline at end of file

Index: reports/catalogue_stats.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/Attic/catalogue_stats.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
--- reports/catalogue_stats.tmpl        12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ reports/catalogue_stats.tmpl        30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,15 +2,16 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-reports.inc" -->
 
-<dl>
-<dt>Reports : Catalog Statistics</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Reports : Catalog Statistics</dt>
+<dd class="bodyPane">
 
 
 <div id="main" >
 
 <!-- TMPL_IF NAME="do_it" -->
        <!-- TMPL_LOOP NAME="mainloop" -->
+               <h1>Catalogue Statistics </h1>
                <!-- TMPL_IF NAME="loopfilter"-->
                        <p>Filtered on</p>
                        <!-- TMPL_LOOP NAME="loopfilter" -->

Index: reports/inventory.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/Attic/inventory.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
--- reports/inventory.tmpl      12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ reports/inventory.tmpl      30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,20 +2,21 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-reports.inc" -->
 
-<dl>
-<dt>Reports : Inventory Report</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Reports : Inventory Report</dt>
+<dd class="bodyPane">
 
 
 <div id="main">
-       <form method="post">
+       <h1>Inventory Report</h1>
+       <form action="/cgi-bin/koha/reports/inventory.pl" method="post">
        <div class="data">
        <table>
        <caption>Select items you want to check</caption>
        <tr><th><label for="minlocation">Item Location (items.itemcallnumber) 
between:</label></th><td><input type="text" name="minlocation" id="minlocation" 
value="<!-- TMPL_VAR NAME="minlocation" -->" /> 
                        <label for="maxlocation">...and...</label>
                                <input type="text" name="maxlocation" 
id="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->" /></td></tr>
-       <tr><th><label for="datelastseen">Not seen 
since:</label></th><td><input type="text" name="datelastseen" id="datelastseen" 
value="<!-- TMPL_VAR NAME="datelastseen" -->" size="10" maxlength="10" 
/></td></tr>
+       <tr><th><label for="datelastseen">Not seen since 
(yyyy-mm-dd):</label></th><td><input type="text" name="datelastseen" 
id="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" size="10" 
maxlength="10" /></td></tr>
        <tr><th><label for="pagesize">Items per Page: </label></th><td><input 
type="text" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" 
maxlength="5" size="5" /></td></tr>
        <tr><th><label for="offset">Beginning at Page: </label></th><td><input 
type="text" name="offset" id="offset" value="<!-- TMPL_VAR NAME="offset" -->" 
size="5" maxlength="5" /></td></tr>
        </table>
@@ -23,8 +24,27 @@
                        <input type="submit" value="Generate Report" 
class="submit">
                </p>
        </form>
+       
+       <div class="data">
+               <form action="/cgi-bin/koha/reports/inventory.pl"  
name="barcodefile" method="post">
+<table>
+<caption>Use a barcode file</caption>
+<tr><th><label for="uploadbarcodes">Barcode filename:</label> </th><td><input 
type="file" id="uploadbarcodes" name="uploadbarcodes" /></td></tr>
+       <tr><th><label for="setdate">Set datelastseen to:</label></th> 
<td><input type="text" id="setdate" name="setdate" /></td></tr></table>
+<p><input type="submit" value="Submit" class="submit"></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">
+       <form action="/cgi-bin/koha/reports/inventory.pl" 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" -->" />
@@ -40,7 +60,7 @@
                        <th>Title</th>
                        <th>Author</th>
                </tr>
-       <!-- TMPL_LOOP NAME="loop" -->
+<!--TMPL_LOOP Name="loop"-->
                <tr>
                        <td>
                                <input type="checkbox" name="SEEN-<!-- TMPL_VAR 
NAME="itemnumber" -->" value="1" />
@@ -62,9 +82,10 @@
        </table>
        <input type="submit" value="Mark seen" class="submit">
        </form>
+       <!-- /TMPL_IF -->
        
        <!-- TMPL_IF NAME="offset" -->
-       <form method="post">
+       <form action="/cgi-bin/koha/reports/inventory.pl" 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" -->" />
@@ -73,8 +94,9 @@
                <input type="submit" value="&lt;&lt;&lt;" class="submit" />
        </form>
        <!-- /TMPL_IF -->
+       
        <!-- TMPL_IF NAME="nextoffset" -->
-       <form method="post">
+       <form action="/cgi-bin/koha/reports/inventory.pl" 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" -->" />
@@ -82,7 +104,7 @@
                <input type="hidden" name="offset" value="<!-- TMPL_VAR 
NAME="nextoffset" -->" />
                <input type="submit" value="&gt;&gt;&gt;" class="submit" />
        </form>
-       <!-- /TMPL_IF --><!-- /TMPL_IF -->
+       <!-- /TMPL_IF -->
 </div>
 
 </dd>

Index: reports/issues_avg_stats.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/Attic/issues_avg_stats.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
--- reports/issues_avg_stats.tmpl       12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ reports/issues_avg_stats.tmpl       30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,14 +2,15 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-reports.inc" -->
 
-<dl>
-<dt>Reports : Issues Average Period Statistics</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Reports : Issues Average Period Statistics</dt>
+<dd class="bodyPane">
 
 <div id="main">
 
 <!-- TMPL_IF NAME="do_it" -->
        <!-- TMPL_LOOP NAME="mainloop" -->
+               <h1>Koha : Issues Average Period statistics </h1>
                <!-- TMPL_IF NAME="loopfilter"-->
                        <p>Filtered on</p>
                        <!-- TMPL_LOOP NAME="loopfilter" -->
@@ -280,4 +281,8 @@
        </div>
 <!-- /TMPL_IF -->
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+
+</dd>
+</dt>
+</body>
+</html>
\ No newline at end of file

Index: reports/issues_by_borrower_category.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/Attic/issues_by_borrower_category.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
--- reports/issues_by_borrower_category.tmpl    12 Apr 2006 18:34:07 -0000      
1.1.2.1
+++ reports/issues_by_borrower_category.tmpl    30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -2,9 +2,9 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-reports.inc" -->
 
-<dl>
-<dt>Reports : Issues by Borrower Category</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Reports : Issues by Borrower Category</dt>
+<dd class="bodyPane">
 
 <div id="main">
 <!-- TMPL_IF name="do_it" -->

Index: reports/issues_stats.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/Attic/issues_stats.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
--- reports/issues_stats.tmpl   12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ reports/issues_stats.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,14 +2,15 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-reports.inc" -->
 
-<dl>
-<dt>Reports : Issues Statistics Reports</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Reports : Issues Statistics Reports</dt>
+<dd class="bodyPane">
 
 <div id="main" >
 
 <!-- TMPL_IF NAME="do_it" -->
        <!-- TMPL_LOOP NAME="mainloop" -->
+               <h1>Issues Statistics Report</h1>
                <!-- TMPL_IF NAME="loopfilter"-->
                        <p>Showing Issues where 
                        <!-- TMPL_LOOP NAME="loopfilter" -->
@@ -257,4 +258,7 @@
 <!-- /TMPL_IF -->
 </div>
 
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+</dd>
+</dt>
+</body>
+</html>
\ No newline at end of file

Index: reports/itemtypes.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/Attic/itemtypes.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
--- reports/itemtypes.tmpl      12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ reports/itemtypes.tmpl      30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,9 +2,9 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-reports.inc" -->
 
-<dl>
-<dt>Reports : Item Counts</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Reports : Item Counts</dt>
+<dd class="bodyPane">
 
 <div id="main">
 <!-- TMPL_IF name="do_it" -->
@@ -41,6 +41,7 @@
 </div>
 </div>
 
+
 </dd>
 </dl>
 </body>

Index: reports/reports-home.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/reports/Attic/reports-home.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
--- reports/reports-home.tmpl   12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ reports/reports-home.tmpl   30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -2,9 +2,9 @@
 <!-- TMPL_INCLUDE NAME="body-top.inc" -->
 <!-- TMPL_INCLUDE NAME="body-top-reports.inc" -->
 
-<dl>
-<dt>Reports</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Reports</dt>
+<dd class="bodyPane">
 
 <div id="main">
 <div class="details">
@@ -54,6 +54,7 @@
 
 </div>
 
+
 </dd>
 </dl>
 </body>

Index: search.marc/dictionary.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/search.marc/Attic/dictionary.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
--- search.marc/dictionary.tmpl 12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ search.marc/dictionary.tmpl 30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -32,9 +32,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Catalog: Dictionary Search</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Catalog: Dictionary Search</dt>
+<dd class="bodyPane">
 
 <div id="main-compact">
        <h1>Dictionary Search</h1>
@@ -170,6 +170,7 @@
 <!-- /TMPL_IF -->
 </div>
 
+
 </dd>
 </dl>
 </body>

Index: search.marc/result.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/search.marc/Attic/result.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
--- search.marc/result.tmpl     12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ search.marc/result.tmpl     30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -32,30 +32,26 @@
        </a>
 </div>
 
-<dl>
-<dt>Catalog: MARC Search Results</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Catalog: MARC Search Results</dt>
+<dd class="bodyPane">
 
 <div id="main">
-<!-- TMPL_IF NAME="searchdesc" -->
-    <h3>Results for Search: <span class="ex"><!-- TMPL_VAR NAME="searchdesc" 
--></span></h3>
-<!-- TMPL_ELSE -->
-               <h3>You did not specify any search criteria</h3>
-<!-- /TMPL_IF -->
+<h3>Search Results</h3>
 
 <!-- TMPL_IF name="total" --><div id="pages">
 <!-- TMPL_IF NAME="displayprev" -->
-                       <a class="pages" 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;type=intranet&amp;op=do_search">&lt;&lt;</a> 
+                       <a class="pages" 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;</a> 
                        <!-- /TMPL_IF -->
                        <!-- TMPL_LOOP NAME="numbers" -->
                                <!-- TMPL_IF NAME="highlight" -->
                                 <span class="current"><!-- TMPL_VAR 
NAME="number" --></span>
                                <!-- TMPL_ELSE -->
-                                 <a class="pages" 
href="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;type=intranet&amp;op=do_search"><!-- TMPL_VAR 
NAME="number" --></a>
+                                 <a class="pages" 
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="pages" 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;type=intranet&amp;op=do_search">&gt;&gt;</a>
+                       <a class="pages" 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">&gt;&gt;</a>
                                <!-- /TMPL_IF --></div>
 <!-- TMPL_ELSE --><!-- /TMPL_IF -->
 
@@ -63,8 +59,8 @@
 
 <div class="table searchresults"><table>
        <tr>
-       <th>Type</th>
        <th>Title</th>
+       <th>Call No.</th>
        <th>Copies</th>
        <th>Location</th>
        <th>&nbsp;</th>
@@ -72,8 +68,8 @@
 <tbody>
        <!-- TMPL_LOOP name="result" -->
                <tr<!-- TMPL_IF NAME="even" --> class="highlight"<!-- /TMPL_IF 
-->>
-                       <td><!-- TMPL_VAR NAME="description" --></td>           
        
-                       <td><p><a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- 
TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" 
--></a></p>
+                       <td><p>
+                       <!-- TMPL_IF name="BiblioDefaultViewmarc" --><a 
href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" 
--></a><!-- TMPL_ELSE --><!-- TMPL_IF name="BiblioDefaultViewisbd" --><a 
href="/cgi-bin/koha/ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" 
--></a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR 
NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- 
TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --><!-- /TMPL_IF --></p>
                                                <p><!-- TMPL_VAR NAME="author" 
-->
                                                <!-- TMPL_IF 
NAME="publishercode" -->- <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF 
-->
                                                <!-- TMPL_IF NAME="place" --> ; 
<!-- TMPL_VAR NAME="place" --><!-- /TMPL_IF -->
@@ -81,30 +77,32 @@
                                                <!-- TMPL_IF NAME="notes" --> : 
<!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF -->
                                                <!-- TMPL_IF NAME="size" --> ; 
<!-- TMPL_VAR NAME="size" --><!-- /TMPL_IF -->
                                        </p></td>
+                                       <td><!-- TMPL_VAR NAME="classification" 
--></td>
                        <td><!-- TMPL_VAR NAME="totitem" --></td>
-<td><!-- TMPL_LOOP NAME="CN" --><!-- TMPL_IF name="date_due" --><div 
id="issued"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="holdingbranch" --><!-- TMPL_IF 
name="date_due" --> (due <!-- TMPL_VAR NAME="date_due" -->)<!-- TMPL_IF 
name="date_due" --></div><!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_IF 
NAME="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF 
--><!-- /TMPL_IF --><br /><!-- /TMPL_LOOP --></td><td><!-- TMPL_UNLESS 
name="norequests" --><a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR 
NAME="biblionumber" ESCAPE="URL" -->">Reserves</a><!-- TMPL_ELSE -->Not 
Reservable<!-- /TMPL_UNLESS --></td>
+<td style="white-space : nowrap;"><!-- TMPL_LOOP NAME="CN" --><!-- TMPL_VAR 
NAME="holdingbranch" --><!-- TMPL_IF name="date_due" --> <span 
class="issued">(due <!-- TMPL_VAR NAME="date_due" -->)</span>       <!-- 
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 --><br /><!-- 
/TMPL_LOOP --></td><td><!-- TMPL_UNLESS name="norequests" --><a 
href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->">Reserves</a><!-- TMPL_ELSE -->Not Reservable<!-- /TMPL_UNLESS 
--></td>
                </tr>
        <!-- /TMPL_LOOP -->
 </table></div>
 
 <!-- TMPL_IF name="total" --><div id="pages">
 <!-- TMPL_IF NAME="displayprev" -->
-                       <a class="pages" 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;type=intranet&amp;op=do_search">&lt;&lt;</a> 
+                       <a class="pages" 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;</a> 
                        <!-- /TMPL_IF -->
                        <!-- TMPL_LOOP NAME="numbers" -->
                                <!-- TMPL_IF NAME="highlight" -->
                                 <span class="current"><!-- TMPL_VAR 
NAME="number" --></span>
                                <!-- TMPL_ELSE -->
-                                 <a class="pages" 
href="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;type=intranet&amp;op=do_search"><!-- TMPL_VAR 
NAME=number --></a>
+                                 <a class="pages" 
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="pages" 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;type=intranet&amp;op=do_search">&gt;&gt;</a>
+                       <a class="pages" 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">&gt;&gt;</a>
                                <!-- /TMPL_IF --></div>
 <!-- TMPL_ELSE --><!-- /TMPL_IF -->
 
 </div>
 
+
 </dd>
 </dl>
 </body>

Index: search.marc/search.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/search.marc/Attic/search.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
--- search.marc/search.tmpl     12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ search.marc/search.tmpl     30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -32,17 +32,18 @@
        </a>
 </div>
 
-<dl>
-<dt>Catalog: Search</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Catalog: Advanced MARC Search</dt>
+<dd class="bodyPane">
 
 <div id="main">
+<h1>Catalog Search</h1>
 <form name="f" method="post" action="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 class="form">
+<div class="data">
 <table>
 <caption>Quick Search</caption>
                                        <tr>
@@ -89,7 +90,9 @@
                        <input type="hidden" name="excluding" value="" />
                        <input type="hidden" name="operator" value="contains" />
                        <input type="text" id="seriestitle" name="value" 
size="35"/></td></tr>
-       </table><input type="submit" value="Start search" class="submit" 
/><table>
+       </table>
+       <p><input type="submit" value="Start search" class="submit" /></p>
+       <table>
                <tr>
                        <th><label for="itemtype">Item Type</label></th>
                        <td><input type="hidden" name="marclist" 
value="biblioitems.itemtype" />
@@ -139,7 +142,7 @@
                        <input type="text" id="publisher" name="value" 
onchange="sql_update()" size="35"  accesskey="p" /></td>
                </tr>
                </table>
-               <input type="submit" value="Start search" class="submit" />
+               <p><input type="submit" value="Start search" class="submit" 
/></p>
 </div>
 
 <div class="table">
@@ -243,7 +246,6 @@
 
 </script>
 
-
 </dd>
 </dl>
 </body>

Index: search.marc/suggest.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/search.marc/Attic/suggest.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
--- search.marc/suggest.tmpl    12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ search.marc/suggest.tmpl    30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -32,9 +32,9 @@
        </a>
 </div>
 
-<dl>
-<dt>Catalog: Search Suggestions</dt>
-<dd>
+<dl class="bodyPane">
+<dt class="bodyPane">Catalog: Search Suggestions</dt>
+<dd class="bodyPane">
 
 <div id="main">
                <table>

Index: value_builder/marc21_leader.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/value_builder/Attic/marc21_leader.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
--- value_builder/marc21_leader.tmpl    12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ value_builder/marc21_leader.tmpl    30 Nov 2006 15:56:27 -0000      
1.1.2.1.2.1
@@ -309,10 +309,17 @@
 <script>
 function report() {
                opener.document.f.field_value[<!-- TMPL_VAR name="index" 
-->].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.f17.value+ document.f_pop.f18.value+ 
document.f_pop.f19.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+ 
+                       '22     '+
+                       document.f_pop.f17.value+
+                       document.f_pop.f18.value+
+                       document.f_pop.f19.value+
+                       ' 4500';
                self.close();
                return false;
        }

Index: z3950/searchresult.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/z3950/Attic/searchresult.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
--- z3950/searchresult.tmpl     12 Apr 2006 18:34:07 -0000      1.1.2.1
+++ z3950/searchresult.tmpl     30 Nov 2006 15:56:27 -0000      1.1.2.1.2.1
@@ -3,11 +3,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml";>
 <head>
 <title>Z39.50 Search Results</title>
-<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR NAME="refresh" -->" />
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<link rel="shortcut icon" href="/intranet-tmpl/npl/en/includes/favicon.ico" 
type="image/x-icon" />
+       <!-- TMPL_IF NAME="refresh" -->
+               <meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR 
NAME="refresh" -->" />
+       <!-- /TMPL_IF -->
+       <!-- 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="<!-- TMPL_VAR NAME='themelang' 
-->/includes/favicon.ico" type="image/x-icon" />
 <style type="text/css"> 
-       @import url(/intranet-tmpl/npl/en/includes/intranet.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>
 
@@ -15,7 +18,7 @@
 
 <div id="main-compact">
        <h2>Z3950 Search Results</h2>
-       
+       <!-- TMPL_IF NAME="numberpending" --><h3>Still <!-- TMPL_VAR 
NAME="numberpending" --> requests to go</h3><!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="breeding_loop" -->
                <table>
                        <tr>
@@ -24,22 +27,21 @@
                                <th>ISBN</th>
                                <th>coming from</th>
                                <th>&nbsp;</th>
-                               <th>&nbsp;</th>
                        </tr>
                                <!-- TMPL_LOOP NAME="breeding_loop" -->
-                                       <tr bgcolor="<!-- TMPL_VAR 
NAME="toggle" -->">
+                                       <!-- TMPL_IF NAME="toggle" --><tr><!-- 
TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
                                                <td><!-- TMPL_VAR NAME="title" 
--></td>
                                                <td><!-- TMPL_VAR NAME="author" 
--></td>
                                                <td><!-- TMPL_VAR NAME="isbn" 
--></td>
                                                <td><!-- TMPL_VAR NAME="file" 
--></td>
-                                               <td><a 
href="javascript:Import(<!-- TMPL_VAR NAME="id" -->)">Import this 
biblio</a></td>
+                                               <td><a href="#" 
onclick="Import(<!-- TMPL_VAR NAME="id" -->); return false;">Import this 
biblio</a></td>
                                        </tr>
                                <!-- /TMPL_LOOP -->
                </table>
        <!-- TMPL_ELSE -->
                                <p>Nothing found</p>
        <!-- /TMPL_IF -->
-       <!-- TMPL_IF NAME="numberpending" --><h1>Still <!-- TMPL_VAR 
NAME="numberpending" --> requests to go</h1><!-- /TMPL_IF -->
+       
        <script language="javascript" type="text/javascript">
                function Import(GetThisOne) {
                        opener.document.location= 
"../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR 
NAME="oldbiblionumber" -->&breedingid="+GetThisOne;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]