From ec04fb92398bcac3291f86bdd6c173a00c7604ae Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park 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 --- 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' %] -Koha › Error [% errno | html %] +Error [% errno | html %] › Koha [% INCLUDE 'doc-head-close.inc' %] 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' %] -Koha › ILL requests +ILL requests › Koha [% INCLUDE 'doc-head-close.inc' %] 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' %] -Koha › +<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 %] › Koha [% INCLUDE 'installer-doc-head-close.inc' %] 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' %] -Koha › Web installer › +<title> [% UNLESS ( language ) %] Choose your language [% END %] [% IF ( language ) %] [% UNLESS ( checkmodule ) %] @@ -11,7 +11,7 @@ [% END %] [% END %] Check Perl dependencies - [% END %] + [% END %] › Web installer › Koha [% INCLUDE 'installer-doc-head-close.inc' %] 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' %]Koha › Web installer › Database settings +[% INCLUDE 'doc-head-open.inc' %]Database settings › Web installer › Koha [% INCLUDE 'installer-doc-head-close.inc' %] 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' %] -Koha › Web installer › +<title> [% IF ( proposeimport ) %] Set up database [% END %] @@ -30,7 +30,7 @@ [% END %] [% IF ( finish ) %] Installation complete - [% END %] + [% END %] › Web installer › Koha [% INCLUDE 'installer-doc-head-close.inc' %] -- 2.20.1