From: Mike Rylander <mrylander@gmail.com>
Date: Mon, 30 Jul 2012 19:08:47 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen
X-Git-Tag: sprint4-merge-nov22~3948
X-Git-Url: https://git.evergreen-ils.org/?p=working%2FEvergreen.git;a=commitdiff_plain;h=5b83924a077b6d7306b6c2c1302d4e166206ef73;hp=7513dfff14a1bb2bb10a3e8ff3a0a1d4ff9bb084

Merge branch 'master' of git.evergreen-ils.org:Evergreen

Appologies for the merge commit noise...

Signed-off-by: Mike Rylander <mrylander@gmail.com>
---

diff --git a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
index 7d1ffa1fb2..b5abd34adb 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,11 +19,22 @@
         </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 colspan="7"><a href="javascript:addExpertRow();">[ [% l("Add row") %] ]</a></td>
+            </tr>
+            <tr>
+               <td colspan="5" class="expert-search-row">
+                   <label><strong>[% l("Search Library:") %]</strong>
+                       [%- PROCESS "opac/parts/org_selector.tt2";
+                           INCLUDE build_org_selector show_loc_groups=1 
+                       %]
+                   </label>
+               </td>
+            </tr>
+            <tr>
+                <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>
diff --git a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2 b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
index 32bf56eb3c..819fd79721 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
@@ -2,10 +2,9 @@
     <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>
+            <td><label><strong>[% l("Field:") %]</strong>
                 <select name="qtype">
                     <!-- TODO: Pull labels from config.metabib_field.label -->
                     <option value="identifier|isbn">[% l('ISBN') %]</option>
@@ -16,12 +15,21 @@
                     <option value="identifier|tcn">[% l('TCN') %]</option>
                     <option value="item_barcode">[% l('Item Barcode') %]</option>
                 </select>
+                </label>
             </td>
             <td>
                 <input type="text" name="query" size="16" autofocus />
             </td>
         </tr>
         <tr>
+            <td colspan="2"><label><strong>[% l("Search Library:") %]</strong>
+                  [% PROCESS "opac/parts/org_selector.tt2";
+                     INCLUDE build_org_selector show_loc_groups=1
+                  %]
+                </label>
+            </td>
+        </tr>
+        <tr>
             <td colspan="2" align="right">
                 <input type="submit" alt="[% l('Search') %]"
                     value="[% l('Search') %]" class="opac-button" />
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;