From 8a5779758a08ba8f34fbf21b48fe7369ff511d10 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 20 Sep 2021 15:22:33 +0000 Subject: [PATCH] Bug 29057: Use font awesome icons on request.pl This patch offers an alternate take on using Font Awesome icons on the holds page in place of images as links. This revised patch updates the icon implementation so that it is easier to override the Font Awesome icon selection with CSS. Test by adding the contents of this file to the IntranetUserCSS preference: https://gitlab.com/-/snippets/2319364 To test: 1 - Place some holds on a record 2 - View the 'Holds' tab in the staff interface 3 - Note the new icons 4 - Note their hover test 5 - Confirm the buttons still work as expected Signed-off-by: David Nind Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi --- .../prog/en/includes/holds_table.inc | 40 ++++++----- .../prog/en/modules/reserve/request.tt | 66 ++++++++++++++++++- 2 files changed, 88 insertions(+), 18 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc index 2c1fd418dd..be1d4fe101 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -17,7 +17,9 @@ Pickup library Details [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %] - Toggle set to lowest priority + + + [% END %]     @@ -86,17 +88,20 @@ [%- SET prev_priority = loop.prev.priority -%] [%- SET next_priority = loop.next.priority -%] - - Go up + + - - Go top + + + - - Go bottom + + + - - Go down + + + [%- ELSE -%] @@ -185,12 +190,13 @@ [%- IF ( CAN_user_reserveforothers_modify_holds_priority ) -%] [%- UNLESS hold.found -%] - - [%- IF ( hold.lowestPriority ) -%] - Unset lowest priority - [%- ELSE -%] - Set to lowest priority - [%- END -%] + [% IF ( hold.lowestPriority ) %] + + + [% ELSE %] + + + [% END %] [%- ELSE -%] @@ -198,8 +204,8 @@ [%- END -%] [%- END -%] - - Cancel + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index 20cde5f0e3..d43f824a94 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -24,7 +24,71 @@ Confirm holds › Holds › Circulation › Koha [% END %] [% INCLUDE 'doc-head-close.inc' %] -[% Asset.css("css/holds.css") | $raw %] +[% FILTER collapse %] + +[% END %] -- 2.39.5