From 72a7e2369bf74ec2f7cbb8843b25067e5fd50842 Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Fri, 26 Feb 2021 02:32:31 +0000 Subject: [PATCH] Bug 26703: modules and modules/acqui 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 modules folder and the modules/acqui 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 --- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/addorder.tt | 2 +- .../prog/en/modules/acqui/addorderiso2709.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 2 +- .../prog/en/modules/acqui/basketheader.tt | 10 +++++----- .../intranet-tmpl/prog/en/modules/acqui/booksellers.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/cancelorder.tt | 2 +- .../prog/en/modules/acqui/duplicate_orders.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/acqui/edi_ean.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/edimsg.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/histsearch.tt | 2 +- .../prog/en/modules/acqui/invoice-files.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/invoices.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/lateorders.tt | 2 +- .../prog/en/modules/acqui/modordernotes.tt | 5 ++--- .../prog/en/modules/acqui/neworderempty.tt | 2 +- .../prog/en/modules/acqui/neworderempty_duplicate.tt | 2 +- .../prog/en/modules/acqui/newordersubscription.tt | 2 +- .../prog/en/modules/acqui/newordersuggestion.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 2 +- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/showorder.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/supplier.tt | 2 +- .../prog/en/modules/acqui/transferorder.tt | 2 +- .../prog/en/modules/acqui/uncertainprice.tt | 2 +- .../prog/en/modules/acqui/z3950_search.tt | 3 ++- 33 files changed, 46 insertions(+), 46 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index 9d24e81334..780fb45b8e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -3,7 +3,7 @@ [% USE KohaDates %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › About Koha +About Koha › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index 5195314c8e..d9fc47a151 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -4,7 +4,7 @@ [% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisitions +Acquisitions › Koha [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt index de927ac12a..6dc6ba94a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt @@ -1,5 +1,5 @@ [% INCLUDE "doc-head-open.inc" %] -Koha › Acquisition › Add order +Add order › Acquisition › Koha [% INCLUDE "doc-head-close.inc" %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index c730d3e1b2..cdae6dc6f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -3,12 +3,12 @@ [% USE KohaDates %] [% USE Branches %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisitions › Order staged MARC records +<title> [% IF ( batch_details ) %] - › Batch [% import_batch_id | html %] +Batch [% import_batch_id | html %] [% ELSE %] - › Batch list -[% END %] +Batch list +[% END %] › Order staged MARC records › Acquisitions › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 56462c51d5..b25fa0683c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -22,7 +22,7 @@ [% USE TablesSettings %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisitions › [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for [% booksellername | html %] +[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for [% booksellername | html %] › Acquisitions › Koha [% INCLUDE 'doc-head-close.inc' %]