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' %]
-
Koha › Administration ›
+
[% SWITCH op %]
[% CASE 'add_form' %][% IF field %]Modify additional field '[% field.name | html %]'[% ELSE %]Add additional field[% END %]
[% CASE %]Manage additional fields
- [% END %]
+ [% END %] › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration
+Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › Advanced editor shortcuts
+Advanced editor shortcuts › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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 %]
- Koha › Administration › Budgets
-
- [% IF ( add_form ) %]›
+ [% IF ( add_form ) %]
[% IF ( budget_period_id ) %]
Modify budget [% budget_period_description | html %]
[% ELSE %]
Add budget
- [% END %]
- [% END %]
- [% IF ( duplicate_form ) %]› Duplicate budget[% END %]
- [% IF ( delete_confirm ) %]›
- Delete budget '[% budget_period_description | html %]'?
- [% END %]
- [% IF ( delete_confirmed ) %]›
- Data deleted
- [% END %]
- [% IF close_form %]›
- Close budget [% budget_period_description | html %]
- [% END %]
- [% IF closed %]›
- Budget [% budget_period_description | html %] closed
- [% END %]
+ [% END %] › [% END %]
+
+ [% IF ( duplicate_form ) %]
+ Duplicate budget › [% END %]
+
+ [% IF ( delete_confirm ) %]
+ Delete budget '[% budget_period_description | html %]'? › [% END %]
+
+ [% IF ( delete_confirmed ) %]
+ Data deleted › [% END %]
+
+ [% IF close_form %]
+ Close budget [% budget_period_description | html %] › [% END %]
+
+ [% IF closed %]
+ Budget [% budget_period_description | html %] closed › [% END %]
+
+ Budgets › Administration › Koha
+
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' %]
-Koha › Administration › Funds[% IF op == 'add_form' %] › [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name | html %]'[% END %][% ELSE %]Add fund [% END %][% END %]
+[% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name | html %]'[% END %][% ELSE %]Add fund [% END %][% END %] › Funds[% IF op == 'add_form' %] › Administration › Koha
[% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") | $raw %]
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Acquisitions › Contracts ›
+
[% 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 %]
+[% IF ( delete_confirmed ) %]Contract deleted[% END %]
+ › Contracts › Acquisitions › Koha
+
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › Budgets › Funds › Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %]
+Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %] › Funds › Budgets › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › Audio alerts
+Audio alerts › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › Authority MARC subfield structure
+Authority MARC subfield structure › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › Authority MARC framework [% IF ( add_form ) %][% IF ( use_heading_flags_p ) %]
- [% IF ( heading_modify_tag_p ) %]› [% IF ( authtypecode ) %][% authtypecode | html %] Framework[% ELSE %]Default framework[% END %] › Modify tag[% END %]
- [% IF ( heading_add_tag_p ) %]› [% IF ( authtypecode ) %][% authtypecode | html %] Framework[% ELSE %]Default framework[% END %] › New tag[% END %]
- [% ELSE %]› [% action | html %][% END %][% END %][% IF ( delete_confirm ) %]› [% IF ( authtypecode ) %][% authtypecode | html %] Framework[% ELSE %]Default framework[% END %] › Confirm deletion[% END %][% IF ( delete_confirmed ) %]› [% IF ( authtypecode ) %][% authtypecode | html %] Framework[% ELSE %]Default framework[% END %] › Data deleted[% END %]
+
+ [% IF ( add_form ) %]
+ [% IF ( use_heading_flags_p ) %]
+ [% IF ( heading_modify_tag_p ) %]
+ Modify tag › [% IF ( authtypecode ) %]
+ [% authtypecode | html %] Framework
+ [% ELSE %]
+ Default framework
+ [% END %] › [% END %]
+ [% IF ( heading_add_tag_p ) %]
+ New tag › [% IF ( authtypecode ) %]
+ [% authtypecode | html %] Framework
+ [% ELSE %]
+ Default framework
+ [% END %] › [% END %]
+ [% ELSE %]
+ [% action | html %] › [% END %]
+ [% END %]
+ [% IF ( delete_confirm ) %]
+ Confirm deletion › [% IF ( authtypecode ) %]
+ [% authtypecode | html %] Framework
+ [% ELSE %]Default framework
+ [% END %] › [% END %]
+ [% IF ( delete_confirmed ) %]
+ Data deleted › [% IF ( authtypecode ) %]
+ [% authtypecode | html %] Framework
+ [% ELSE %]Default framework
+ [% END %] › [% END %]
+Authority MARC framework › Administration › Koha
+
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › Authorized values
+
[% IF op == 'add_form' %]
- [% IF ( action_modify ) %] › Modify authorized value[% END %]
- [% IF ( action_add_value ) %] › New authorized value[% END %]
- [% IF ( action_add_category ) %] › New category[% END %]
+ [% IF ( action_modify ) %]Modify authorized value › [% END %]
+ [% IF ( action_add_value ) %]New authorized value › [% END %]
+ [% IF ( action_add_category ) %]New category › [% END %]
[% END %]
+
+Authorized values › Administration › Koha
[% 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' %]
-Koha › Administration › Authority types
+
[% IF op == 'add_form' %]
-› [% IF authority_type.authtypecode.defined %]Modify authority type[% ELSE %]New authority type[% END %]
-[% ELSIF op == 'delete_confirm' %]
-› Confirm deletion of authority type
-[% END %]
+ [% IF authority_type.authtypecode.defined %]
+ Modify authority type
+ [% ELSE %]
+ New authority type
+ [% END %] › [% ELSIF op == 'delete_confirm' %]
+ Confirm deletion of authority type › [% END %]
+Authority types › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › [% IF op =='add_form' %]Background jobs› [% IF job %] View background job[% ELSE %] Background jobs[% END %][% END %]
+
+[% IF op =='add_form' %]
+ [% IF job %]
+ View background job
+ [% ELSE %]
+ Background jobs
+ [% END %] › Background jobs › [% END %]
+Administration › Koha
+
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › MARC frameworks
+
[% IF op == 'add_form' %]
-› [% IF framework %]Modify framework text[% ELSE %]Add framework[% END %]
-[% ELSIF op == 'delete_confirm' %]
-› Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])?
-[% END %]
+ [% IF framework %]
+ Modify framework text
+ [% ELSE %]
+ Add framework
+ [% END %] › [% ELSIF op == 'delete_confirm' %]
+ Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])? › [% END %]
+MARC frameworks › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › Library checkin and transfer policy
+Library checkin and transfer policy › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › Libraries
+
[% IF op == 'add_form' %]
- ›[% IF library %]Modify library[% ELSE %]New library [% library.branchcode | html %][% END %]
-[% ELSIF op == 'delete_confirm' %]
- › Confirm deletion of library '[% library.branchcode | html %]'
-[% END %]
+ [% IF library %]
+ Modify library
+ [% ELSE %]
+ New library [% library.branchcode | html %]
+ [% END %] › [% ELSIF op == 'delete_confirm' %]
+ Confirm deletion of library '[% library.branchcode | html %]' › [% END %]
+Libraries › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › Cash registers
+
[% IF op == 'add_form' %]
- ›[% IF cash_register %]Modify cash register[% ELSE %]New cash register [% cash_register.id | html %][% END %]
-[% ELSIF op == 'delete_confirm' %]
- › 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 %] › [% ELSIF op == 'delete_confirm' %]
+ Confirm deletion of cash register '[% cash_register.id | html %]' › [% END %]
+Cash registers › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › Patron categories › [% 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 %]
+[% 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 %] › Patron categories › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › MARC check
-[% IF ( total ) %] :[% total | html %] errors found[% ELSE %] : Configuration OK![% END %]
+MARC check
+[% IF ( total ) %] :[% total | html %] errors found[% ELSE %] : Configuration OK![% END %] › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › [% IF op =='add_form' %]Cities › [% IF city.cityid %] Modify city[% ELSE %] New city[% END %][% ELSE %][% IF op == 'delete_confirm' %]Cities › Confirm deletion of city[% ELSE %] Cities[% END %][% END %]
+
+ [% IF op =='add_form' %]
+ [% IF city.cityid %]
+ Modify city
+ [% ELSE %]
+ New city
+ [% END %] › [% ELSE %]
+ [% IF op == 'delete_confirm' %]
+ Confirm deletion of city › [% END %]
+ [% END %]
+ Cities › Administration › Koha
+
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › Classification sources
+
[% IF op == 'add_source' %]
-›
- [% IF class_source %]Modify classification source[% ELSE %]Add classification source[% END %]
-[% ELSIF op == 'add_sort_rule' %]
-›
- [% IF sort_rule %]Modify filing rule[% ELSE %]Add filing rule[% END %]
-[% ELSIF op == 'add_split_rule' %]
-›
- [% IF split_rule %]Modify splitting rule[% ELSE %]Add splitting rule[% END %]
-[% END %]
-
+ [% IF class_source %]
+ Modify classification source
+ [% ELSE %]
+ Add classification source
+ [% END %] › [% ELSIF op == 'add_sort_rule' %]
+ [% IF sort_rule %]
+ Modify filing rule
+ [% ELSE %]
+ Add filing rule
+ [% END %] › [% ELSIF op == 'add_split_rule' %]
+ [% IF split_rule %]
+ Modify splitting rule
+ [% ELSE %]
+ Add splitting rule
+ [% END %] › [% END %]
+Classification sources › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
- Koha › Administration ›
[%- IF ( add_form ) -%]
[%- IF ( use_heading_flags_p ) -%]
[%- IF ( heading_edit_subfields_p ) -%]
- MARC subfield structure › Edit MARC subfields constraints
+ Edit MARC subfields constraints › MARC subfield structure
[%- END -%]
+
[%- ELSE -%]
- MARC subfield structure › [%- action | html -%]
+ [%- action | html -%] › MARC subfield structure
[%- END -%]
+
[%- END -%]
+
[%- IF ( delete_confirm ) -%]
+
MARC subfield structure › Confirm deletion of subfield [%- mss.tagsubfield | html -%]
+
+ Confirm deletion of subfield [%- tagsubfield | html -%] › MARC subfield structure
[%- END -%]
+
+ [%- IF ( delete_confirmed ) -%]
+ Subfield deleted › MARC subfield structure
+
+ [%- END -%]
+
[%- IF ( else ) -%]
MARC subfield structure
- [%- END -%]
+ [%- END -%] › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration ›
-[% IF ( add_form ) %]MARC frameworks › [% IF heading_add_tag_p %]Add tag[% ELSE %]Modify tag[% END %] [% searchfield | html %][% END %]
-[% IF ( delete_confirm ) %]MARC frameworks › Confirm deletion of tag '[% searchfield | html %]'[% END %]
-[% IF ( delete_confirmed ) %]MARC frameworks › Data deleted[% END %]
-[% IF ( else ) %]MARC frameworks[% END %]
+
+[% IF ( add_form ) %]
+ [% IF heading_add_tag_p %]
+ Add tag [% searchfield | html %]
+ [% ELSE %]
+ Modify tag [% searchfield | html %]
+ [% END %] › [% END %]
+
+[% IF ( delete_confirm ) %]
+ Confirm deletion of tag '[% searchfield | html %]' › [% END %]
+
+[% IF ( delete_confirmed ) %]
+ Data deleted › [% END %]
+MARC frameworks › Administration › Koha
+
[% INCLUDE 'doc-head-close.inc' %]
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' %]
- Koha › Administration › Record matching rules
[% IF ( matching_rule_form ) %]
[% IF ( edit_matching_rule ) %]
- › Modify record matching rule
- [% ELSE %]
- › Add record matching rule
- [% END %]
+ Modify record matching rule › [% ELSE %]
+ Add record matching rule › [% END %]
[% END %]
+
[% IF ( delete_matching_rule_form ) %]
- › Confirm deletion of record matching rule "[% code | html %]"
- [% END %]
+ Confirm deletion of record matching rule "[% code | html %]" › [% END %]
+
+ Record matching rules › Administration › Koha
[% 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' %]
-Koha › Administration › OAI sets › OAI set mappings
+OAI set mappings › OAI sets › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › [% IF ( op_new ) %]OAI sets configuration › Add a new OAI set[% ELSE %]OAI sets configuration[% END %]
+
+ [% IF ( op_new ) %]
+ Add a new OAI set › [% END %]
+ OAI sets configuration › Administration › Koha
+
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › OverDrive library authnames
+OverDrive library authnames › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › Patron attribute types
+
[% IF ( attribute_type_form ) %]
- [% IF ( edit_attribute_type ) %]
- › Modify patron attribute type
- [% ELSE %]
- › Add patron attribute type
- [% END %]
+ [% IF ( edit_attribute_type ) %]
+ Modify patron attribute type › [% ELSE %]
+ Add patron attribute type › [% END %]
[% END %]
+
[% IF ( delete_attribute_type_form ) %]
- › Confirm deletion of patron attribute type "[% code | html %]"
-[% END %]
+ Confirm deletion of patron attribute type "[% code | html %]" › [% END %]
+
+Patron attribute types › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]
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' %]
-Koha › Administration › System preferences
+System preferences › Administration › Koha
[% 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' %]
-Koha › Administration › Search engine configuration (Elasticsearch)
+Search engine configuration (Elasticsearch) › Administration › Koha
[% INCLUDE 'doc-head-close.inc' %]