From bb402ba49571e298429ed59120bccb6dcc7430ac Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 19 Jun 2008 13:52:49 +0000
Subject: [PATCH 1/1] moved copy location filter in with other filters -- only
 visible when search location has can_have_vols==true

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       |  2 +-
 Open-ILS/web/opac/skin/default/css/layout.css |  3 ---
 .../web/opac/skin/default/js/adv_global.js    | 20 +++++--------------
 .../default/xml/advanced/advanced_global.xml  | 17 ++++++++--------
 4 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/Open-ILS/web/opac/locale/en-US/opac.dtd b/Open-ILS/web/opac/locale/en-US/opac.dtd
index a2d4f2e68a..8be327b693 100644
--- a/Open-ILS/web/opac/locale/en-US/opac.dtd
+++ b/Open-ILS/web/opac/locale/en-US/opac.dtd
@@ -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
diff --git a/Open-ILS/web/opac/skin/default/css/layout.css b/Open-ILS/web/opac/skin/default/css/layout.css
index c68914c5d4..0eae7a793f 100644
--- a/Open-ILS/web/opac/skin/default/css/layout.css
+++ b/Open-ILS/web/opac/skin/default/css/layout.css
@@ -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; }
diff --git a/Open-ILS/web/opac/skin/default/js/adv_global.js b/Open-ILS/web/opac/skin/default/js/adv_global.js
index 3e93f52046..11beca3506 100644
--- a/Open-ILS/web/opac/skin/default/js/adv_global.js
+++ b/Open-ILS/web/opac/skin/default/js/adv_global.js
@@ -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();
diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
index 20b9240dda..33c589da65 100644
--- a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
+++ b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_global.xml
@@ -182,6 +182,14 @@
 						</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>
@@ -262,15 +270,6 @@
 						</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>
 
-- 
2.43.2