From 5ed2ab05373103434f5f68fc1f46d83350354d9c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 25 Jul 2023 15:32:44 +0000 Subject: [PATCH] Bug 31667: Merge 'tip' and 'hint' classes This patch corrects a few instances of the use of the "tip" class and replaces them with "hint." The patch also removes the class from the staff interface CSS. To test, apply the patch and rebuild the staff interface CSS. - View a patron account and click the "Routing lists" link in the left-hand sidebar. - On the subscription routing lists page the "Search subscriptions" page label should look correct. - Go to Reports -> Catalog by item type. - The "Select none..." hint should be styled correctly. - The third instance, in the installer, is only visible if you try to install Koha using a MySQL user who doesn't have the correct privileges, so may be too much trouble to really test. A check of the patch should be adequate. --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 4 ---- koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/members/routing-lists.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt | 2 +- 4 files changed, 4 insertions(+), 8 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 abbc4a82b75..323f3513b30 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -1177,10 +1177,6 @@ div { display: none; } -.tip { - color: #808080; -} - .single-line { white-space: nowrap; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt index d9e528cb1c0..b5af87bf641 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt @@ -45,7 +45,7 @@ [% ELSE %]

User [% user | $HtmlTags tag=>'code' %] doesn't have enough privilege on database [% dbname | $HtmlTags tag=>'code' %].

-

Ask for or make a change in the user's privileges. User [% user | $HtmlTags tag=>'code' %] must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on database [% dbname | $HtmlTags tag=>'code' %].

+

Ask for or make a change in the user's privileges. User [% user | $HtmlTags tag=>'code' %] must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on database [% dbname | $HtmlTags tag=>'code' %].

Need help? For help with granting permissions, please search online for "[% dbms | $HtmlTags tag=>'code' %] manual grant permissions"

[% END %] @@ -64,7 +64,7 @@ [% END %] [% ELSE %] -
+
  • Check that your database is running.
  • Check your database settings in [% 'koha-conf.xml' | $HtmlTags Tag=>'code' %].
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt index bc41221adf0..efb0a1a117c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt @@ -37,7 +37,7 @@

    Subscription routing lists for [% INCLUDE 'patron-title.inc' %]

    -

    Search subscriptions:

    +

    Search subscriptions:

    [% IF ( routing ) %][% END %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt index e24cff8ff7e..4cbcac58ec3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt @@ -78,7 +78,7 @@ [% PROCESS options_for_libraries libraries => Branches.all() %] - Select none to see all libraries +
    Select none to see all libraries
    -- 2.30.2