[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm lonpickcourse.pm

[raeburn]

raeburn		Mon Mar 17 13:38:58 2014 EDT

  Modified files:              
    /loncom/interface	loncommon.pm lonpickcourse.pm 
  Log:
  - Results of course search.
   - Text : 'Searching ...' hidden on completion of loading of results.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1182 loncom/interface/loncommon.pm:1.1183
--- loncom/interface/loncommon.pm:1.1182	Mon Mar 17 02:45:25 2014
+++ loncom/interface/loncommon.pm	Mon Mar 17 13:38:57 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1182 2014/03/17 02:45:25 raeburn Exp $
+# $Id: loncommon.pm,v 1.1183 2014/03/17 13:38:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -15054,11 +15054,12 @@
 =item * &js_changer()
 
 Create script tag containing Javascript used to submit course search form
-when course type or domain is changed.
+when course type or domain is changed, and also to hide 'Searching ...' on
+page load completion for page showing search result.
 
 Inputs: None
 
-Returns: markup containing updateFilters() javascript function. 
+Returns: markup containing updateFilters() and hideSearching() javascript functions. 
 
 Side Effects: None
 
@@ -15074,6 +15075,14 @@
     }
     document.filterpicker.submit();
 }
+
+function hideSearching() {
+    if (document.getElementById('searching')) {
+        document.getElementById('searching').style.display = 'none';
+    }
+    return;
+}
+
 // ]]>
 </script>
 
Index: loncom/interface/lonpickcourse.pm
diff -u loncom/interface/lonpickcourse.pm:1.112 loncom/interface/lonpickcourse.pm:1.113
--- loncom/interface/lonpickcourse.pm:1.112	Mon Mar 17 02:45:25 2014
+++ loncom/interface/lonpickcourse.pm	Mon Mar 17 13:38:57 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.112 2014/03/17 02:45:25 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.113 2014/03/17 13:38:57 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -107,6 +107,9 @@
         ($env{'form.pickedcourse'})) {
         $loaditem{'onload'} .= 'setDefaultCredits();setRoles();setSections();';
     }
+    if ((($env{'form.gosearch'}) && ($env{'form.updater'} eq '')) && (!$onlyown)) {
+        $loaditem{'onload'} .=  'hideSearching(); ';
+    }
     my $js = &Apache::loncommon::js_changer();
     $r->print(&Apache::loncommon::start_page($title,$js,
 					     {'add_entries' => \%loaditem,