Attachment 154236 Details for Bug 31667 – Bug 31667: Merge 'tip' and 'hint' classes

[patch] Bug 31667: Merge 'tip' and 'hint' classes

Bug-31667-Merge-tip-and-hint-classes.patch (text/plain), 5.63 KB, created by Fridolin Somers on 2023-08-04 07:00:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fridolin Somers

Created: 2023-08-04 07:00:40 UTC

Size: 5.63 KB

patch

obsolete

>From cba5996e83a26b6f8156d91ba6b3cc075ac61886 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>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.
>
>Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
>---
> koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss   | 9 ---------
> .../intranet-tmpl/prog/en/modules/installer/step2.tt     | 4 ++--
> .../prog/en/modules/members/routing-lists.tt             | 2 +-
> .../intranet-tmpl/prog/en/modules/reports/itemtypes.tt   | 2 +-
> 4 files changed, 4 insertions(+), 13 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 abbc4a82b7..3ced7187e1 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;
> }
>@@ -3155,11 +3151,6 @@ label {
>         padding-left: 0;
>     }
> 
>-    &.tip {
>-        display: block;
>-        margin: .5em 0;
>-    }
>-
>     &.disabled {
>         color: #CCC;
>         cursor: not-allowed;
>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 d9e528cb1c..b5af87bf64 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 %]
>                                     </ul>
>                                     <p class="error">User [% user | $HtmlTags tag=>'code' %] doesn't have enough privilege on database [% dbname | $HtmlTags tag=>'code' %].</p>
>-                                    <p class="tip">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' %].</p>
>+                                    <p class="hint">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' %].</p>
>                                     <p>Need help? For help with granting permissions, please search online for "[% dbms | $HtmlTags tag=>'code' %] manual grant permissions"
>                                     </p>
>                                 [% END %]
>@@ -64,7 +64,7 @@
>                             [% END %]
>                         [% ELSE %]
>                             <div class="alert alert-warning" role="alert">[% error | html %] : [% message | html %]</div>
>-                            <div class="tip">
>+                            <div class="hint">
>                                 <ul>
>                                     <li>Check that your database is running.</li>
>                                     <li>Check your database settings in [% 'koha-conf.xml' | $HtmlTags Tag=>'code' %].</li>
>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 bc41221adf..efb0a1a117 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 @@
> 
>                 <h1>Subscription routing lists for [% INCLUDE 'patron-title.inc' %]</h1>
> 
>-<p class="tip">Search subscriptions:</p>
>+<p class="hint">Search subscriptions:</p>
> <form action="/cgi-bin/koha/serials/serials-search.pl" method="get">[% IF ( routing ) %]<input type="hidden" name="routing" value="[% routing | html %]" />[% END %]<input type="hidden" name="searched" value="1" /> <label for="ISSN_filter">ISSN:</label> <input type="text" size="10" maxlength="11" name="ISSN_filter" id="ISSN_filter" value="[% ISSN_filter | html %]" /> <label for="title_filter">Title:</label> <input type="text" size="20" maxlength="40" name="title_filter" id="title_filter" value="[% title_filter | html %]" /><input type="submit" class="btn btn-primary" value="Search" />
> </form>
> 
>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 e24cff8ff7..4cbcac58ec 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 @@
>                   <option value=""></option>
>                   [% PROCESS options_for_libraries libraries => Branches.all() %]
>                 </select>
>-                <span class="tip">Select none to see all libraries</span>
>+                <div class="hint">Select none to see all libraries</div>
>               </li>
>             </ol>
>           </fieldset>
>-- 
>2.41.0

Actions: View | Diff | Splinter Review

Attachments on bug 31667: 153888 | 154233 | 154236 | 154261