@@ -, +, @@ rotating_collections folders pos, reserve, rotating_collections folders and check that they have an obvious and descriptive heading --- .../prog/en/modules/offline_circ/enqueue_koc.tt | 2 +- .../intranet-tmpl/prog/en/modules/offline_circ/list.tt | 2 +- .../prog/en/modules/offline_circ/process_koc.tt | 4 ++-- .../prog/en/modules/patroncards/edit-batch.tt | 2 ++ .../prog/en/modules/patroncards/edit-layout.tt | 2 ++ .../prog/en/modules/patroncards/edit-profile.tt | 2 +- .../prog/en/modules/patroncards/edit-template.tt | 2 +- .../intranet-tmpl/prog/en/modules/patroncards/home.tt | 1 + .../prog/en/modules/patroncards/image-manage.tt | 5 +++-- .../intranet-tmpl/prog/en/modules/patroncards/manage.tt | 3 +++ .../intranet-tmpl/prog/en/modules/patroncards/print.tt | 1 + .../intranet-tmpl/prog/en/modules/plugins/plugins-home.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 7 ++++--- .../prog/en/modules/rotating_collections/addItems.tt | 3 ++- 15 files changed, 27 insertions(+), 13 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt @@ -24,7 +24,7 @@
-

Koha offline circulation

+

Koha offline circulation

Your file was uploaded. Once all files are uploaded, please process them in pending offline circulation actions.

[% FOREACH message IN messages %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt @@ -30,7 +30,7 @@
-

Offline circulation

+

Offline circulation

[% IF ( pending_operations ) %] --- 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 @@ -43,7 +43,7 @@
[% IF ( transactions_loaded ) %] -

Koha offline circulation

+

Koha offline circulation

Your data was processed. Here are the results:

[% FOREACH message IN messages %] [% IF ( message.message ) %] @@ -58,7 +58,7 @@ [% IF ( message.payment ) %]

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

[% END %] [% END %] [% ELSE %] -

Upload offline circulation data

+

Upload offline circulation data

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -45,6 +45,8 @@ [% INCLUDE 'patroncards-toolbar.inc' %] +

[% IF description %]Edit [% ELSIF batch_id %]Edit [% ELSE %]New [% END %]patron card batches

+ [% IF ( duplicate_message ) %]
Duplicate patrons removed from batch number [% batch_id | html %]: [% duplicate_count | html %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-layout.tt @@ -41,6 +41,8 @@ [% INCLUDE 'patroncards-toolbar.inc' %] +

[% IF ( layout_id ) %]Edit[% ELSE %]Create[% END %] patron card layout

+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-profile.tt @@ -41,7 +41,7 @@ [% INCLUDE 'patroncards-toolbar.inc' %] -

[% IF (profile_id) %]Edit[% ELSE %]Create[% END%] printer profile[% IF (profile_id) %] ([% profile_id | html %])[% END %]

+

[% IF (profile_id) %]Edit[% ELSE %]Create[% END%] printer profile[% IF (profile_id) %] ([% profile_id | html %])[% END %]

Profile settings
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-template.tt @@ -42,8 +42,8 @@
    [% INCLUDE 'patroncards-toolbar.inc' %] +

    [% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id | html %])[% END %]

    -

    [% IF (template_id) %]Edit[% ELSE %]Create[% END %] patron card template[% IF (template_id) %] ([% template_id | html %])[% END %]

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/home.tt @@ -28,6 +28,7 @@ [% INCLUDE 'patroncards-toolbar.inc' %] +

    Patron card creator

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt @@ -32,10 +32,11 @@
[% INCLUDE 'patroncards-toolbar.inc' %] +

Image manager

[% INCLUDE 'patroncards-errors.inc' %]
-

Upload additional images for patron cards

+

Upload additional images for patron cards

Manage additional images to use as logo, decoration or background on a patron card layout.

@@ -74,7 +75,7 @@
-

Delete images

+

Delete images

[% IF ( TABLE ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt @@ -56,6 +56,9 @@
[% INCLUDE 'patroncards-toolbar.inc' %] + +

Patron card templates

+ [% INCLUDE 'patroncards-errors.inc' %]
[% IF ( table_loop ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt @@ -7,6 +7,7 @@
+

Patron card printing/exporting

[% IF ( batches ) %]

Click on the following link(s) to download the exported batch(es).

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt @@ -31,6 +31,7 @@
+

Plugins

@@ -67,7 +68,6 @@ [% END %]
[% END %] -

Plugins

[% IF search_results %]

Search results

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt @@ -33,6 +33,8 @@
+

Point of sale

+ [% IF ( registers.size == 0 ) %]

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -86,6 +86,7 @@ [% END %]

+

Holds

[% IF ( nobiblio ) %]
@@ -118,9 +119,9 @@ [% END %] [% UNLESS ( multi_hold ) %] -

Place a hold on [% INCLUDE 'biblio-title.inc' link = 1 %] [% IF biblio.author %] by [% biblio.author | html %][% END %]

+

Place a hold on [% INCLUDE 'biblio-title.inc' link = 1 %] [% IF biblio.author %] by [% biblio.author | html %][% END %]

[% ELSE %] -

+

[% IF ( patron ) %] Place holds [% ELSE %] @@ -130,7 +131,7 @@ Search patrons [% END %] [% END %] -

+ [% END %] [% UNLESS club OR patron OR patron.borrowernumber OR noitems OR nobiblio %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt @@ -36,6 +36,7 @@
+

Add/remove items from collection

[% IF ( ! colId ) %]
@@ -44,7 +45,7 @@
[% ELSE %] [% INCLUDE 'rotating-collections-toolbar.inc' %] -

Collection [% colTitle | html %]

+

Collection [% colTitle | html %]

[% IF ( previousActionAdd ) %] [% IF ( addSuccess ) %] --