searchbar.tt2 modifications

- Re-ordered search type/format/location option menus and broke them
  out into separate INCLUDE chunks.

Signed-off-by: William Rockwood <wrockwood@tadl.org>

diff --git a/templates_tadlskin/opac/parts/searchbar.tt2 b/templates_tadlskin/opac/parts/searchbar.tt2
index bd1550c..353066d 100644 (file)
--- a/templates_tadlskin/opac/parts/searchbar.tt2
+++ b/templates_tadlskin/opac/parts/searchbar.tt2
@@ -27,10 +27,9 @@
             class="adv_search_font">[% l('Advanced Search') %]</span></a>
     </div>
     <div class="searchbar">
-    [%- INCLUDE "opac/parts/coded_value_selector.tt2" attr=["mattype", "item_type"] none_ok=1 none_label=l('All Formats'); %]
-        [%- INCLUDE "opac/parts/qtype_selector.tt2" id="qtype";
-            l(' in '); INCLUDE build_org_selector show_loc_groups=1
-    %]
+        [%- INCLUDE "opac/parts/qtype_selector.tt2" id="qtype"; %]
+        [%- INCLUDE "opac/parts/coded_value_selector.tt2" attr=["mattype", "item_type"] none_ok=1 none_label=l('All Formats'); %]
+        [%- INCLUDE build_org_selector show_loc_groups=1 %]
     </div>
     [% IF ctx.bookbag %]
     <div id="search-only-bookbag-container">