From 51d4c23a7e089f66a4a8856b2f3eddf1e54980ba Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Mon, 1 Mar 2021 20:50:04 +0000 Subject: [PATCH] Bug 26703: labels 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 labels 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 Signed-off-by: Henry Bolshaw Signed-off-by: Jonathan Druart --- .../intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt | 2 +- .../intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt | 2 +- .../intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt | 2 +- .../intranet-tmpl/prog/en/modules/labels/label-edit-range.tt | 2 +- .../prog/en/modules/labels/label-edit-template.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt | 3 ++- .../intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt | 2 +- 12 files changed, 13 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt index aa593452bd..273bb5ceb2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt @@ -3,7 +3,7 @@ [% USE ItemTypes %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Tools › Label creator › Batches › [% IF batch_id %]Edit label batch [% batch_id | html %][% ELSE %]New label batch[% END %] + [% IF batch_id %]Edit label batch ([% batch_id | html %])[% ELSE %]New label batch[% END %]› Batches › Label creator › Tools › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt index 927be6e891..f04ff65fd5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt @@ -10,7 +10,7 @@ [% END %] [% END %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Tools › Label creator › Layouts › [% IF ( layout_id ) %]Edit label layout [% layout_id | html %] [% ELSE %] New label layout [% END %] + [% IF ( layout_id ) %]Edit label layout [% layout_id | html %] [% ELSE %] New label layout [% END %] › Layouts › Label creator › Tools › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt index e6fb3e268d..66b09a05cf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-profile.tt @@ -1,7 +1,7 @@ [% USE raw %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Tools › Label creator › Profiles › [% IF ( profile_id ) %]Edit printer profile [% profile_id | html %] [% ELSE %] New printer profile [% END%] + [% IF ( profile_id ) %]Edit printer profile [% profile_id | html %] [% ELSE %] New printer profile [% END%] › Profiles › Label creator › Tools › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt index 11c5abb03f..6f3a463086 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-range.tt @@ -1,6 +1,6 @@ [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Tools › Label creator › Print barcode range + Print barcode range › Label creator › Tools › Koha [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'greybox.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt index 0e65301d97..3515267fef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-template.tt @@ -1,7 +1,7 @@ [% USE raw %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Tools › Label creator › Templates › [% IF ( template_id ) %]Edit label template [% template_id | html %] [% ELSE %] New label template [% END %] + [% IF ( template_id ) %]Edit label template [% template_id | html %] [% ELSE %] New label template [% END %] › Templates › Label creator › Tools › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt index d189dcb6e0..347d0b1544 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tt @@ -2,7 +2,7 @@ [% USE Asset %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Tools › Label creator + Label creator › Tools › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt index 63cb74d9fd..029594994d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt @@ -14,7 +14,7 @@ [%- END -%] [% END %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Tools › Label creator › [% PROCESS translate_label_element element=label_element_title %] + [% PROCESS translate_label_element element=label_element_title %] › Label creator › Tools › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt index 63b3836503..fcf706b87f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt @@ -1,7 +1,7 @@ [% USE raw %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Tools › Label creator › Label printing/exporting + Label printing/exporting › Label creator › Tools › Koha [% INCLUDE 'doc-head-close.inc' popup => 1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt index 8e5657a219..3e31ec279b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tt @@ -23,7 +23,7 @@ [% USE Asset %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] - Koha › Barcodes and labels › Search results + Search results › Barcodes and labels › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt index 039b63c864..a6f905d2ec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt @@ -1,5 +1,6 @@ [% SET footerjs = 1 %] -[% INCLUDE 'doc-head-open.inc' %]Koha › Labels +[% INCLUDE 'doc-head-open.inc' %] +Labels › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt index 60dd4753c0..04536f3f4b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt @@ -1,7 +1,7 @@ [% USE raw %] [% USE Asset %] [% SET footerjs = 1 %] -[% INCLUDE 'doc-head-open.inc' %]Koha › Tools › Quick spine label creator +[% INCLUDE 'doc-head-open.inc' %]Quick spine label creator › Tools › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt index 55fb795de0..d9505eac7d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt @@ -2,7 +2,7 @@ [% USE Asset %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Tools › Spine labels +Spine labels › Tools › Koha [% INCLUDE 'doc-head-close.inc' popup => 1 %] [% Asset.css("css/spinelabel.css") | $raw %]