From c46dd36389f235db6dac4314a4aae716109f8a72 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 5 Sep 2023 17:58:58 +0000 Subject: [PATCH] Bug 34412: Inconsistencies in System preferences page titles, breadcrumbs, and header This patch makes changes to the markup of various areas of the local use system preferences template in order to make it more consistent with other pages in Koha. To test, apply the patch and go to Administration -> System preferences -> Local use. View each variation of the page to confirm that breadcrumb navigation, page title, and page headings are consistent with each other. - On the main page confirm that the heading is "Local use system preferences" - New preference: - The form on this page has been updated to make the markup structure more consistent with other pages, with the heading outside the white box of the form. - The two portions of the form have been combined into one so that the layout of the form is more consistent with similar forms. - Edit preference - Delete: - The deletion confirmation page has been reformatted to use an "alert" style dialog with styled confirmation buttons. - The "Data deleted" view has been reformatted to use a "message" style dialog. Signed-off-by: David Cook Signed-off-by: Tomas Cohen Arazi --- .../en/modules/admin/systempreferences.tt | 124 ++++++++++-------- 1 file changed, 68 insertions(+), 56 deletions(-) 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 0da7d14c82..8d2deedd0c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -7,21 +7,21 @@ [% FILTER collapse %] [% IF ( add_form ) %] [% IF ( modify ) %] - [% tx("Modify system preference '{searchfield}'", { searchfield = searchfield }) | html %] + [% tx("Modify preference '{searchfield}'", { searchfield = searchfield }) | html %] [% ELSE %] - [% t("Add a system preference") | html %] + [% t("New preference") | html %] [% END %] › [% END %] [% IF ( add_validate ) %] - [% t("Data added") | html %] › + [% t("Preference added") | html %] › [% END %] [% IF ( delete_confirm ) %] - [% tx("Confirm deletion of parameter '{searchfield}'", { searchfield = searchfield }) | html %] › + [% tx("Confirm deletion of preference '{searchfield}'", { searchfield = searchfield }) | html %] › [% END %] [% IF ( delete_confirmed ) %] - [% t("Parameter deleted") | html %] › + [% t("Preference deleted") | html %] › [% END %] - [% t("System preferences") | html %] › + [% t("Local use system preferences") | html %] › [% t("Administration") | html %] › [% t("Koha") | html %] [% END %] @@ -41,16 +41,16 @@ [% IF ( add_form || add_validate || delete_confirm || delete_confirmed ) %] [% WRAPPER breadcrumb_item %] - System preferences + Local use system preferences [% END %] [% END %] [% IF ( add_form ) %] [% WRAPPER breadcrumb_item bc_active= 1 %] [% IF ( modify ) %] - Modify system preference '[% searchfield | html %]' + Modify preference '[% searchfield | html %]' [% ELSE %] - Add a system preference + New preference [% END %] [% END %] [% END %] @@ -66,19 +66,19 @@ [% searchfield | html %] [% END %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Confirm deletion of parameter '[% searchfield | html %]' + Confirm deletion of preference '[% searchfield | html %]' [% END %] [% END %] [% IF ( delete_confirmed ) %] [% WRAPPER breadcrumb_item bc_active= 1 %] - Parameter deleted + Preference deleted [% END %] [% END %] [% IF ( else ) %] [% WRAPPER breadcrumb_item bc_active= 1 %] - System preferences + Local use system preferences [% END %] [% END %] [% END #/ WRAPPER breadcrumbs %] @@ -90,18 +90,22 @@
[% IF ( add_form ) %] +

+ [% IF ( modify ) %] + Modify a local use system preference + [% ELSE %] + New local use system preference + [% END %] +

+ [% IF ( type_upload ) %]
[% ELSE %] [% END %] -
-

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

-
    +
    + Preference details +
    2. [% IF ( searchfield ) %]Variable: [% searchfield | html %] [% ELSE %][% END %]
      3. @@ -192,19 +196,7 @@ [% END %] -
    -
    - [% IF ( return_tab ) %] - Cancel - [% ELSE %] - Cancel - [% END %] -
    - -
    - Koha internal -
    Note: change the variable type to one of the dropdown values as needed
    -
      +
    1. +
      Note: change the variable type to one of the dropdown values as needed
    2. -
      (a choice list for choice (separated by |) or cols|rows for texarea)
      -
      3. + +
      (a choice list for choice (separated by |) or cols|rows for texarea)
      +
    + +
    + [% IF ( return_tab ) %] + Cancel + [% ELSE %] + Cancel + [% END %] +
    + [% END %] @@ -280,30 +283,39 @@ [% END %] [% IF ( delete_confirm ) %] - - - - - - -

    Confirm deletion of [% searchfield | html %]?

    Variable name:[% searchfield | html %]
    Value: - [% Tvalue | html %] -
    -
    - - - -
    -
    +
    +

    Confirm deletion of [% searchfield | html %]?

    + + + + + + + + + +
    Variable name:[% searchfield | html %]
    Value: [% Tvalue | html %]
    +
    + + + + +
    +
    + +
    +
    [% END %] - + [% IF ( delete_confirmed ) %] -

    Data deleted

    -
    - -
    +
    +

    Data deleted

    +
    + +
    +
    [% END %] - + [% IF ( else ) %]
    @@ -314,7 +326,7 @@

    Please click on one of the tabs at the left side of this form.

    [% ELSE %] -

    Local use preferences

    +

    Local use system preferences

    -- 2.39.5