From 518b3aa4a3631b8ec7c6a700e3df1f9076d00213 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Wed, 6 Mar 2024 23:44:08 +0000 Subject: [PATCH] Bug 35862: Display modal search results to the right of form above 1200px To test: 1. Apply patch 2. Rebuild CSS ( yarn build ) 3. Look at some of the places where there is a modal patron search. -suggestion/suggestion.pl: Set to patron -members/memberentry.pl: Add guarantor 4. Make sure the modal looks good before and after you have searched for a patron. 5. Play with many different screen sizes, ensuring everything looks good and makes sense. Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer --- .../prog/css/src/staff-global.scss | 21 +++- .../prog/en/includes/patron-search.inc | 102 ++++++++---------- 2 files changed, 66 insertions(+), 57 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 183e5d65bb..28beabafc7 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -2412,6 +2412,17 @@ td.bundle { pointer-events: auto; } +.patron_search_modal { + .modal-body { + display: flex; + column-gap: 2em; + } + + .search_results_block { + flex-grow: 1; + } +} + #cartDetails { background-color: #352C2E; box-shadow: 1px 1px 3px 0 #666; @@ -4863,4 +4874,12 @@ div .suggestion_note { bottom: 40px; right: 40px; z-index: 1000; -} \ No newline at end of file +} + +@media only screen and ( max-width: 1200px ) { + .patron_search_modal { + .modal-body { + display: block; + } + } +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc index 6d4b6e0cf0..2c934936d3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -29,23 +29,21 @@ [%# - search_type: select 'contains' or 'starts with' %] [%- searchtype = searchtype || Koha.Preference('DefaultPatronSearchMethod') -%] [% BLOCK patron_search_filters %] -
-
-

Search for patron

-
    -
  1. -
+
+ + +
- -
+ + [% END %] [%# Display the table with: %] @@ -928,7 +918,7 @@ [% search_results_block_id = patron_search_modal_id _ '_searchresults' %] -