Attachment 21880 Details for Bug 10309 – [SIGNED-OFF] Bug 10309 [Follow-up] Add changes from Bug 8712, "and" labels in advanced search

[patch] [SIGNED-OFF] Bug 10309 [Follow-up] Add changes from Bug 8712, "and" labels in advanced search

SIGNED-OFF-Bug-10309-Follow-up-Add-changes-from-Bu.patch (text/plain), 5.16 KB, created by Bernardo Gonzalez Kriegel on 2013-10-08 14:39:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernardo Gonzalez Kriegel

Created: 2013-10-08 14:39:08 UTC

Size: 5.16 KB

patch

obsolete

>From a34b50e7674e27cb083619e091f5d384ed572403 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 7 Oct 2013 15:12:03 -0400
>Subject: [PATCH] [SIGNED-OFF] Bug 10309 [Follow-up] Add changes from Bug
> 8712, "and" labels in advanced search
>
>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
>---
> koha-tmpl/opac-tmpl/bootstrap/css/opac.css         |    3 +-
> .../bootstrap/en/modules/opac-advsearch.tt         |   29 +++++++++++---------
> koha-tmpl/opac-tmpl/bootstrap/less/opac.less       |    7 +++--
> 3 files changed, 23 insertions(+), 16 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/opac.css b/koha-tmpl/opac-tmpl/bootstrap/css/opac.css
>index a56dbc3..36b7a1e 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/css/opac.css
>+++ b/koha-tmpl/opac-tmpl/bootstrap/css/opac.css
>@@ -104,7 +104,8 @@ table,
> td {
>   background-color: #FFF;
> }
>-#advsearches label {
>+#advsearches label,
>+#booleansearch label {
>   display: inline;
> }
> #basketcount {
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
>index 5d2fa45..c55eccc 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
>@@ -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> 
>                         [% END # / FOREACH advancedsearchesloop %]
>                     </div> 
>-                </div>
>+                </div> 
> 
>                 <div class="row-fluid">
>                     <div class="span3">
>@@ -329,9 +337,6 @@
>                         </div> 
>                     </div> 
>                 [% END # / IF expanded_options %]
>-
>-                    </div> 
>-                </div> 
>             </div> 
>         </div> 
>     </div> 
>@@ -344,11 +349,9 @@
>                         [% PROCESS searchbuttons %]
>                         
>                     </div>
>-                </form>
>-            </div> 
>+                </div> 
>             </div> 
>         </div> 
>-
> </form>
> 
> [% INCLUDE 'opac-bottom.inc' %]
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/less/opac.less b/koha-tmpl/opac-tmpl/bootstrap/less/opac.less
>index 7424d67..106fb3a 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/less/opac.less
>+++ b/koha-tmpl/opac-tmpl/bootstrap/less/opac.less
>@@ -121,8 +121,11 @@ table, td {
>     background-color: #FFF;
> }
> 
>-#advsearches label {
>-    display: inline;
>+#advsearches,
>+#booleansearch {
>+    label {
>+        display: inline;
>+    }
> }
> 
> #basketcount {
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 10309: 19456 | 19457 | 19458 | 19459 | 21858 | 21859 | 21860 | 21861 | 21862 | 21877 | 21878 | 21879 | 21880 | 21881