');
- $r->print(&Apache::lonhtmlcommon::start_pick_box());
+ $r->print(&Apache::lonhtmlcommon::start_pick_box(undef,'parmlevel'));
&levelmenu($r,\%alllevs,$parmlev);
if ($parmlev ne 'general') {
$r->print(&Apache::lonhtmlcommon::row_closure());
@@ -3413,7 +3442,6 @@ ENDOVER
$r->print(&tableend().
((($env{'form.store'}) || ($env{'form.dis'}))?'
':'').
'');
- &endSettingsScreen($r);
$r->print(&Apache::loncommon::end_page());
}
@@ -3462,7 +3490,6 @@ sub overview {
my $start_page=&Apache::loncommon::start_page('Modify Parameters');
my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
$r->print($start_page.$breadcrumbs);
- &startSettingsScreen($r,'parmset');
$r->print('
'.
+ ($foundkeys?'
':'
'.&mt('There are no parameters.').'').''.
&Apache::loncommon::end_page());
}
@@ -3559,8 +3586,9 @@ ENDOVER
} elsif ($data{'realm_type'} eq 'symb') {
my ($map,$resid,$url) =
&Apache::lonnet::decode_symb($data{'realm'});
- $r->print(&mt('Resource: [_1]
with ID: [_2]
in folder [_3]',
- $url,$resid,$map));
+ $r->print(&mt('Resource: [_1]with ID: [_2]in folder [_3]',
+ $url.'
',
+ $resid.'
',$map));
}
$r->print('
'.&mt('Part: [_1]',$data{'parameter_part'}));
$r->print('');
@@ -3570,7 +3598,6 @@ ENDOVER
$r->print(&Apache::loncommon::end_data_table().'
'.
''.
'
');
- &endSettingsScreen($r);
$r->print(&Apache::loncommon::end_page());
}
@@ -3584,8 +3611,7 @@ sub date_shift_one {
my $start_page=&Apache::loncommon::start_page('Shift Dates');
my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift');
$r->print($start_page.$breadcrumbs);
- &startSettingsScreen($r,'parmset');
- $r->print('
');
- &endSettingsScreen($r);
}
@@ -3982,7 +4000,6 @@ sub setrestrictmeta {
text=>"Restrict Metadata"});
$r->print(&Apache::loncommon::start_page('Restrict Metadata'));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
- &startSettingsScreen($r,'parmset');
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
@@ -4055,7 +4072,6 @@ ENDButtons
$buttons
ENDenv
- &endSettingsScreen($r);
$r->print(&Apache::loncommon::end_page());
return 'ok';
}
@@ -4100,7 +4116,6 @@ sub defaultsetter {
&Apache::loncommon::start_page('Parameter Setting Default Actions');
my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
$r->print($start_page.$breadcrumbs);
- &startSettingsScreen($r,'parmset');
$r->print('
'."\n");
- &endSettingsScreen($r);
$r->print(&Apache::loncommon::end_page());
return;
}
@@ -4345,7 +4359,6 @@ sub parm_change_log {
''."\n";
$r->print(&Apache::loncommon::start_page('Parameter Change Log',$js));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Change Log'));
- &startSettingsScreen($r,'parmset');
my %parmlog=&Apache::lonnet::dump('nohist_parameterlog',
$env{'course.'.$env{'request.course.id'}.'.domain'},
$env{'course.'.$env{'request.course.id'}.'.num'});
@@ -4514,7 +4527,6 @@ sub parm_change_log {
|| $shown<=$env{'form.show'})) { last; }
}
$r->print(&Apache::loncommon::end_data_table());
- &endSettingsScreen($r);
$r->print(&Apache::loncommon::end_page());
}
@@ -4562,10 +4574,10 @@ sub update_slots {
action => 'reserve',
context => 'parameter',
);
- &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
+ &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
'',$uname,$udom,$cnum,$cdom);
- &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+ &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
'',$uname,$udom,$uname,$udom);
}
return $success;
@@ -4596,9 +4608,9 @@ sub delete_slots {
action => 'release',
context => 'parameter',
);
- &Apache::lonnet::instructor_log('slotreservationslog',\%storehash,
+ &Apache::lonnet::write_log('course','slotreservationslog',\%storehash,
1,$uname,$udom,$cnum,$cdom);
- &Apache::lonnet::instructor_log($cdom.'_'.$cnum.'_slotlog',\%storehash,
+ &Apache::lonnet::write_log('course',$cdom.'_'.$cnum.'_slotlog',\%storehash,
1,$uname,$udom,$uname,$udom);
}
}
@@ -4642,9 +4654,12 @@ sub oldversion_warning {
lenient => 'string_lenient',
retrypartial => 'string_yesno',
discussvote => 'string_discussvote',
+ examcode => 'string_examcode',
);
if (exists($stringtypes{$name})) {
- if (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
+ if ($name eq 'examcode') {
+ $desc = $value;
+ } elsif (ref($strings{$stringtypes{$name}}) eq 'ARRAY') {
foreach my $possibilities (@{ $strings{$stringtypes{$name}} }) {
next unless (ref($possibilities) eq 'ARRAY');
my ($parmval, $description) = @{ $possibilities };