Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 24627: Correct style of clubs search results during hold process

Browse source 
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 <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Owen Leonard 2020-02-11 15:10:48 +00:00 committed by Martin Renvoize
parent 0fc78cae28
commit 3b47f87b0f
Signed by: martin.renvoize
GPG key ID: 422B469130441A0F
6 changed files with 54 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss
View file

@ -275,7 +275,7 @@ tr {
}
}
.table_borrowers {
.selections-table {
tr {
&:hover {
td {

6
koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
View file

@ -2769,6 +2769,12 @@ li {
}
}
.toptabs {
.ui-tabs-panel {
background: #FFF none;
}
}
.authref {
font-style: normal;
text-indent: 4em;

3
koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
View file

@ -1,6 +1,5 @@
[% USE KohaDates %]
<legend>Patron selection</legend>
<table id="table_borrowers" class="table_borrowers">
<table id="table_borrowers" class="selections-table">
<thead>
<tr>
<th>Name</th>

4
koha-tmpl/intranet-tmpl/prog/en/includes/clubs-table.inc
View file

@ -1,4 +1,4 @@
<table id="clubs-table">
<table id="clubs-table" class="selections-table">
<thead>
<tr>
<th>Name</th>
@ -29,7 +29,7 @@
[% ELSE %]
<tr>
[% END %]
<td>[% c.name | html %]</td>
<td><a href="[% data_url | url %]">[% c.name | html %]</a></td>
<td>[% c.club_template.name | html %]</td>
<td>[% c.description | html %]</td>
[% UNLESS destination == 'holds' %]

1
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
View file

@ -488,6 +488,7 @@
[% INCLUDE 'patron-toolbar.inc' %]
<fieldset id="circ_circulation_selectborrower">
<legend>Patron selection</legend>
[% INCLUDE 'circ-patron-search-results.inc' destination = "circ" %]
</fieldset>

89
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
View file

@ -90,57 +90,54 @@
[% END %]
<fieldset class="brief">
<label>Search Patrons or clubs</label>
<div id="circ_holds_select">
<ul class="nav nav-tabs" role="tablist">
<li role="presentation"><a href="#holds_patronsearch_pane" aria-controls="holds_patronsearch_pane" role="tab" data-toggle="tab">Patrons</a></li>
<li role="presentation"><a href="#holds_clubsearch_pane" aria-controls="holds_clubsearch_pane" role="tab" data-toggle="tab">Clubs</a></li>
<div id="circ_holds_select" class="toptabs">
<ul>
<li><a href="#holds_patronsearch_pane">Patrons</a></li>
<li><a href="#holds_clubsearch_pane">Clubs</a></li>
</ul>
<div class="tab-content">
<div role="tabpanel" class="tab-pane" id="holds_patronsearch_pane">
<form id="holds_patronsearch" action="request.pl?biblionumber=[% biblionumber | html %]" method="post">
<div class="hint">Enter patron card number or partial name:</div>
<input type="text" size="40" id="patron" class="focus" name="findborrower" autocomplete="off" />
<input type="submit" value="Search" />
[% IF multi_hold %]
<input type="hidden" name="multi_hold" value="[% multi_hold | html %]"/>
<input type="hidden" name="biblionumbers" value="[% biblionumbers | html %]"/>
[% ELSE %]
<input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
[% END %]
<div id="holds_patronsearch_pane">
<form id="holds_patronsearch" action="request.pl?biblionumber=[% biblionumber | html %]" method="post">
<div class="hint">Enter patron card number or partial name:</div>
<input type="text" size="40" id="patron" class="focus" name="findborrower" autocomplete="off" />
<input type="submit" value="Search" />
[% IF multi_hold %]
<input type="hidden" name="multi_hold" value="[% multi_hold | html %]"/>
<input type="hidden" name="biblionumbers" value="[% biblionumbers | html %]"/>
[% ELSE %]
<input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
[% END %]
[% IF ( multi_hold ) %]
<input type="hidden" name="multi_hold" value="[% multi_hold | html %]"/>
<input type="hidden" name="biblionumbers" value="[% biblionumbers | html %]"/>
[% END %]
</form> <!-- /#holds_patronsearch -->
</div>
<div role="tabpanel" class="tab-pane" id="holds_clubsearch_pane">
<form id="holds_clubsearch" action="request.pl?biblionumber=[% biblionumber | html %]" method="post">
<div class="hint">Enter club id or partial name:</div>
<input type="text" size="40" id="club" class="focus" name="findclub" autocomplete="off" />
<input type="submit" value="Search" />
[% IF multi_hold %]
<input type="hidden" name="multi_hold" value="[% multi_hold | html %]"/>
<input type="hidden" name="biblionumbers" value="[% biblionumbers | html %]"/>
[% ELSE %]
<input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
[% END %]
[% IF ( multi_hold ) %]
<input type="hidden" name="multi_hold" value="[% multi_hold | html %]"/>
<input type="hidden" name="biblionumbers" value="[% biblionumbers | html %]"/>
[% END %]
</form> <!-- /#holds_patronsearch -->
[% IF borrowers %]
[% INCLUDE 'circ-patron-search-results.inc' destination = "holds" %]
[% END %]
</div>
<div id="holds_clubsearch_pane">
<form id="holds_clubsearch" action="request.pl?biblionumber=[% biblionumber | html %]" method="post">
<div class="hint">Enter club id or partial name:</div>
<input type="text" size="40" id="club" class="focus" name="findclub" autocomplete="off" />
<input type="submit" value="Search" />
[% IF multi_hold %]
<input type="hidden" name="multi_hold" value="[% multi_hold | html %]"/>
<input type="hidden" name="biblionumbers" value="[% biblionumbers | html %]"/>
[% ELSE %]
<input type="hidden" name="biblionumber" value="[% biblionumber | html %]" />
[% END %]
[% IF ( multi_hold ) %]
<input type="hidden" name="multi_hold" value="[% multi_hold | html %]"/>
<input type="hidden" name="biblionumbers" value="[% biblionumbers | html %]"/>
[% END %]
</form> <!-- /#holds_patronsearch -->
</div>
[% IF ( multi_hold ) %]
<input type="hidden" name="multi_hold" value="[% multi_hold | html %]"/>
<input type="hidden" name="biblionumbers" value="[% biblionumbers | html %]"/>
[% END %]
</form> <!-- /#holds_patronsearch -->
[% IF clubs %]
[% INCLUDE 'clubs-table.inc' destination = "holds" %]
[% END %]
</div>
</div>
<p>
[% IF borrowers %]
[% INCLUDE 'circ-patron-search-results.inc' destination = "holds" %]
[% ELSIF clubs %]
[% INCLUDE 'clubs-table.inc' destination = "holds" %]
[% END %]
</p>
</fieldset>
[% ELSIF club %]
<div class="dialog alert hide clubalert">