From 5c15d6113e0d3764168a39d2fee12542621332d3 Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Mon, 1 Mar 2021 02:23:12 +0000 Subject: [PATCH] Bug 26703: clubs, common & course_reserves folders 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 clubs, common and course_reserves folders 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 --- koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt | 2 +- .../intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt | 2 +- .../intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt | 2 +- .../intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt | 2 +- .../intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt | 2 +- .../intranet-tmpl/prog/en/modules/course_reserves/course-details.tt | 2 +- .../intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt | 2 +- .../intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt index f6bc52e61d..4bd118f1aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt @@ -5,7 +5,7 @@ [% USE Koha %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Tools › Patron clubs › Club enrollments +Club enrollments › Patron clubs › Tools › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt index cdfd13830a..c078f1d9fd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt @@ -4,12 +4,12 @@ [% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Tools › Patron clubs › +<title> [% IF club %] Modify club [% club.name | html %] [% ELSE %] Create a new [% club_template.name | html %] club - [% END %] + [% END %] › Patron clubs › Tools › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt index f7db215b35..b47e45524e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt @@ -5,7 +5,7 @@ [% USE Koha %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Tools › Patron clubs +Patron clubs › Tools › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt index 13aa40c195..be309da083 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt @@ -2,12 +2,12 @@ [% USE AuthorisedValues %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Tools › Patron clubs › +<title> [% IF club_template %] Modify club template [% club_template.name | html %] [% ELSE %] Create a new club template - [% END %] + [% END %] › Patron clubs › Tools › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt index 428e293713..c9faa48b4b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Course reserves › Add items +Add items › Course reserves › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt index 9c12bc05db..9cc5d1438e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt @@ -1,7 +1,7 @@ [% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Course reserves ›[% IF is_edit || course_reserve %] Edit item[% ELSE %] Add items[% END %] +[% IF is_edit || course_reserve %]Edit item[% ELSE %]Add items[% END %] › Course reserves › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt index 1da830054d..0052a33f61 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt @@ -5,7 +5,7 @@ [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Course reserves › Add items +Add items › Course reserves › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt index d39db41914..78c95f0e15 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt @@ -2,7 +2,7 @@ [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Course reserves › Remove reserves +Remove reserves › Course reserves › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt index aed553c2fb..64514e95fb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt @@ -6,7 +6,7 @@ [% USE TablesSettings %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Course reserves › Course details for [% course.course_name | html %] +Course details for [% course.course_name | html %] › Course reserves › Koha [% INCLUDE 'doc-head-close.inc' %]