[open-ils-commits] r9066 - in branches/rel_1_2/Open-ILS/web/opac/skin/default: js xml/common xml/result

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-03-18 09:26:25 -0400 (Tue, 18 Mar 2008)
New Revision: 9066

Modified:
   branches/rel_1_2/Open-ILS/web/opac/skin/default/js/search_bar.js
   branches/rel_1_2/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml
   branches/rel_1_2/Open-ILS/web/opac/skin/default/xml/result/filtersort.xml
Log:
added search filters and sorting to metarecord results page

Modified: branches/rel_1_2/Open-ILS/web/opac/skin/default/js/search_bar.js
===================================================================
--- branches/rel_1_2/Open-ILS/web/opac/skin/default/js/search_bar.js	2008-03-18 04:02:21 UTC (rev 9065)
+++ branches/rel_1_2/Open-ILS/web/opac/skin/default/js/search_bar.js	2008-03-18 13:26:25 UTC (rev 9066)
@@ -48,7 +48,7 @@
     }
 }
 
-function searchBarSubmit() {
+function searchBarSubmit(isFilterSort) {
 
 	var text = G.ui.searchbar.text.value;
 
@@ -60,7 +60,7 @@
 
 	var args = {};
 
-	if(SHOW_MR_DEFAULT) {
+	if(SHOW_MR_DEFAULT || (isFilterSort && findCurrentPage() == MRESULT)) {
 		args.page				= MRESULT;
 	} else {
 		args.page				= RRESULT;

Modified: branches/rel_1_2/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml
===================================================================
--- branches/rel_1_2/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml	2008-03-18 04:02:21 UTC (rev 9065)
+++ branches/rel_1_2/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml	2008-03-18 13:26:25 UTC (rev 9066)
@@ -13,7 +13,7 @@
 					</i>
 				</td>
                 <td align='right'>
-                    <!--#if expr="$OILS_PAGE='rresult.xml'"-->
+                    <!--#if expr="$OILS_PAGE='rresult.xml' || $OILS_PAGE='mresult.xml'"-->
                     <!--#include virtual="../result/filtersort.xml" -->
                     <!--#endif -->
                 </td>

Modified: branches/rel_1_2/Open-ILS/web/opac/skin/default/xml/result/filtersort.xml
===================================================================
--- branches/rel_1_2/Open-ILS/web/opac/skin/default/xml/result/filtersort.xml	2008-03-18 04:02:21 UTC (rev 9065)
+++ branches/rel_1_2/Open-ILS/web/opac/skin/default/xml/result/filtersort.xml	2008-03-18 13:26:25 UTC (rev 9066)
@@ -1,6 +1,6 @@
 <span>
-    &result.limit2avail;<input type='checkbox' id='opac.result.limit2avail' onclick='searchBarSubmit();'/>
-    <select id='opac.result.sort' onchange='searchBarSubmit();'>
+    &result.limit2avail;<input type='checkbox' id='opac.result.limit2avail' onclick='searchBarSubmit(true);'/>
+    <select id='opac.result.sort' onchange='searchBarSubmit(true);'>
         <option selected='selected' value=''>&result.sort_by;</option>
         <optgroup label='&result.sort_by.title;'>
             <option id='opac.result.title.a2z' label='&common.a2z.titla;' value='title.asc'>&common.a2z.title;</option>