Koha › Patrons › [% INCLUDE 'patron-title.inc' no

From da21920c416f7fe183e54687af81f6ece5755205 Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Mon, 1 Mar 2021 21:23:22 +0000 Subject: [PATCH] Bug 26703: members folder Swapped the order of the page titles to have the unique information first, i.e. the name of the specific page displays first, and the name of the website (e.g. Koha) displays at the end. To test: 1) Apply patch 2) Ensure each of the files in the members folder are swapped around to display the most unique information first, and the website name is at the end 3) Ensure the pages displayed on the Staff Client that correspond to these files also display the changes Sponsored-by: Catalyst IT Signed-off-by: Martin Renvoize --- .../prog/en/modules/members/accountline-details.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/apikeys.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/boraccount.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/deletemem.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/discharge.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/discharges.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/housebound.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/ill-requests.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/mancredit.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/maninvoice.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/member-flags.tt | 4 +++- .../prog/en/modules/members/member-password.tt | 4 +++- koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 4 ++-- .../prog/en/modules/members/members-update.tt | 2 +- .../prog/en/modules/members/merge-patrons.tt | 2 +- .../prog/en/modules/members/moremember-brief.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/paycollect.tt | 4 ++-- .../prog/en/modules/members/purchase-suggestions.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/statistics.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/members/update-child.tt | 2 +- 23 files changed, 33 insertions(+), 29 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt index c98dbb8ca0..0f3fde2e87 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt @@ -7,7 +7,7 @@ [% SET footerjs = 1 %] [% PROCESS 'accounts.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Patrons › [% INCLUDE 'patron-title.inc' no_html = 1 %] › Details of fee +Details of fee › [% INCLUDE 'patron-title.inc' no_html = 1 %] › Patrons › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt index 6389e1994a..91054846b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt @@ -3,7 +3,7 @@ [% USE Asset %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Patrons › API Keys +API Keys › Patrons › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index b23267b970..606c804bd8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -14,7 +14,7 @@ [% PROCESS 'accounts.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Patrons › Account for [% INCLUDE 'patron-title.inc' no_html = 1 %] +Account for [% INCLUDE 'patron-title.inc' no_html = 1 %] › Patrons › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt index 23c59cd49b..2f0a6b19b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt @@ -4,7 +4,7 @@ [% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Delete patron [% patron.firstname | html %] [% patron.surname | html %] +Delete patron [% patron.firstname | html %] [% patron.surname | html %] › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt index 692e4942f4..4217796780 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt @@ -5,7 +5,7 @@ [% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Patrons › [% UNLESS blocking_error %]Discharge for [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])[% END %] +[% UNLESS blocking_error %]Discharge for [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])[% END %] › Patrons › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt index f24d630be6..b0db4e704f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt @@ -4,7 +4,7 @@ [% USE KohaDates %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Patrons › Pending discharge requests +Pending discharge requests › Patrons › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt index d9515160f7..00efe7eeb4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt @@ -6,7 +6,7 @@ [% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Housebound › Details for [% INCLUDE 'patron-title.inc' no_html = 1 %] +Details for [% INCLUDE 'patron-title.inc' no_html = 1 %] › Housebound › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt index 66322860d4..f6eac4e849 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt @@ -8,7 +8,7 @@ [% USE TablesSettings %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Patrons › ILL requests history for [% INCLUDE 'patron-title.inc' no_html = 1 %] +ILL requests history for [% INCLUDE 'patron-title.inc' no_html = 1 %] › Patrons › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt index 10a5071e93..08fbcd8bfa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt @@ -7,7 +7,7 @@ [% PROCESS 'accounts.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Patrons › Create manual credit +Create manual credit › Patrons › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt index be950ce76c..efcd70b937 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt @@ -8,7 +8,7 @@ [% PROCESS 'accounts.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Patrons › Create manual invoice +Create manual invoice › Patrons › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt index c28655733e..0118579685 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt @@ -4,7 +4,9 @@ [% SET footerjs = 1 %] [% PROCESS 'permissions.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Patrons › Set permissions for [% patron.surname | html %], [% patron.firstname | html %] + + Set permissions for [% patron.surname | html %], [% patron.firstname | html %] › Patrons › Koha + [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt index a0a1b2ea79..3d8d602f51 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt @@ -4,7 +4,9 @@ [% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Patrons › [% IF ( newpassword ) %]Password updated [% ELSE %]Update password for [% patron.surname | html %], [% patron.firstname | html %][% END %] + + [% IF ( newpassword ) %]Password updated [% ELSE %]Update password for [% patron.surname | html %], [% patron.firstname | html %][% END %] › Patrons › Koha + [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt index 2ab9c823a2..0506130ef0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -7,7 +7,7 @@ [% SET footerjs = 1 %] [% PROCESS 'patronfields.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Patrons [% IF ( searching ) %]› Search results[% END %] +Patrons[% IF ( searching ) %] › Search results[% END %] › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index e63e97e347..7ae1246819 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -10,7 +10,7 @@ [% PROCESS 'member-alt-contact-style.inc' %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Patrons › + <title> [% UNLESS blocking_error %] [% IF ( opadd ) %] Add patron @@ -21,7 +21,7 @@ [% END %] [% INCLUDE 'patron-title.inc' no_html = 1 %] [% IF categoryname %]([% categoryname | html %])[% END %] - [% END %] + [% END %] › Patrons › Koha