From be6f28b14d0e8277da91aabe64d8b44b74615eee Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 11 Feb 2020 15:10:48 +0000 Subject: [PATCH] Bug 24627: Correct style of clubs search results during hold process This patch updates some markup and CSS so that the process of selecting a club from search results during the hold process looks the same as when selecting a patron: Club names should be links (like patron names are) and the table row should have a hover color to help indicate that it is clickable. This patch also changes the markup of the Patrons/Clubs tabs a little bit to make the information clearer: Superfluous Bootstrap-related tab markup has been removed, and the patron and club search results have been moved into their respective tab containers. This means that if you search for a patron but then switch to the clubs tab the patron list doesn't still display. To test, apply the patch and rebuild the staff client CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client) - You should have more than one patron club defined. - Begin the process of placing a hold on a title. - Test the process of searching for both patrons and clubs. - In each case the name (patron or club) should be an active link. - Hovering your mouse over the table rows should change the row background to yellow. - Clicking the other tab at this stage should hide the search results from your last search. - Whether you click the linked name or elsewhere in the table row you should be correctly redirected to the next step in the holds process. Signed-off-by: David Nind Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss | 2 +- .../intranet-tmpl/prog/css/src/staff-global.scss | 6 ++ .../en/includes/circ-patron-search-results.inc | 3 +- .../intranet-tmpl/prog/en/includes/clubs-table.inc | 4 +- .../prog/en/modules/circ/circulation.tt | 1 + .../prog/en/modules/reserve/request.tt | 89 +++++++++++----------- 6 files changed, 54 insertions(+), 51 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss index f30ed516b0..c468050b08 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss @@ -275,7 +275,7 @@ tr { } } -.table_borrowers { +.selections-table { tr { &:hover { td { 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 7e4cdb62d1..87b5680de3 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -2769,6 +2769,12 @@ li { } } +.toptabs { + .ui-tabs-panel { + background: #FFF none; + } +} + .authref { font-style: normal; text-indent: 4em; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc index 8b34bd6c59..50821d14a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc @@ -1,6 +1,5 @@ [% USE KohaDates %] -Patron selection - +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc index c5b5ced526..c3a5877e21 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc @@ -1,4 +1,4 @@ -
Name
+
@@ -29,7 +29,7 @@ [% ELSE %] [% END %] - + [% UNLESS destination == 'holds' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 568eb5944a..56225edec4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -488,6 +488,7 @@ [% INCLUDE 'patron-toolbar.inc' %]
+ Patron selection [% INCLUDE 'circ-patron-search-results.inc' destination = "circ" %]
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 00b7b66243..3ee726cf7e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -90,57 +90,54 @@ [% END %]
-
-
    -
  • Patrons
    • -
  • Clubs
    • +
    + -
    -
    -
    -
    Enter patron card number or partial name:
    - - - [% IF multi_hold %] - - - [% ELSE %] - - [% END %] +
    + +
    Enter patron card number or partial name:
    + + + [% IF multi_hold %] + + + [% ELSE %] + + [% END %] - [% IF ( multi_hold ) %] - - - [% END %] - -
    -
    -
    -
    Enter club id or partial name:
    - - - [% IF multi_hold %] - - - [% ELSE %] - - [% END %] + [% IF ( multi_hold ) %] + + + [% END %] + + [% IF borrowers %] + [% INCLUDE 'circ-patron-search-results.inc' destination = "holds" %] + [% END %] +
    +
    +
    +
    Enter club id or partial name:
    + + + [% IF multi_hold %] + + + [% ELSE %] + + [% END %] - [% IF ( multi_hold ) %] - - - [% END %] - -
    + [% IF ( multi_hold ) %] + + + [% END %] + + [% IF clubs %] + [% INCLUDE 'clubs-table.inc' destination = "holds" %] + [% END %]
    -

    - [% IF borrowers %] - [% INCLUDE 'circ-patron-search-results.inc' destination = "holds" %] - [% ELSIF clubs %] - [% INCLUDE 'clubs-table.inc' destination = "holds" %] - [% END %] -

[% ELSIF club %]
-- 2.11.0
Name
[% c.name | html %][% c.name | html %] [% c.club_template.name | html %] [% c.description | html %]