added org selector to search form; added 'loc' param to search next/prev links

diff --git a/Open-ILS/web/templates/default/opac/common.tt2 b/Open-ILS/web/templates/default/opac/common.tt2
index e343c9c..76b4646 100644 (file)
--- a/Open-ILS/web/templates/default/opac/common.tt2
+++ b/Open-ILS/web/templates/default/opac/common.tt2
@@ -11,7 +11,7 @@
     [% END %]
         <option value='[% org_unit.id %]' [% IF org_unit.id == value %] selected='selected' [% END %]>
             [% 
-                pad = org_unit.ou_type.depth * 4;
+                pad = org_unit.ou_type.depth * 2;
                 FOR idx IN [0..pad]; '&nbsp;'; END;
                 org_unit.name;
             %]

diff --git a/Open-ILS/web/templates/default/opac/home.tt2 b/Open-ILS/web/templates/default/opac/home.tt2
index d1c2e05..9faf5e6 100644 (file)
--- a/Open-ILS/web/templates/default/opac/home.tt2
+++ b/Open-ILS/web/templates/default/opac/home.tt2
@@ -7,12 +7,14 @@
 [% END %]
 
 [% WRAPPER "default/opac/base.tt2" %]
+[% PROCESS "default/opac/common.tt2" %]
 
 <div id='home_div'>
     <img src='/images/eg_logo.jpg'/>
     <br/><br/>
     <form action='./results' method='GET'>
-        <input type='text' name='query' value='[% query %]'/>
+        <input type='text' name='query' size='50' value='[% query %]'/>
+        [% PROCESS build_org_selector name='loc' %]
         <input type='submit'/>
         <input type='hidden' name='page' value='0'/>
     </form>

diff --git a/Open-ILS/web/templates/default/opac/myopac/holds.tt2 b/Open-ILS/web/templates/default/opac/myopac/holds.tt2
index d9ee02e..84b4650 100644 (file)
--- a/Open-ILS/web/templates/default/opac/myopac/holds.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/holds.tt2
@@ -27,7 +27,6 @@
             <input type='Submit' value='Go'/>
         </div>
     </div>
-
     <table>
         <thead>
             <tr>

diff --git a/Open-ILS/web/templates/default/opac/results.tt2 b/Open-ILS/web/templates/default/opac/results.tt2
index 601acd5..adc53ae 100644 (file)
--- a/Open-ILS/web/templates/default/opac/results.tt2
+++ b/Open-ILS/web/templates/default/opac/results.tt2
@@ -21,11 +21,13 @@
     page = CGI.param('page') || 0; 
     query = CGI.param('query');
     page_count = POSIX.ceil(ctx.hit_count / ctx.page_size);
+    loc = CGI.param('loc');
 %]
 
 <div id='form_div'>
     <form action='./results' method='GET'>
         <input type='text' name='query' size='50' value='[% query %]'/>
+        [% PROCESS build_org_selector name='loc' value=loc %]
         <input type='submit'/>
         <input type='hidden' name='page' value='0'/>
     </form>
@@ -71,8 +73,14 @@
         <td id='right_block'>
             <div>
                 <span>Hits: [% ctx.hit_count %] / Page [% page + 1 %] of [% page_count %]</span>
-                <a [% IF page > 0 %] href='?page=[% page - 1 %]&query=[% query | uri %]' [% END %]>Prev</a>  
-                <a [% IF (page + 1) < page_count %] href='?page=[% page + 1 %]&query=[% query | uri %]' [% END %]>Next</a>
+                [% 
+                    q = query | url;
+                    np_link = '?query=' _ q;
+                    IF loc; np_link = np_link _ "&loc=" _ loc; END;
+                    IF depth or depth == 0; np_link = np_link _ "&depth=" _ depth; END;
+                %]
+                <a [% IF page > 0 %] href='[% np_link %]&page=[% page - 1 %]' [% END %]>Prev</a>  
+                <a [% IF (page + 1) < page_count %] href='[% np_link %]&page=[% page + 1 %]' [% END %]>Next</a>
             </div>
             <table id='record_table'>
                 [%