moved copy location filter in with other filters -- only visible when search location...
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Thu, 19 Jun 2008 13:52:49 +0000 (13:52 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Thu, 19 Jun 2008 13:52:49 +0000 (13:52 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@9869 dcc99617-32d9-48b4-a31d-7c20da2025e4

Open-ILS/web/opac/locale/en-US/opac.dtd
Open-ILS/web/opac/skin/default/css/layout.css
Open-ILS/web/opac/skin/default/js/adv_global.js
Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml

index a2d4f2e..8be327b 100644 (file)
@@ -319,7 +319,7 @@ Please see a librarian to renew your account.">
 <!ENTITY opac.advanced.quick.tcn "TCN"> <!-- title control number -->
 <!ENTITY opac.advanced.quick.barcode "Item Barcode"> 
 <!ENTITY opac.advanced.quick.cn "Call Number"> 
-<!ENTITY opac.advanced.copy_loc_filter "Filter by Shelving Location">
+<!ENTITY opac.advanced.copy_loc_filter "Shelving Location">
 
 <!-- ==========================================================
      MARC expert search
index c68914c..0eae7a7 100644 (file)
@@ -247,6 +247,3 @@ table { border-collapse: collapse; }
 #xul_recipient_me { margin-left: 25px; }
 #myopac_holds_thaw_date_form {padding: 10px; text-align: center;}
 #myopac_holds_freeze_select_thaw {margin-right: 100px; margin-left: 100px; }
-
-#adv_copy_location_filter_td { text-align:center; }
-#adv_copy_location_filter_div { padding:5px; margin:5px; }
index 3e93f52..11beca3 100644 (file)
@@ -62,8 +62,7 @@ function advSyncCopyLocLink(org) {
 
     if(isTrue(findOrgType(findOrgUnit(org).ou_type()).can_have_vols())) {
         unHideMe($('adv_copy_location_filter_row'));
-        if(!$('adv_copy_location_filter_div').className.match(/hide_me/))
-            advLoadCopyLocations(org); 
+        advLoadCopyLocations(org); 
     } else {
         hideMe($('adv_copy_location_filter_row'));
     }
@@ -170,6 +169,7 @@ function advSubmitGlobal() {
        var itemtypes = advGetVisSelectorVals('adv_global_item_type');
        var audiences = advGetVisSelectorVals('adv_global_audience');
        var biblevels = advGetVisSelectorVals('adv_global_bib_level');
+    var locations = advGetVisSelectorVals('adv_copy_location_filter_select');
        var languages = getSelectedList($('adv_global_lang')) + '';     
     var limit2avail = $('opac.result.limit2avail').checked ? 1 : ''
 
@@ -186,6 +186,7 @@ function advSubmitGlobal() {
        args[PARAM_LITFORM]     = litforms;
        args[PARAM_AUDIENCE]    = audiences;
        args[PARAM_LANGUAGE] = languages;
+       args[PARAM_COPYLOCS] = locations;
        //args[PARAM_SEARCHES]  = js2JSON(searches); /* break these out */
        args[PARAM_DEPTH]               = depthSelGetDepth();
        args[PARAM_LOCATION]    = depthSelGetNewLoc();
@@ -266,19 +267,8 @@ function advBuildSearchBlob() {
 // retrieves the shelving locations
 var advLocationsLoaded = false;
 function advLoadCopyLocations(org) {
-    if(advLocationsLoaded) {
-        removeChildren($('adv_copy_location_filter_select'));
-        hideMe($('adv_copy_location_filter_div'));
-        advLocationsLoaded = false;
-        return;
-    }
-    if(org == null) {
-        if(advSelectedOrg == null)
-            org = getLocation();
-        else
-            org = advSelectedOrg;
-    }
-    unHideMe($('adv_copy_location_filter_div'));
+    if(org == null) 
+        org = advSelectedOrg;
     var req = new Request(FETCH_COPY_LOCATIONS, org);
     req.callback(advShowCopyLocations);
     req.send();
index 20b9240..33c589d 100644 (file)
                                                </td>
                                        </tr>
 
+                    <!-- copy location selector -->
+                    <tr id='adv_copy_location_filter_row' class='hide_me'>
+                        <td align='right'>&opac.advanced.copy_loc_filter;</td>
+                        <td align='left' id='adv_copy_location_filter_td'>
+                            <select size='3' id='adv_copy_location_filter_select' multiple='multiple'>
+                            </select>
+                        </td>
+                    </tr>
                                </tbody>
                        </table>
                </td>
                                                </table>
                                        </td>
                                </tr>
-                <tr id='adv_copy_location_filter_row' class='hide_me'>
-                    <td id='adv_copy_location_filter_td' colspan='2'>
-                        <a class='classic_link' href='javascript:advLoadCopyLocations();'>&opac.advanced.copy_loc_filter;</a>
-                        <div id='adv_copy_location_filter_div' class='hide_me'>
-                            <select id='adv_copy_location_filter_select' multiple='multiple'>
-                            </select>
-                        </div>
-                    </td>
-                </tr>
                        </table>
                </td>