Attachment 119874 Details for Bug 26703 – Bug 26703: admin folder

[patch] Bug 26703: admin folder

Bug-26703-admin-folder.patch (text/plain), 55.28 KB, created by Henry Bolshaw on 2021-04-20 08:53:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Henry Bolshaw

Created: 2021-04-20 08:53:34 UTC

Size: 55.28 KB

patch

obsolete

>From 5c7918a7edcd11b18ac94e2607a16ac3f39f37c2 Mon Sep 17 00:00:00 2001
>From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
>Date: Sun, 28 Feb 2021 23:14:17 +0000
>Subject: [PATCH] Bug 26703: admin 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 admin 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>
>
>Signed-off-by: Henry Bolshaw <bolshawh@parliament.uk>
>---
> .../prog/en/modules/admin/additional-fields.tt     |  4 +--
> .../prog/en/modules/admin/admin-home.tt            |  2 +-
> .../prog/en/modules/admin/adveditorshortcuts.tt    |  2 +-
> .../prog/en/modules/admin/aqbudgetperiods.tt       | 38 ++++++++++++----------
> .../prog/en/modules/admin/aqbudgets.tt             |  2 +-
> .../prog/en/modules/admin/aqcontract.tt            |  6 ++--
> .../intranet-tmpl/prog/en/modules/admin/aqplan.tt  |  2 +-
> .../prog/en/modules/admin/audio_alerts.tt          |  2 +-
> .../en/modules/admin/auth_subfields_structure.tt   |  2 +-
> .../prog/en/modules/admin/auth_tag_structure.tt    | 34 ++++++++++++++++---
> .../prog/en/modules/admin/authorised_values.tt     | 10 +++---
> .../prog/en/modules/admin/authtypes.tt             | 13 +++++---
> .../prog/en/modules/admin/background_jobs.tt       | 10 +++++-
> .../prog/en/modules/admin/biblio_framework.tt      | 13 +++++---
> .../en/modules/admin/branch_transfer_limits.tt     |  2 +-
> .../prog/en/modules/admin/branches.tt              | 13 +++++---
> .../prog/en/modules/admin/cash_registers.tt        | 13 +++++---
> .../prog/en/modules/admin/categories.tt            |  4 +--
> .../prog/en/modules/admin/checkmarc.tt             |  4 +--
> .../intranet-tmpl/prog/en/modules/admin/cities.tt  | 13 +++++++-
> .../prog/en/modules/admin/classsources.tt          | 28 +++++++++-------
> .../prog/en/modules/admin/clone-rules.tt           |  2 +-
> .../prog/en/modules/admin/columns_settings.tt      |  2 +-
> .../prog/en/modules/admin/credit_types.tt          |  4 +--
> .../prog/en/modules/admin/currency.tt              |  6 ++--
> .../prog/en/modules/admin/debit_types.tt           |  9 ++---
> .../intranet-tmpl/prog/en/modules/admin/desks.tt   | 13 +++++++-
> .../prog/en/modules/admin/didyoumean.tt            |  2 +-
> .../prog/en/modules/admin/edi_accounts.tt          | 17 +++++-----
> .../prog/en/modules/admin/edi_ean_accounts.tt      | 17 +++++-----
> .../en/modules/admin/item_circulation_alerts.tt    |  2 +-
> .../prog/en/modules/admin/items_search_field.tt    |  2 +-
> .../prog/en/modules/admin/items_search_fields.tt   |  2 +-
> .../prog/en/modules/admin/itemtypes.tt             | 33 +++++++++----------
> .../prog/en/modules/admin/koha2marclinks.tt        |  2 +-
> .../prog/en/modules/admin/library_groups.tt        |  2 +-
> .../prog/en/modules/admin/localization.tt          |  2 +-
> .../en/modules/admin/marc_subfields_structure.tt   | 19 ++++++++---
> .../prog/en/modules/admin/marctagstructure.tt      | 20 +++++++++---
> .../prog/en/modules/admin/matching-rules.tt        | 13 ++++----
> .../prog/en/modules/admin/oai_set_mappings.tt      |  2 +-
> .../prog/en/modules/admin/oai_sets.tt              |  6 +++-
> .../prog/en/modules/admin/overdrive.tt             |  2 +-
> .../prog/en/modules/admin/patron-attr-types.tt     | 16 ++++-----
> .../prog/en/modules/admin/preferences.tt           |  2 +-
> .../admin/searchengine/elasticsearch/mappings.tt   |  2 +-
> .../prog/en/modules/admin/share_content.tt         |  2 +-
> .../prog/en/modules/admin/smart-rules.tt           |  2 +-
> .../prog/en/modules/admin/sms_providers.tt         |  2 +-
> .../prog/en/modules/admin/smtp_servers.tt          | 14 ++++----
> .../prog/en/modules/admin/sru_modmapping.tt        |  2 +-
> .../prog/en/modules/admin/sru_modmapping_auth.tt   |  2 +-
> .../prog/en/modules/admin/systempreferences.tt     | 21 ++++++++++--
> .../prog/en/modules/admin/transport-cost-matrix.tt |  2 +-
> .../prog/en/modules/admin/usage_statistics.tt      |  2 +-
> .../prog/en/modules/admin/z3950servers.tt          | 11 +++++--
> 56 files changed, 297 insertions(+), 179 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
>index c93a635f05..ccbfb8e441 100755
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
>@@ -1,11 +1,11 @@
> [% USE AuthorisedValues %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo;
>+<title>
>     [% SWITCH op %]
>         [% CASE 'add_form' %][% IF field %]Modify additional field '[% field.name | html %]'[% ELSE %]Add additional field[% END %]
>         [% CASE %]Manage additional fields
>-    [% END %]
>+    [% END %] &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>index 6dfbfd5801..2a5f5db99a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>@@ -1,7 +1,7 @@
> [% USE Koha %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration</title>
>+<title>Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="admin_admin-home" class="admin">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
>index 812e65af4f..a34e4fa129 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
>@@ -3,7 +3,7 @@
> [% USE Koha %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Advanced editor shortcuts</title>
>+<title>Advanced editor shortcuts &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="adveditor_shortcuts" class="admin">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>index 753b2a30d5..e7d9d87d9b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>@@ -41,28 +41,30 @@
> [% END %]
> 
> <title>
>-    Koha &rsaquo; Administration &rsaquo; Budgets
>-
>-    [% IF ( add_form ) %]&rsaquo;
>+    [% IF ( add_form ) %]
>         [% IF ( budget_period_id ) %]
>             Modify budget [% budget_period_description | html %]
>         [% ELSE %]
>             Add budget
>-        [% END %]
>-    [% END %]
>-    [% IF ( duplicate_form ) %]&rsaquo; Duplicate budget[% END %]
>-    [% IF ( delete_confirm ) %]&rsaquo;
>-            Delete budget '[% budget_period_description | html %]'?
>-    [% END %]
>-    [% IF ( delete_confirmed ) %]&rsaquo;
>-        Data deleted
>-    [% END %]
>-    [% IF close_form %]&rsaquo;
>-      Close budget [% budget_period_description | html %]
>-    [% END %]
>-    [% IF closed %]&rsaquo;
>-      Budget [% budget_period_description | html %] closed
>-    [% END %]
>+        [% END %] &rsaquo; [% END %]
>+
>+    [% IF ( duplicate_form ) %]
>+        Duplicate budget &rsaquo; [% END %]
>+
>+    [% IF ( delete_confirm ) %]
>+            Delete budget '[% budget_period_description | html %]'? &rsaquo; [% END %]
>+
>+    [% IF ( delete_confirmed ) %]
>+        Data deleted &rsaquo; [% END %]
>+
>+    [% IF close_form %]
>+      Close budget [% budget_period_description | html %] &rsaquo; [% END %]
>+
>+    [% IF closed %]
>+      Budget [% budget_period_description | html %] closed &rsaquo; [% END %]
>+
>+    Budgets &rsaquo; Administration &rsaquo; Koha
>+
> </title>
> 
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>index 60f75c1e0e..5ef7d306c8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>@@ -5,7 +5,7 @@
> [% USE Price %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Funds[% IF op == 'add_form' %] &rsaquo; [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name | html %]'[% END %][% ELSE %]Add fund [% END %][% END %]</title>
>+<title>[% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name | html %]'[% END %][% ELSE %]Add fund [% END %][% END %] &rsaquo; Funds[% IF op == 'add_form' %] &rsaquo; Administration &rsaquo; Koha</title>
> [% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") | $raw %]
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>index 593499f8f4..f1c10f98ca 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>@@ -3,7 +3,7 @@
> [% USE KohaDates %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Acquisitions &rsaquo; Contracts &rsaquo;
>+<title>
> [% IF ( add_form ) %]
>     [% IF ( contractnumber ) %]Modify contract '[% contractname | html %]'
> [% ELSE %]New contract[% END %]
>@@ -11,7 +11,9 @@
> [% IF ( else ) %]Contracts of [% booksellername | html %][% END %]
> [% IF ( add_validate ) %]Data recorded[% END %]
> [% IF ( delete_confirm ) %]Confirm deletion of contract '[% contractnumber | html %]'[% END %]
>-[% IF ( delete_confirmed ) %]Contract deleted[% END %]</title>
>+[% IF ( delete_confirmed ) %]Contract deleted[% END %]
>+ &rsaquo; Contracts &rsaquo; Acquisitions &rsaquo; Koha
>+</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
>index 26d0ab975c..85180f4efd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
>@@ -4,7 +4,7 @@
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> [% PROCESS 'budget_planning.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Budgets &rsaquo; Funds &rsaquo; Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %]</title>
>+<title>Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %] &rsaquo; Funds &rsaquo; Budgets &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>td.locked { background-image: url('[% interface | html %]/[% theme | html %]/img/locked.png'); padding-left : 20px; background-repeat: no-repeat; background-position: 5px 5px; } a.control { font-size:85%;text-decoration:none; } .plan_entry { text-align: right; width:90%; }</style>
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
>index ee56b4c662..23a5e89b29 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
>@@ -3,7 +3,7 @@
> [% USE Koha %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Audio alerts</title>
>+<title>Audio alerts &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>index 7e4e1dc7db..b87fd7f0eb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>@@ -2,7 +2,7 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Authority MARC subfield structure</title>
>+<title>Authority MARC subfield structure &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>index e3e80362e2..659ff9085f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>@@ -3,10 +3,36 @@
> [% USE AuthorisedValues %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Authority MARC framework [% IF ( add_form ) %][% IF ( use_heading_flags_p ) %]
>-    [% IF ( heading_modify_tag_p ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode | html %] Framework[% ELSE %]Default framework[% END %] &rsaquo; Modify tag[% END %]
>-    [% IF ( heading_add_tag_p ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode | html %] Framework[% ELSE %]Default framework[% END %] &rsaquo; New tag[% END %]
>-    [% ELSE %]&rsaquo; [% action | html %][% END %][% END %][% IF ( delete_confirm ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode | html %] Framework[% ELSE %]Default framework[% END %] &rsaquo; Confirm deletion[% END %][% IF ( delete_confirmed ) %]&rsaquo; [% IF ( authtypecode ) %][% authtypecode | html %] Framework[% ELSE %]Default framework[% END %] &rsaquo; Data deleted[% END %]</title>
>+<title>
>+    [% IF ( add_form ) %]
>+        [% IF ( use_heading_flags_p ) %]
>+            [% IF ( heading_modify_tag_p ) %]
>+                Modify tag &rsaquo; [% IF ( authtypecode ) %]
>+                    [% authtypecode | html %] Framework
>+                [% ELSE %]
>+                    Default framework
>+                [% END %] &rsaquo; [% END %]
>+            [% IF ( heading_add_tag_p ) %]
>+                New tag &rsaquo; [% IF ( authtypecode ) %]
>+                    [% authtypecode | html %] Framework
>+                [% ELSE %]
>+                    Default framework
>+                [% END %] &rsaquo; [% END %]
>+        [% ELSE %]
>+           [% action | html %] &rsaquo; [% END %]
>+    [% END %]
>+    [% IF ( delete_confirm ) %]
>+        Confirm deletion &rsaquo; [% IF ( authtypecode ) %]
>+            [% authtypecode | html %] Framework
>+        [% ELSE %]Default framework
>+        [% END %] &rsaquo; [% END %]
>+    [% IF ( delete_confirmed ) %]
>+        Data deleted &rsaquo; [% IF ( authtypecode ) %]
>+            [% authtypecode | html %] Framework
>+        [% ELSE %]Default framework
>+        [% END %] &rsaquo; [% END %]
>+Authority MARC framework &rsaquo; Administration &rsaquo; Koha
>+</title>
> [% INCLUDE 'doc-head-close.inc' %]
> 
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
>index ca36a496ec..b8e1f82b71 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
>@@ -2,12 +2,14 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Authorized values
>+<title>
> [% IF op == 'add_form' %]
>-  [% IF ( action_modify ) %] &rsaquo; Modify authorized value[% END %]
>-  [% IF ( action_add_value ) %] &rsaquo;  New authorized value[% END %]
>-  [% IF ( action_add_category ) %] &rsaquo; New category[% END %]
>+  [% IF ( action_modify ) %]Modify authorized value &rsaquo; [% END %]
>+  [% IF ( action_add_value ) %]New authorized value &rsaquo; [% END %]
>+  [% IF ( action_add_category ) %]New category &rsaquo; [% END %]
> [% END %]
>+
>+Authorized values &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>index 25c9718475..83338af0f6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>@@ -2,12 +2,15 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Authority types
>+<title>
> [% IF op == 'add_form' %]
>-&rsaquo; [% IF authority_type.authtypecode.defined %]Modify authority type[% ELSE %]New authority type[% END %]
>-[% ELSIF op == 'delete_confirm' %]
>-&rsaquo; Confirm deletion of authority type
>-[% END %]
>+    [% IF authority_type.authtypecode.defined %]
>+        Modify authority type
>+    [% ELSE %]
>+        New authority type
>+    [% END %] &rsaquo; [% ELSIF op == 'delete_confirm' %]
>+    Confirm deletion of authority type &rsaquo; [% END %]
>+Authority types &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
>index a10c6a72de..64f2278c20 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt
>@@ -2,7 +2,15 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; [% IF op =='add_form' %]Background jobs&rsaquo; [% IF job %] View background job[% ELSE %] Background jobs[% END %][% END %]</title>
>+<title>
>+[% IF op =='add_form' %]
>+    [% IF job %]
>+        View background job
>+    [% ELSE %]
>+        Background jobs
>+    [% END %] &rsaquo; Background jobs &rsaquo; [% END %]
>+Administration &rsaquo; Koha
>+</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>index cff421b376..ce45d1260f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>@@ -2,12 +2,15 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; MARC frameworks
>+<title>
> [% IF op == 'add_form' %]
>-&rsaquo; [% IF framework %]Modify framework text[% ELSE %]Add framework[% END %]
>-[% ELSIF op == 'delete_confirm' %]
>-&rsaquo; Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])?
>-[% END %]
>+    [% IF framework %]
>+        Modify framework text
>+    [% ELSE %]
>+        Add framework
>+    [% END %] &rsaquo; [% ELSIF op == 'delete_confirm' %]
>+    Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])? &rsaquo; [% END %]
>+MARC frameworks &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
>index 7faef16d69..86f9fa56cb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
>@@ -3,7 +3,7 @@
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Library checkin and transfer policy</title>
>+<title>Library checkin and transfer policy &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>td { text-align: center; } .sorted { min-width: 50%; }</style>
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>index 40a11a4ee5..f3d15e1d22 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
>@@ -4,12 +4,15 @@
> [% SET footerjs = 1 %]
> [% USE TablesSettings %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Libraries
>+<title>
> [% IF op == 'add_form' %]
>-    &rsaquo;[% IF library %]Modify library[% ELSE %]New library [% library.branchcode | html %][% END %]
>-[% ELSIF op == 'delete_confirm' %]
>-    &rsaquo; Confirm deletion of library '[% library.branchcode | html %]'
>-[% END %]
>+    [% IF library %]
>+        Modify library
>+    [% ELSE %]
>+        New library [% library.branchcode | html %]
>+    [% END %] &rsaquo; [% ELSIF op == 'delete_confirm' %]
>+    Confirm deletion of library '[% library.branchcode | html %]' &rsaquo; [% END %]
>+Libraries &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
>index 9d75b2a4ec..1a39afd51e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt
>@@ -4,12 +4,15 @@
> [% USE Price %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Cash registers
>+<title>
> [% IF op == 'add_form' %]
>-    &rsaquo;[% IF cash_register %]Modify cash register[% ELSE %]New cash register [% cash_register.id | html %][% END %]
>-[% ELSIF op == 'delete_confirm' %]
>-    &rsaquo; Confirm deletion of cash register '[% cash_register.id | html %]'
>-[% END %]
>+    [% IF cash_register %]
>+        Modify cash register
>+    [% ELSE %]
>+        New cash register [% cash_register.id | html %]
>+    [% END %] &rsaquo; [% ELSIF op == 'delete_confirm' %]
>+    Confirm deletion of cash register '[% cash_register.id | html %]' &rsaquo; [% END %]
>+Cash registers &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>index 54831764e2..69ae79284b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
>@@ -6,8 +6,8 @@
> [% USE TablesSettings %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Patron categories &rsaquo; [% IF op == 'add_form' %][% IF ( categorycode ) %]Modify category '[% categorycode | html %]'[% ELSE %]New category[% END %][% END %]
>-[% IF op == 'delete_confirm' %][% IF ( patrons_in_category > 0 ) %]Cannot delete: category [% categorycode | html %] in use[% ELSE %]Confirm deletion of category '[% categorycode | html %]'[% END %][% END %]
>+<title>[% IF op == 'add_form' %][% IF ( categorycode ) %]Modify category '[% categorycode | html %]'[% ELSE %]New category[% END %][% END %]
>+[% IF op == 'delete_confirm' %][% IF ( patrons_in_category > 0 ) %]Cannot delete: category [% categorycode | html %] in use[% ELSE %]Confirm deletion of category '[% categorycode | html %]'[% END %][% END %] &rsaquo; Patron categories &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>#enrolmentmessage.hint { display : none; }</style>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
>index 3bcd8c8a7b..8ee016c4b9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt
>@@ -2,8 +2,8 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; MARC check
>-[% IF ( total ) %] :[% total | html %] errors found[% ELSE %] : Configuration OK![% END %]</title>
>+<title>MARC check
>+[% IF ( total ) %] :[% total | html %] errors found[% ELSE %] : Configuration OK![% END %] &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="admin_checkmarc" class="admin">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>index 859fab1290..f31f9c7200 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
>@@ -2,7 +2,18 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; [% IF op =='add_form' %]Cities &rsaquo; [% IF city.cityid %] Modify city[% ELSE %] New city[% END %][% ELSE %][% IF op == 'delete_confirm' %]Cities &rsaquo; Confirm deletion of city[% ELSE %] Cities[% END %][% END %]</title>
>+<title>
>+    [% IF op =='add_form' %]
>+        [% IF city.cityid %]
>+            Modify city
>+        [% ELSE %]
>+            New city
>+        [% END %] &rsaquo; [% ELSE %]
>+        [% IF op == 'delete_confirm' %]
>+            Confirm deletion of city &rsaquo; [% END %]
>+    [% END %]
>+    Cities &rsaquo; Administration &rsaquo; Koha
>+</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
>index d68a748f8b..399dacdb8a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
>@@ -2,18 +2,24 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Classification sources
>+<title>
> [% IF op == 'add_source' %]
>-&rsaquo;
>-    [% IF class_source %]Modify classification source[% ELSE %]Add classification source[% END %]
>-[% ELSIF op == 'add_sort_rule' %]
>-&rsaquo;
>-    [% IF sort_rule %]Modify filing rule[% ELSE %]Add filing rule[% END %]
>-[% ELSIF op == 'add_split_rule' %]
>-&rsaquo;
>-    [% IF split_rule %]Modify splitting rule[% ELSE %]Add splitting rule[% END %]
>-[% END %]
>-
>+    [% IF class_source %]
>+        Modify classification source
>+    [% ELSE %]
>+        Add classification source
>+    [% END %] &rsaquo; [% ELSIF op == 'add_sort_rule' %]
>+    [% IF sort_rule %]
>+        Modify filing rule
>+    [% ELSE %]
>+        Add filing rule
>+    [% END %] &rsaquo; [% ELSIF op == 'add_split_rule' %]
>+    [% IF split_rule %]
>+        Modify splitting rule
>+    [% ELSE %]
>+        Add splitting rule
>+    [% END %] &rsaquo; [% END %]
>+Classification sources &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
>index 7595f3cb4b..fee155958b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
>@@ -3,7 +3,7 @@
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Circulation and fine rules &rsaquo; Clone circulation and fine rules</title>
>+<title>Clone circulation and fine rules &rsaquo; Circulation and fine rules &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="admin_clone-rules" class="admin">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
>index 22241486aa..11477b4ea3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt
>@@ -157,7 +157,7 @@
> [% END %]
> 
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Table settings</title>
>+<title>Table settings &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>
>     caption {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
>index 2ce02658d6..7ba964417e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt
>@@ -3,7 +3,7 @@
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo;
>+<title>
>     [% IF op =='add_form' %]
>        Credit types &rsaquo;
>        [% IF credit_type.code %]
>@@ -13,7 +13,7 @@
>        [% END %]
>     [% ELSE %]
>        Credit types
>-    [% END %]
>+    [% END %] &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>index c257ff96c6..dae58a1b4c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
>@@ -5,10 +5,10 @@
> [% USE HtmlTags %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Currencies &amp; Exchange rates &rsaquo;
>-[% IF op == 'add_form' %][% IF currency %]Modify currency '[% currency.currency | html %]'[% ELSE %]New currency[% END %][% END %]
>+<title>[% IF op == 'add_form' %][% IF currency %]Modify currency '[% currency.currency | html %]'[% ELSE %]New currency[% END %][% END %]
> [% IF op == 'delete_confirm' %]Confirm deletion of currency '[% currency.currency | html %]'[% END %]
>-[% IF op == 'list' %]Currencies[% END %]</title>
>+[% IF op == 'list' %]Currencies[% END %] &rsaquo; Exchange rates &rsaquo; Currencies &amp; Administration &rsaquo; Koha
>+</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
>index a350aafbac..a5772617d9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt
>@@ -4,17 +4,14 @@
> [% USE Price %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo;
>+<title>
>     [% IF op =='add_form' %]
>-       Debit types &rsaquo;
>        [% IF debit_type.code %]
>            Modify debit type
>        [% ELSE %]
>            New debit type
>-       [% END %]
>-    [% ELSE %]
>-       Debit types
>-    [% END %]
>+       [% END %] &rsaquo; [% END %]
>+    Debit types &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
>index 04e0064a0f..9da4510f69 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt
>@@ -3,7 +3,18 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; [% IF op =='add_form' %]Desks &rsaquo; [% IF desk.desk_id %] Modify desk[% ELSE %] New desk[% END %][% ELSE %][% IF op == 'delete_confirm' %]Desks &rsaquo; Confirm deletion of desk[% ELSE %] Desks[% END %][% END %]</title>
>+<title>
>+    [% IF op =='add_form' %]
>+        [% IF desk.desk_id %]
>+            Modify desk
>+        [% ELSE %]
>+            New desk
>+        [% END %] &rsaquo; [% ELSE %]
>+        [% IF op == 'delete_confirm' %]
>+            Confirm deletion of desk &rsaquo; [% END %]
>+    [% END %]
>+    Desks &rsaquo; Administration &rsaquo; Koha
>+</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
>index 77b74d7391..4b6a7ffbaf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt
>@@ -24,7 +24,7 @@
> </div>
> [% END %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Did you mean?</title>
>+<title>Did you mean? &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>index 79e56ce0db..51d8ec0019 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>@@ -2,17 +2,16 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; EDI accounts
>+<title>
> [% IF acct_form %]
>-  [% IF account %]
>-     &rsaquo; Modify account
>-  [% ELSE %]
>-     &rsaquo; Add new account
>-  [% END %]
>-[% END %]
>+    [% IF account %]
>+        Modify account
>+    [% ELSE %]
>+        Add new account
>+    [% END %] &rsaquo; [% END %]
> [% IF delete_confirm %]
>-     &rsaquo; Confirm deletion of account
>-[% END %]
>+    Confirm deletion of account &rsaquo; [% END %]
>+EDI accounts &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
>index 888405b93a..70dcc732e2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt
>@@ -2,17 +2,16 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Library EANs
>+<title>
> [% IF ean_form %]
>-  [% IF ean %]
>-     &rsaquo; Modify library EAN
>-  [% ELSE %]
>-     &rsaquo; Add new library EAN
>-  [% END %]
>-[% END %]
>+    [% IF ean %]
>+        Modify library EAN
>+    [% ELSE %]
>+        Add new library EAN
>+    [% END %] &rsaquo; [% END %]
> [% IF delete_confirm %]
>-     &rsaquo; Confirm deletion of EAN
>-[% END %]
>+    Confirm deletion of EAN &rsaquo; [% END %]
>+Library EANs &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
>index 3fc9cf8288..9cdef2b019 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt
>@@ -3,7 +3,7 @@
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Item circulation alerts</title>
>+<title>Item circulation alerts &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>
> table.grid thead th {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
>index 9a6228433b..ddad79786e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt
>@@ -3,7 +3,7 @@
> [% SET footerjs = 1 %]
> [% USE AuthorisedValues %]
> [% INCLUDE 'doc-head-open.inc' %]
>-  <title>Koha &rsaquo; Administration &rsaquo; Item search fields</title>
>+  <title>Item search fields &rsaquo; Administration &rsaquo; Koha</title>
>   [% INCLUDE 'doc-head-close.inc' %]
> </head>
> <body id="admin_itemssearchfields" class="admin">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
>index 5b82b2f457..ab6139dcfb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt
>@@ -3,7 +3,7 @@
> [% SET footerjs = 1 %]
> [% USE AuthorisedValues %]
> [% INCLUDE 'doc-head-open.inc' %]
>-  <title>Koha &rsaquo; Administration &rsaquo; Item search fields</title>
>+  <title>Item search fields &rsaquo; Administration &rsaquo; Koha</title>
>   [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
>index b419619a30..c008073d06 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
>@@ -6,23 +6,22 @@
> [% USE TablesSettings %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Item types [% IF op == 'add_form' %]&rsaquo;
>-  [% IF ( itemtype ) %]
>-Modify item type '[% itemtype.itemtype | html %]'
>-  [% ELSE %]
>-Add item type
>-  [% END %]
>-[% END %]
>-[% IF op == 'delete_confirm' %]&rsaquo;
>-  [% IF ( total ) %]
>-Cannot delete item type '[% itemtype.itemtype | html %]'
>-  [% ELSE %]
>-Delete item type '[% itemtype.itemtype | html %]'?
>-  [% END %]
>-[% END %]
>-[% IF op == 'delete_confirmed' %]&rsaquo;
>-Data deleted
>-[% END %]
>+<title>
>+[% IF op == 'add_form' %]
>+    [% IF ( itemtype ) %]
>+        Modify item type '[% itemtype.itemtype | html %]'
>+    [% ELSE %]
>+        Add item type
>+    [% END %] &rsaquo; [% END %]
>+[% IF op == 'delete_confirm' %]
>+    [% IF ( total ) %]
>+        Cannot delete item type '[% itemtype.itemtype | html %]'
>+    [% ELSE %]
>+        Delete item type '[% itemtype.itemtype | html %]'?
>+    [% END %] &rsaquo; [% END %]
>+[% IF op == 'delete_confirmed' %]
>+    Data deleted &rsaquo; [% END %]
>+Item types &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
>index c4f07cb8ca..efdea290c8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
>@@ -2,7 +2,7 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Koha to MARC mapping</title>
>+<title>Koha to MARC mapping &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
>index 095a0d64f3..d483b056b0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
>@@ -3,7 +3,7 @@
> [% USE KohaSpan %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Library groups</title>
>+<title>Library groups &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") | $raw %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt
>index 95d2810d52..2f8522a451 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt
>@@ -2,7 +2,7 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Localization</title>
>+<title>Localization &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' popup => 1 %]
> <style>#localization { margin-top: 1em; }</style>
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
>index 33df4fd409..dac2bb45e3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
>@@ -3,22 +3,33 @@
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>
>-    Koha &rsaquo; Administration &rsaquo;
>     [%- IF ( add_form ) -%]
>         [%- IF ( use_heading_flags_p ) -%]
>             [%- IF ( heading_edit_subfields_p ) -%]
>-                MARC subfield structure &rsaquo; Edit MARC subfields constraints
>+                Edit MARC subfields constraints &rsaquo; MARC subfield structure
>             [%- END -%]
>+
>         [%- ELSE -%]
>-            MARC subfield structure &rsaquo; [%- action | html -%]
>+            [%- action | html -%] &rsaquo; MARC subfield structure
>         [%- END -%]
>+
>     [%- END -%]
>+
>     [%- IF ( delete_confirm ) -%]
>+
>         MARC subfield structure &rsaquo; Confirm deletion of subfield [%- mss.tagsubfield | html -%]
>+
>+        Confirm deletion of subfield [%- tagsubfield | html -%] &rsaquo; MARC subfield structure
>     [%- END -%]
>+
>+    [%- IF ( delete_confirmed ) -%]
>+        Subfield deleted &rsaquo; MARC subfield structure
>+
>+    [%- END -%]
>+
>     [%- IF ( else ) -%]
>         MARC subfield structure
>-    [%- END -%]
>+    [%- END -%] &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>.constraints::after { content:  " "; clear: both; display:block; }</style>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>index f5baff5947..28983854d1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
>@@ -3,11 +3,21 @@
> [% USE AuthorisedValues %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo;
>-[% IF ( add_form ) %]MARC frameworks &rsaquo; [% IF heading_add_tag_p %]Add tag[% ELSE %]Modify tag[% END %] [% searchfield | html %][% END %]
>-[% IF ( delete_confirm ) %]MARC frameworks &rsaquo; Confirm deletion of tag '[% searchfield | html %]'[% END %]
>-[% IF ( delete_confirmed ) %]MARC frameworks &rsaquo;  Data deleted[% END %]
>-[% IF ( else ) %]MARC frameworks[% END %]</title>
>+<title>
>+[% IF ( add_form ) %]
>+    [% IF heading_add_tag_p %]
>+        Add tag [% searchfield | html %]
>+    [% ELSE %]
>+        Modify tag [% searchfield | html %]
>+    [% END %] &rsaquo; [% END %]
>+
>+[% IF ( delete_confirm ) %]
>+    Confirm deletion of tag '[% searchfield | html %]' &rsaquo; [% END %]
>+
>+[% IF ( delete_confirmed ) %]
>+    Data deleted &rsaquo; [% END %]
>+MARC frameworks &rsaquo; Administration &rsaquo; Koha
>+</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
>index 1ca9985ee6..06983048ec 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt
>@@ -3,17 +3,16 @@
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>
>-    Koha &rsaquo; Administration &rsaquo; Record matching rules
>     [% IF ( matching_rule_form ) %]
>         [% IF ( edit_matching_rule ) %]
>-            &rsaquo; Modify record matching rule
>-        [% ELSE %]
>-            &rsaquo; Add record matching rule
>-        [% END %]
>+            Modify record matching rule &rsaquo; [% ELSE %]
>+            Add record matching rule &rsaquo; [% END %]
>     [% END %]
>+
>     [% IF ( delete_matching_rule_form ) %]
>-        &rsaquo; Confirm deletion of record matching rule &quot;[% code | html %]&quot;
>-    [% END %]
>+        Confirm deletion of record matching rule &quot;[% code | html %]&quot; &rsaquo; [% END %]
>+
>+    Record matching rules &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
>index 915f0fd497..08bc96de1e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt
>@@ -2,7 +2,7 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; OAI sets &rsaquo; OAI set mappings</title>
>+<title>OAI set mappings &rsaquo; OAI sets &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
>index 1d12adcbb3..a433a8c10b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt
>@@ -2,7 +2,11 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; [% IF ( op_new ) %]OAI sets configuration &rsaquo; Add a new OAI set[% ELSE %]OAI sets configuration[% END %]</title>
>+<title>
>+    [% IF ( op_new ) %]
>+         Add a new OAI set &rsaquo; [% END %]
>+    OAI sets configuration &rsaquo; Administration &rsaquo; Koha
>+</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
>index 798ea1f447..fa06d4dd7b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt
>@@ -4,7 +4,7 @@
> [% USE HtmlTags %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; OverDrive library authnames</title>
>+<title>OverDrive library authnames &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
>index f87e9cf4d8..91c2ef6603 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt
>@@ -6,17 +6,17 @@
> [% USE scalar %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Patron attribute types
>+<title>
> [% IF ( attribute_type_form ) %]
>-  [% IF ( edit_attribute_type ) %]
>-    &rsaquo; Modify patron attribute type
>-  [% ELSE %]
>-    &rsaquo; Add patron attribute type
>-  [% END %]
>+    [% IF ( edit_attribute_type ) %]
>+        Modify patron attribute type &rsaquo; [% ELSE %]
>+        Add patron attribute type &rsaquo; [% END %]
> [% END %]
>+
> [% IF ( delete_attribute_type_form ) %]
>-  &rsaquo; Confirm deletion of patron attribute type &quot;[% code | html %]&quot;
>-[% END %]
>+    Confirm deletion of patron attribute type &quot;[% code | html %]&quot; &rsaquo; [% END %]
>+
>+Patron attribute types &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
>index b79d5d5359..33a9d5a69c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
>@@ -5,7 +5,7 @@
> [% USE HtmlId %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; System preferences</title>
>+<title>System preferences &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("css/preferences.css") | $raw %]
> [% Asset.css("lib/jquery/plugins/multiple-select/multiple-select.css") | $raw %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
>index 1b4302a14d..e43ce683f9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt
>@@ -3,7 +3,7 @@
> [% SET footerjs = 1 %]
> [% PROCESS 'i18n.inc' %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Search engine configuration (Elasticsearch)</title>
>+<title>Search engine configuration (Elasticsearch) &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>
> a.add, a.delete {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
>index ba27cb4803..68cf0d79aa 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt
>@@ -3,7 +3,7 @@
> [% SET footerjs = 1 %]
> [% USE Koha %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Share content with Mana KB</title>
>+<title>Share content with Mana KB &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>index 79a87ae164..088657327e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>@@ -23,7 +23,7 @@
> [% itemtypes.push(undef) %]
> 
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Circulation and fine rules</title>
>+<title>Circulation and fine rules &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
>index 685fe53f3d..614b704484 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt
>@@ -2,7 +2,7 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; SMS cellular providers</title>
>+<title>SMS cellular providers &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
>index dd95ba3c77..b1e5ab5ba7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
>@@ -2,14 +2,12 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo;
>-Administration &rsaquo;
>-SMTP servers
>-[% IF    op == 'add_form' %]
>-    &rsaquo; New SMTP server
>-[% ELSIF op == 'edit_form' %]
>-    &rsaquo; Edit SMTP server
>-[% END %]
>+<title>
>+    [% IF op == 'add_form' %]
>+        New SMTP server &rsaquo; [% ELSIF op == 'edit_form' %]
>+        Edit SMTP server &rsaquo; [% END %]
>+
>+    SMTP servers &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
>index 8528933768..7dc7efdaea 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt
>@@ -2,7 +2,7 @@
> [% USE Asset %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; SRU search fields mapping for bibliographic records</title>
>+<title>SRU search fields mapping for bibliographic records &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
>index 75b3205512..388c048b80 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt
>@@ -1,6 +1,6 @@
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; SRU search fields mapping for authorities</title>
>+<title>SRU search fields mapping for authorities &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>index 3ab57fbaf7..6daad362f2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
>@@ -3,8 +3,25 @@
> [% USE Koha %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; [% IF ( add_form ) %] System preferences &rsaquo; [% IF ( modify ) %]Modify system preference '[% searchfield | html %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] System preferences &rsaquo; Data added[% END %]
>-[% IF ( delete_confirm ) %] System preferences &rsaquo; [% searchfield | html %] &rsaquo; Confirm deletion of parameter '[% searchfield | html %]'[% END %][% IF ( delete_confirmed ) %] System preferences &rsaquo; Parameter deleted[% END %][% IF ( else ) %]System preferences[% END %]</title>
>+<title>
>+    [% IF ( add_form ) %]
>+        [% IF ( modify ) %]
>+            Modify system preference '[% searchfield | html %]'
>+        [% ELSE %]
>+            Add a system preference
>+        [% END %] &rsaquo; [% END %]
>+
>+    [% IF ( add_validate ) %]
>+        Data added &rsaquo; [% END %]
>+
>+    [% IF ( delete_confirm ) %]
>+        Confirm deletion of parameter '[% searchfield | html %]' &rsaquo; [% searchfield | html %] &rsaquo; [% END %]
>+
>+    [% IF ( delete_confirmed ) %]
>+        Parameter deleted &rsaquo; [% END %]
>+
>+    System preferences &rsaquo; Administration &rsaquo; Koha
>+</title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
>index 11c3e3e6dd..4d3a813fc2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt
>@@ -3,7 +3,7 @@
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Transport cost matrix</title>
>+<title>Transport cost matrix &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> <style>
> .disabled-transfer {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
>index e568abb0ab..2e02b03eb0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt
>@@ -5,7 +5,7 @@
> [% USE KohaDates %]
> [% USE Price %]
> [% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Administration &rsaquo; Koha usage statistics</title>
>+<title>Koha usage statistics &rsaquo; Administration &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("lib/leaflet/leaflet.css") | $raw %]
> </head>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>index 4b0cf4e194..dd7557067f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>@@ -11,9 +11,14 @@
>     [% END %]
> [% END %]
> 
>-<title>Koha &rsaquo; Administration &rsaquo; Z39.50/SRU servers
>-[% IF op == 'edit' %] &rsaquo; Modify [% PROCESS ServerType %] server [% server.servername | html %][% END %]
>-[% IF op ==  'add' %] &rsaquo; New [% PROCESS ServerType %] server[% END %]
>+<title>
>+    [% IF op == 'edit' %]
>+        Modify [% PROCESS ServerType %] server [% server.servername | html %] &rsaquo; [% END %]
>+
>+    [% IF op ==  'add' %]
>+        New [% PROCESS ServerType %] server &rsaquo; [% END %]
>+
>+    Z39.50/SRU servers &rsaquo; Administration &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
> </head>
>-- 
>2.11.0

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