From 804677265e1bb6c5118bc76d5f45b51ae0f579b4 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Thu, 10 Nov 2016 09:57:47 +0000 Subject: [PATCH] Bug 16239: Update templates Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- .../prog/en/includes/acquisitions-toolbar.inc | 10 +- .../prog/en/includes/auth-finder-search.inc | 4 +- .../prog/en/includes/authorities-toolbar.inc | 12 +-- .../prog/en/includes/blocked-fines.inc | 4 +- .../prog/en/includes/borrower_debarments.inc | 2 +- .../en/includes/budgets-admin-toolbar.inc | 8 +- .../prog/en/includes/cat-toolbar.inc | 28 +++--- .../prog/en/includes/cateditor-ui.inc | 24 ++--- .../prog/en/includes/checkouts-table.inc | 8 +- .../prog/en/includes/doc-head-close.inc | 1 + .../intranet-tmpl/prog/en/includes/header.inc | 8 +- .../prog/en/includes/intranet-bottom.inc | 8 +- .../prog/en/includes/labels-toolbar.inc | 4 +- .../prog/en/includes/members-toolbar.inc | 92 ++++++++++--------- .../prog/en/includes/patron-toolbar.inc | 6 +- .../prog/en/includes/patroncards-toolbar.inc | 4 +- .../prog/en/includes/quotes-toolbar.inc | 6 +- .../en/includes/quotes-upload-toolbar.inc | 6 +- .../prog/en/includes/reports-toolbar.inc | 14 +-- .../includes/rotating-collections-toolbar.inc | 8 +- .../prog/en/includes/serials-toolbar.inc | 18 ++-- .../en/includes/virtualshelves-toolbar.inc | 10 +- .../prog/en/modules/acqui/addorderiso2709.tt | 8 +- .../prog/en/modules/acqui/basket.tt | 38 +++++--- .../prog/en/modules/acqui/basketgroup.tt | 10 +- .../prog/en/modules/acqui/booksellers.tt | 14 ++- .../prog/en/modules/acqui/edifactmsgs.tt | 12 ++- .../prog/en/modules/acqui/invoices.tt | 2 +- .../prog/en/modules/acqui/neworderbiblio.tt | 8 +- .../prog/en/modules/acqui/neworderempty.tt | 12 ++- .../en/modules/acqui/newordersuggestion.tt | 4 +- .../prog/en/modules/acqui/parcel.tt | 8 +- .../prog/en/modules/acqui/supplier.tt | 8 +- .../modules/acqui/tables/members_results.tt | 4 +- .../prog/en/modules/acqui/transferorder.tt | 8 +- .../prog/en/modules/acqui/z3950_search.tt | 8 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/admin/aqbudgets.tt | 2 +- .../prog/en/modules/admin/aqcontract.tt | 4 +- .../prog/en/modules/admin/audio_alerts.tt | 8 +- .../modules/admin/auth_subfields_structure.tt | 2 +- .../en/modules/admin/auth_tag_structure.tt | 4 +- .../en/modules/admin/authorised_values.tt | 8 +- .../prog/en/modules/admin/authtypes.tt | 4 +- .../prog/en/modules/admin/biblio_framework.tt | 38 +++++--- .../prog/en/modules/admin/branches.tt | 12 +-- .../prog/en/modules/admin/categories.tt | 6 +- .../prog/en/modules/admin/cities.tt | 6 +- .../prog/en/modules/admin/classsources.tt | 12 +-- .../prog/en/modules/admin/currency.tt | 6 +- .../prog/en/modules/admin/edi_accounts.tt | 4 +- .../prog/en/modules/admin/edi_ean_accounts.tt | 6 +- .../prog/en/modules/admin/fieldmapping.tt | 2 +- .../en/modules/admin/items_search_fields.tt | 6 +- .../prog/en/modules/admin/itemtypes.tt | 6 +- .../prog/en/modules/admin/koha2marclinks.tt | 2 +- .../modules/admin/marc_subfields_structure.tt | 4 +- .../prog/en/modules/admin/marctagstructure.tt | 6 +- .../prog/en/modules/admin/matching-rules.tt | 6 +- .../prog/en/modules/admin/oai_set_mappings.tt | 4 +- .../prog/en/modules/admin/oai_sets.tt | 4 +- .../en/modules/admin/patron-attr-types.tt | 6 +- .../prog/en/modules/admin/printers.tt | 2 +- .../searchengine/elasticsearch/mappings.tt | 6 +- .../prog/en/modules/admin/smart-rules.tt | 22 ++--- .../prog/en/modules/admin/sms_providers.tt | 6 +- .../en/modules/admin/systempreferences.tt | 6 +- .../prog/en/modules/admin/z3950servers.tt | 6 +- .../en/modules/authorities/authorities.tt | 4 +- .../modules/authorities/searchresultlist.tt | 2 +- .../prog/en/modules/basket/basket.tt | 14 +-- .../prog/en/modules/catalogue/advsearch.tt | 12 ++- .../prog/en/modules/catalogue/detail.tt | 12 ++- .../prog/en/modules/catalogue/itemsearch.tt | 2 +- .../prog/en/modules/catalogue/results.tt | 12 +-- .../prog/en/modules/cataloguing/addbiblio.tt | 22 ++--- .../prog/en/modules/cataloguing/addbooks.tt | 22 +++-- .../prog/en/modules/cataloguing/additem.tt | 2 +- .../prog/en/modules/cataloguing/editor.tt | 83 ++++++++++------- .../prog/en/modules/cataloguing/merge.tt | 8 +- .../modules/cataloguing/z3950_auth_search.tt | 10 +- .../en/modules/cataloguing/z3950_search.tt | 9 +- .../prog/en/modules/circ/article-requests.tt | 6 +- .../prog/en/modules/circ/circulation.tt | 14 ++- .../prog/en/modules/circ/offline-mf.tt | 1 + .../prog/en/modules/circ/offline.tt | 4 +- .../prog/en/modules/circ/request-article.tt | 2 +- .../prog/en/modules/circ/returns.tt | 22 +++-- .../en/modules/circ/transferstoreceive.tt | 2 +- .../prog/en/modules/common/patron_search.tt | 2 +- .../modules/course_reserves/course-details.tt | 14 +-- .../course_reserves/course-reserves.tt | 2 +- .../prog/en/modules/intranet-main.tt | 2 +- .../en/modules/labels/label-edit-batch.tt | 16 ++-- .../prog/en/modules/labels/label-manage.tt | 6 +- .../prog/en/modules/labels/result.tt | 8 +- .../prog/en/modules/members/boraccount.tt | 6 +- .../prog/en/modules/members/housebound.tt | 16 ++-- .../prog/en/modules/members/memberentrygen.tt | 26 +++--- .../prog/en/modules/members/moremember.tt | 4 + .../prog/en/modules/members/notices.tt | 2 +- .../modules/members/purchase-suggestions.tt | 2 +- .../members/tables/guarantor_search.tt | 2 +- .../modules/members/tables/members_results.tt | 2 +- .../prog/en/modules/patron_lists/list.tt | 4 +- .../prog/en/modules/patron_lists/lists.tt | 10 +- .../prog/en/modules/patroncards/edit-batch.tt | 16 ++-- .../en/modules/patroncards/edit-layout.tt | 2 +- .../en/modules/patroncards/image-manage.tt | 6 +- .../prog/en/modules/patroncards/manage.tt | 6 +- .../patroncards/tables/members_results.tt | 2 +- .../prog/en/modules/plugins/plugins-home.tt | 4 +- .../prog/en/modules/reports/dictionary.tt | 4 +- .../modules/reports/guided_reports_start.tt | 8 +- .../prog/en/modules/reviews/reviewswaiting.tt | 4 +- .../rotatingCollections.tt | 2 +- .../en/modules/serials/acqui-search-result.tt | 4 +- .../prog/en/modules/serials/add_fields.tt | 6 +- .../en/modules/serials/checkexpiration.tt | 4 +- .../prog/en/modules/serials/result.tt | 4 +- .../modules/serials/routing-preview-slip.tt | 2 +- .../prog/en/modules/serials/routing.tt | 2 +- .../en/modules/serials/serials-collection.tt | 10 +- .../prog/en/modules/serials/serials-search.tt | 12 ++- .../serials/subscription-frequencies.tt | 6 +- .../serials/subscription-numberpatterns.tt | 6 +- .../modules/serials/tables/members_results.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 6 +- .../prog/en/modules/tags/list.tt | 2 +- .../prog/en/modules/tags/review.tt | 20 ++-- .../automatic_item_modification_by_age.tt | 10 +- .../prog/en/modules/tools/batchMod-del.tt | 6 +- .../prog/en/modules/tools/batchMod-edit.tt | 6 +- .../tools/batch_record_modification.tt | 10 +- .../prog/en/modules/tools/csv-profiles.tt | 2 +- .../prog/en/modules/tools/holidays.tt | 2 +- .../prog/en/modules/tools/koha-news.tt | 6 +- .../prog/en/modules/tools/letter.tt | 10 +- .../en/modules/tools/manage-marc-import.tt | 12 ++- .../tools/marc_modification_templates.tt | 22 +++-- .../en/modules/tools/stage-marc-import.tt | 4 +- .../prog/en/modules/tools/upload.tt | 10 +- .../prog/en/modules/virtualshelves/shelves.tt | 8 +- .../virtualshelves/tables/shelves_results.tt | 4 +- 144 files changed, 717 insertions(+), 571 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc index af24d52ddf..a82ab411a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -10,7 +10,7 @@ function confirm_deletion() {
[% IF ( booksellerid ) %]
- New + New
[% IF ( CAN_user_acquisition_vendors_manage ) %] - + [% UNLESS ( basketcount OR subscriptioncount ) %] - + [% END %] [% END %] [% IF CAN_user_acquisition_order_receive && basketcount %] - + [% END %] [% ELSE %] - + [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc index fad1b4cfb1..16a666e1f3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/auth-finder-search.inc @@ -106,8 +106,8 @@ function finderjumpfull(page)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc index 6001e43f92..582a4eddf1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc @@ -28,15 +28,15 @@ [% IF ( authid ) %] [% IF ( CAN_user_editauthorities ) %] - - + + [% UNLESS ( count ) %] - + [% END %] [% END %]
- Save + Save
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc index 0789789bff..21098f0ffd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc @@ -7,7 +7,7 @@ [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %] Checkouts are BLOCKED because fine balance is OVER THE LIMIT. [% END %] - Make payment - Pay all fines + Make payment + Pay all fines [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc index a72a76e41a..7b4b25d7d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc @@ -66,7 +66,7 @@ [% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] Indefinite [% END %] [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %] - + Remove diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc index 7172a8de39..e9d61a1dea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc @@ -1,7 +1,7 @@
[% IF ( budget_period_id ) %]
- +
- +
[% ELSE %] - + [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index a8868abd8d..3d6b23b9e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -130,7 +130,7 @@ [% IF ( CAN_user_editcatalogue_edit_catalogue || CAN_user_editcatalogue_edit_items || CAN_user_serials_create_subscription ) %]
- +