From 5d2ee0dfa376b332a9c0381491b23eede77eb802 Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Mon, 26 Apr 2021 06:50:08 +0000 Subject: [PATCH] Bug 27741: admin folder Bug 27631 corrected the tags in each of the pages in the staff client. This bug deals with correcting the hierarchy of each of the other headings. To test: 1) Apply patch and dependencies 2) Go to each of the pages and check the headings under

are in the correct order and hierarchy Sponsored-by: Catalyst IT --- .../prog/en/includes/messaging-preference-form.inc | 1 + .../prog/en/modules/admin/admin-home.tt | 24 ++++++++--------- .../prog/en/modules/admin/aqbudgetperiods.tt | 4 +-- .../prog/en/modules/admin/audio_alerts.tt | 2 +- .../prog/en/modules/admin/auth_tag_structure.tt | 4 +-- .../prog/en/modules/admin/authorised_values.tt | 2 +- .../en/modules/admin/branch_transfer_limits.tt | 2 +- .../prog/en/modules/admin/cash_registers.tt | 2 +- .../prog/en/modules/admin/categories.tt | 1 - .../prog/en/modules/admin/columns_settings.tt | 30 +++++++++++----------- .../prog/en/modules/admin/currency.tt | 2 +- .../prog/en/modules/admin/itemtypes.tt | 2 +- .../prog/en/modules/admin/library_groups.tt | 12 ++++----- .../prog/en/modules/admin/marctagstructure.tt | 4 +-- .../prog/en/modules/admin/matching-rules.tt | 4 +-- .../prog/en/modules/admin/oai_set_mappings.tt | 2 +- .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../prog/en/modules/admin/share_content.tt | 2 +- .../prog/en/modules/admin/smart-rules.tt | 10 ++++---- .../prog/en/modules/admin/smtp_servers.tt | 2 +- .../prog/en/modules/admin/transport-cost-matrix.tt | 2 +- 21 files changed, 58 insertions(+), 58 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc index f2a2e0f241..9ce7ca60af 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc @@ -4,6 +4,7 @@ + [% IF Koha.Preference('SMSSendDriver') %][% 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 5064dc0d12..fbc3dcf4c5 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 @@ -28,7 +28,7 @@ [% IF ( CAN_user_parameters_manage_mana ) %] [% IF ( Koha.Preference('Mana') == 1) && !mana_url %]
-

The Mana Knowledge Base feature is enabled but not configured.

+

The Mana Knowledge Base feature is enabled but not configured.

This feature allows you to retrieve and share data (subscription patterns and reports) with other Koha libraries.

Ask your system administrator to configure this feature, or remove this note by disabling the 'Mana' system preference. @@ -37,7 +37,7 @@ [% END %] [% IF ( Koha.Preference('Mana') == 2 ) %]

-

Share content with Mana KB?

+

Share content with Mana KB?

You haven't decided if you want to activate Mana Knowledge Base. Change your Mana KB settings.

[% END %] @@ -45,7 +45,7 @@ [% IF ( CAN_user_parameters_manage_usage_stats ) %] [% IF ( Koha.Preference('UsageStats') == 2 ) %]
-

Share anonymous usage statistics with the Koha community?

+

Share anonymous usage statistics with the Koha community?

You haven't decided if you want to activate usage statistic sharing in Koha yet. Change your Hea settings.

This feature gives the Koha developers valuable information regarding how Koha is being used and helps to drive decisions during the development cycle

@@ -56,7 +56,7 @@ [% IF ( CAN_user_parameters_manage_sysprefs ) %]
-

Global system preferences

+

Global system preferences

Manage global system preferences like MARC flavor, date format, administrator email, and templates.

@@ -66,8 +66,8 @@ [% END %] [% IF ( CAN_user_parameters_manage_libraries || CAN_user_parameters_manage_itemtypes || CAN_user_parameters_manage_auth_values ) %] -

Hint:

Configure these parameters in the order they appear.

-

Basic parameters

+

Hint:

Configure these parameters in the order they appear.

+

Basic parameters

[% IF ( CAN_user_parameters_manage_libraries ) %]
Libraries
@@ -87,7 +87,7 @@ [% END %] [% IF ( CAN_user_parameters_manage_patron_categories || CAN_user_parameters_manage_circ_rules || CAN_user_parameters_manage_patron_attributes || CAN_user_parameters_manage_transfers || CAN_user_parameters_manage_item_circ_alerts || CAN_user_parameters_manage_cities ) %] -

Patrons and circulation

+

Patrons and circulation

[% IF ( CAN_user_parameters_manage_patron_categories ) %]
Patron categories
@@ -123,7 +123,7 @@ [% END %] [% IF ( CAN_user_parameters_manage_accounts || ( Koha.Preference('UseCashRegisters') && CAN_user_parameters_manage_cash_registers ) ) %] -

Accounting

+

Accounting

[% IF ( CAN_user_parameters_manage_accounts ) %]
Debit types
@@ -139,7 +139,7 @@ [% END %] [% IF CAN_user_plugins && plugins_enabled %] -

Plugins

+

Plugins

Manage plugins
View, manage, configure and run plugins.
@@ -149,7 +149,7 @@
[% IF ( CAN_user_parameters_manage_marc_frameworks || CAN_user_parameters_manage_classifications || CAN_user_parameters_manage_matching_rules || CAN_user_parameters_manage_oai_sets || CAN_user_parameters_manage_item_search_fields || CAN_user_parameters_manage_search_engine_config ) %] -

Catalog

+

Catalog

[% IF ( CAN_user_parameters_manage_marc_frameworks ) %]
MARC bibliographic framework
@@ -187,7 +187,7 @@ [% END %] [% IF ( CAN_user_acquisition_currencies_manage || CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || CAN_user_acquisition_edi_manage ) %] -

Acquisition parameters

+

Acquisition parameters

[% IF ( CAN_user_acquisition_currencies_manage ) %]
Currencies and exchange rates
@@ -211,7 +211,7 @@ [% END %] [% IF ( ( CAN_user_parameters_manage_smtp_servers || CAN_user_parameters_manage_search_targets || CAN_user_parameters_manage_didyoumean || CAN_user_parameters_manage_column_config || CAN_user_parameters_manage_audio_alerts || CAN_user_parameters_manage_sms_providers && Koha.Preference('SMSSendDriver') == 'Email' ) || CAN_user_parameters_manage_usage_stats || CAN_user_parameters_manage_additional_fields || CAN_user_parameters_manage_mana || (Koha.Preference('EnableAdvancedCatalogingEditor') && CAN_user_parameters_manage_keyboard_shortcuts) ) %] -

Additional parameters

+

Additional parameters

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 3514e6ad7f..728cef755f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -364,7 +364,7 @@ There are no unreceived orders for this budget. Back [% ELSE %] -

The unreceived orders from the following funds will be moved

+

The unreceived orders from the following funds will be moved

Fund list of budget [% budget_period_description | html %]:
Default messaging preferences for this patron category
Days in advanceSMS
@@ -414,7 +414,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%])

+

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%])

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 9922efa583..ec47bc0986 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 @@ -89,7 +89,7 @@

Audio alerts

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

Audio alerts are disabled

+

Audio alerts are disabled

[% IF ( CAN_user_parameters_manage_sysprefs ) %]

Please enable system preference AudioAlerts to activate sounds.

[% ELSE %] 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 659ff9085f..8db80438c5 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 @@ -228,7 +228,7 @@ Authority MARC framework › Administration › Koha [% IF ( delete_confirm ) %]
-

Confirm deletion

+

Confirm deletion

@@ -246,7 +246,7 @@ Authority MARC framework › Administration › Koha [% IF ( delete_confirmed ) %] -

Data deleted

+

Data deleted

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 b8e1f82b71..bde52c5c00 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 @@ -138,7 +138,7 @@ Authorized values › Administration › Koha
-
Choose an icon:
+

Choose an icon:

  • None
  • [% FOREACH imageset IN imagesets %] 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 86f9fa56cb..82b5f08cd8 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 @@ -61,7 +61,7 @@ [% FOREACH codes_loo IN codes_loop %]
    -

    Policy for [% codes_loo.limit_phrase | html %]: [% codes_loo.code | html %]

    +

    Policy for [% codes_loo.limit_phrase | html %]: [% codes_loo.code | html %]

    Select all | Clear all

    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 79094e8d3a..1ef30d668c 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 @@ -156,7 +156,7 @@ Cash registers › Administration › Koha

    Cash registers

    -

    Cash registers for [% PROCESS options_for_libraries libraries => Branches.all( selected => branchcode, unfiltered => 1, ) %] 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 04d7603a97..396cd2c946 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -410,7 +410,6 @@ [% IF ( EnhancedMessagingPreferences ) %]
    -

    Default messaging preferences for this patron category

    [% INCLUDE 'messaging-preference-form.inc' %]
    [% END %] 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 ca71c895da..7ff97df9f6 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 @@ -19,7 +19,7 @@ [% SET panel_id = panel_id + 1 %] [% IF module.keys and module.keys.size > 0 %] [% FOR pagename IN module.keys.sort %] -

    Page: [% pagename | html %]

    +

    Page: [% pagename | html %]

    [% SET tables = module %] [% IF tables.$pagename.keys and tables.$pagename.keys.size > 0 %] [% FOR tablename IN tables.$pagename.keys.sort %] @@ -204,85 +204,85 @@
    -

    Acquisition tables

    +

    Acquisition tables

    [% PROCESS pagelist module=modules.acqui modulename="acqui" %]
    -

    Administration tables

    +

    Administration tables

    [% PROCESS pagelist module=modules.admin modulename="admin" %]
    -

    Authorities tables

    +

    Authorities tables

    [% PROCESS pagelist module=modules.authorities modulename="authorities" %]
    -

    Catalogue tables

    +

    Catalogue tables

    [% PROCESS pagelist module=modules.catalogue modulename="catalogue" %]
    -

    Cataloguing tables

    +

    Cataloguing tables

    [% PROCESS pagelist module=modules.cataloguing modulename="cataloguing" %]
    -

    Circulation tables

    +

    Circulation tables

    [% PROCESS pagelist module=modules.circ modulename="circ" %]
    -

    Course reserves tables

    +

    Course reserves tables

    [% PROCESS pagelist module=modules.coursereserves modulename="coursereserves" %]
    -

    Interlibrary loans tables

    +

    Interlibrary loans tables

    [% PROCESS pagelist module=modules.illrequests modulename="illrequests" %]
    -

    Patrons tables

    +

    Patrons tables

    [% PROCESS pagelist module=modules.members modulename="members" %]
    -

    Point of sale tables

    +

    Point of sale tables

    [% PROCESS pagelist module=modules.pos modulename="pos" %]
    -

    Tools tables

    +

    Tools tables

    [% PROCESS pagelist module=modules.tools modulename="tools" %]
    -

    OPAC tables

    +

    OPAC tables

    [% PROCESS pagelist module=modules.opac modulename="opac" %]
    -

    Reports tables

    +

    Reports tables

    [% PROCESS pagelist module=modules.reports modulename="reports" %]
    -

    Serials tables

    +

    Serials tables

    [% PROCESS pagelist module=modules.serials modulename="serials" %]
    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 115d1d986a..d0adecea70 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -203,7 +203,7 @@

    Currencies and exchange rates

    [% IF currencies and no_active_currency %] -

    No active currency is defined

    Please edit one currency and mark it as active.

    +

    No active currency is defined

    Please edit one currency and mark it as active.

    [% END %] [% IF searchfield %] 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 4e4a870ec5..a1ca43e1de 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -217,7 +217,7 @@ Item types › Administration › Koha [% UNLESS Koha.Preference('noItemTypeImages') && Koha.Preference('OpacNoItemTypeImages') %]
    -
    Choose an icon:
    +

    Choose an icon:

    • None
    • [% FOREACH imageset IN imagesets %] 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 6b68db01aa..e52cead935 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 @@ -101,7 +101,7 @@
Tag: [% searchfield | html %] [% liblibrarian | html %]
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 68cf0d79aa..6226795c60 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 @@ -108,7 +108,7 @@ [% UNLESS Koha.Preference('ManaToken') %] -

Configure Mana KB

+

Configure Mana KB

Once you have enabled Mana it must be configured. Type your name, and email address and submit. This will send an account creation request to Mana KB that will respond back with a Mana KB token (an encrypted ID that uniquely identifies your Koha installation). This token will automatically be saved in your database. After that you will receive an email. Read it and follow the instructions.

[% END %] 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 088657327e..e29e1aba2c 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 @@ -527,7 +527,7 @@
-

Default checkout, hold and return policy[% IF humanbranch %] for [% Branches.GetName( humanbranch ) | html %][% END %]

+

Default checkout, hold and return policy[% IF humanbranch %] for [% Branches.GetName( humanbranch ) | html %][% END %]

You can set a default maximum number of checkouts, hold policy and return policy that will be used if none is defined below for a particular item type or category.

@@ -697,7 +697,7 @@
[% IF ( show_branch_cat_rule_form ) %]
-

[% IF humanbranch %]Checkout, hold policy by patron category for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default checkout, hold policy by patron category[% END %]

+

[% IF humanbranch %]Checkout, hold policy by patron category for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default checkout, hold policy by patron category[% END %]

For this library, you can specify the maximum number of loans that a patron of a given category can make, regardless of the item type.

@@ -778,9 +778,9 @@
[% IF current_branch == '*' %] -

Default lost item fee refund on return policy

+

Default lost item fee refund on return policy

[% ELSE %] -

Lost item fee refund on return policy for [% Branches.GetName(current_branch) | html %]

+

Lost item fee refund on return policy for [% Branches.GetName(current_branch) | html %]

[% END %]

Specify the default policy for lost item fees on return.

@@ -881,7 +881,7 @@
-

[% IF humanbranch %]Holds policy by item type for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default holds policy by item type[% END %]

+

[% IF humanbranch %]Holds policy by item type for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default holds policy by item type[% END %]

For this library, you can edit rules for given itemtypes, regardless of the patron's category. 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 f6a2088b8a..c7a86e9ec6 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 @@ -267,7 +267,7 @@