Attachment 118040 Details for Bug 26703 – Bug 26703: clubs, common & course_reserves folders

[patch] Bug 26703: clubs, common & course_reserves folders

Bug-26703-clubs-common--coursereserves-folders.patch (text/plain), 10.34 KB, created by Martin Renvoize (ashimema) on 2021-03-10 16:36:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

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

Size: 10.34 KB

patch

obsolete

>From ffcc0362a2e6b37ed0ddb72ddcc0a1f648722b5b Mon Sep 17 00:00:00 2001
>From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
>Date: Mon, 1 Mar 2021 02:23:12 +0000
>Subject: [PATCH] Bug 26703: clubs, common & course_reserves 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 clubs, common and course_reserves 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 <martin.renvoize@ptfs-europe.com>
>---
> .../intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt   | 2 +-
> .../intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt   | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt        | 2 +-
> .../prog/en/modules/clubs/templates-add-modify.tt             | 4 ++--
> .../intranet-tmpl/prog/en/modules/common/patron_search.tt     | 2 +-
> .../prog/en/modules/course_reserves/add_items-step1.tt        | 2 +-
> .../prog/en/modules/course_reserves/add_items-step2.tt        | 2 +-
> .../prog/en/modules/course_reserves/batch_add_items.tt        | 2 +-
> .../prog/en/modules/course_reserves/batch_rm_items.tt         | 2 +-
> .../prog/en/modules/course_reserves/course-details.tt         | 2 +-
> .../prog/en/modules/course_reserves/course-reserves.tt        | 2 +-
> .../intranet-tmpl/prog/en/modules/course_reserves/course.tt   | 2 +-
> .../prog/en/modules/course_reserves/invalid-course.tt         | 2 +-
> 13 files changed, 15 insertions(+), 15 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
>index f6bc52e61d..4bd118f1aa 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/club-enrollments.tt
>@@ -5,7 +5,7 @@
> [% USE Koha %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Tools &rsaquo; Patron clubs &rsaquo; Club enrollments</title>
>+<title>Club enrollments &rsaquo; Patron clubs &rsaquo; Tools &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt
>index cdfd13830a..c078f1d9fd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt
>@@ -4,12 +4,12 @@
> [% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Tools &rsaquo; Patron clubs &rsaquo;
>+<title>
>     [% IF club %]
>         Modify club [% club.name | html %]
>     [% ELSE %]
>         Create a new [% club_template.name | html %] club
>-    [% END %]
>+    [% END %] &rsaquo; Patron clubs &rsaquo; Tools &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
>index f7db215b35..b47e45524e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt
>@@ -5,7 +5,7 @@
> [% USE Koha %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Tools &rsaquo; Patron clubs</title>
>+<title>Patron clubs &rsaquo; Tools &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> 
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
>index 13aa40c195..be309da083 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt
>@@ -2,12 +2,12 @@
> [% USE AuthorisedValues %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Tools &rsaquo; Patron clubs &rsaquo;
>+<title>
>     [% IF club_template %]
>         Modify club template [% club_template.name | html %]
>     [% ELSE %]
>         Create a new club template
>-    [% END %]
>+    [% END %] &rsaquo; Patron clubs &rsaquo; Tools &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
>index ef285dd0ed..9022c9fa18 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/common/patron_search.tt
>@@ -4,7 +4,7 @@
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Patron search</title>
>+<title>Patron search &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style> .modal-body .close { display: none; } </style>
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
>index 428e293713..c9faa48b4b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step1.tt
>@@ -1,5 +1,5 @@
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Course reserves &rsaquo; Add items</title>
>+<title>Add items &rsaquo; Course reserves &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="courses_add_items_step1" class="course">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
>index 9c12bc05db..9cc5d1438e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/add_items-step2.tt
>@@ -1,7 +1,7 @@
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Course reserves &rsaquo;[% IF is_edit || course_reserve %] Edit item[% ELSE %] Add items[% END %]</title>
>+<title>[% IF is_edit || course_reserve %]Edit item[% ELSE %]Add items[% END %] &rsaquo; Course reserves &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
>index 1da830054d..0052a33f61 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_add_items.tt
>@@ -5,7 +5,7 @@
> [% SET footerjs = 1 %]
> 
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Course reserves &rsaquo; Add items</title>
>+<title>Add items &rsaquo; Course reserves &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="courses_add_items_step1" class="course">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt
>index d39db41914..78c95f0e15 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/batch_rm_items.tt
>@@ -2,7 +2,7 @@
> [% SET footerjs = 1 %]
> 
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Course reserves &rsaquo; Remove reserves</title>
>+<title>Remove reserves &rsaquo; Course reserves &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="courses_rm_items" class="course">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>index aed553c2fb..64514e95fb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt
>@@ -6,7 +6,7 @@
> [% USE TablesSettings %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Course reserves &rsaquo; Course details for [% course.course_name | html %]</title>
>+<title>Course details for [% course.course_name | html %] &rsaquo; Course reserves &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> 
> <style>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
>index fe3d7482ec..d825de4476 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-reserves.tt
>@@ -4,7 +4,7 @@
> [% USE TablesSettings %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Course reserves</title>
>+<title>Course reserves &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> 
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
>index 1f5886fefb..15aea75f03 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt
>@@ -1,6 +1,6 @@
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Course reserves &rsaquo; [% IF course_name %] Edit [% course_name | html %] [% ELSE %] New course [% END %]</title>
>+<title>[% IF course_name %] Edit [% course_name | html %] [% ELSE %] New course [% END %] &rsaquo; Course reserves &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>
>     #course_instructors {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt
>index eb12031abf..e97e11fa92 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/invalid-course.tt
>@@ -1,5 +1,5 @@
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Course reserves</title>
>+<title>Course reserves &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <body id="courses_invalid_course" class="course">
> 
>-- 
>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