Attachment 118042 Details for Bug 26703 – Bug 26703: labels folder

[patch] Bug 26703: labels folder

Bug-26703-labels-folder.patch (text/plain), 9.95 KB, created by Martin Renvoize (ashimema) on 2021-03-10 16:36:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-03-10 16:36:52 UTC

Size: 9.95 KB

patch

obsolete

>From b0b610ea670292ef6e8e42cc6e9d7ff0ae9d4f14 Mon Sep 17 00:00:00 2001
>From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
>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 <martin.renvoize@ptfs-europe.com>
>---
> .../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 faa5e64c55..c1e0d0e1ce 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' %]
>-    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Batches &rsaquo; [% IF batch_id %]Edit ([% batch_id | html %])[% ELSE %]New[% END %]</title>
>+    <title>[% IF batch_id %]Edit ([% batch_id | html %])[% ELSE %]New[% END %] &rsaquo; Batches &rsaquo; Label creator &rsaquo; Tools &rsaquo; Koha</title>
>     [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>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 b7a42e8b46..7f32a5bdde 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' %]
>-    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Layouts &rsaquo; [% IF ( layout_id ) %]Edit ([% layout_id | html %])[% ELSE %]New[% END %]</title>
>+    <title>[% IF ( layout_id ) %]Edit ([% layout_id | html %])[% ELSE %]New[% END %] &rsaquo; Layouts &rsaquo; Label creator &rsaquo; Tools &rsaquo; Koha</title>
>     [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>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 1fc6f594c3..1356337d8d 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' %]
>-    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Profiles &rsaquo; [% IF ( profile_id ) %]Edit ([% profile_id | html %])[% ELSE %]New[% END%]</title>
>+    <title>[% IF ( profile_id ) %]Edit ([% profile_id | html %])[% ELSE %]New[% END%] &rsaquo; Profiles &rsaquo; Label creator &rsaquo; Tools &rsaquo; Koha</title>
>     [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>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 5685f1b132..405cf77e0f 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' %]
>-    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Barcode range</title>
>+    <title>Barcode range &rsaquo; Label creator &rsaquo; Tools &rsaquo; Koha</title>
>     [% INCLUDE 'doc-head-close.inc' %]
>     [% INCLUDE 'greybox.inc' %]
> </head>
>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 071cb64d44..cdf389c783 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' %]
>-    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Templates &rsaquo; [% IF ( template_id ) %]Edit ([% template_id | html %])[% ELSE %]New[% END %]</title>
>+    <title>[% IF ( template_id ) %]Edit ([% template_id | html %])[% ELSE %]New[% END %] &rsaquo; Templates &rsaquo; Label creator &rsaquo; Tools &rsaquo; Koha</title>
>     [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>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 f4898fcb6d..1c920b94dd 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' %]
>-    <title>Koha &rsaquo; Tools &rsaquo; Label creator</title>
>+    <title>Label creator &rsaquo; Tools &rsaquo; Koha</title>
>     [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="labels_label-home" class="tools labels">
>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 35c3afd6ae..099f9b5bec 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' %]
>-    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; [% PROCESS translate_label_element element=label_element_title %]</title>
>+    <title>[% PROCESS translate_label_element element=label_element_title %] &rsaquo; Label creator &rsaquo; Tools &rsaquo; Koha</title>
>     [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>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' %]
>-    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Label printing/exporting</title>
>+    <title>Label printing/exporting &rsaquo; Label creator &rsaquo; Tools &rsaquo; Koha</title>
>     [% INCLUDE 'doc-head-close.inc' popup => 1 %]
>     <style>table {border-collapse: separate; border-spacing: 0; border: hidden none;} .header {cursor: auto; background-position: center center; background-repeat: repeat;}</style>
> </head>
>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' %]
>-    <title>Koha &rsaquo; Barcodes and labels &rsaquo; Search results</title>
>+    <title>Search results &rsaquo; Barcodes and labels &rsaquo; Koha</title>
>     [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>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' %]<title>Koha &rsaquo;  Labels</title>
>+[% INCLUDE 'doc-head-open.inc' %]
>+<title>Labels &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>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 b323b4ccdc..05bd701b67 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' %]<title>Koha &rsaquo; Tools &rsaquo; Quick spine label creator</title>
>+[% INCLUDE 'doc-head-open.inc' %]<title>Quick spine label creator &rsaquo; Tools &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>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' %]
>-<title>Koha &rsaquo; Tools &rsaquo; Spine labels</title>
>+<title>Spine labels &rsaquo; Tools &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' popup => 1 %]
> [% Asset.css("css/spinelabel.css") | $raw %]
> <style>
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 26703: 117894 | 117895 | 117896 | 117897 | 117898 | 117899 | 117900 | 117901 | 117902 | 117903 | 117904 | 117905 | 117906 | 117907 | 117908 | 117909 | 117910 | 117911 | 117912 | 117997 | 117998 | 117999 | 118000 | 118001 | 118002 | 118003 | 118004 | 118005 | 118006 | 118007 | 118008 | 118009 | 118010 | 118011 | 118012 | 118013 | 118014 | 118015 | 118034 | 118035 | 118036 | 118037 | 118038 | 118039 | 118040 | 118041 | 118042 | 118043 | 118044 | 118045 | 118046 | 118047 | 118048 | 118049 | 118050 | 118051 | 118052 | 118053 | 119652 | 119653 | 119654 | 119655 | 119656 | 119657 | 119658 | 119659 | 119660 | 119661 | 119662 | 119663 | 119664 | 119665 | 119666 | 119667 | 119668 | 119669 | 119670 | 119671 | 119820 | 119824 | 119873 | 119874 | 119875 | 119876 | 119877 | 119878 | 119879 | 119880 | 119881 | 119882 | 119883 | 119884 | 119885 | 119886 | 119887 | 119888 | 119889 | 119890 | 119891 | 119892 | 119893 | 119894 | 119895 | 119897 | 119940 | 119982 | 119983