From f7094d7cfb239762975bf16ebd25a21dcc0237d2 Mon Sep 17 00:00:00 2001
From: Kathy Lussier <klussier@masslnc.org>
Date: Mon, 23 Jul 2012 23:23:55 -0400
Subject: [PATCH] Add the library selector to numeric and expert search pages.

Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
---
 .../src/templates/opac/parts/advanced/expert.tt2     | 20 +++++++++++++-------
 .../src/templates/opac/parts/advanced/numeric.tt2    |  5 ++++-
 Open-ILS/web/css/skin/default/opac/style.css         |  1 +
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
index 7d1ffa1fb2..09176c2450 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
@@ -1,7 +1,6 @@
 <form action="[% ctx.opac_root %]/results" method="GET">
     <div class="header_middle">[% l("Expert Search") %]</div>
     <input type="hidden" name="_special" value="1" />
-    [% IF loc %]<input type="hidden" name="loc" value="[% loc %]" />[% END %]
     <table class="expert-search">
         <tbody id="adv_expert_rows_here">
             <tr id="adv_expert_row">
@@ -20,13 +19,20 @@
         </tbody>
         <tfoot>
             <tr>
-                <td colspan="2"><a href="javascript:addExpertRow();">[ [% l("Add row") %] ]</a></td>
-                <td colspan="4">
-                    <input type="submit" value="[% l('Search') %]"
-                        alt="[% l('Search') %]" title="[% l('Search') %]"
-                        class="opac-button" />
-                </td>
+               <td colspan="7"><a href="javascript:addExpertRow();">[ [% l("Add row") %] ]</a>
+	       </td>
             </tr>
+            <tr>
+               <td colspan="5" class="expert-search-row">
+	           [% PROCESS "opac/parts/org_selector.tt2";
+	              l("in");   INCLUDE build_org_selector show_loc_groups=1 %]
+	       </td>
+	       <td colspan="2" class="expert-search-row">
+	            <input type="submit" value="[% l('Search') %]"
+	               alt="[% l('Search') %]" title="[% l('Search') %]"
+	               class="opac-button" />
+	       </td>
+	     </tr>
         </tfoot>
     </table>
 </form>
diff --git a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2 b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
index 32bf56eb3c..c685aaf967 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
@@ -2,7 +2,6 @@
     <div class="header_middle">[% l("Numeric Search") %]</div>
     <input type="hidden" name="contains" value="contains" />
     <input type="hidden" name="_special" value="1" />
-    [% IF loc %]<input type="hidden" name="loc" value="[% loc %]" />[% END %]
     <table>
         <tr>
             <td>
@@ -20,6 +19,10 @@
             <td>
                 <input type="text" name="query" size="16" autofocus />
             </td>
+            <td>
+                  [% PROCESS "opac/parts/org_selector.tt2";
+                     l(' in '); INCLUDE build_org_selector show_loc_groups=1 %]
+            </td>
         </tr>
         <tr>
             <td colspan="2" align="right">
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 9aa2ba7552..3f5b33f1fc 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -1203,6 +1203,7 @@ a.dash-link:hover { text-decoration: underline !important; }
 .rdetail-extras-summary { margin: 10px; }
 .staff-hold { background-color: #eee; }
 .expert-search tbody tr th { text-align: right; padding-left: 2em; }
+.expert-search-row { padding-top: 10px; }
 .bookshelf thead tr td {
     border-bottom: 1px dashed #999;
     padding-bottom: 1ex;
-- 
2.11.0