From 9174029a8e057182bd1d5922026e5c643942d01f Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Mon, 19 Apr 2021 05:31:07 +0000 Subject: [PATCH] Bug 27631: admin folder Changed each of the pages in the admin folder to have one

tag showing that describes the page, rather than the

describing the logo. The hierarchy of heading tags may be broken in many pages, but this will be dealt with in an additional bug. To test: 1) Go to the Staff Client 2) Apply patch 3) Go to each of the pages in the admin folder and check that they have an obvious and descriptive heading 4) Ensure that the heading in the page is

Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Fridolin Somers --- .../prog/en/modules/admin/additional-fields.tt | 8 ++++---- .../prog/en/modules/admin/admin-home.tt | 2 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 16 +++++++++------- .../prog/en/modules/admin/aqbudgets.tt | 5 +++-- .../prog/en/modules/admin/aqcontract.tt | 8 ++++---- .../prog/en/modules/admin/aqplan.tt | 2 +- .../prog/en/modules/admin/audio_alerts.tt | 4 ++-- .../modules/admin/auth_subfields_structure.tt | 2 +- .../prog/en/modules/admin/authtypes.tt | 6 ++++-- .../prog/en/modules/admin/background_jobs.tt | 2 +- .../prog/en/modules/admin/biblio_framework.tt | 12 ++++++------ .../prog/en/modules/admin/branches.tt | 6 +++--- .../prog/en/modules/admin/cash_registers.tt | 3 ++- .../prog/en/modules/admin/categories.tt | 14 ++++++++------ .../prog/en/modules/admin/cities.tt | 4 ++-- .../prog/en/modules/admin/classsources.tt | 14 +++++++------- .../prog/en/modules/admin/clone-rules.tt | 4 ++-- .../prog/en/modules/admin/columns_settings.tt | 2 +- .../prog/en/modules/admin/credit_types.tt | 6 +++--- .../prog/en/modules/admin/currency.tt | 18 ++++++++++-------- .../prog/en/modules/admin/debit_types.tt | 6 +++--- .../prog/en/modules/admin/desks.tt | 4 ++-- .../prog/en/modules/admin/didyoumean.tt | 2 +- .../prog/en/modules/admin/edi_accounts.tt | 16 +++++++++------- .../prog/en/modules/admin/edi_ean_accounts.tt | 16 +++++++++------- .../en/modules/admin/items_search_fields.tt | 4 ++-- .../prog/en/modules/admin/itemtypes.tt | 8 ++++---- .../prog/en/modules/admin/library_groups.tt | 2 +- .../prog/en/modules/admin/localization.tt | 1 + .../modules/admin/marc_subfields_structure.tt | 2 +- .../prog/en/modules/admin/matching-rules.tt | 8 ++++---- .../prog/en/modules/admin/oai_sets.tt | 6 +++--- .../prog/en/modules/admin/overdrive.tt | 2 +- .../prog/en/modules/admin/patron-attr-types.tt | 8 ++++---- .../prog/en/modules/admin/preferences.tt | 4 ++-- .../prog/en/modules/admin/sms_providers.tt | 2 +- .../prog/en/modules/admin/smtp_servers.tt | 6 +++--- .../prog/en/modules/admin/systempreferences.tt | 11 +++++++---- .../prog/en/modules/admin/z3950servers.tt | 2 +- 39 files changed, 133 insertions(+), 115 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 3fdd329014..38965080b7 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 @@ -102,7 +102,7 @@ [% IF op == 'list_tables' %] [% IF CAN_user_acquisitions_order_manage || CAN_user_serials_edit_subscription %] -

Additional fields

+

Additional fields

Select a table:

[% BLOCK table_option %]
  • [% content | html %] ([% value | html %])
    • @@ -119,7 +119,7 @@ Additional permissions in the acquisitions or serials modules are required for editing additional fields [% END %] [% ELSIF op == 'list' %] -

    Additional fields for '[% tablename | html %]'

    +

    Additional fields for '[% tablename | html %]'

    [% IF fields %] @@ -157,9 +157,9 @@ [% END %] [% ELSIF op == 'add_form' %] [% IF field %] -

    Modify field

    +

    Modify field

    [% ELSE %] -

    Add field

    +

    Add field

    [% END %]
    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 e2930fbf51..903e759870 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 @@ -24,6 +24,7 @@
    +

    Koha administration

    [% IF ( CAN_user_parameters_manage_mana ) %] [% IF ( Koha.Preference('Mana') == 1) && !mana_url %]
    @@ -50,7 +51,6 @@
    [% END %] [% END %] -

    Koha administration

    [% IF ( CAN_user_parameters_manage_sysprefs ) %] 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 244f9366b9..2ec2e9e901 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -179,7 +179,7 @@ [% END %] [% IF ( duplicate_form ) %] -

    Duplicate budget

    +

    Duplicate budget

    @@ -245,9 +245,9 @@ [% IF ( budget_period_id ) %] -

    Modify budget [% budget_period_description | html %]

    +

    Modify budget [% budget_period_description | html %]

    [% ELSE %] -

    Add budget

    +

    Add budget

    [% END %]
    @@ -326,16 +326,16 @@ [% IF ( delete_confirm ) %] [% IF ( total ) %]
    -

    Cannot delete budget

    +

    Cannot delete budget

    This record is used [% total | html %] times . Deletion is not possible.

    [% ELSIF ( funds_exist ) %]
    -

    Cannot delete budget

    +

    Cannot delete budget

    This budget has funds attached. You must delete all attached funds before you can delete this budget.

    [% ELSE %]
    -

    Delete budget '[% budget_period_description | html %]'?

    +

    Delete budget '[% budget_period_description | html %]'?

    @@ -355,6 +355,7 @@ [% END %] [% IF close_form %] +

    Close budget [% budget_period_description | html %]

    [% IF budget_periods.size == 0 %] You cannot move funds of this budget, there is no active budget. Please create a new active budget and retry. @@ -412,6 +413,7 @@ [% END %] [% ELSIF closed %] +

    Budget [% budget_period_description | html %] closed

    Report after moving unreceived orders from budget [% from_budget_period.budget_period_description | html %] ([% from_budget_period.budget_period_startdate | $KohaDates %] - [% from_budget_period.budget_period_enddate | $KohaDates %]) to [% to_budget_period.budget_period_description | html %] ([% to_budget_period.budget_period_startdate | $KohaDates %] - [% to_budget_period.budget_period_enddate | $KohaDates%])

    @@ -462,7 +464,7 @@ [% IF ( else ) %] -

    Budgets administration

    +

    Budgets administration

    [% IF ( failed_delete_funds_exist ) %]
    Failed to delete budget because funds exist.
    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 cf5852d20a..bb1b9ff600 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -243,10 +243,11 @@ [% IF op == 'add_form' && !error_not_authorised_to_modify %]
    - [% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund +

    [% IF ( budget_id ) %]Modify[% ELSE %]Add[% END %] Fund [% IF ( budget_period_description ) %] [% budget_name | html %] for Budget '[% budget_period_description | html %]' [% END %] +

    @@ -411,7 +412,7 @@ [% IF op == 'delete_confirm' %]
    -

    Delete fund [% budget_name | html %]?

    +

    Delete fund [% budget_name | html %]?

    If you delete this fund, all orders linked to this fund will be deleted!
    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 b4a0983041..f97eac73ed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -149,14 +149,14 @@ [% END %] [% IF ( add_validate ) %] -

    Data recorded

    +

    Data recorded

    [% END %] [% IF ( delete_confirm ) %]
    -

    Confirm deletion of contract [% contractname | html %]

    +

    Confirm deletion of contract [% contractname | html %]

    @@ -179,14 +179,14 @@ [% END %] [% IF ( delete_confirmed ) %] -

    Contract deleted

    +

    Contract deleted

    [% END %] [% IF ( else ) %] -

    Contract(s) of [% booksellername | html %]

    +

    Contract(s) of [% booksellername | html %]

    [% IF ( loop ) %]
    Contract number:[% contractnumber | html %]
    Contract name:[% contractname | html %]
    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 85180f4efd..cbd85c4edc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -41,7 +41,7 @@ [% INCLUDE 'budgets-admin-toolbar.inc' %] -

    Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %]

    +

    Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %]

    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 23a5e89b29..9922efa583 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 @@ -38,7 +38,7 @@
    - Add new alertEdit alert +

    Add new alertEdit alert
      @@ -86,7 +86,7 @@
      -

      Audio alerts

      +

      Audio alerts

      [%IF !( Koha.Preference('AudioAlerts') ) %]

      Audio alerts are disabled

      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 67eee4f1ab..d6b77237d8 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 @@ -270,7 +270,7 @@ [% IF ( delete_confirm ) %]
      -

      Delete subfield '[% ass.tagsubfield | html %]'?

      +

      Delete subfield '[% ass.tagsubfield | html %]'?

    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 d6bde4457f..bb4e979402 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -92,11 +92,13 @@ Authority types › Administration › Koha
    +

    [% IF authority_type.authtypecode.defined %] Modify authority type [% ELSE %] New authority type [% END %] +

    1. @@ -142,11 +144,11 @@ Authority types › Administration › Koha [% IF op == 'delete_confirm' %]
      [% IF authorities_using_it %] -

      This authority type cannot be deleted

      +

      This authority type cannot be deleted

      This record is used [% authorities_using_it | html %] times

      Back to the list [% ELSE %] -

      Confirm deletion of authority structure definition for '[% authority_type.authtypetext | html %]' ([% authority_type.authtypecode | html %])

      +

      Confirm deletion of authority structure definition for '[% authority_type.authtypetext | html %]' ([% authority_type.authtypecode | html %])

      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 baea27077c..f516c39506 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 @@ -150,7 +150,7 @@ [% IF op == 'list' %] -

      Background jobs

      +

      Background jobs

      [% IF jobs.count %]
    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 40f6a2e2dd..6162ebbd07 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 @@ -137,14 +137,14 @@ MARC frameworks › Administration › Koha [% IF op == 'delete_confirm' %]
    [% IF biblios_use_this_framework %] -

    This framework cannot be deleted

    +

    This framework cannot be deleted

    [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])

    The framework is used [% biblios_use_this_framework | html %] times.

    [% ELSE %] -

    Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])?

    +

    Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])?

    @@ -191,7 +191,7 @@ MARC frameworks › Administration › Koha
    -

    Export default framework

    +

    Export default framework

    @@ -216,7 +216,7 @@ MARC frameworks › Administration › Koha
    -

    Import default framework structure (fields and subfields) from a spreadsheet file (.csv or .ods) +

    Import default framework structure (fields and subfields) from a spreadsheet file (.csv or .ods)

    @@ -261,7 +261,7 @@ MARC frameworks › Administration › Koha
    -

    Export [% loo.frameworktext | html %] framework

    +

    Export [% loo.frameworktext | html %] framework

    @@ -286,7 +286,7 @@ MARC frameworks › Administration › Koha
    -

    Import [% loo.frameworkcode | html %] framework structure (fields and subfields) from a spreadsheet file (.csv or .ods)

    +

    Import [% loo.frameworkcode | html %] framework structure (fields and subfields) from a spreadsheet file (.csv or .ods)

    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 780a6cdece..6de1d61861 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -124,7 +124,7 @@ Libraries › Administration › Koha [% END %] [% IF op == 'add_form' %] -

    [% IF library %]Modify library[% ELSE %]New library[% END %]

    +

    [% IF library %]Modify library[% ELSE %]New library[% END %]

    @@ -289,7 +289,7 @@ Libraries › Administration › Koha [% IF op == 'delete_confirm' and not ( items_count or patrons_count )%]
    -

    Are you sure you want to delete [% library.branchname | html %] ([% library.branchcode | html %])?

    +

    Are you sure you want to delete [% library.branchname | html %] ([% library.branchcode | html %])?

    @@ -302,7 +302,7 @@ Libraries › Administration › Koha [% END %] [% IF op == 'list' %] -

    Libraries

    +

    Libraries

    [% IF libraries_count > 0 %]
    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 e44dca1e3e..193685c792 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 @@ -98,7 +98,7 @@ Cash registers › Administration › Koha [% END %] [% IF op == 'add_form' %] -

    [% IF cash_register %]Modify cash register[% ELSE %]Add new cash register[% END %]

    +

    [% IF cash_register %]Modify cash register[% ELSE %]Add new cash register[% END %]

    @@ -155,6 +155,7 @@ Cash registers › Administration › Koha New cash register +

    Cash registers

    Cash registers for

    @@ -172,7 +172,7 @@ New city -

    Cities

    +

    Cities

    [% IF city_name_filter %] Searching: [% city_name_filter | html %] [% END %] 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 0e21c3a0b6..0a2347fae8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -151,9 +151,9 @@ Classification sources › Administration › Koha [% IF op == 'add_source' %] [% IF class_source %] -

    Modify classification source

    +

    Modify classification source

    [% ELSE %] -

    Add classification source

    +

    Add classification source

    [% END %] @@ -215,9 +215,9 @@ Classification sources › Administration › Koha [% IF op == 'add_sort_rule' %] [% IF sort_rule %] -

    Modify filing rule

    +

    Modify filing rule

    [% ELSE %] -

    Add filing rule

    +

    Add filing rule

    [% END %] @@ -261,9 +261,9 @@ Classification sources › Administration › Koha [% IF op == 'add_split_rule' %] [% IF split_rule %] -

    Modify splitting rule

    +

    Modify splitting rule

    [% ELSE %] -

    Add splitting rule

    +

    Add splitting rule

    [% END %] @@ -340,7 +340,7 @@ Classification sources › Administration › Koha New filing rule New splitting rule - +

    Classification sources

    Classification sources

    City id [% city.cityid | html %]
    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 fee155958b..fa260548e2 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 @@ -34,10 +34,10 @@
    -

    Cloning circulation and fine rules +

    Cloning circulation and fine rules [% IF frombranch %] from "[% Branches.GetName( frombranch ) | html %]"[% END %] [% IF tobranch %] to "[% Branches.GetName( tobranch ) | html %]"[% END %] -

    + [% IF ( result ) %] [% IF ( error ) %] 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 5db60d762c..1885e780db 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 @@ -200,7 +200,7 @@
    -

    Table settings

    +

    Table settings

    Acquisition
    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 3c2555ba2f..6bdcb18ea4 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 @@ -79,9 +79,9 @@ [% IF op == 'add_form' %] [% IF credit_type %] -

    Modify a credit type

    +

    Modify a credit type

    [% ELSE %] -

    New credit type

    +

    New credit type

    [% END %] @@ -157,7 +157,7 @@ New credit type
    -

    Account credit types

    +

    Account credit types

    [% IF credit_types.count %]
    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 d4faa3f64d..0aefdbec1b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -97,11 +97,13 @@
    - [% IF currency %] - Modify currency - [% ELSE %] - New currency - [% END %] +

    + [% IF currency %] + Modify currency + [% ELSE %] + New currency + [% END %] +

    1. @@ -160,7 +162,7 @@ [% IF op =='delete_confirm' %] [% IF nb_of_orders or nb_of_vendors %]
      -

      Cannot delete currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]

      +

      Cannot delete currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]

      [% IF nb_of_orders %] This currency is used by [% nb_of_orders | html %] orders. @@ -175,7 +177,7 @@

      [% ELSE %]
      -

      Confirm deletion of currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]

      +

      Confirm deletion of currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]

    @@ -198,7 +200,7 @@ [% IF op == 'list' %] -

    Currencies and exchange rates

    +

    Currencies and exchange rates

    [% IF currencies and no_active_currency %]

    No active currency is defined

    Please edit one currency and mark it as active.

    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 20a08df5d8..2b3e3fc7ba 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 @@ -77,9 +77,9 @@ [% IF op == 'add_form' %] [% IF debit_type %] -

    Modify a debit type

    +

    Modify a debit type

    [% ELSE %] -

    New debit type

    +

    New debit type

    [% END %] @@ -148,7 +148,7 @@ New debit type -

    Account debit types

    +

    Account debit types

    [% IF debit_types.count %]
    Currency [% currency.currency | html %]
    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 0e302c4ff7..c6e955fc81 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt @@ -144,7 +144,7 @@ [% IF op == 'delete_confirm' %]
    -

    Delete desk "[% desk.desk_name | html %]"?

    +

    Delete desk "[% desk.desk_name | html %]?"

    @@ -173,7 +173,7 @@ New desk -

    Desks

    +

    Desks

    [% IF searchfield %] Searching: [% searchfield | html %] [% END %] 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 2d81110399..0d48c25b8b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt @@ -52,7 +52,7 @@
    -

    Did you mean?

    +

    Did you mean?

    Desk ID [% desk.desk_id | html %]
    @@ -298,7 +300,7 @@ EDI accounts › Administration › Koha [% END %] [% IF display %] [% IF ( ediaccounts ) %] -

    Vendor EDI accounts

    +

    Vendor EDI accounts

    Vendor
    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 70dcc732e2..0b1630ba69 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 @@ -86,11 +86,13 @@ Library EANs › Administration › Koha
    - [% IF ean %] - Modify EAN - [% ELSE %] - New EAN - [% END %] +

    + [% IF ean %] + Modify EAN + [% ELSE %] + New EAN + [% END %] +

      @@ -143,7 +145,7 @@ Library EANs › Administration › Koha [% IF delete_confirm %]
      -

      Delete EAN [% ean.ean | html %] for [% ean.branch.branchname | html %]?

      +

      Delete EAN [% ean.ean | html %] for [% ean.branch.branchname | html %]?

      @@ -157,7 +159,7 @@ Library EANs › Administration › Koha [% IF display %] [% IF ( eans ) %] -

      Library EANs

      +

      Library EANs

    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 c2168f1001..1c12fa62bf 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 @@ -66,7 +66,7 @@ [% END %] [% IF fields.size %]
    -

    Item search fields

    +

    Item search fields

    Library
    @@ -104,7 +104,7 @@
    - Add a new field +

    Add a new field

     [% INCLUDE 'admin-items-search-field-form.inc' field=undef %]
    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 cb3216ab1e..6b190b2b8e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -155,9 +155,9 @@ Item types › Administration › Koha [% IF op == 'add_form' %] [% IF itemtype %] -

    Modify item type

    +

    Modify item type

    [% ELSE %] -

    Add item type

    +

    Add item type

    [% END %] @@ -437,7 +437,7 @@ Item types › Administration › Koha [% IF op == 'delete_confirm' %]
    -

    Delete item type '[% itemtype.itemtype | html %]'?

    +

    Delete item type '[% itemtype.itemtype | html %]'?

    @@ -466,7 +466,7 @@ Item types › Administration › Koha [% END %] [% IF op == 'list' %] -

    Item types administration

    +

    Item types administration

    [% IF itemtypes %]
    Item type
    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 50622ac4b8..9686e1b9c4 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 @@ -72,7 +72,7 @@ -

    Library groups

    +

    Library groups

    [% FOREACH root_group IN root_groups %]
    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 2f8522a451..542547b5f3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt @@ -11,6 +11,7 @@
    +

    Localization

    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 e4c485ceec..4baa81201e 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 @@ -333,7 +333,7 @@ [% IF ( delete_confirm ) %]
    -

    Confirm deletion of subfield [% mss.tagsubfield | html %]?

    +

    Confirm deletion of subfield [% mss.tagsubfield | html %]?

    Subfield: [% mss.tagsubfield | html %]

    Description: [% mss.liblibrarian | html_entity %]

    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 86ff1bfb43..f9da8b684e 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 @@ -112,9 +112,9 @@ [% IF ( matching_rule_form ) %] [% IF ( edit_matching_rule ) %] -

    Modify record matching rule

    +

    Modify record matching rule

    [% ELSE %] -

    Add record matching rule

    +

    Add record matching rule

    [% END %] @@ -425,7 +425,7 @@ [% IF ( delete_matching_rule_form ) %]
    -

    Confirm deletion of record matching rule '[% code | html %]' ([% description | html %])?

    +

    Confirm deletion of record matching rule '[% code | html %]' ([% description | html %])?

    @@ -443,7 +443,7 @@ New record matching rule
    -

    Record matching rules

    +

    Record matching rules

    [% IF ( added_matching_rule ) %]
    Added record matching rule "[% added_matching_rule | html %]"
    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 a433a8c10b..657284fd2e 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 @@ -61,10 +61,10 @@ [% IF ( op_new || op_mod ) %] [% IF ( op_new ) %] -

    Add a new OAI set

    +

    Add a new OAI set

    [% ELSIF ( op_mod ) %] -

    Edit OAI set '[% spec | html %]'

    +

    Edit OAI set '[% spec | html %]'

    [% END %] @@ -101,7 +101,7 @@ New set
    -

    OAI sets

    +

    OAI sets

    [% IF sets_loop %]
    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 fa06d4dd7b..63deb0a6f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt @@ -32,7 +32,7 @@
    -

    OverDrive library authnames

    +

    OverDrive library authnames

    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 8a809c7d8c..4535f1a351 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 @@ -79,9 +79,9 @@ Patron attribute types › Administration › Koha [% IF ( attribute_type_form ) %] [% IF ( edit_attribute_type ) %] -

    Modify patron attribute type

    +

    Modify patron attribute type

    [% ELSE %] -

    Add patron attribute type

    +

    Add patron attribute type

    [% END %] [% IF ( duplicate_code_error ) %]
    Could not add patron attribute type "[% duplicate_code_error | html %]" @@ -251,7 +251,7 @@ Patron attribute types › Administration › Koha [% IF ( delete_attribute_type_form ) %]
    -

    Confirm deletion of patron attribute type '[% code | html %]' ([% description | html %])?

    +

    Confirm deletion of patron attribute type '[% code | html %]' ([% description | html %])?

    @@ -269,7 +269,7 @@ Patron attribute types › Administration › Koha New patron attribute type
    -

    Patron attribute types

    +

    Patron attribute types

    [% IF ( added_attribute_type ) %]
    Added patron attribute type "[% added_attribute_type | html %]"
    [% END %] 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 1cd9fed0a2..9a7b9acefc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -38,8 +38,8 @@
    +

    System preferences

    [% IF ( jump_not_found ) %] -

    System preferences

    Could not find a system preference named [% jumpfield | html %].
    @@ -49,7 +49,7 @@ No system preferences matched your search for: [% searchfield | html %]
    [% ELSIF searchfield %] -

    You searched for: [% searchfield | html %]

    +

    You searched for: [% searchfield | html %]

    [% END %] [% FOREACH TAB IN TABS %]
    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 120104a626..8650cef0f3 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 @@ -35,7 +35,7 @@ New SMS provider
    -

    SMS cellular providers

    +

    SMS cellular providers

    [% IF providers.count %] 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 43c688a216..7a39d63ed1 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 @@ -81,7 +81,7 @@ [% IF op == 'add_form' %] -

    New SMTP server

    +

    New SMTP server

    @@ -144,7 +144,7 @@ [% END %] [% IF op == 'edit_form' %] -

    Edit SMTP server

    +

    Edit SMTP server

    @@ -231,7 +231,7 @@ New SMTP server
    -

    SMTP servers

    +

    SMTP servers

    Default configuration:

    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 c769c72b81..956d21e066 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -111,9 +111,12 @@ [% END %]
    +

    [% IF ( modify ) %]Modify [% ELSE %]Add - [% END %] a system preference
      + [% END %] a system preference +

    +
    2. [% IF ( searchfield ) %]Variable: [% searchfield | html %] [% ELSE %][% END %]
      3. @@ -284,7 +287,7 @@ [% END %] [% IF ( add_validate ) %] -

      Data recorded

      +

      Data recorded

      @@ -293,7 +296,7 @@ [% IF ( delete_confirm ) %]
    - + @@ -310,7 +313,7 @@ [% END %] [% IF ( delete_confirmed ) %] -

    Data deleted

    +

    Data deleted

    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 7582f6d18b..6260f39ff8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -207,7 +207,7 @@ New Z39.50 server New SRU server -

    Z39.50/SRU servers administration

    +

    Z19.50/SRU servers administration

    [% IF id %] You searched for record [% id | html %] [% ELSIF searchfield %] -- 2.20.1
    Confirm deletion of [% searchfield | html %]?

    Confirm deletion of [% searchfield | html %]?
    Variable name: [% searchfield | html %]