From a9ea3650bd09c25539242736b07c9c33041cc090 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 25 Oct 2022 19:13:06 +0000 Subject: [PATCH] Bug 31986: Add page-section to various administration pages This patch adds a page-section div to some administration pages in order to provide a consistent structure visual contrast. The following pages are modified: Additional fields Funds Authority types Authority types -> MARC tag structure Authority types -> MARC tag structure -> Subfields MARC bibliographic framework MARC bibliographic framework -> MARC tag structure MARC bibliographic framework -> MARC tag structure -> Subfields MARC Bibliographic framework test Classification configuration Currencies and exchange rates EDI accounts Library EANs Item search fields Koha to MARC mapping Record overlay rules Record matching rules OAI sets configuration SMTP servers Z39.50/SRU servers To test, view each page to confirm that the page-section div visibly delineates the main content area. Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../en/modules/admin/additional-fields.tt | 43 ++--- .../prog/en/modules/admin/aqbudgets.tt | 3 +- .../modules/admin/auth_subfields_structure.tt | 2 + .../en/modules/admin/auth_tag_structure.tt | 4 +- .../prog/en/modules/admin/authtypes.tt | 167 +++++++++--------- .../prog/en/modules/admin/biblio_framework.tt | 4 +- .../prog/en/modules/admin/checkmarc.tt | 3 + .../prog/en/modules/admin/classsources.tt | 6 + .../prog/en/modules/admin/currency.tt | 65 +++---- .../prog/en/modules/admin/edi_accounts.tt | 3 +- .../prog/en/modules/admin/edi_ean_accounts.tt | 2 + .../en/modules/admin/items_search_fields.tt | 4 +- .../prog/en/modules/admin/koha2marclinks.tt | 3 +- .../en/modules/admin/marc-overlay-rules.tt | 2 + .../modules/admin/marc_subfields_structure.tt | 90 +++++----- .../prog/en/modules/admin/marctagstructure.tt | 2 + .../prog/en/modules/admin/matching-rules.tt | 36 ++-- .../prog/en/modules/admin/oai_sets.tt | 78 ++++---- .../prog/en/modules/admin/smtp_servers.tt | 28 +-- .../prog/en/modules/admin/z3950servers.tt | 3 + 20 files changed, 294 insertions(+), 254 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 858e5a7751..c76d77df6f 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 @@ -109,28 +109,31 @@ [% IF op == 'list_tables' %] [% IF CAN_user_acquisitions_order_manage || CAN_user_serials_edit_subscription || CAN_user_updatecharges_remaining_permissions %]

Additional fields

-

Select a table:

- [% BLOCK table_option %] -
  • [% content | $raw %] ([% value | html %])
    • - [% END %] -
      - [% IF CAN_user_acquisition_order_manage %] - [% WRAPPER table_option value="aqbasket" %]Order baskets[% END %] - [% END %] - [% IF CAN_user_acquisition_edit_invoices %] - [% WRAPPER table_option value="aqinvoices" %]Invoices[% END %] - [% END %] - [% IF CAN_user_serials_edit_subscription %] - [% WRAPPER table_option value="subscription" %]Subscriptions[% END %] + +
      +

      Select a table:

      + [% BLOCK table_option %] +
    • [% content | $raw %] ([% value | html %])
      • [% END %] - [% IF CAN_user_updatecharges_remaining_permissions %] - [% WRAPPER table_option value="accountlines:credit" %]Account lines (credit)[% END %] - [% WRAPPER table_option value="accountlines:debit" %]Account lines (debit)[% END %] +
        + [% IF CAN_user_acquisition_order_manage %] + [% WRAPPER table_option value="aqbasket" %]Order baskets[% END %] + [% END %] + [% IF CAN_user_acquisition_edit_invoices %] + [% WRAPPER table_option value="aqinvoices" %]Invoices[% END %] + [% END %] + [% IF CAN_user_serials_edit_subscription %] + [% WRAPPER table_option value="subscription" %]Subscriptions[% END %] + [% END %] + [% IF CAN_user_updatecharges_remaining_permissions %] + [% WRAPPER table_option value="accountlines:credit" %]Account lines (credit)[% END %] + [% WRAPPER table_option value="accountlines:debit" %]Account lines (debit)[% END %] + [% END %] +
      + [% ELSE %] + Additional permissions are required for editing additional fields [% END %] -
    - [% ELSE %] - Additional permissions are required for editing additional fields - [% END %] + [% ELSIF op == 'list' %]

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

    [% IF fields %] 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 eb76f3702e..195c2a6564 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -116,7 +116,7 @@ [% END %] - +
    @@ -234,6 +234,7 @@ [% END %]
    +
    [% ELSE %]

    No fund found

    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 8078d6d99b..e2e0130dc9 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 @@ -313,6 +313,7 @@

    This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.

    The column 'Koha field' shows that the subfield is linked with a Koha field.

    +
    @@ -364,6 +365,7 @@ [% END %]
    +
    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 efc0f2982b..1fe94868e5 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 @@ -298,6 +298,8 @@ Authority MARC framework › Administration › Koha
    + +
    @@ -332,7 +334,7 @@ Authority MARC framework › Administration › Koha [% END %]
    - +
    [% END %] 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 9d998bec63..b6c940a08d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -171,92 +171,95 @@ Authority types › Administration › Koha

    Authority types

    Define authority types, then authority MARC structure in the same way you define itemtypes and bibliographic MARC tag structure. Authority values are managed through plugins

    - - - - - - - - - - - - [% FOREACH authority_type IN authority_types %] + +
    +
    CodeDescriptionSummaryAuth field copied 
    + - - - - - + + + + + + + + [% FOREACH authority_type IN authority_types %] + + + + + + - - [% END %] - -
    [% authority_type.authtypecode | html %][% authority_type.authtypetext | html %][% authority_type.summary | html %][% authority_type.auth_tag_to_report | html %] -
    - - Actions - -
    +     		CodeDescriptionSummaryAuth field copied 
    [% authority_type.authtypecode | html %][% authority_type.authtypetext | html %][% authority_type.summary | html %][% authority_type.auth_tag_to_report | html %] +
    + + Actions + +
    - - + + - - + + -
    + + + [% END %] + + + [% END %] 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 701f35a191..570d36336f 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 @@ -162,7 +162,7 @@ MARC frameworks › Administration › Koha [% IF op == 'list' %]

    MARC frameworks

    - +
    @@ -311,7 +311,7 @@ MARC frameworks › Administration › Koha [% END %]
    - +
    [% END %] 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 e165aaeb2f..2ca6c01004 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt @@ -40,6 +40,8 @@

    MARC bibliographic framework test

    + +
    @@ -289,6 +291,7 @@ [% ELSE %]
    Test

    Configuration OK, you don't have errors in your MARC parameters table

    +
    [% 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 474db75bc8..c4d3381568 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -344,6 +344,7 @@ Classification sources › Administration › Koha New splitting rule

    Classification configuration

    +

    Classification sources

    @@ -368,7 +369,9 @@ Classification sources › Administration › Koha [% END %]
    +
    +

    Classification filing rules

    @@ -389,7 +392,9 @@ Classification sources › Administration › Koha [% END %]
    +
    +

    Classification splitting rules

    @@ -410,6 +415,7 @@ Classification sources › Administration › Koha [% END %]
    +
    [% END %] 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 ce5a9a04e2..27846b3ea0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -213,39 +213,40 @@ You searched for [% searchfield | html %] [% END %] - - - - - - - - - - - - - - - [% FOREACH currency IN currencies %] - - - - - - - - - - - [% END %] - -
    CurrencyRateSymbolISO codeLast updatedActiveArchivedActions
    [% currency.currency | html %][% currency.rate | html %][% currency.symbol | html %][% currency.isocode | html %][% currency.timestamp | $KohaDates %][% IF currency.active %]✓[% END %][% IF currency.archived %]Yes[% END %] - Edit - Delete -
    +
    + + + + + + + + + + + + + + + [% FOREACH currency IN currencies %] + + + + + + + + + + + [% END %] + +
    CurrencyRateSymbolISO codeLast updatedActiveArchivedActions
    [% currency.currency | html %][% currency.rate | html %][% currency.symbol | html %][% currency.isocode | html %][% currency.timestamp | $KohaDates %][% IF currency.active %]✓[% END %][% IF currency.archived %]Yes[% END %] + Edit + Delete +
    +
    -

    When importing MARC files via the staging tools, the tool will attempt to find and use the price of the currently active currency. 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 a3110e380a..abb4b2836d 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 @@ -304,7 +304,7 @@ EDI accounts › Administration › Koha [% IF display %] [% IF ( ediaccounts ) %]

    Vendor EDI accounts

    - +
    @@ -378,6 +378,7 @@ EDI accounts › Administration › Koha [% END %]
    ID
    +
    [% ELSE %]
    There are no EDI accounts. 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 0c11fab672..b585530da1 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 @@ -163,6 +163,7 @@ Library EANs › Administration › Koha [% IF display %]

    Library EANs

    [% IF ( eans ) %] +
    @@ -194,6 +195,7 @@ Library EANs › Administration › Koha [% END %]
    Library
    +
    [% ELSE %]
    There are no 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 4b4353a2ba..f40f7e9a05 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 @@ -70,7 +70,7 @@ [% IF fields.size %]

    Item search fields

    - +
    @@ -98,7 +98,7 @@ [% END %]
    -
    +
    [% ELSE %]

    Item search fields

    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 cd69335640..ca545be15a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt @@ -41,6 +41,7 @@
    Failed to add mapping for [% error_info | html %]
    [% END %] +
    @@ -67,7 +68,7 @@ [% END %]
    Koha field
    - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt index 49e9441c88..781457643f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc-overlay-rules.tt @@ -75,6 +75,7 @@
    [% END %] +
    @@ -254,6 +255,7 @@
    +
    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 141233e1a2..781511efd7 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 @@ -383,52 +383,54 @@

    This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.

    The column 'Koha field' shows that the subfield is linked with a Koha field.

    - - - - - - - - - - - [% FOREACH loo IN loop %] +
    +
    SubfieldTextConstraintsActions
    + - - - - + + + + - [% END %] - -
    [% loo.tagsubfield | html %] - [% IF loo.tab == -1 %] - [% loo.liblibrarian | html_entity %] - [% ELSE %] - [% loo.liblibrarian | html_entity %] - [% END %] - - [% IF loo.tab == -1 %] - subfield ignored - [% ELSE %] - Tab:[% loo.tab | html %], - [% IF ( loo.kohafield ) %] | Koha field: [% loo.kohafield | html %], [% END %] - [% IF ( loo.repeatable ) %]Repeatable, [% ELSE %]Not repeatable,[% END %] - [% IF ( loo.mandatory ) %]Mandatory, [% ELSE %]Not mandatory,[% END %] - [% IF ( loo.important ) %]Important, [% ELSE %]Not important,[% END %] - [% IF ( loo.seealso ) %] | See also: [% loo.seealso | html %],[% END %] - [% IF ( loo.hidden ) %]hidden,[% END %] - [% IF ( loo.isurl ) %]is a URL,[% END %] - [% IF ( loo.authorised_value ) %] | Auth value:[% loo.authorised_value | html %],[% END %] - [% IF ( loo.authtypecode ) %] | Authority:[% loo.authtypecode | html %],[% END %] - [% IF ( loo.value_builder ) %] | Plugin:[% loo.value_builder | html %],[% END %] - [% IF ( loo.link ) %] | Link:[% loo.link | html %],[% END %] - [% END %] - - Edit - Delete - SubfieldTextConstraintsActions
    + + + [% FOREACH loo IN loop %] + + [% loo.tagsubfield | html %] + + [% IF loo.tab == -1 %] + [% loo.liblibrarian | html_entity %] + [% ELSE %] + [% loo.liblibrarian | html_entity %] + [% END %] + + + [% IF loo.tab == -1 %] + subfield ignored + [% ELSE %] + Tab:[% loo.tab | html %], + [% IF ( loo.kohafield ) %] | Koha field: [% loo.kohafield | html %], [% END %] + [% IF ( loo.repeatable ) %]Repeatable, [% ELSE %]Not repeatable,[% END %] + [% IF ( loo.mandatory ) %]Mandatory, [% ELSE %]Not mandatory,[% END %] + [% IF ( loo.important ) %]Important, [% ELSE %]Not important,[% END %] + [% IF ( loo.seealso ) %] | See also: [% loo.seealso | html %],[% END %] + [% IF ( loo.hidden ) %]hidden,[% END %] + [% IF ( loo.isurl ) %]is a URL,[% END %] + [% IF ( loo.authorised_value ) %] | Auth value:[% loo.authorised_value | html %],[% END %] + [% IF ( loo.authtypecode ) %] | Authority:[% loo.authtypecode | html %],[% END %] + [% IF ( loo.value_builder ) %] | Plugin:[% loo.value_builder | html %],[% END %] + [% IF ( loo.link ) %] | Link:[% loo.link | html %],[% END %] + [% END %] + + + Edit + Delete + + + [% END %] + + +
    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 e282707b07..35fa9b0c94 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -260,6 +260,7 @@ MARC frameworks › Administration › Koha
    +
    @@ -311,6 +312,7 @@ MARC frameworks › Administration › Koha [% END %]
    +
    [% END %] 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 3e9d47d5bf..f1b89ae874 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 @@ -459,25 +459,27 @@
    Deleted record matching rule "[% deleted_matching_rule | html %]"
    [% END %] [% IF ( available_matching_rules ) %] - - - - - - - - [% FOREACH available_matching_rule IN available_matching_rules %] +
    +
    #CodeDescriptionActions
    - - - - + + + + - [% END %] -
    [% available_matching_rule.matcher_id | html %][% available_matching_rule.code | html %][% available_matching_rule.description | html %] - Edit - Delete - #CodeDescriptionActions
    + [% FOREACH available_matching_rule IN available_matching_rules %] + + [% available_matching_rule.matcher_id | html %] + [% available_matching_rule.code | html %] + [% available_matching_rule.description | html %] + + Edit + Delete + + + [% END %] + +
    [% ELSE %]

    There are no saved matching rules.

    [% END # /IF ( available_matching_rules ) %] 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 2503134e37..2a2d429813 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 @@ -106,46 +106,48 @@

    OAI sets

    [% IF sets_loop %] - - - - - - - - - - - [% FOREACH set IN sets_loop %] +
    +
    setSpecsetNamesetDescriptions 
    + - - - - + + + + - [% END %] - -
    [% set.spec | html %][% set.name | html %] - [% IF set.descriptions %] -
      - [% FOREACH desc IN set.descriptions %] -
    • [% desc.description | html %]
      • - [% END %] -
    - [% ELSE %] - No descriptions - [% END %] -     		-
    - - Actions - -
    -     		setSpecsetNamesetDescriptions 
    + + + [% FOREACH set IN sets_loop %] + + [% set.spec | html %] + [% set.name | html %] + + [% IF set.descriptions %] +
      + [% FOREACH desc IN set.descriptions %] +
    • [% desc.description | html %]
      • + [% END %] +
    + [% ELSE %] + No descriptions + [% END %] + + +
    + + Actions + +
    + + + [% END %] + + +
    [% ELSE %]

    There are no sets defined.

    [% END %] 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 e9278f2014..b9d75e7815 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 @@ -246,19 +246,21 @@ [% IF servers_count > 0 %] - - - - - - - - - - - - -
    NameHostPortTimeout (secs)SSLAuthenticatedActions
    +
    + + + + + + + + + + + + +
    NameHostPortTimeout (secs)SSLAuthenticatedActions
    +
    [% END %] [% END %] 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 0a15e518b3..f7f8ad1d6f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -216,6 +216,8 @@ [% ELSIF searchfield %] You searched for [% searchfield | html %] [% END %] + +
    @@ -248,6 +250,7 @@ [% END %]
    TargetHostname/PortDatabaseUseridPasswordPreselectedRankSyntaxEncodingTimeoutRecord typeAttributesActions
    +
    [% END %] -- 2.39.5