From ecd9bd421ec3a0f7693b0b6ebeaf295896629151 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 28 Jul 2021 15:12:09 +0000 Subject: [PATCH] Bug 29052: Make consistent use of spans and div with hint class This patch makes minor HTML corrections to several templates, primarily to wrap form help text in or
. To test, apply the patch and rebuild the staff interface CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). View the following pages to confirm that forms look correct: - Administration -> Authority types -> Authority type -> Edit. - Administration -> Authority types -> Authority type -> MARC structure. -> Subfields -> Edit. - Administration -> Authorised values -> View category -> New authorized value. - Administration -> Credit types -> New credit type. - Administration -> Debit types -> New debit type. - Administration -> Item types -> New item type. Also changed: Added link to ITEMTYPECAT authorized value page for users with the correct permission. - Administration -> MARC frameworks -> MARC structure -> Edit subfields. - Administration -> Patron attribute types -> New patron attribute type. - Administration -> Share content with Mana KB. - Administration -> Z39.50/SRU servers -> New Z39.50 server. Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../prog/css/src/staff-global.scss | 19 +++++++++----- .../en/modules/admin/additional-fields.tt | 6 ++--- .../modules/admin/auth_subfields_structure.tt | 4 +-- .../en/modules/admin/auth_tag_structure.tt | 2 +- .../en/modules/admin/authorised_values.tt | 2 +- .../prog/en/modules/admin/credit_types.tt | 4 +-- .../prog/en/modules/admin/debit_types.tt | 2 +- .../prog/en/modules/admin/itemtypes.tt | 24 ++++++++++------- .../modules/admin/marc_subfields_structure.tt | 2 +- .../en/modules/admin/patron-attr-types.tt | 16 ++++++------ .../prog/en/modules/admin/share_content.tt | 2 +- .../prog/en/modules/admin/z3950servers.tt | 26 ++++++++++++++----- 12 files changed, 67 insertions(+), 42 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index 09c7644b13..df2354cad2 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -806,33 +806,34 @@ fieldset { div { &.hint { - margin: .5em 0; - margin-left: 10.5em; + font-size: 105%; + margin: .5rem 0; + margin-left: 10.5rem; } } label { float: left; font-weight: bold; - margin-right: 1em; + margin-right: 1rem; text-align: right; - width: 9em; + width: 9rem; &.error { float: none; - margin-left: 1em; + margin-left: 1rem; width: auto; } &.inline { display: inline; float: none; - margin-left: 1em; + margin-left: 1rem; } &.radio { display: inline-block; - margin: 0 1em 0 0; + margin: 0 1rem 0 0; padding: 0; width: auto; } @@ -941,6 +942,10 @@ fieldset { text-align: right; width: 9em; } + + &.hint { + font-size: 105%; + } } table { 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 ccbfb8e441..3fdd329014 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 @@ -125,7 +125,7 @@ Name - Authorised value category + Authorized value category [% IF show_marcfield %] MARC field [% END %] @@ -170,8 +170,8 @@ Required
  • - - [% PROCESS options_for_authorised_value_categories authorised_value_categories = AuthorisedValues.GetCategories({selected => field.authorised_value_category}) %] 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 b87fd7f0eb..67eee4f1ab 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 @@ -149,7 +149,7 @@ [%- END -%] [%- END -%] - (ignore means that the subfield does not display in the record editor) +
    Ignore means that the subfield does not display in the record editor
  • @@ -181,7 +181,7 @@ [% ELSE %] [% END %] - (if checked, it means that the subfield is a URL and can be clicked) + If checked, it means that the subfield is a URL and can be clicked.
  • 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..1c04aa734f 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 @@ -214,7 +214,7 @@ Authority MARC framework › Administration › Koha [% PROCESS options_for_authorised_value_categories authorised_value_categories => AuthorisedValues.GetCategories( selected => authorised_value ) %] - (if you select a value here, the indicators will be limited to the authorized value list) +
    If you select a value here, the indicators will be limited to the authorized value list
    • 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 e6cb47ce5c..f27cced624 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 @@ -133,7 +133,7 @@ Authorized values › Administration › Koha [% END %] [% END %] - Select 'All libraries' if this authorized value must be displayed all the time. Otherwise select libraries you want to associate with this value. +
    Select 'All libraries' if this authorized value must be displayed all the time. Otherwise select libraries you want to associate with this value.
    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 7ba964417e..d1d37a5e17 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 @@ -122,7 +122,7 @@ [% ELSE %] [% END %] - Enable automatic generation of credit number (see AutoCreditNumber) + Enable automatic generation of credit number (see AutoCreditNumber)
  • @@ -139,7 +139,7 @@ [% END %] [% END %] - Select 'All libraries' if this credit type should be available at all libraries. Otherwise select libraries you want to associate credit type with. +
    Select 'All libraries' if this credit type should be available at all libraries. Otherwise select libraries you want to associate credit type with.
    [% END %]
    • 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 a5772617d9..98f6dc3ef1 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 @@ -131,7 +131,7 @@ [% END %] [% END %] - Select 'All libraries' if this debit type should be available at all libraries. Otherwise select libraries you want to associate debit type with. +
    Select 'All libraries' if this debit type should be available at all libraries. Otherwise select libraries you want to associate debit type with.
    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 f61e0602f0..b53945ca35 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -182,7 +182,7 @@ Item types › Administration › Koha

    No available parent types

    [% END %] - Defining a parent type will apply checkout limits for all children as described on the circulation rules page. +
    Defining a parent type will apply checkout limits for all children as described on the circulation rules page.
  • @@ -192,7 +192,7 @@ Item types › Administration › Koha [% END %]
  • - Search category + - Options are defined as the authorized values for the ITEMTYPECAT category. +
    + [% IF ( CAN_user_parameters_manage_auth_values ) %] + Options are defined by the authorized value ITEMTYPECAT. + [% ELSE %] + Options are defined by the authorized value ITEMTYPECAT. + [% END %] +
    • [% IF ( Koha.Preference('noItemTypeImages') && Koha.Preference('OpacNoItemTypeImages') ) %]
  • @@ -312,12 +318,12 @@ Item types › Administration › Koha
  • - This fee is charged once per checkout/renewal per item +
    This fee is charged once per checkout/renewal per item
  • - This fee is charged at checkout/renewal time for each day between the checkout/renewal date and due date for loans specified in days. +
    This fee is charged at checkout/renewal time for each day between the checkout/renewal date and due date for loans specified in days.
  • @@ -331,7 +337,7 @@ Item types › Administration › Koha
  • - This fee is charged at checkout/renewal time for each hour between the checkout/renewal date and due date for loans specified in hours. +
    This fee is charged at checkout/renewal time for each hour between the checkout/renewal date and due date for loans specified in hours.
  • @@ -387,13 +393,13 @@ Item types › Administration › Koha [% PROCESS options_for_libraries libraries => Branches.all( selected => itemtype.get_library_limits, unfiltered => 1, do_not_select_my_library => 1 ) %] - Select 'All libraries' if all libraries use this item type. Otherwise, select the specific libraries that use this item type. +
    Select 'All libraries' if all libraries use this item type. Otherwise, select the specific libraries that use this item type.
  • -

    Enter a summary that will overwrite the default one in search results lists. Example, for a website itemtype :

    -

    <a href="[856u]">open site</a> will show the link just below the title

    +
    Enter a summary that will overwrite the default one in search results lists. Example, for a website itemtype :
    +
    <a href="[856u]">open site</a> will show the link just below the title
    • 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 0fc99e2308..881adf1a3e 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 @@ -251,7 +251,7 @@ [% ELSE %] [% END %] -
    If checked, it means that the subfield is a URL and can be clicked
    + If checked, it means that the subfield is a URL and can be clicked
  • 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 3696ad6162..b57890ace2 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 @@ -126,7 +126,7 @@ Patron attribute types › Administration › Koha [% ELSE %] [% END %] - Check to let a patron record have multiple values of this attribute. + Check to let a patron record have multiple values of this attribute.
    • [% IF attribute_type AND not can_be_set_to_unique %] @@ -147,7 +147,7 @@ Patron attribute types › Administration › Koha [% ELSE %] [% END %] - If checked, attribute will be a unique identifier — if a value is given to a patron record, the same value + If checked, attribute will be a unique identifier. If a value is given to a patron record, the same value cannot be given to a different record. @@ -157,7 +157,7 @@ Patron attribute types › Administration › Koha [% ELSE %] [% END %] - Check to display this attribute on a patron's details page in the OPAC. + Check to display this attribute on a patron's details page in the OPAC.
  • [% IF attribute_type AND attribute_type.opac_editable %] @@ -165,7 +165,7 @@ Patron attribute types › Administration › Koha [% ELSE %] [% END %] - Check to allow patrons to edit this attribute from their details page in the OPAC. (Requires above, does not work during self-registration if PatronSelfRegistrationVerifyByEmail is set.) + Check to allow patrons to edit this attribute from their details page in the OPAC. (Requires above, does not work during self-registration if PatronSelfRegistrationVerifyByEmail is set.)
  • [% IF attribute_type AND attribute_type.staff_searchable %] @@ -173,7 +173,7 @@ Patron attribute types › Administration › Koha [% ELSE %] [% END %] - Check to make this attribute staff_searchable in the staff patron search. + Check to make this attribute staff_searchable in the staff patron search.
  • [% IF attribute_type AND attribute_type.mandatory %] @@ -181,7 +181,7 @@ Patron attribute types › Administration › Koha [% ELSE %] [% END %] - Check to make this attribute mandatory when creating or editing a patron. + Check to make this attribute mandatory when creating or editing a patron.
  • [% IF attribute_type AND attribute_type.display_checkout %] @@ -189,7 +189,7 @@ Patron attribute types › Administration › Koha [% ELSE %] [% END %] - Check to show this attribute in the brief information panel in the patron's record (staff interface). + Check to show this attribute in the brief information panel in the patron's record (staff interface).
    • [% IF Koha.Preference('Pseudonymization') %] @@ -200,7 +200,7 @@ Patron attribute types › Administration › Koha [% ELSE %] [% END %] - Check to make this attribute copied to the patron's pseudonymized attributes. + Check to make this attribute copied to the patron's pseudonymized attributes. [% END %] 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..c6f8d95257 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 @@ -97,7 +97,7 @@ [% ELSE %] [% END %] -
    If checked, new subscriptions you create will be automatically shared with Mana KB.
    + If checked, new subscriptions you create will be automatically shared with Mana KB.
    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 dd7557067f..585e6bc86b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -111,21 +111,30 @@
    • -
  • +
  • + [% IF ( server.checked ) %] [% ELSE %] [% END %] + Searched by default.
    • -
  • +
  • + + +
    Display order.
    • [% IF (server.servertype||type) == 'zed' %] -
  • +
  • + + +
    Additional PQF attributes added to each query.
    • [% END %] -
  • +
  • + +
    Z39.50 can send records in various formats. Choose one.
    • -
  • +
  • + +
    Z39.50 can send records in various encodings. Choose one.
    • -
  • +
  • + seconds +
    Enter 0 to disable.