[koha-commits] main Koha release repository branch, new/enh/bug_5917, updated. v3.02.00-1405-gec16c3a
Git repo owner
gitmaster at git.koha-community.org
Sun Apr 10 10:01:04 CEST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, new/enh/bug_5917 has been updated
via ec16c3a09212c684c0c905f1ac293b4495c2432b (commit)
via 77167b3b17690ccff682d410847b13aa5ac186e8 (commit)
via 8843e29a9dd35fa3c34813077f4dfffd91483995 (commit)
via 0d991c6abecc87105eddcf57db56f5e118b426dc (commit)
via 93d8a890c0fe716003b63e5dcbf69be13a075bb3 (commit)
via fb10394d99d36c7b58bf184d636fc878f1fe5baa (commit)
via 79610c74216fba1b71d458ecf9dc6b690d2a7401 (commit)
via cba9b427a4f2d378a402cbde94b3747f186ce0ea (commit)
via e1ab8bc53e32e7908899bbce401e8cd37ca4a8e2 (commit)
via f078103e33093731a9dd50d20340279accd0d269 (commit)
via b8d3cfa91b78ef44347fd0a6163205b552588a93 (commit)
via 726a00fd7ea5378a478ca87b990da04b038c006d (commit)
via 8902dadf0657da6da87e4c88626be27891bbed08 (commit)
via 7e1077b51bbdd13e4a8032f73b286b1ea61bb288 (commit)
via 7e7c6bcb34db54a8da26e60e67bb9e64473095bb (commit)
via 3b7a22aa099410cb3537cea3b5c87d7b61f7fe79 (commit)
via 1fafaafc9a165a662cc8c2431956c92ca3f7d13d (commit)
via e6ec28d062da657eb6ee431506694fc557fb44cb (commit)
via 0c8c7a8db6d18efc4632e6ba006aecaf1ec32ee0 (commit)
via 40b49900c34e47916ebf7c8ec4a73446dec72820 (commit)
via db6ab6a6fdc2da1573da9cafc728e7fab065d749 (commit)
via 004d2a10c5eaebaea31e3319577cd9b9d48cb753 (commit)
via c1181b780bb87ae688d15070001ce9b949c35070 (commit)
via c218254018f43f0702aa5178bbb4c8f327ab0746 (commit)
via ac2da44b69397296266694267deffca3ac102068 (commit)
via 4f170b7b5644257278015e2ce570712d1cdb83b7 (commit)
via 3224b92743eec68bc211018daf0fd923b39984f7 (commit)
via b0f74b68bdd45cfde849c40a8fae21990adec523 (commit)
via f81726249b615e4a20a94818762ac654172bc2f8 (commit)
via 07ec1afa970db753581a5c975aeb76588b1b27ba (commit)
via e82f88d5d97dbf478dd3598e3ccbfe60f602588d (commit)
via 21727e00f5238903edf94e2efc56d62aa42bed4c (commit)
via 0ff09dc64993551d1b3cda3633605c73dacbacb7 (commit)
via 298919981c0ae0b6a57b1d005182bb7679534735 (commit)
via ac4e83161c7aac7414239642b49bdc3afbcb3f0b (commit)
via ef8171ba425f766b67d9e139194b6a8d570e301e (commit)
via 00e019bfd7c671c723e7d74e2a1558bb5da62e2a (commit)
via 4468aea43c3a92a19bf7d91a5f9125ab3774677b (commit)
via 7cc7fb8c9913ed14af7230e0e90b8407c8140a08 (commit)
via 4268fd376f09df33fd3799f5b4bd58af2714182e (commit)
via ac9e9cf809fd486cd98e826f0d3e92f1ab5d659e (commit)
via 5b16634c0c692a40899d67c7946e68f3fa303910 (commit)
via b29e6e860957393e05888fb01c3dd53cc67b3e6f (commit)
via bda0be46b2b35b6879f3dc0fd3ab1834755733a0 (commit)
via 18b89e9a67470eabb6878dd2e00edbe0e6fa396b (commit)
via 7c08d7c81edf6b25d74c71d57414dc9da78810d8 (commit)
via 074bcc1970f0417d2e39ed59cb99501c32ef21e5 (commit)
via 2cf3e24797d80e266bd2f4bb0a0f5a9ba400b236 (commit)
via 8464104fb299d1b1d707c0a083a04dce7c108953 (commit)
via 228587f19b25406f8a2ee76827524ef3fc921a77 (commit)
via edf8ad5d5da9c11e0dc61c1df40ce977e9e6a125 (commit)
from 1e7c5166aa4fa8f983cce549803c8ddc8893c846 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ec16c3a09212c684c0c905f1ac293b4495c2432b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Sun Apr 10 19:57:40 2011 +1200
Bug 5917 : Updating templates
commit 77167b3b17690ccff682d410847b13aa5ac186e8
Merge: 1e7c5166aa4fa8f983cce549803c8ddc8893c846 8843e29a9dd35fa3c34813077f4dfffd91483995
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Sun Apr 10 20:00:04 2011 +1200
Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
installer/data/mysql/updatedatabase.pl
-----------------------------------------------------------------------
Summary of changes:
C4/Accounts.pm | 25 +-
C4/Auth_with_ldap.pm | 127 +-
C4/Biblio.pm | 104 +-
C4/Branch.pm | 10 +-
C4/Charset.pm | 8 +-
C4/Context.pm | 2 +-
C4/Items.pm | 53 +
C4/Koha.pm | 49 +-
C4/Letters.pm | 4 +-
C4/Record.pm | 2 +
C4/SIP/ILS/Patron.pm | 137 +-
C4/Search.pm | 29 +-
Makefile.PL | 4 +-
acqui/acqui-home.pl | 18 +-
acqui/addorderiso2709.pl | 370 +-
admin/branch_transfer_limits.pl | 2 +-
admin/branches.pl | 3 +-
cataloguing/addbiblio.pl | 3 +
cataloguing/value_builder/normarc_field_007.pl | 162 +
cataloguing/value_builder/normarc_field_008.pl | 184 +
cataloguing/value_builder/normarc_leader.pl | 106 +
circ/circulation.pl | 1 +
circ/overdue.pl | 12 +-
docs/opac/OpacHiddenItems.txt | 12 +
etc/zebradb/ccl.properties | 6 +
etc/zebradb/lang_defs/nb/sort-string-utf.chr | 43 +
etc/zebradb/marc_defs/normarc/biblios/record.abs | 327 ++
etc/zebradb/marc_defs/unimarc/biblios/record.abs | 3 +
installer/data/mysql/de-DE/mandatory/sysprefs.sql | 3 +-
installer/data/mysql/en/mandatory/sysprefs.sql | 5 +-
.../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 4 +-
.../1-Obligatoire/unimarc_standard_systemprefs.sql | 2 +
installer/data/mysql/it-IT/necessari/sysprefs.sql | 4 +-
installer/data/mysql/kohastructure.sql | 9 +
.../marcflavour/normarc/Obligatorisk/normarc.sql | 991 +++++
.../marcflavour/normarc/Obligatorisk/normarc.txt | 1 +
installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 3 +-
...m_preferences_full_optimal_for_install_only.sql | 2 +
...m_preferences_full_optimal_for_install_only.sql | 3 +
installer/data/mysql/updatedatabase.pl | 37 +-
.../intranet-tmpl/prog/en/css/intranet-print.css | 235 -
koha-tmpl/intranet-tmpl/prog/en/css/intranet.css | 491 ---
koha-tmpl/intranet-tmpl/prog/en/css/intranet2.css | 665 ---
.../intranet-tmpl/prog/en/css/intranet2popup.css | 551 ---
.../intranet-tmpl/prog/en/css/pages/addbiblio.css | 75 -
.../intranet-tmpl/prog/en/css/staff-global2.css | 575 ---
.../prog/en/includes/budgets-admin-toolbar.inc | 2 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 5 +-
.../prog/en/includes/search_indexes.inc | 1 +
.../prog/en/modules/acqui/acqui-home.tmpl | 46 +-
.../prog/en/modules/acqui/addorderiso2709.tmpl | 141 +-
.../prog/en/modules/acqui/neworderbiblio.tmpl | 4 +-
.../prog/en/modules/admin/aqbudgetperiods.tmpl | 2 +-
.../prog/en/modules/admin/aqbudgets.tmpl | 2 +-
.../prog/en/modules/admin/branches.tmpl | 6 +-
.../prog/en/modules/admin/classsources.tmpl | 3 +-
.../prog/en/modules/admin/itemtypes.tmpl | 2 +-
.../prog/en/modules/admin/marctagstructure.tmpl | 29 +-
.../prog/en/modules/admin/matching-rules.tmpl | 2 +-
.../prog/en/modules/admin/patron-attr-types.tmpl | 2 +-
.../en/modules/admin/preferences/cataloguing.pref | 1 +
.../prog/en/modules/admin/preferences/opac.pref | 16 +-
.../en/modules/authorities/searchresultlist.tmpl | 2 +-
.../prog/en/modules/cataloguing/addbiblio.tmpl | 41 +-
.../prog/en/modules/cataloguing/addbooks.tmpl | 2 +-
.../value_builder/normarc_field_007.tmpl | 2825 ++++++++++++
.../value_builder/normarc_field_008.tmpl | 4519 ++++++++++++++++++++
.../cataloguing/value_builder/normarc_leader.tmpl | 223 +
.../value_builder/unimarc_field_210c.tmpl | 4 +-
.../prog/en/modules/cataloguing/z3950_search.tmpl | 2 +-
.../prog/en/modules/circ/overdue.tmpl | 30 +
.../en/modules/help/tools/import_borrowers.tmpl | 4 +-
.../prog/en/modules/members/boraccount.tmpl | 2 +
.../prog/en/modules/members/guarantor_search.tmpl | 9 +-
.../prog/en/modules/members/mancredit.tmpl | 1 +
.../prog/en/modules/members/maninvoice.tmpl | 1 +
.../prog/en/modules/members/member.tmpl | 2 +-
.../prog/en/modules/members/memberentrygen.tmpl | 40 +-
.../prog/en/modules/members/moremember.tmpl | 9 +-
.../intranet-tmpl/prog/en/modules/members/pay.tmpl | 12 +-
.../en/modules/patroncards/members-search.tmpl | 2 +-
.../en/modules/reports/guided_reports_start.tmpl | 2 +-
.../prog/en/modules/serials/member-search.tmpl | 2 +-
.../intranet-tmpl/prog/en/modules/tags/review.tmpl | 2 +-
.../prog/en/modules/virtualshelves/shelves.tmpl | 2 +-
...{MARC21slim2OAIDC.xsl => NORMARCslim2OAIDC.xsl} | 0
.../opac-tmpl/prog/en/modules/opac-advsearch.tmpl | 1 +
.../opac-tmpl/prog/en/modules/opac-results.tmpl | 3 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl | 14 +-
.../opac-tmpl/prog/en/modules/opac-userupdate.tmpl | 12 +-
.../prog/en/xslt/NORMARCslim2OPACDetail.xsl | 528 +++
.../prog/en/xslt/NORMARCslim2OPACResults.xsl | 871 ++++
.../opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl | 205 +
.../prog/en/includes/acquisitions-toolbar.inc | 20 +-
.../prog/en/includes/budgets-admin-toolbar.inc | 2 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 5 +-
.../prog/en/includes/search_indexes.inc | 1 +
.../prog/en/modules/acqui/acqui-home.tt | 46 +-
.../prog/en/modules/acqui/addorderiso2709.tt | 141 +-
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 1 +
.../prog/en/modules/acqui/booksellers.tt | 4 +-
.../prog/en/modules/acqui/neworderbiblio.tt | 2 +-
.../prog/en/modules/acqui/neworderempty.tt | 4 +-
.../prog/en/modules/admin/aqbudgetperiods.tt | 2 +-
.../prog/en/modules/admin/aqbudgets.tt | 2 +-
.../prog/en/modules/admin/branches.tt | 6 +-
.../prog/en/modules/admin/classsources.tt | 3 +-
.../prog/en/modules/admin/fieldmapping.tt | 2 +-
.../prog/en/modules/admin/itemtypes.tt | 2 +-
.../en/modules/admin/marc_subfields_structure.tt | 2 +-
.../prog/en/modules/admin/marctagstructure.tt | 30 +-
.../prog/en/modules/admin/matching-rules.tt | 2 +-
.../prog/en/modules/admin/patron-attr-types.tt | 2 +-
.../en/modules/authorities/searchresultlist.tt | 2 +-
.../prog/en/modules/batch/print-notices.tt | 1 +
.../prog/en/modules/catalogue/moredetail.tt | 2 +-
.../prog/en/modules/catalogue/results.tt | 2 +-
.../prog/en/modules/cataloguing/addbiblio.tt | 41 +-
.../prog/en/modules/cataloguing/addbooks.tt | 2 +-
.../cataloguing/value_builder/normarc_field_007.tt | 2825 ++++++++++++
.../cataloguing/value_builder/normarc_field_008.tt | 4519 ++++++++++++++++++++
.../cataloguing/value_builder/normarc_leader.tt | 223 +
.../value_builder/unimarc_field_210c.tt | 4 +-
.../prog/en/modules/cataloguing/z3950_search.tt | 18 +-
.../intranet-tmpl/prog/en/modules/circ/overdue.tt | 30 +
.../modules/help/admin/marc_subfields_structure.tt | 2 +-
.../prog/en/modules/help/tools/import_borrowers.tt | 4 +-
.../prog/en/modules/members/boraccount.tt | 2 +
.../prog/en/modules/members/guarantor_search.tt | 9 +-
.../prog/en/modules/members/mancredit.tt | 1 +
.../prog/en/modules/members/maninvoice.tt | 1 +
.../prog/en/modules/members/member.tt | 2 +-
.../prog/en/modules/members/memberentrygen.tt | 40 +-
.../prog/en/modules/members/moremember.tt | 9 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 12 +-
.../prog/en/modules/patroncards/members-search.tt | 2 +-
.../en/modules/reports/guided_reports_start.tt | 5 +-
.../prog/en/modules/serials/member-search.tt | 2 +-
.../intranet-tmpl/prog/en/modules/tags/review.tt | 2 +-
.../prog/en/modules/tools/stage-marc-import.tt | 3 -
.../prog/en/modules/virtualshelves/shelves.tt | 2 +-
.../prog/en/xslt/NORMARCslim2OAIDC.xsl | 0
.../opac-tmpl/prog/en/modules/opac-advsearch.tt | 1 +
koha-tt/opac-tmpl/prog/en/modules/opac-results.tt | 3 +-
koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt | 6 +-
koha-tt/opac-tmpl/prog/en/modules/opac-user.tt | 14 +-
.../opac-tmpl/prog/en/modules/opac-userupdate.tt | 12 +-
.../prog/en/xslt/NORMARCslim2OPACDetail.xsl | 528 +++
.../prog/en/xslt/NORMARCslim2OPACResults.xsl | 871 ++++
.../opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl | 205 +
kohaversion.pl | 2 +-
members/boraccount.pl | 1 +
members/guarantor_search.pl | 2 +
members/mancredit.pl | 20 +-
members/maninvoice.pl | 56 +-
members/member-flags.pl | 1 +
members/member-password.pl | 1 +
members/member.pl | 2 +-
members/moremember.pl | 2 +-
members/pay.pl | 9 +
members/readingrec.pl | 1 +
misc/cronjobs/overdue_notices.pl | 5 +-
opac/opac-detail.pl | 22 +-
opac/opac-user.pl | 18 +-
opac/opac-userupdate.pl | 2 +-
reserve/request.pl | 11 +-
tools/viewlog.pl | 3 +-
167 files changed, 21726 insertions(+), 3216 deletions(-)
mode change 100644 => 100755 C4/Biblio.pm
create mode 100755 cataloguing/value_builder/normarc_field_007.pl
create mode 100755 cataloguing/value_builder/normarc_field_008.pl
create mode 100755 cataloguing/value_builder/normarc_leader.pl
create mode 100644 docs/opac/OpacHiddenItems.txt
create mode 100644 etc/zebradb/lang_defs/nb/sort-string-utf.chr
create mode 100644 etc/zebradb/marc_defs/normarc/biblios/record.abs
create mode 100644 installer/data/mysql/nb-NO/marcflavour/normarc/Obligatorisk/normarc.sql
create mode 100644 installer/data/mysql/nb-NO/marcflavour/normarc/Obligatorisk/normarc.txt
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet-print.css
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet.css
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet2.css
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/intranet2popup.css
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/pages/addbiblio.css
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/staff-global2.css
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/normarc_field_007.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/normarc_field_008.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/normarc_leader.tmpl
copy koha-tmpl/intranet-tmpl/prog/en/xslt/{MARC21slim2OAIDC.xsl => NORMARCslim2OAIDC.xsl} (100%)
create mode 100644 koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl
create mode 100644 koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl
create mode 100644 koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
create mode 100644 koha-tt/intranet-tmpl/prog/en/modules/cataloguing/value_builder/normarc_field_007.tt
create mode 100644 koha-tt/intranet-tmpl/prog/en/modules/cataloguing/value_builder/normarc_field_008.tt
create mode 100644 koha-tt/intranet-tmpl/prog/en/modules/cataloguing/value_builder/normarc_leader.tt
copy koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2OAIDC.xsl => koha-tt/intranet-tmpl/prog/en/xslt/NORMARCslim2OAIDC.xsl (100%)
create mode 100644 koha-tt/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl
create mode 100644 koha-tt/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl
create mode 100644 koha-tt/opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list