From 85eff61960db5e53d1650b612d0da3acb0eaa608 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 30 Oct 2020 12:33:54 +0000 Subject: [PATCH] Bug 26838: Improve styling of checkin message This patch makes some changes to the style and use of the "problem" class in the staff interface: - Remove the background color - Remove the extra line height Some changes to the template: - Remove the problem class from the checkin message. The checkin message configuration determines whether the dialog is an alert or a message-style dialog. - Add Font Awesome icons to the "problem" messages in patron details and serials collection. This is to help emphasize the message for users who might have difficulty seeing the color difference. 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). - Go to Administration -> Item types and configure a checkin message for an item type: Add a message and select "Message" as the checkin message type. - Check in an item with that item type and confirm that you see the checkin message. It should be displayed in a message-style dialog without any additional styling. - Change the item type configuration to use "Alert" as the checkin message type. Confirm that the correct style is shown in this case as well. - Locate a patron with a NULL value in borrowers.password. View the detail page for that patron. - Under the "Library use" heading, the "Password" line should contain a link with the text "Undefined," preceded by a red-colored Font Awesome icon. - In Serials, locate a subscription which is expired. - View the details for the subscription, and then open "serial collection" from the sidebar menu. - On the serial collection page there should be a cell in the subscription summary table showing the message "Subscription expired" preceded by a red-colored Font Awesome icon. --- .../intranet-tmpl/prog/css/src/staff-global.scss | 19 ++++++++----------- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../prog/en/modules/members/moremember.tt | 2 +- .../prog/en/modules/serials/serials-collection.tt | 2 +- 4 files changed, 11 insertions(+), 14 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 6d03d1a310..5aee0b318d 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -596,10 +596,8 @@ ol { } .problem { - background-color: #FFFFCC; color: #990000; font-weight: bold; - line-height: 1.7em; } fieldset { @@ -1746,7 +1744,7 @@ i { h2, h3, h4 { - margin: auto; + margin: 5px auto; text-align: center; } @@ -1769,6 +1767,13 @@ i { list-style-position: inside; } + p { + margin-top: 0; + &+p { + margin-top: 5px; + } + } + table { margin: .5em auto; @@ -2312,19 +2317,11 @@ li { &.alert { background: #FFFADE none; border-color: #E0C726; - - .problem { - background-color: transparent; - } } &.message { background: #E8EDF6 none; border-color: #A4BEDD; - - .problem { - background-color: transparent; - } } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 4ebc4cd40f..670cec1e3d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -306,7 +306,7 @@ [% ELSE %]
[% END %] -

[% checkinmsg | html_line_break %]

+

[% checkinmsg | html_line_break %]

[% END # /IF checkinmsg %] [% END # /BLOCK all_checkin_messages %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 7b7fd26e67..c431a09c48 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -541,7 +541,7 @@ [% IF ( patron.password ) %] ******* [% ELSE %] - Undefined + Undefined [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt index d0b6d72cf0..ddd1c260dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -87,7 +87,7 @@ [% subscription.notes | html | html_line_break %] [% UNLESS subscription.closed %] [% IF ( subscription.subscriptionexpired ) %] -
Subscription expired +

Subscription expired

[% END %] [% ELSE %]
Subscription closed -- 2.11.0