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>
td {
background-color: #FFF;
}
td {
background-color: #FFF;
}
+#advsearches label,
+#booleansearch label {
display: inline;
}
#basketcount {
display: inline;
}
#basketcount {
<p>
[% IF ( expanded_options ) %]
[% IF ( search_box.boolean ) %]
<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>
+ [% ELSE %]
+ <label for="search-field_[% loop.index %]">
+ [% IF loop.index == 0 %]
+
+ [% ELSE %]
+ and
+ [% END %]
+ </label>
[% END %]
[% IF ( expanded_options ) %][% left_content %][% END %]
[% END %]
[% IF ( expanded_options ) %][% left_content %][% END %]
+ <select name="idx" id="search-field_[% loop.index %]">
<option value="kw">Keyword</option>
<option value="su,wrdl">Subject</option>
[% IF ( expanded_options ) %]
<option value="kw">Keyword</option>
<option value="su,wrdl">Subject</option>
[% IF ( expanded_options ) %]
</div> <!-- / #advsearch-[% advsearchloo.advanced_search_type %] -->
[% END # / FOREACH advancedsearchesloop %]
</div> <!-- / #advsearches -->
</div> <!-- / #advsearch-[% advsearchloo.advanced_search_type %] -->
[% END # / FOREACH advancedsearchesloop %]
</div> <!-- / #advsearches -->
+ </div> <!-- / .span12 -->
<div class="row-fluid">
<div class="span3">
<div class="row-fluid">
<div class="span3">
</div> <!-- / .span4 -->
</div> <!-- / .row-fluid -->
[% END # / IF expanded_options %]
</div> <!-- / .span4 -->
</div> <!-- / .row-fluid -->
[% END # / IF expanded_options %]
-
- </div> <!-- /BOOLEAN SEARCH OPTIONS -->
- </div> <!-- / .span12 -->
</div> <!-- / .row-fluid -->
</div> <!-- / .container-fluid -->
</div> <!-- / .main -->
</div> <!-- / .row-fluid -->
</div> <!-- / .container-fluid -->
</div> <!-- / .main -->
[% PROCESS searchbuttons %]
<!-- /SEARCH BUTTONS -->
</div>
[% PROCESS searchbuttons %]
<!-- /SEARCH BUTTONS -->
</div>
- </form>
- </div> <!-- / .span12 -->
+ </div> <!-- / .span12 -->
</div> <!-- / .row-fluid -->
</div> <!-- / .container-fluid -->
</div> <!-- / .row-fluid -->
</div> <!-- / .container-fluid -->
</form>
[% INCLUDE 'opac-bottom.inc' %]
</form>
[% INCLUDE 'opac-bottom.inc' %]
background-color: #FFF;
}
background-color: #FFF;
}
-#advsearches label {
- display: inline;
+#advsearches,
+#booleansearch {
+ label {
+ display: inline;
+ }