From 93d2f8fb286bb01333db5861d5e7c4b768864d81 Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Mon, 1 Mar 2021 21:26:41 +0000 Subject: [PATCH] Bug 26703: offline_circ and onboarding 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 offline_circ and onboarding 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 Signed-off-by: Martin Renvoize Signed-off-by: Henry Bolshaw Signed-off-by: Jonathan Druart --- .../intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt | 2 +- .../intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt | 2 +- .../prog/en/modules/onboarding/onboardingstep1.tt | 2 +- .../prog/en/modules/onboarding/onboardingstep2.tt | 2 +- .../prog/en/modules/onboarding/onboardingstep3.tt | 2 +- .../prog/en/modules/onboarding/onboardingstep4.tt | 2 +- .../prog/en/modules/onboarding/onboardingstep5.tt | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt index f329fcad64..2a75a3e053 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Add offline circulations to queue +Add offline circulations to queue › Circulation › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt index 2423b28cc5..d80c6ab15f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt @@ -2,7 +2,7 @@ [% USE Asset %] [% SET footerjs = 1 %] [% INCLUDE "doc-head-open.inc" %] - Koha › Circulation › Offline circulation + Offline circulation › Circulation › Koha [% INCLUDE "doc-head-close.inc" %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt index e302d2b1c1..20e95365d4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt @@ -2,7 +2,7 @@ [% USE Asset %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Circulation › Offline circulation file upload +Offline circulation file upload › Circulation › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt index 01fd4e5f1d..0320c1543b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt @@ -1,6 +1,6 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Web installer › Create a library +Create a library › Web installer › Koha [% INCLUDE 'installer-doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt index b01da625cd..2a7d8f1c83 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt @@ -1,7 +1,7 @@ [% USE Koha %] [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Web installer › Add a patron category +Add a patron category › Web installer › Koha [%# The following if statement checks if the categories variable handed to this template %] [%# by onboarding.pl has data in it. If the categories variable does have data %] [%# in it this means that the user has previously imported sample patron category %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt index d8b3f77080..a1114f908b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt @@ -2,7 +2,7 @@ [% USE raw %] [% USE Asset %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Web installer › Create Koha administrator patron +Create Koha administrator patron › Web installer › Koha [% INCLUDE 'installer-doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt index 67cd5ef0a3..69f057734f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Web installer › Create a new item type +Create a new item type › Web installer › Koha [% INCLUDE 'installer-doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt index e70870f500..831f4efbe4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt @@ -1,10 +1,10 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Web installer › +<title> [% IF all_done %] Complete [% ELSE %] Create circulation rule - [% END %] + [% END %] › Web installer › Koha [% INCLUDE 'installer-doc-head-close.inc' %] -- 2.39.5