--- loncom/interface/lonparmset.pm 2009/09/15 03:01:17 1.413.6.2 +++ loncom/interface/lonparmset.pm 2008/11/11 20:12:17 1.414 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set parameters for assessments # -# $Id: lonparmset.pm,v 1.413.6.2 2009/09/15 03:01:17 raeburn Exp $ +# $Id: lonparmset.pm,v 1.414 2008/11/11 20:12:17 droeschl Exp $ # # Copyright Michigan State University Board of Trustees # @@ -643,13 +643,12 @@ sub plink { my ($hour,$min,$sec,$val)=&preset_defaults($parmname); unless (defined($winvalue)) { $winvalue=$val; } my $valout = &valout($value,$type,1); - my $unencmarker = $marker; foreach my $item (\$type, \$dis, \$winvalue, \$marker, \$return, \$call, \$hour, \$min, \$sec) { $$item = &HTML::Entities::encode($$item,'"<>&'); $$item =~ s/\'/\\\'/g; } - return '
'.
+ return '
'; - undef($value); - } - } - } } if ($name eq 'url') { $value=~s/^\/res\///; @@ -2366,7 +2325,7 @@ sub crsenv { 'student_classlist_view' => ''.&mt('Allow students to view classlist.').' ' .'('.&mt('[_1]: students can view all sections. [_2]: students can only view their own section. blank or [_3] prevents student view.','"all"','"section"','"disabled"').')', 'student_classlist_portfiles' => ''.&mt('Include link to accessible portfolio files').' ' - .'('.&mt("[_1] for link to each a listing of each student's files.",'"yes"').')', + .'('.&mt('[_1] for link to each a listing of each student\'s files.','"yes"').')', 'student_classlist_opt_in' => ''.&mt("Student's agreement needed for listing in student-viewable roster").' ' .'('.&mt('[_1] to require students to opt-in to listing in the roster (on the roster page).','"yes"').')', 'plc.roles.denied'=> ''.&mt('Disallow live chatroom use for Roles').' ' @@ -2453,7 +2412,7 @@ sub crsenv { 'texengine' => ''.&mt('Force all students in the course to use a specific math rendering engine.').' ' - .'('.&mt("[_1], [_2] (Convert to Images), [_3] (TeX to HTML), or blank for student's preference",'"jsMath"','"mimetex"','"tth"').')', + .'('.&mt('[_1], [_2] (Convert to Images), [_3] (TeX to HTML), or blank for student\'s preference','"jsMath"','"mimetex"','"tth"').')', 'timezone' => ''.&mt('Timezone in which the course takes place').'', @@ -2468,9 +2427,6 @@ sub crsenv { &mt('Display Categories').'', 'datelocale' => ''.&mt('Locale used for course calendar').'', - 'rolenames' - => ''.&mt('Replacement titles for standard course roles').' '. - '('.&mt('To replace the standard title for a course role, enter the title you wish to use, otherwise leave blank.').')', ); my @Display_Order = ('url','description','courseid','cloners'); (my $can_toggle_cat,$can_categorize) = &can_modify_catsettings($dom); @@ -2495,7 +2451,6 @@ sub crsenv { 'languages', 'timezone', 'datelocale', - 'rolenames', 'nothideprivileged', 'rndseed', 'receiptalg', @@ -2518,9 +2473,8 @@ sub crsenv { 'task_messages','task_grading')); foreach my $parameter (sort(keys(%values))) { unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) || - ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/) || - ($parameter eq 'type') || - ($parameter =~ m/^(cc|in|ta|ep|ad|st)\.plaintext$/)) { + ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/) + || ($parameter eq 'type')) { if (! $descriptions{$parameter}) { $descriptions{$parameter}=$parameter; push(@Display_Order,$parameter); @@ -2560,28 +2514,7 @@ sub crsenv { $output .= ' '.
&Apache::loncommon::select_datelocale($parameter.'_value',
$currdatelocale,
- $onchange,$includeempty).' | ';
- } elsif ($parameter eq 'rolenames') {
- $output.= '
| ';
+ $onchange,$includeempty).'';
} elsif ($parameter eq 'categories') {
my $catdisplay;
if ($values{'categories'} ne '') {
@@ -2603,11 +2536,9 @@ sub crsenv {
$values{$parameter},
40,$onchange).'';
}
- unless ($parameter eq 'rolenames') {
- $output .= '
'.
- &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
- ' | ';
- }
+ $output .= ''.
+ &Apache::lonhtmlcommon::checkbox($parameter.'_setparmval').
+ ' | ';
$output .= &Apache::loncommon::end_data_table_row()."\n";
}
my $onchange = 'onFocus="javascript:window.document.forms'.
@@ -3037,16 +2968,15 @@ sub listdata {
}
if ($part ne $oldpart) {
$r->print(&tableend().
- "\n".''.&mt('Part').": $part");
+ "\n".&mt('Part').": $part");
$oldpart=$part;
}
#
# Ready to print
#
- my $parmitem = &standard_parameter_names($name);
$r->print(&tablestart().
&Apache::loncommon::start_data_table_row().
- ''.&mt($parmitem).
+ ' | '.&standard_parameter_names($name).
' | ');
$foundkeys++;
@@ -3073,7 +3003,7 @@ sub listdata {
$r->print(&default_selector($thiskey,$$resourcedata{$thiskey}));
}
$r->print('');
+ $thistype.'">');
$r->print(' | '.&Apache::loncommon::end_data_table_row());
}
}
@@ -3196,6 +3126,8 @@ sub newoverview {
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
+ &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
+ text=>"Overview Mode"});
my $start_page = &Apache::loncommon::start_page('Set Parameters');
my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Overview');
$r->print(<'. &mt('These parameters refer to resources that do not exist.'). ''. - ''.''. + ''.' '. ' '); $r->print(&Apache::loncommon::start_data_table(). ' '); if ($data{'scope_type'} eq 'all') { $r->print(&mt('All users')); @@ -3464,7 +3399,7 @@ ENDOVER } } $r->print(&Apache::loncommon::end_data_table().' '. - ''. + ''. ' '. &Apache::loncommon::end_page()); } @@ -3474,6 +3409,8 @@ sub date_shift_one { my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $crs = $env{'course.'.$env{'request.course.id'}.'.num'}; + &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'}, + text=>"Shifting Dates"}); my $start_page=&Apache::loncommon::start_page('Shift Dates'); my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Shift'); $r->print(<'.&mt($menu_item->{'divider'}).''; - next; - } - next if (! $menu_item->{'permission'}); - $menu_html.=''; - $menu_html.=' '.$/; - } - $r->print($menu_html); +#---- Remove when done ---- +# my $menu_html = ''; +# foreach my $menu_item (@menu) { +# if ($menu_item->{'categorytitle'}) { +# $menu_html .= ' '; - if (exists($menu_item->{'help'})) { - $menu_html.= - &Apache::loncommon::help_open_topic($menu_item->{'help'}); - } - $menu_html.=''.&mt($menu_item->{'categorytitle'}).''; +# next; +# } +# next if (! $menu_item->{'permission'}); +# $menu_html.=''; +# $menu_html.=' '.$/; +# } +# -------------------------- + + $r->print(&Apache::lonhtmlcommon::generate_menu(@menu)); return; } + ### Set portfolio metadata sub output_row { my ($r, $field_name, $field_text, $added_flag) = @_; @@ -3850,21 +3795,21 @@ sub output_row { my $multiple_checked; my $single_checked; if ($options =~ m/onlyone/) { - $multiple_checked = ''; - $single_checked = ' checked="checked"'; + $multiple_checked = ""; + $single_checked = " CHECKED "; } else { - $multiple_checked = ' checked="checked"'; - $single_checked = ''; + $multiple_checked = " CHECKED "; + $single_checked = ""; } $output .= &Apache::loncommon::continue_data_table_row(); $output .= ' '; +# if (exists($menu_item->{'help'})) { +# $menu_html.= +# &Apache::loncommon::help_open_topic($menu_item->{'help'}); +# } +# $menu_html.=''.(' ' x 10).' | ';
+
+ Student may select multiple choices from list';
$output .= &Apache::loncommon::end_data_table_row();
$output .= &Apache::loncommon::continue_data_table_row();
$output .= ''.(' ' x 10).' | ';
+ Student may select only one choice from list';
$output .= &Apache::loncommon::end_data_table_row();
}
return ($output);
@@ -3875,6 +3820,8 @@ sub order_meta_fields {
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
$r->print(&Apache::loncommon::start_page('Order Metadata Fields'));
+ &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+ text=>"Add Metadata Field"});
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/parmset?action=setrestrictmeta",
text=>"Restrict Metadata"},
@@ -3960,6 +3907,8 @@ sub continue {
}
sub addmetafield {
my ($r)=@_;
+ &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
+ text=>"Add Metadata Field"});
$r->print(&Apache::loncommon::start_page('Add Metadata Field'));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -4010,6 +3959,8 @@ sub setrestrictmeta {
my $output;
my $item_num;
my $put_result;
+ &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
+ text=>"Restrict Metadata"});
$r->print(&Apache::loncommon::start_page('Restrict Metadata'));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Restrict Metadata'));
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -4117,6 +4068,8 @@ sub get_deleted_meta_fieldnames {
sub defaultsetter {
my ($r) = @_;
+ &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
+ text=>"Set Defaults"});
my $start_page =
&Apache::loncommon::start_page('Parameter Setting Default Actions');
my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs('Defaults');
@@ -4327,6 +4280,7 @@ sub load_parameter_names {
close($config);
$standard_parms{'int_pos'} = 'Positive Integer';
$standard_parms{'int_zero_pos'} = 'Positive Integer or Zero';
+ %standard_parms=&Apache::lonlocal::texthash(%standard_parms);
}
sub standard_parameter_names {
@@ -4348,6 +4302,8 @@ sub standard_parameter_names {
sub parm_change_log {
my ($r)=@_;
+ &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
+ text=>"Parameter Change Log"});
$r->print(&Apache::loncommon::start_page('Parameter Change Log'));
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Change Log'));
@@ -4440,18 +4396,15 @@ sub parm_change_log {
} else {
$makenewrow=1;
}
- my $parmitem = &standard_parameter_names($parmname);
$output .=''.$realm.' | '.$section.' | '.
- &mt($parmitem).' | '.
+ &standard_parameter_names($parmname).' | '.
($part?&mt('Part: [_1]',$part):&mt('All Parts')).' | ';
my $stillactive=0;
if ($parmlog{$id}{'delflag'}) {
$output .= &mt('Deleted');
} else {
if ($typeflag) {
- my $parmitem = &standard_parameter_names($value);
- $parmitem = &mt($parmitem);
- $output .= &mt('Type: [_1]',$parmitem);
+ $output .= &mt('Type: [_1]',&standard_parameter_names($value));
} else {
my ($level,@all)=&parmval_by_symb($what,$middle,&Apache::lonnet::metadata($middle,$what),
$uname,$udom,$issection,$issection,$courseopt);
@@ -4469,11 +4422,8 @@ sub parm_change_log {
}
$output .= ' | ';
if ($stillactive) {
- my $parmitem = &standard_parameter_names($parmname);
- $parmitem = &mt($parmitem);
- my $title=&mt('Changed [_1]',$parmitem);
- my $description=&mt('Changed [_1] for [_2] to [_3]',
- $parmitem,$realmdescription,
+ my $title=&mt('Changed [_1]',&standard_parameter_names($parmname));
+ my $description=&mt('Changed [_1] for [_2] to [_3]',&standard_parameter_names($parmname),$realmdescription,
(&isdateparm($istype{$parmname})?&Apache::lonlocal::locallocaltime($value):$value));
if (($uname) && ($udom)) {
$output .=
@@ -4534,11 +4484,10 @@ sub handler {
&reset_caches();
- if ($r->header_only) {
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- return OK;
- }
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+ return OK if $r->header_only;
+
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['action','state',
'pres_marker',
@@ -4562,12 +4511,6 @@ sub handler {
my $exists = &check_for_course_info();
if ($env{'request.course.id'} && $parm_permission && $exists) {
-
- # Start Page
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
-
-
#
# Main switch on form.action and form.state, as appropriate
#
@@ -4575,64 +4518,34 @@ sub handler {
# the table mode
if ((($env{'form.command'} eq 'set') && ($env{'form.url'})
&& (!$env{'form.dis'})) || ($env{'form.symb'})) {
- &Apache::lonhtmlcommon::add_breadcrumb({help=>'Problem_Parameters',
- text=>"Problem Parameters"});
&assessparms($r);
-
} elsif (! exists($env{'form.action'})) {
- $r->print(&header());
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Parameter Manager'));
&print_main_menu($r,$parm_permission);
- } elsif ($env{'form.action'} eq 'crsenv' && $parm_permission) {
- &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=crsenv',
- text=>"Course Environment"});
+ } elsif ($env{'form.action'} eq 'crsenv') {
&crsenv($r);
- } elsif ($env{'form.action'} eq 'setoverview' && $parm_permission) {
- &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
- text=>"Overview Mode"});
+ } elsif ($env{'form.action'} eq 'setoverview') {
&overview($r);
- } elsif ($env{'form.action'} eq 'addmetadata' && $parm_permission) {
- &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
- text=>"Add Metadata Field"});
+ } elsif ($env{'form.action'} eq 'addmetadata') {
&addmetafield($r);
- } elsif ($env{'form.action'} eq 'ordermetadata' && $parm_permission) {
- &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=addmetadata',
- text=>"Add Metadata Field"});
+ } elsif ($env{'form.action'} eq 'ordermetadata') {
&order_meta_fields($r);
- } elsif ($env{'form.action'} eq 'setrestrictmeta' && $parm_permission) {
- &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setrestrictmeta',
- text=>"Restrict Metadata"});
+ } elsif ($env{'form.action'} eq 'setrestrictmeta') {
&setrestrictmeta($r);
- } elsif ($env{'form.action'} eq 'newoverview' && $parm_permission) {
- &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setoverview',
- text=>"Overview Mode"});
+ } elsif ($env{'form.action'} eq 'newoverview') {
&newoverview($r);
- } elsif ($env{'form.action'} eq 'setdefaults' && $parm_permission) {
- &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=setdefaults',
- text=>"Set Defaults"});
+ } elsif ($env{'form.action'} eq 'setdefaults') {
&defaultsetter($r);
- } elsif ($env{'form.action'} eq 'settable' && $parm_permission) {
- &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
- text=>"Table Mode",
- help => 'Course_Setting_Parameters'});
+ } elsif ($env{'form.action'} eq 'settable') {
&assessparms($r);
- } elsif ($env{'form.action'} eq 'parameterchangelog' && $parm_permission) {
- &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=settable',
- text=>"Parameter Change Log"});
+ } elsif ($env{'form.action'} eq 'parameterchangelog') {
&parm_change_log($r);
- } elsif ($env{'form.action'} eq 'cleanparameters' && $parm_permission) {
- &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=cleanparameters',
- text=>"Clean Parameters"});
+ } elsif ($env{'form.action'} eq 'cleanparameters') {
&clean_parameters($r);
- } elsif ($env{'form.action'} eq 'dateshift1' && $parm_permission) {
- &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
- text=>"Shifting Dates"});
+ } elsif ($env{'form.action'} eq 'dateshift1') {
&date_shift_one($r);
- } elsif ($env{'form.action'} eq 'dateshift2' && $parm_permission) {
- &Apache::lonhtmlcommon::add_breadcrumb({href=>'/adm/parmset?action=dateshift1&timebase='.$env{'form.timebase'},
- text=>"Shifting Dates"});
+ } elsif ($env{'form.action'} eq 'dateshift2') {
&date_shift_two($r);
- } elsif ($env{'form.action'} eq 'categorizecourse' && $parm_permission) {
+ } elsif ($env{'form.action'} eq 'categorizecourse') {
&assign_course_categories($r);
}
} else {
| |