X-Git-Url: https://git.evergreen-ils.org/?p=working%2FEvergreen.git;a=blobdiff_plain;f=Open-ILS%2Fsrc%2Ftemplates%2Fdefault%2Fopac%2Fparts%2Fadvanced%2Fglobal_row.tt2;h=ddb4260847561e0931c8cbcf0c989108e047f133;hp=6325c0af1e1f8ca32231b3bf83212e1e4ba86865;hb=14ae716ceff99375347ead1ea7f4d4aadaf2cd8a;hpb=720cf416cf0f30f4bf8e42ff5ec08ee356fe47c8

diff --git a/Open-ILS/src/templates/default/opac/parts/advanced/global_row.tt2 b/Open-ILS/src/templates/default/opac/parts/advanced/global_row.tt2
index 6325c0af1e..ddb4260847 100644
--- a/Open-ILS/src/templates/default/opac/parts/advanced/global_row.tt2
+++ b/Open-ILS/src/templates/default/opac/parts/advanced/global_row.tt2
@@ -7,27 +7,38 @@
     ];
     contains = CGI.param('contains');
     queries = CGI.param('query');
+    bools = CGI.param('bool') || ['and' x 3];
     qtypes = CGI.param('qtype') || ['keyword' x 3];
     FOR qtype IN qtypes;
         c = contains.shift;
+        b = bools.shift;
         q = queries.shift; %]
-<tr[% IF loop.first %] id="adv_global_row"[% END %]>
+
+<!-- tag the second row so the bool column won't be hidden -->
+<tr[% IF loop.index == 1 %] id="adv_global_row"[% END %]>
     <td align='left' width='100%' nowrap='nowrap'>
+
+        <!-- bool selector.  hide for first row.  safe to ignore first bool value in form submission -->
+        <select name='bool' style='width: auto' [% IF loop.first %] class='invisible' [% END %]>
+            <option value='and' [% b == 'and' ? 'selected="selected"' : '' %]>[% l('And') %]</option>
+            <option value='or' [% b == 'or' ? 'selected="selected"' : '' %]>[% l('Or') %]</option>
+        </select>
+
+        <!-- keyword, subject, etc. selector -->
         <span class="opac-auto-078">
             [% INCLUDE "default/opac/parts/qtype_selector.tt2"
                 query_type=qtype %]
         </span>
+
         <select name='contains' style='margin-right: 7px;'>
-            [% FOR o IN contains_options;
-                |l(o.value, o.label) -%]
-            <option value="[_1]"[% c == o.value ? ' selected="selected"' : '' %]>[_2]</option>
-            [% END; END %]
+            [% FOR o IN contains_options; -%]
+            <option value="[% o.value %]" [% c == o.value ? ' selected="selected"' : '' %]>[% o.label %]</option>
+            [% END %]
         </select>
         <input type='text' size='18' name='query' value="[% q | html %]" x-webkit-speech />
         <a href="javascript:;" class="row-remover"
             title="[% l('Remove row') %]" alt="[% l('Remove row') %]"
-            onclick='var row = this.parentNode.parentNode;var tbody = row.parentNode; if( tbody.getElementsByTagName("tr").length > 2 ) row.parentNode.removeChild(row);'><img src="[% ctx.media_prefix %]/images/adv_row_close_btn.png" /></a>
+            onclick='return killRowIfAtLeast(2, this);'><img src="[% ctx.media_prefix %]/images/adv_row_close_btn.png" /></a>
     </td>
 </tr>
-[%      i = i + 1;
-    END %]
+[% END %]