@@ -, +, @@ --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt | 4 ++-- .../en/modules/cataloguing/value_builder/marc21_linking_section.tt | 3 ++- .../prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt | 2 +- .../prog/en/modules/virtualshelves/addbybiblionumber.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 1 - koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt | 4 ++-- 18 files changed, 26 insertions(+), 27 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -256,7 +256,7 @@ function CheckRuleForm(f) { --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -500,7 +500,7 @@ var holdForPatron = function () { [% IF ( SEARCH_RESULT.XSLTResultsRecord ) %] [% SEARCH_RESULT.result_number %]. - [% SEARCH_RESULT.XSLTResultsRecord.raw %] + [% SEARCH_RESULT.XSLTResultsRecord.raw %] [% ELSE %]

[% SEARCH_RESULT.result_number %]. [% biblionumber = SEARCH_RESULT.biblionumber %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tt @@ -28,7 +28,7 @@ [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] [% IF ( SEARCH_RESULT.even ) %][% ELSE %][% END %] - [% SEARCH_RESULT.subject %] + [% SEARCH_RESULT.subject %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt @@ -20,7 +20,7 @@ [% ELSE %] [% IF ( success ) %] -

The item has successfully been linked to [% bibliotitle %].
+
The item has successfully been linked to [% bibliotitle %].
@@ -40,7 +40,7 @@ [% IF ( missingbarcode ) %]
- +
Enter item barcode:
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt @@ -52,7 +52,7 @@ [% ELSE %] [% IF ( success ) %] -
The item has successfully been attached to [% INCLUDE 'biblio-default-view.inc' %][% bibliotitle %]. +
The item has successfully been attached to [% INCLUDE 'biblio-default-view.inc' %][% bibliotitle %].

[% INCLUDE actions %] @@ -79,7 +79,7 @@ [% END %] [% IF ( missingbarcode ) %] -

Attach an item[% IF ( bibliotitle ) %] to [% bibliotitle %][% END %]

+

Attach an item[% IF ( bibliotitle ) %] to [% bibliotitle %][% END %]

The item you select will be moved to the target record.

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_linking_section.tt @@ -173,7 +173,8 @@ [% IF ( resul.MARC_ON ) %] [% resul.title %] [% ELSE %] - [% resul.title %] [% END %] + [% resul.title %] + [% END %]

[% resul.author %] [% IF ( resul.publishercode ) %]- [% resul.publishercode %][% END %] [% IF ( resul.place ) %] ; [% resul.place %][% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt @@ -41,7 +41,7 @@ [% IF ( total ) %]

Authority search results

- [% pagination_bar.raw %] + [% pagination_bar.raw %]
[% END %]

[% IF ( total ) %] @@ -74,7 +74,7 @@ [% END %] [% IF ( total ) %]

- [% pagination_bar.raw %] + [% pagination_bar.raw %]
[% END %]
- +
[% ELSE %] - + [% END %] [% IF ( patron_attr_filter_loo.repeatable ) %] Add --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt @@ -69,7 +69,7 @@ [% FOREACH result_se IN result_set %]
-

[% result_se.title %]

+

[% result_se.title %]

[% IF ( result_se.author ) %]by [% result_se.author %][% END %] [[% result_se.itemtype %]], [% IF ( result_se.publishercode ) %][% result_se.publishercode %] [% END %][% IF ( result_se.place ) %][% result_se.place %] [% END %][% IF ( result_se.copyrightdate ) %][% result_se.copyrightdate %], [% END %][% IF ( result_se.pages ) %][% result_se.pages %][% END %][% IF ( result_se.isbn ) %], ISBN: [% result_se.isbn %][% END %][% IF ( result_se.notes ) %],
[% result_se.notes %][% END %]

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -621,7 +621,6 @@ [% CASE # us %] [% INCLUDE 'member-alt-contact-style-us.inc' %] [% END %] - [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt @@ -80,9 +80,9 @@ function CheckForm(f) {
[% END %] [% IF ( message.ERROR_no_borrower_from_item ) %]

Warning: Unable to determine patron from item barcode ([% message.badbarcode %]). Cannot check in.

[% END %] - [% IF ( message.issue ) %]

Checked out [% message.title %] ([% message.barcode %]) to [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

[% END %] - [% IF ( message.renew ) %]

Renewed [% message.title %] ([% message.barcode %]) for [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

[% END %] - [% IF ( message.return ) %]

Checked in [% message.title %] ([% message.barcode %]) from [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

[% END %] + [% IF ( message.issue ) %]

Checked out [% message.title %] ([% message.barcode %]) to [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

[% END %] + [% IF ( message.renew ) %]

Renewed [% message.title %] ([% message.barcode %]) for [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

[% END %] + [% IF ( message.return ) %]

Checked in [% message.title %] ([% message.barcode %]) from [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

[% END %] [% IF ( message.payment ) %]

Accepted payment ([% message.amount %]) from [% message.firstname %] [% message.surname %] ([% message.cardnumber %]): [% message.datetime %]

[% END %] [% END %] [% ELSE %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt @@ -211,7 +211,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; } [% END %] [% IF ( pagination_bar ) %]
- [% pagination_bar.raw %] + [% pagination_bar.raw %]
[% END %] [% IF ( tagloop ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt @@ -97,7 +97,7 @@ for( x=0; x [% FOREACH item_loo IN item_loop %] [% IF ( show ) %][% IF ( item_loo.nomod ) %] Cannot edit[% ELSE %][% END %][% END %] - [% FOREACH item_valu IN item_loo.item_value %] [% item_valu.field %] + [% FOREACH item_valu IN item_loo.item_value %] [% item_valu.field %] [% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt @@ -132,7 +132,7 @@ $(document).ready(function(){   [% END %] - [% FOREACH item_valu IN item_loo.item_value %] [% item_valu.field %] + [% FOREACH item_valu IN item_loo.item_value %] [% item_valu.field %] [% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt @@ -17,13 +17,13 @@
[% IF ( multiple ) %] -

Add [% total %] items to [% IF ( singleshelf ) %][% shelfname%]: [% ELSE %]a list:[% END %]

+

Add [% total %] items to [% IF ( singleshelf ) %][% shelfname%]: [% ELSE %]a list:[% END %]

[% ELSE %]

Add to [% IF ( singleshelf ) %][% shelfname %][% ELSE %]a list:[% END %]

[% END %]
    [% FOREACH biblio IN biblios %] -
  • [% biblio.title %] +
  • [% biblio.title %] [% IF ( biblio.author ) %] [% biblio.author %] [% END %]
  • [% END %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt @@ -45,8 +45,8 @@ [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %] [% IF ( BakerTaylorEnabled ) %][% IF bt_id %]See Baker & Taylor[% END %][% END %] -

    [% IF ( SEARCH_RESULT.author ) %]By [% SEARCH_RESULT.author %]. [% END %] - [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place %] [% END %][% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode %][% END %][% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear %] +

    [% IF ( SEARCH_RESULT.author ) %]By [% SEARCH_RESULT.author %]. [% END %] + [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place %] [% END %][% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode %][% END %][% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear %] [% ELSE %][% IF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate %][% END %][% END %] [% IF ( SEARCH_RESULT.pages ) %]. [% SEARCH_RESULT.pages %][% END %] [% IF ( SEARCH_RESULT.notes ) %], [% SEARCH_RESULT.notes %][% END %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -514,7 +514,6 @@ [% END %]

[% END # / IF itemsloop %] - [% END %] [% IF itemsloop && can_remove_biblios %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt @@ -20,8 +20,8 @@ [% bt_id = ( review.normalized_upc || review.normalized_isbn ) %] [% IF ( BakerTaylorEnabled && bt_id ) %]See Baker & Taylor[% END %] - [% IF ( review.author ) %]

By [% review.author %].

[% END %] -

[% IF ( review.place ) %][% review.place %] [% END %][% IF ( review.publishercode ) %][% review.publishercode %][% END %][% IF ( review.publicationyear ) %] [% review.publicationyear %] + [% IF ( review.author ) %]

By [% review.author %].

[% END %] +

[% IF ( review.place ) %][% review.place %] [% END %][% IF ( review.publishercode ) %][% review.publishercode %][% END %][% IF ( review.publicationyear ) %] [% review.publicationyear %] [% ELSE %][% IF ( review.copyrightdate ) %] [% review.copyrightdate %][% END %][% END %] [% IF ( review.pages ) %]. [% review.pages %][% END %] [% IF ( review.notes ) %], [% review.notes %][% END %] --