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

Bug 10309: (follow-up) Add changes from Bug 8712, "and" labels in advanced search

Browse source 
This patch adds the changes from Bug 8712 to the new theme. Some HTML
markup errors have also been corrected. From Bug 8712:

"The "and" label not only improves the accessibility but also gives the
user an idea that the operation between multiple search fields is a
boolean "AND" by default."

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

"and" looks well on advanced search. No errors

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Owen Leonard 2013-10-07 15:12:03 -04:00 committed by Galen Charlton
parent b0793ec34c
commit 0956a28df3
3 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
koha-tmpl/opac-tmpl/bootstrap/css/opac.css
View file

@ -104,7 +104,8 @@ table,
td {
background-color: #FFF;
}
#advsearches label {
#advsearches label,
#booleansearch label {
display: inline;
}
#basketcount {

29
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
View file

@ -25,15 +25,23 @@
<p>
[% IF ( expanded_options ) %]
[% IF ( search_box.boolean ) %]
<select class="span1" name="op">
<option value="and" selected="selected">and</option>
<option value="or">or</option>
<option value="not">not</option>
</select>
<select name="op">
<option value="and" selected="selected">and</option>
<option value="or">or</option>
<option value="not">not</option>
</select>
[% END %]
[% ELSE %]
<label for="search-field_[% loop.index %]">
[% IF loop.index == 0 %]
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
[% ELSE %]
and
[% END %]
</label>
[% END %]
[% IF ( expanded_options ) %][% left_content %][% END %]
<select name="idx">
<select name="idx" id="search-field_[% loop.index %]">
<option value="kw">Keyword</option>
<option value="su,wrdl">Subject</option>
[% IF ( expanded_options ) %]
@ -142,7 +150,7 @@
</div> <!-- / #advsearch-[% advsearchloo.advanced_search_type %] -->
[% END # / FOREACH advancedsearchesloop %]
</div> <!-- / #advsearches -->
</div>
</div> <!-- / .span12 -->
<div class="row-fluid">
<div class="span3">
@ -329,9 +337,6 @@
</div> <!-- / .span4 -->
</div> <!-- / .row-fluid -->
[% END # / IF expanded_options %]
</div> <!-- /BOOLEAN SEARCH OPTIONS -->
</div> <!-- / .span12 -->
</div> <!-- / .row-fluid -->
</div> <!-- / .container-fluid -->
</div> <!-- / .main -->
@ -344,11 +349,9 @@
[% PROCESS searchbuttons %]
<!-- /SEARCH BUTTONS -->
</div>
</form>
</div> <!-- / .span12 -->
</div> <!-- / .span12 -->
</div> <!-- / .row-fluid -->
</div> <!-- / .container-fluid -->
</form>
[% INCLUDE 'opac-bottom.inc' %]

7
koha-tmpl/opac-tmpl/bootstrap/less/opac.less
View file

@ -121,8 +121,11 @@ table, td {
background-color: #FFF;
}
#advsearches label {
display: inline;
#advsearches,
#booleansearch {
label {
display: inline;
}
}
#basketcount {