From 3d3d974e3041171d684c52a7b0cd0bb8f96bf2da Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Mon, 1 Mar 2021 02:15:26 +0000 Subject: [PATCH] Bug 26703: circ 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 circ 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/circ/article-requests.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/bookcount.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/branchoverdues.tt | 2 +- .../prog/en/modules/circ/branchtransfers.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/checkout-notes.tt | 2 +- .../prog/en/modules/circ/circulation-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 6 +++--- .../prog/en/modules/circ/circulation_batch_checkouts.tt | 9 +++++---- koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt | 2 +- .../prog/en/modules/circ/on-site_checkouts.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt | 2 +- .../prog/en/modules/circ/pendingreserves.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/printslip.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt | 2 +- .../prog/en/modules/circ/request-article.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/reserveratios.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/set-library.tt | 4 ++-- .../prog/en/modules/circ/transferstoreceive.tt | 2 +- .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 2 +- 21 files changed, 31 insertions(+), 30 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt index eec1c7432e..8c17b0563e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt @@ -6,7 +6,7 @@ [% USE raw %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Article requests +Article requests › Circulation › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt index ec4ea1c74c..eea385bdce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/bookcount.tt @@ -3,7 +3,7 @@ [% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Circulation statistics for [% title | html %] +Circulation statistics for [% title | html %] › Circulation › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt index 8da31eb24f..a51df46abf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt @@ -1,7 +1,7 @@ [% USE Branches %] [% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Overdues at [% Branches.GetLoggedInBranchname | html %] +Overdues at [% Branches.GetLoggedInBranchname | html %] › Circulation › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt index 41aff35af8..0200ec742f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -3,7 +3,7 @@ [% USE ItemTypes %] [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Transfers +Transfers › Circulation › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt index 693b752540..1ae7a887e9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt @@ -5,7 +5,7 @@ [% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Checkout notes +Checkout notes › Circulation › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt index 2c5a6c666b..e0ff319991 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt @@ -2,7 +2,7 @@ [% USE Koha %] [% USE Branches %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation +Circulation › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index e0ea618df2..d10c6fd0fa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -13,10 +13,10 @@ [% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %] [% SET destination = "circ" %] - Koha › Circulation [% IF patron %] - › Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] - [% END %] + Checking out to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] › [% END %] + + Circulation › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt index 0fcce3ee13..54a41d4fbf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt @@ -8,10 +8,11 @@ [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] [% SET destination = "circ" %] -Koha › Circulation -[% IF patron %] - › Batch check out › Issuing items to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] -[% END %] +<title> + [% IF patron %] + Issuing items to [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %] › Batch check out › [% END %] + + Circulation › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt index 012033cfba..f366f50cfd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt @@ -11,7 +11,7 @@ [% ELSIF ( AllowOfflineCirculation ) %] [% ELSE %][% END %] -Koha › Circulation +Circulation › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt index 38f387a6a8..cbef5acf85 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt @@ -6,7 +6,7 @@ [% USE AuthorisedValues %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Pending on-site checkouts +Pending on-site checkouts › Circulation › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt index d4c90e5700..2652208802 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -8,7 +8,7 @@ [%- USE TablesSettings -%] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Items overdue as of [% todaysdate | html %] +Items overdue as of [% todaysdate | html %] › Circulation › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt index 38882f3b5d..47054530eb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -6,7 +6,7 @@ [% USE TablesSettings %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Holds awaiting pickup +Holds awaiting pickup › Circulation › Koha [% INCLUDE 'doc-head-close.inc' %] -- 2.20.1