[LON-CAPA-cvs] cvs: loncom /interface lonparmset.pm
raeburn
raeburn at source.lon-capa.org
Sun Nov 20 22:25:19 EST 2011
raeburn Mon Nov 21 03:25:19 2011 EDT
Modified files:
/loncom/interface lonparmset.pm
Log:
- Only include call to javascript function: showHide_courseContent() in
onload, if that function was included in the page (i.e., $psymb is false).
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.514 loncom/interface/lonparmset.pm:1.515
--- loncom/interface/lonparmset.pm:1.514 Sat Oct 8 19:02:49 2011
+++ loncom/interface/lonparmset.pm Mon Nov 21 03:25:19 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.514 2011/10/08 19:02:49 raeburn Exp $
+# $Id: lonparmset.pm,v 1.515 2011/11/21 03:25:19 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -900,11 +900,15 @@
}
sub startpage {
- my ($r) = @_;
+ my ($r,$psymb) = @_;
- my %loaditems = ('onunload' => "pclose()",
- 'onload' => "showHide_courseContent(); group_or_section('cgroup')",
- );
+ my %loaditems = (
+ 'onunload' => "pclose()",
+ 'onload' => "group_or_section('cgroup')",
+ );
+ if (!$psymb) {
+ $loaditems{'onload'} = "showHide_courseContent(); group_or_section('cgroup')";
+ }
if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
&& (!$env{'form.dis'})) || ($env{'form.symb'})) {
@@ -2187,7 +2191,7 @@
if ($psprt[0] eq "all" || !@psprt) {@psprt = (keys %allparts);}
# ------------------------------------------------------------------ Start page
- &startpage($r);
+ &startpage($r,$pssymb);
foreach ('tolerance','date_default','date_start','date_end',
'date_interval','int','float','string') {
@@ -2279,6 +2283,7 @@
.'</a>'
.'</p>');
} else {
+ $r->print();
# parameter screen for a single resource.
my ($map,$iid,$resource)=&Apache::lonnet::decode_symb($pssymb);
my $title = &Apache::lonnet::gettitle($pssymb);
More information about the LON-CAPA-cvs
mailing list