Attachment 118041 Details for Bug 26703 – Bug 26703: errors, ill and installer folders

[patch] Bug 26703: errors, ill and installer folders

Bug-26703-errors-ill-and-installer-folders.patch (text/plain), 5.16 KB, created by Martin Renvoize (ashimema) on 2021-03-10 16:36:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

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

Size: 5.16 KB

patch

obsolete

>From ec04fb92398bcac3291f86bdd6c173a00c7604ae Mon Sep 17 00:00:00 2001
>From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
>Date: Mon, 1 Mar 2021 02:36:28 +0000
>Subject: [PATCH] Bug 26703: errors, ill and installer 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 errors, ill and installer 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>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt   | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt  | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt  | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt  | 4 ++--
> 6 files changed, 9 insertions(+), 9 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt
>index 6cd94c19fc..210a0d401b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt
>@@ -1,5 +1,5 @@
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Error [% errno | html %]</title>
>+<title>Error [% errno | html %] &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="err_[% errno | html %]" class="err">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>index 1d57e28fa8..23c0578597 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>@@ -9,7 +9,7 @@
> [% USE Price %]
> 
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; ILL requests</title>
>+<title>ILL requests &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt
>index 71cd268d67..1fe4efa0e1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt
>@@ -1,11 +1,11 @@
> [% USE Koha %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo;
>+<title>
>     [% IF ( nopermission ) %]Access denied[% END %]
>     [% IF ( timed_out ) %]Session timed out[% END %]
>     [% IF ( different_ip ) %]IP address change[% END %]
>     [% IF ( invalid_username_or_password ) %]Invalid username or password[% END %]
>-    [% IF ( loginprompt ) %]Log in to the Koha web installer[% END %]
>+    [% IF ( loginprompt ) %]Log in to the Koha web installer[% END %] &rsaquo; Koha
> </title>
> [% INCLUDE 'installer-doc-head-close.inc' %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
>index d314036b99..2c6d5c6a59 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt
>@@ -1,5 +1,5 @@
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Web installer &rsaquo;
>+<title>
>     [% UNLESS ( language ) %] Choose your language [% END %]
>     [% IF ( language ) %]
>         [% UNLESS ( checkmodule ) %]
>@@ -11,7 +11,7 @@
>             [% END %]
>         [% END %]
>         Check Perl dependencies
>-    [% END %]
>+    [% END %] &rsaquo; Web installer &rsaquo; Koha
> </title>
> [% INCLUDE 'installer-doc-head-close.inc' %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
>index 5bd245081d..37ec80f1e8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt
>@@ -1,5 +1,5 @@
> [% USE HtmlTags %]
>-[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web installer &rsaquo; Database settings</title>
>+[% INCLUDE 'doc-head-open.inc' %]<title>Database settings &rsaquo; Web installer &rsaquo; Koha</title>
> [% INCLUDE 'installer-doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>index 28f14d177b..789451f05c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>@@ -1,7 +1,7 @@
> [% USE raw %]
> [% INCLUDE 'doc-head-open.inc' %]
> 
>-<title>Koha &rsaquo; Web installer &rsaquo;
>+<title>
>      [% IF ( proposeimport ) %]
>          Set up database
>      [% END %]
>@@ -30,7 +30,7 @@
>      [% END %]
>      [% IF ( finish ) %]
>         Installation complete
>-     [% END %]
>+     [% END %] &rsaquo; Web installer &rsaquo; Koha
> </title>
> 
> [% INCLUDE 'installer-doc-head-close.inc' %]
>-- 
>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