Bugzilla – Attachment 117998 Details for
Bug 26703
Modify the "title" elements to contain unique information first
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26703: admin folder
Bug-26703-admin-folder.patch (text/plain), 55.17 KB, created by
Wainui Witika-Park
on 2021-03-09 21:39:54 UTC
(
hide
)
Description:
Bug 26703: admin folder
Filename:
MIME Type:
Creator:
Wainui Witika-Park
Created:
2021-03-09 21:39:54 UTC
Size:
55.17 KB
patch
obsolete
>From 73932fd5ab8218059ec3290712e3254039ecf08d 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 >--- > .../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 2f75f21ce8..4124b17a61 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 › Administration › >+<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 %] › Administration › 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 2c7fbb7b2f..7b1ea874df 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 › Administration</title> >+<title>Administration › 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 4589653c18..8709e72c69 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 › Administration › Advanced editor shortcuts</title> >+<title>Advanced editor shortcuts › Administration › 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 092b14d439..56bd4a5712 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 › 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 >+ > </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 3fb5727045..6f0a4c3812 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 › Administration › Funds[% IF op == 'add_form' %] › [% 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 %] › Funds[% IF op == 'add_form' %] › Administration › 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 b9319e204c..2405e4e94f 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 › Acquisitions › Contracts › >+<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 %] >+ › Contracts › Acquisitions › 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 3b7724732a..09cd1dcd4e 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 › Administration › Budgets › Funds › Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %]</title> >+<title>Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %] › Funds › Budgets › Administration › 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 34a6446c13..9b9a7ce83e 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 › Administration › Audio alerts</title> >+<title>Audio alerts › Administration › 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 8325c171c1..de7d69d5eb 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 › Administration › Authority MARC subfield structure</title> >+<title>Authority MARC subfield structure › Administration › 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 53b35acbe6..bfe5672cc0 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 › 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 %]</title> >+<title> >+ [% 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 >+</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 bac32901d2..6c4c9ca924 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 › Administration › Authorized values >+<title> > [% 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 > </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 7aefc88de1..1e0664db1f 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 › Administration › Authority types >+<title> > [% 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 > </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 86ffb3c540..c25aab30b9 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 › Administration › [% IF op =='add_form' %]Background jobs› [% 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 %] › Background jobs › [% END %] >+Administration › 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 9371c2ced9..359a195a53 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 › Administration › MARC frameworks >+<title> > [% 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 > </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 2647ee28f8..1937954a33 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 › Administration › Library checkin and transfer policy</title> >+<title>Library checkin and transfer policy › Administration › 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 6fd708df85..224723eaec 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 › Administration › Libraries >+<title> > [% 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 > </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 c93e72c115..5d76e22615 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 › Administration › Cash registers >+<title> > [% 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 > </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 f95f95991b..9ef03498e7 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 › 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 %] >+<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 %] › Patron categories › Administration › 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 4a78bcc8d9..3ea6a95ccc 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 › Administration › 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 %] › Administration › 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 e95e817f7a..fa1723717e 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 › 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 %]</title> >+<title> >+ [% 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 >+</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 93a4fd86f0..65da1eab81 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 › Administration › Classification sources >+<title> > [% 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 > </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 d7ff05068d..d7e1fa14bb 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 › Administration › Circulation and fine rules › Clone circulation and fine rules</title> >+<title>Clone circulation and fine rules › Circulation and fine rules › Administration › 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 80b20d790d..c3061d7598 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 › Administration › Table settings</title> >+<title>Table settings › Administration › 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 53fddc8e87..0b0284dc99 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 › Administration › >+<title> > [% IF op =='add_form' %] > Credit types › > [% IF credit_type.code %] >@@ -13,7 +13,7 @@ > [% END %] > [% ELSE %] > Credit types >- [% END %] >+ [% END %] › Administration › 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 e427c76f7a..3677dfbf8d 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 › Administration › Currencies & Exchange rates › >-[% 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 %] › Exchange rates › Currencies & Administration › 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 5de8f1766f..ca4ec26c7e 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 › Administration › >+<title> > [% IF op =='add_form' %] >- Debit types › > [% IF debit_type.code %] > Modify debit type > [% ELSE %] > New debit type >- [% END %] >- [% ELSE %] >- Debit types >- [% END %] >+ [% END %] › [% END %] >+ Debit types › Administration › 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 022968b7c6..ca32389879 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 › Administration › [% IF op =='add_form' %]Desks › [% IF desk.desk_id %] Modify desk[% ELSE %] New desk[% END %][% ELSE %][% IF op == 'delete_confirm' %]Desks › Confirm deletion of desk[% ELSE %] Desks[% END %][% END %]</title> >+<title> >+ [% IF op =='add_form' %] >+ [% IF desk.desk_id %] >+ Modify desk >+ [% ELSE %] >+ New desk >+ [% END %] › [% ELSE %] >+ [% IF op == 'delete_confirm' %] >+ Confirm deletion of desk › [% END %] >+ [% END %] >+ Desks › Administration › 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 db72d6bee3..b473c8a8a2 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 › Administration › Did you mean?</title> >+<title>Did you mean? › Administration › 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 db0ae0ad29..10a6958ed8 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 › Administration › EDI accounts >+<title> > [% IF acct_form %] >- [% IF account %] >- › Modify account >- [% ELSE %] >- › Add new account >- [% END %] >-[% END %] >+ [% IF account %] >+ Modify account >+ [% ELSE %] >+ Add new account >+ [% END %] › [% END %] > [% IF delete_confirm %] >- › Confirm deletion of account >-[% END %] >+ Confirm deletion of account › [% END %] >+EDI accounts › Administration › 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 9aaf0b732e..a5c8ca5b6c 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 › Administration › Library EANs >+<title> > [% IF ean_form %] >- [% IF ean %] >- › Modify library EAN >- [% ELSE %] >- › Add new library EAN >- [% END %] >-[% END %] >+ [% IF ean %] >+ Modify library EAN >+ [% ELSE %] >+ Add new library EAN >+ [% END %] › [% END %] > [% IF delete_confirm %] >- › Confirm deletion of EAN >-[% END %] >+ Confirm deletion of EAN › [% END %] >+Library EANs › Administration › 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 bec399c8fc..aa9ff3777c 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 › Administration › Item circulation alerts</title> >+<title>Item circulation alerts › Administration › 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 3cf8791b21..2cb07b3efb 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 › Administration › Item search fields</title> >+ <title>Item search fields › Administration › 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 52eb80bd8e..c29949962f 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 › Administration › Item search fields</title> >+ <title>Item search fields › Administration › 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 8ef4d32abe..09d11ed607 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 › Administration › Item types [% IF op == 'add_form' %]› >- [% IF ( itemtype ) %] >-Modify item type '[% itemtype.itemtype | html %]' >- [% ELSE %] >-Add item type >- [% END %] >-[% END %] >-[% IF op == 'delete_confirm' %]› >- [% IF ( total ) %] >-Cannot delete item type '[% itemtype.itemtype | html %]' >- [% ELSE %] >-Delete item type '[% itemtype.itemtype | html %]'? >- [% END %] >-[% END %] >-[% IF op == 'delete_confirmed' %]› >-Data deleted >-[% END %] >+<title> >+[% IF op == 'add_form' %] >+ [% IF ( itemtype ) %] >+ Modify item type '[% itemtype.itemtype | html %]' >+ [% ELSE %] >+ Add item type >+ [% END %] › [% END %] >+[% IF op == 'delete_confirm' %] >+ [% IF ( total ) %] >+ Cannot delete item type '[% itemtype.itemtype | html %]' >+ [% ELSE %] >+ Delete item type '[% itemtype.itemtype | html %]'? >+ [% END %] › [% END %] >+[% IF op == 'delete_confirmed' %] >+ Data deleted › [% END %] >+Item types › Administration › 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 8441157450..48e4eff496 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 › Administration › Koha to MARC mapping</title> >+<title>Koha to MARC mapping › Administration › 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 edfe7b5ddc..0563859bc1 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 › Administration › Library groups</title> >+<title>Library groups › Administration › 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 › Localization</title> >+<title>Localization › 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 7a3d9d2be4..3682ddf2bf 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 › 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 > </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 beed047e47..e52f535806 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 › 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 %]</title> >+<title> >+[% 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 >+</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 b9c21edbce..7ec138bd7e 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 › 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 > </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 758d4dc940..385a227a55 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 › Administration › OAI sets › OAI set mappings</title> >+<title>OAI set mappings › OAI sets › Administration › 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 943d7aac81..30e32b1a21 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 › Administration › [% IF ( op_new ) %]OAI sets configuration › Add a new OAI set[% ELSE %]OAI sets configuration[% END %]</title> >+<title> >+ [% IF ( op_new ) %] >+ Add a new OAI set › [% END %] >+ OAI sets configuration › Administration › 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 807e6cb99d..eea591ccfe 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 › Administration › OverDrive library authnames</title> >+<title>OverDrive library authnames › Administration › 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 c90046e057..00045b58fc 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 › Administration › Patron attribute types >+<title> > [% 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 > </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 dc9377fc01..d9935732ca 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 › Administration › System preferences</title> >+<title>System preferences › Administration › 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 202bb0bc11..ecfa119967 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 › Administration › Search engine configuration (Elasticsearch)</title> >+<title>Search engine configuration (Elasticsearch) › Administration › 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 446984440a..1f8a37aada 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 › Administration › Share content with Mana KB</title> >+<title>Share content with Mana KB › Administration › 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 d41e9ecc50..0ee15395a2 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 › Administration › Circulation and fine rules</title> >+<title>Circulation and fine rules › Administration › 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 3983391274..2a3ca0d832 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 › Administration › SMS cellular providers</title> >+<title>SMS cellular providers › Administration › 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 00c40e98a4..30f9209b89 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 › >-Administration › >-SMTP servers >-[% IF op == 'add_form' %] >- › New SMTP server >-[% ELSIF op == 'edit_form' %] >- › Edit SMTP server >-[% END %] >+<title> >+ [% IF op == 'add_form' %] >+ New SMTP server › [% ELSIF op == 'edit_form' %] >+ Edit SMTP server › [% END %] >+ >+ SMTP servers › Administration › 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 › SRU search fields mapping for bibliographic records</title> >+<title>SRU search fields mapping for bibliographic records › 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 › SRU search fields mapping for authorities</title> >+<title>SRU search fields mapping for authorities › 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 31af56ab02..aeccfc3612 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 › Administration › [% IF ( add_form ) %] System preferences › [% IF ( modify ) %]Modify system preference '[% searchfield | html %]'[% ELSE %]Add a system preference[% END %][% END %][% IF ( add_validate ) %] System preferences › Data added[% END %] >-[% IF ( delete_confirm ) %] System preferences › [% searchfield | html %] › Confirm deletion of parameter '[% searchfield | html %]'[% END %][% IF ( delete_confirmed ) %] System preferences › 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 %] › [% END %] >+ >+ [% IF ( add_validate ) %] >+ Data added › [% END %] >+ >+ [% IF ( delete_confirm ) %] >+ Confirm deletion of parameter '[% searchfield | html %]' › [% searchfield | html %] › [% END %] >+ >+ [% IF ( delete_confirmed ) %] >+ Parameter deleted › [% END %] >+ >+ System preferences › Administration › 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 5479b29e8a..50de777251 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 › Administration › Transport cost matrix</title> >+<title>Transport cost matrix › Administration › 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 f8d018234d..2739939c37 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 › Administration › Koha usage statistics</title> >+<title>Koha usage statistics › Administration › 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 abff6947c4..02573f3cfb 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 › Administration › Z39.50/SRU servers >-[% IF op == 'edit' %] › Modify [% PROCESS ServerType %] server [% server.servername | html %][% END %] >-[% IF op == 'add' %] › New [% PROCESS ServerType %] server[% END %] >+<title> >+ [% IF op == 'edit' %] >+ Modify [% PROCESS ServerType %] server [% server.servername | html %] › [% END %] >+ >+ [% IF op == 'add' %] >+ New [% PROCESS ServerType %] server › [% END %] >+ >+ Z39.50/SRU servers › Administration › Koha > </title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >-- >2.11.0
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=117998">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
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