$title");
@@ -1571,10 +1574,7 @@ Set Defaults for All Resources in $folde
Specifically for
ENDMAPONE
if ($uname) {
- my %name=&Apache::lonnet::userenvironment($udom,$uname,
- ('firstname','middlename','lastname','generation', 'id'));
- my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
- .$name{'lastname'}.' '.$name{'generation'};
+ my $person=&Apache::loncommon::plainname($uname,$udom);
$r->print(&mt("User")." $uname \($person\) ".
&mt('in')." \n");
} else {
@@ -1652,10 +1652,7 @@ ENDMAPONE
$coursename
ENDMAPONE
if ($uname) {
- my %name=&Apache::lonnet::userenvironment($udom,$uname,
- ('firstname','middlename','lastname','generation', 'id'));
- my $person=$name{'firstname'}.' '.$name{'middlename'}.' '
- .$name{'lastname'}.' '.$name{'generation'};
+ my $person=&Apache::loncommon::plainname($uname,$udom);
$r->print(" ".&mt("User")." $uname \($person\) \n");
} else {
$r->print(" ".&mt("ALL")." ".&mt("USERS")." \n");
@@ -1897,8 +1894,8 @@ sub crsenv {
=> ''.&mt('Receipt algorithm used').' '.
&mt('This controls how receipt numbers are generated.'),
'suppress_tries'
- => ''.&mt('Suppress number of tries in printing').' ('.
- &mt('yes if supress').')',
+ => ''.&mt('Suppress number of tries in printing').' '.
+ ' ('.&mt('"[_1]" to suppress, anything else to not suppress','yes ').')',
'problem_stream_switch'
=> ''.&mt('Allow problems to be split over pages').' '.
' ('.&mt('"[_1]" if allowed, anything else if not','yes ').')',
@@ -2696,6 +2693,8 @@ ENDMAINFORMHEAD
#
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $vgr = &Apache::lonnet::allowed('vgr',$env{'request.course.id'});
+
my @menu =
(
{ text => 'Set Course Environment Parameters',
@@ -2703,9 +2702,15 @@ ENDMAINFORMHEAD
permission => $parm_permission,
},
{ text => 'Set Portfolio Metadata',
- action => 'setinstmeta',
+ action => 'setrestrictmeta',
permission => $parm_permission,
},
+ { text => 'Manage Course Slots',
+ url => '/adm/slotrequest?command=showslots',
+ permission => $vgr,
+ },
+ { divider => 1,
+ },
{ text => 'Set/Modify Resource Parameters - Helper Mode',
url => '/adm/helper/parameter.helper',
permission => $parm_permission,
@@ -2730,6 +2735,10 @@ ENDMAINFORMHEAD
);
my $menu_html = '';
foreach my $menu_item (@menu) {
+ if ($menu_item->{'divider'}) {
+ $menu_html .= ' ';
+ next;
+ }
next if (! $menu_item->{'permission'});
$menu_html.='';
$menu_html.='';
@@ -2755,30 +2764,26 @@ sub output_row {
my $output;
my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
- my $checked;
unless (defined($options)) {
$options = 'active,stuadd';
- $values = 'Type a list of values separated by commas.';
- }
- $output.=''.$field_text.' ';
- $output.=' ';
- if ($options =~ m/onlyone/) {
- $checked = ' CHECKED ';
- } else {
- $checked = ' ';
+ $values = '';
}
- $output.=' ';
- if ($options =~ m/stuadd/) {
- $checked = ' CHECKED ';
- } else {
- $checked = ' ';
+ $output.=''.$field_text.': ';
+ $output.=' ';
+
+ my @options= ( ['active', 'Show to student'],
+ ['onlyone','Student may select only one choice'],
+ ['stuadd', 'Student may type choices']);
+ foreach my $opt (@options) {
+ my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+ $output.=(' 'x5).' '.
+ &mt($opt->[1]).' ';
}
- $output.=' ';
-
- $output.=' ';
return ($output);
}
-sub setinstmeta {
+
+sub setrestrictmeta {
my ($r)=@_;
my $next_meta;
my $output;
@@ -2786,16 +2791,16 @@ sub setinstmeta {
my $put_result;
$r->print(&Apache::lonxml::xmlbegin());
$r->print('
- LON-CAPA Set Portfolio Metadata
+ LON-CAPA Restrict Metadata
');
- $r->print(&Apache::loncommon::bodytag('Set Portfolio Metadata'));
+ $r->print(&Apache::loncommon::bodytag('Restrict Metadata'));
$r->print(&Apache::lonhtmlcommon::breadcrumbs(undef,
- 'Set Portfolio Metadata'));
+ 'Restrict Metadata'));
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'}.'.metadata.'};
+ my $key_base = $env{'course.'.$env{'request.course.id'}.'.'};
my $save_field = '';
- if ($env{'form.instmeta'}) {
+ if ($env{'form.restrictmeta'}) {
foreach my $field (sort(keys(%env))) {
if ($field=~m/^form.(.+)_(.+)$/) {
my $options;
@@ -2812,7 +2817,7 @@ sub setinstmeta {
if ($env{'form.'.$meta_field.'_active'}) {
$options.='active,';
}
- my $name = 'metadata.'.$save_field;
+ my $name = $save_field;
$put_result = &Apache::lonnet::put('environment',
{'metadata.'.$meta_field.'.options'=>$options,
'metadata.'.$meta_field.'.values'=>$env{'form.'.$meta_field.'_values'},
@@ -2820,31 +2825,22 @@ sub setinstmeta {
}
}
}
-
}
&Apache::lonnet::coursedescription($env{'request.course.id'});
- my %metadata_fields = &Apache::lonmeta::fieldnames();
-
- foreach my $field (sort(keys (%metadata_fields))) {
-
- if ($field =~ m/metadata/) {
- $output.= &output_row($r, $field, $metadata_fields{$field});
- }
+ my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
+ foreach my $field (sort(keys(%metadata_fields))) {
+ &Apache::lonnet::logthis ($field);
+ if ($field ne 'courserestricted') {
+ $output.= &output_row($r, $field, $metadata_fields{$field});
+ }
}
$r->print(<
-
+
-
ENDenv
-
-
$r->print('