--- loncom/interface/courseprefs.pm 2013/12/13 13:57:22 1.49.2.11 +++ loncom/interface/courseprefs.pm 2013/04/08 23:57:21 1.55 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set configuration settings for a course # -# $Id: courseprefs.pm,v 1.49.2.11 2013/12/13 13:57:22 raeburn Exp $ +# $Id: courseprefs.pm,v 1.55 2013/04/08 23:57:21 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -288,7 +288,7 @@ sub handler { stuv => 'Member-viewable membership list options', stul => 'Member agreement needed to be listed', clas => 'Membership and facilitator listing', - prus => 'Privileged users (Domain Coordinators) in facilitator listing', + priv => 'Privileged users (Domain Coordinators) in facilitator listing', defc => 'Default Community Spreadsheet', defs => 'Default User Spreadsheet', seme => 'Send message to member when clicking Done on Tasks' @@ -300,7 +300,7 @@ sub handler { gens => 'General course settings', idnu => 'Course ID or number', desc => 'Course Description', - cred => 'Student credits', + cred => 'Student credits', ownr => 'Course Owner', cown => 'Course Co-owners', catg => 'Categorize course', @@ -316,8 +316,7 @@ sub handler { stuv => 'Student-viewable classlist options', stul => 'Student agreement needed to be listed', clas => 'Classlists and staff listing', - prus => 'Privileged users (Domain Coordinators) in staff listing', - prdo => "Domains to check for privileged users (besides course's domain)", + priv => 'Privileged users (Domain Coordinators) in staff listing', defc => 'Default Course Spreadsheet', defs => 'Default Student Spreadsheet', seme => 'Send message to student when clicking Done on Tasks', @@ -357,7 +356,7 @@ sub handler { { text => $lt{'gens'}, help => 'Course_Prefs_General', ordered => ['owner','co-owners','loncaparev','description', - 'clonedfrom','courseid','categories','hidefromcat', + 'courseid','categories','hidefromcat', 'externalsyllabus','cloners','url','rolenames'], itemtext => { 'owner' => $lt{'ownr'}, @@ -367,11 +366,10 @@ sub handler { 'categories' => $lt{'catg'}, 'hidefromcat' => $lt{'excc'}, 'cloners' => $lt{'clon'}, - 'externalsyllabus' => 'Syllabus status', + 'externalsyllabus' => 'URL of Syllabus', 'url' => 'Top Level Map', 'rolenames' => $lt{'rept'}, 'loncaparev' => $lt{'lcrv'}, - 'clonedfrom' => 'Cloned from', }, }, 'localization' => @@ -426,14 +424,12 @@ sub handler { ordered => ['default_enrollment_start_date', 'default_enrollment_end_date', 'defaultcredits', - 'nothideprivileged','checkforpriv', - 'student_classlist_view', + 'nothideprivileged','student_classlist_view', 'student_classlist_opt_in','student_classlist_portfiles'], itemtext => { default_enrollment_start_date => 'Start date', default_enrollment_end_date => 'End date', - nothideprivileged => $lt{'prus'}, - checkforpriv => $lt{'prdo'}, + nothideprivileged => $lt{'priv'}, student_classlist_view => $lt{'stuv'}, student_classlist_opt_in => $lt{'stul'}, student_classlist_portfiles => 'Include link to accessible portfolio files', @@ -472,7 +468,7 @@ sub handler { help => 'Course_Prefs_Printouts', ordered => ['problem_stream_switch','suppress_tries', 'default_paper_size','print_header_format', - 'disableexampointprint'], + 'disableexampointprint','canuse_pdfforms'], itemtext => { problem_stream_switch => 'Allow problems to be split over pages', suppress_tries => 'Suppress number of tries in printing', @@ -572,15 +568,8 @@ sub print_config_box { exists $item->{'header'}->[0]->{'col2'}) { $output .= ' - '.&mt($item->{'header'}->[0]->{'col1'}).''; - if ($action eq 'feedback') { - $output .= ' - '; - } else { - $output .= ' - '; - } - $output .= &mt($item->{'header'}->[0]->{'col2'}).' + '.&mt($item->{'header'}->[0]->{'col1'}).' + '.&mt($item->{'header'}->[0]->{'col2'}).' '; } $rowtotal ++; @@ -598,14 +587,8 @@ sub print_config_box { '; - if ($action eq 'classlists') { - $output .= ' - + $output .= ' + '; if ($action eq 'classlists') { $output .= &print_classlists('middle',$cdom,$settings,$itemtext,\$rowtotal,$crstype). @@ -634,14 +617,8 @@ sub print_config_box { exists $item->{'header'}->[0]->{'col2'}) { $output .= ' - '; - if (($action eq 'courseinfo') || ($action eq 'localization') || - ($action eq 'print_discussion')) { - $output .= ' + + '; } } @@ -706,8 +683,7 @@ sub process_changes { next if (($entry eq 'categories') && (!$can_categorize)); next if (($entry eq 'loncaparev') || - ($entry eq 'owner') || - ($entry eq 'clonedfrom')); + ($entry eq 'owner')); push(@ordered,$entry); } } elsif ($action eq 'classlists') { @@ -1029,14 +1005,14 @@ sub process_changes { my ($classorder,$classtitles) = &discussion_vote_classes(); my $fontchange = 0; foreach my $class (@{$classorder}) { - my $ext_entry = $entry.'_'.$class; + my $ext_entry = $entry.'_'.$class; my $size = $env{'form.'.$ext_entry.'_size'}; my $unit = $env{'form.'.$ext_entry.'_unit'}; my $weight = $env{'form.'.$ext_entry.'_weight'}; my $style = $env{'form.'.$ext_entry.'_style'}; my $other = $env{'form.'.$ext_entry.'_other'}; $size =~ s/,//g; - $unit =~ s/,//g; + $unit =~ s/,//g; $weight =~ s/,//g; $style =~ s/,//g; $other =~ s/[^\w;:\s\-\%.]//g; @@ -1044,7 +1020,7 @@ sub process_changes { $newvalues{$ext_entry} = join(',',($size.$unit,$weight,$style,$other)); my $current = $values->{$ext_entry}; if ($values->{$ext_entry} eq '') { - $current = ',,,'; + $current = ',,,'; } if ($newvalues{$ext_entry} ne $current) { $changes->{$ext_entry} = $newvalues{$ext_entry}; @@ -1053,7 +1029,7 @@ sub process_changes { } if ($fontchange) { $changes->{$entry} = 1; - } + } } elsif ($entry eq 'nothideprivileged') { my @curr_nothide; my @new_nothide; @@ -1128,43 +1104,32 @@ sub process_changes { my $newtext = $maxnum-1; $newhdr[$env{'form.printfmthdr_pos_'.$newtext}] = $env{'form.printfmthdr_text_'.$newtext}; $newvalues{$entry} = join('',@newhdr); - } elsif (($entry eq 'languages') || - ($entry eq 'checkforpriv')) { - my $settings; + } elsif ($entry eq 'languages') { + my $langstr; my $total = $env{'form.'.$entry.'_total'}; if ($total) { my @deletes = &Apache::loncommon::get_env_multiple('form.'.$entry.'_delete'); for (my $i=0; $i<$total; $i++) { unless (grep(/^$i$/,@deletes)) { - $settings .= $env{'form.'.$entry.'_'.$i}.','; + $langstr .= $env{'form.'.$entry.'_'.$i}.','; } } } else { $total = 0; } if ($env{'form.'.$entry.'_'.$total} ne '') { - my $new = $env{'form.'.$entry.'_'.$total}; - if ($entry eq 'languages') { - my %langchoices = &get_lang_choices(); - if ($langchoices{$new}) { - $settings .= $new; - } else { - $settings =~ s/,$//; - $disallowed->{'localization'}{$entry} = $new; - } + my $newlang = $env{'form.'.$entry.'_'.$total}; + my %langchoices = &get_lang_choices(); + if ($langchoices{$newlang}) { + $langstr .= $newlang; } else { - my %domains=map { $_ => 1; } &Apache::lonnet::all_domains(); - if ($domains{$new}) { - $settings .= $new; - } else { - $settings =~ s/,$//; - $disallowed->{'classlists'}{$entry} = $new; - } + $langstr =~ s/,$//; + $disallowed->{'localization'}{$entry} = $newlang; } } else { - $settings =~ s/,$//; + $langstr =~ s/,$//; } - $newvalues{$entry} = $settings; + $newvalues{$entry} = $langstr; } else { $newvalues{$entry} = $env{'form.'.$entry}; } @@ -1696,24 +1661,9 @@ function loncaparevinfo() { } ENDSCRIPT } - my $cnum = $env{'course.'.$cid.'.num'}; - my $syllabus_js = <'."\n". - ''."\n".$stubrowse_js."\n"; + $cloners_js."\n".''."\n".$stubrowse_js."\n"; return $jscript; } @@ -1823,7 +1773,6 @@ sub print_courseinfo { } my ($can_toggle_cat,$can_categorize) = &can_modify_catsettings($cdom,$crstype); - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $replace; if ($crstype eq 'Community') { @@ -1854,9 +1803,6 @@ sub print_courseinfo { 'co-owners' => { text => ''.&mt($itemtext->{'co-owners'}).'', }, - 'clonedfrom' => { - text => ''.&mt($itemtext->{'clonedfrom'}).'', - }, 'courseid' => { text => ''.&mt($itemtext->{'courseid'}).'
'.'('. &mt('internal, optional').')', @@ -1877,10 +1823,10 @@ sub print_courseinfo { advanced => 1 }, 'externalsyllabus' => { - text => ''.&mt($itemtext->{'externalsyllabus'}).'
'. - &mt('(Syllabus type in use)').(' ' x2). - &mt('[_1]Edit[_2]','', - ''), + text => ''.&mt($itemtext->{'externalsyllabus'}).'
('. + &mt('not using syllabus template)'), + input => 'textbox', + size => '40', }, 'hidefromcat' => { text => ''.&mt($itemtext->{'hidefromcat'}).'
'. @@ -1903,28 +1849,23 @@ sub print_courseinfo { my $datatable; my $count = 0; foreach my $item (@{$ordered}) { - my $colspan; if ($item eq 'hidefromcat') { next if (!$can_toggle_cat); } elsif ($item eq 'categories') { next if (!$can_categorize); } - unless (($item eq 'cloners') || ($item eq 'rolenames')) { - $colspan = 2; - } $count ++; if (exists $items{$item}{advanced} && $items{$item}{advanced} == 1) { - $datatable .= &item_table_row_start($items{$item}{text},$count,"advanced",$colspan); + $datatable .= &item_table_row_start($items{$item}{text},$count,"advanced"); } else { - $datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan); + $datatable .= &item_table_row_start($items{$item}{text},$count); } if ($items{$item}{input} eq 'radio') { $datatable .= &yesno_radio($item,$settings); } elsif ($item eq 'cloners') { my $includeempty = 1; my $num = 0; - $datatable .= ''. &Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table(). - '
'.&mt($item->{'header'}->[1]->{'col1'}).''; - } else { - $output .= ' - '; - } - $output .= &mt($item->{'header'}->[1]->{'col2'}).''.&mt($item->{'header'}->[1]->{'col2'}).'
'.&mt($item->{'header'}->[0]->{'col1'}).''; - } else { - $output .= ''; - } - $output .= &mt($item->{'header'}->[0]->{'col2'}).''.&mt($item->{'header'}->[0]->{'col1'}).''.&mt($item->{'header'}->[0]->{'col2'}).'
'. - &Apache::loncommon::start_data_table(). + $datatable .= &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_row(). '
'.&mt('Or'). - '
'. + '
'.&mt('Or'). + '
'. &Apache::loncommon::start_data_table(); my @cloners; if ($settings->{$item} eq '') { @@ -1995,8 +1936,8 @@ sub print_courseinfo { ''. ''.&Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table(). - '
'.&mt('And'). - '
'. + '
'.&mt('And'). + '
'. &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_row(). ''. @@ -2007,8 +1948,7 @@ sub print_courseinfo { ''.&Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table(); } elsif ($item eq 'rolenames') { - $datatable .= ''. - &Apache::loncommon::start_data_table(); + $datatable .= &Apache::loncommon::start_data_table(); my @roles; if ($crstype eq 'Community') { @roles = ('co'); @@ -2028,7 +1968,7 @@ sub print_courseinfo { } $datatable .= &Apache::loncommon::end_data_table().''; } elsif ($item eq 'categories') { - my $launcher = 'onfocus="this.blur();javascript:catsbrowser();"'; + my $launcher = 'onFocus="this.blur();javascript:catsbrowser();";'; $datatable .= ''. &Apache::lonhtmlcommon::textbox($item.'_display',$settings->{$item}, $items{$item}{size},$launcher); @@ -2043,17 +1983,8 @@ sub print_courseinfo { $owner = &mt('None specified'); } $datatable .= $owner; - } elsif ($item eq 'clonedfrom') { - my $clonesrc = $env{'course.'.$env{'request.course.id'}.'.clonedfrom'}; - my $clonedfrom = &mt('None'); - if ($clonesrc =~ m{/$match_domain/$match_courseid}) { - my %clonesrcinfo = &Apache::lonnet::coursedescription($cdom.'/'.$cnum); - if ($clonesrcinfo{'description'}) { - $clonedfrom = $clonesrcinfo{'description'}.' '.($clonesrc); - } - } - $datatable .= $clonedfrom; } elsif ($item eq 'co-owners') { + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $coowners = $env{'course.'.$env{'request.course.id'}.'.internal.co-owners'}; my @currcoown; if ($coowners) { @@ -2072,36 +2003,6 @@ sub print_courseinfo { $datatable .= &manage_coownership($cnum,$cdom,@currcoown); } } - } elsif ($item eq 'externalsyllabus') { - my $external = $env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}; - my $uploaded = $env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}; - my $minimal = $env{'course.'.$env{'request.course.id'}.'.minimalsyllabus'}; - if (($minimal =~/\w/) || ($uploaded =~/\w/)) { - if ($minimal =~/\w/) { - if ($external =~ m{\Q$minimal\E$}) { - undef($external); - } - } elsif ($uploaded =~/\w/) { - if ($external =~ m{\Q$uploaded\E$}) { - undef($external); - } - } - } elsif ($external!~/\w/) { - undef($external); - } - if ($external) { - $datatable .= &mt('External URL'); - } elsif ($minimal) { - $datatable .= &mt('Minimal template'); - } elsif ($uploaded) { - $datatable .= &mt('Uploaded file'); - } else { - $datatable .= &mt('Standard template'); - } - $datatable .= (' ' x 2). - &mt('[_1]View[_2]', - '', - ''); } elsif ($item eq 'loncaparev') { my $loncaparev = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'}; my $showreqd; @@ -2297,13 +2198,6 @@ sub display_loncaparev_constraints { if ($key =~ /(\Q$item\E)$/) { if (ref($checkparms{$item}) eq 'ARRAY') { my $value = $resourcedata->{$key}; - if ($item eq 'examcode') { - if (&Apache::lonnet::validCODE($value)) { - $value = 'valid'; - } else { - $value = ''; - } - } my ($middle,$scope,$which,$level,$map,$resource); if (grep(/^\Q$value\E$/,@{$checkparms{$item}})) { my $stdtype = &Apache::lonparmset::standard_parameter_types($item); @@ -2549,7 +2443,7 @@ sub show_contents_view { ''.&mt('Attribute/Setting').''. &Apache::loncommon::end_data_table_header_row(). &Apache::loncommon::start_data_table_row(). - ' '.$icon.' '.&mt('Main Content').''); + ' '.$icon.' '.&mt('Main Course Documents').''); &releases_by_map($r,$bymap,$topmap,$scopeorder,$lt); $r->print(&Apache::loncommon::end_data_table_row()); my $it=$navmap->getIterator(undef,undef,undef,1,1,undef); @@ -2727,7 +2621,7 @@ sub get_param_description { sub show_autocoowners { my (@currcoown) = @_; - my $output = ''.&mt('Co-ownership is set automatically when a Course Coordinator role[_1] is assigned to official course personnel (from institutional data).','
').''; + my $output = ''.&mt('Co-ownership is set automatically when a Course Coordinator role is assigned to official course personnel (from institutional data).').''; if (@currcoown > 0) { $output .= '
'.&mt('Current co-owners are:').' '. join(', ',map { &Apache::loncommon::plainname(split(':',$_)); } (@currcoown)); @@ -2871,11 +2765,7 @@ sub print_localization { my $count = 0; foreach my $item (@{$ordered}) { $count ++; - my $colspan; - unless ($item eq 'languages') { - $colspan = 2; - } - $datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan); + $datatable .= &item_table_row_start($items{$item}{text},$count); if ($item eq 'timezone') { my $includeempty = 1; my $timezone = &Apache::lonlocal::gettimezone(); @@ -2894,13 +2784,12 @@ sub print_localization { undef,$includeempty); } else { if ($settings->{$item} eq '') { - $datatable .= ''. + $datatable .= &Apache::loncommon::select_language('languages_0','',1); } else { my $num = 0; my @languages = split(/\s*[,;:]\s*/,$settings->{$item}); - $datatable .= '
'. - &Apache::loncommon::start_data_table(); + $datatable .= &Apache::loncommon::start_data_table(); if (@languages > 0) { my %langchoices = &get_lang_choices(); foreach my $lang (@languages) { @@ -2927,7 +2816,7 @@ sub print_localization { &Apache::loncommon::select_language('languages_'.$num,'',1). ''. ''.&Apache::loncommon::end_data_table_row(). - &Apache::loncommon::end_data_table().'
'; + &Apache::loncommon::end_data_table(); } } $datatable .= &item_table_row_end(); @@ -2989,12 +2878,11 @@ sub print_feedback { if ($position eq 'top') { $datatable .= &item_table_row_start($items{$item}{text},$count); } else { - $datatable .= &item_table_row_start($items{$item}{text}."
(Custom text)",$count, "advanced",2); + $datatable .= &item_table_row_start($items{$item}{text}."
(Custom text)",$count, "advanced"); } if ($position eq 'top') { my $includeempty = 0; - $datatable .= ''. - &user_table($cdom,$item,\@sections, + $datatable .= &user_table($cdom,$item,\@sections, $settings->{$item},\%lt); } else { $datatable .= &Apache::lonhtmlcommon::textbox($item.'.text', @@ -3014,7 +2902,7 @@ sub user_table { } else { my $num = 0; my @curr = split(/,/,$currvalue); - $output .= ''; + $output .= '
'; my ($currusers); foreach my $val (@curr) { next if ($val eq ''); @@ -3178,52 +3066,43 @@ sub print_discussion { del => 'Delete?', sec => 'Sections:', ); + foreach my $item (@{$ordered}) { $count ++; - my $colspan; - if ($item eq 'allow_limited_html_in_feedback') { - $colspan = 2; - } - $datatable .= &item_table_row_start($items{$item}{text},$count,undef,$colspan); + $datatable .= &item_table_row_start($items{$item}{text},$count); if ($item eq 'plc.roles.denied') { - $datatable .= ''. &Apache::loncommon::end_data_table_row(). &role_checkboxes($cdom,$cnum,$item,$settings,1). - &Apache::loncommon::end_data_table().'
'; + &Apache::loncommon::end_data_table(); } elsif ($item eq 'discussion_post_fonts') { - $datatable .= ''. ''. ''. ''. - ''. + ''. &Apache::loncommon::end_data_table_row(). &set_discussion_fonts($cdom,$cnum,$item,$settings). - &Apache::loncommon::end_data_table().'
'; + &Apache::loncommon::end_data_table(); } $datatable .= &item_table_row_end(); } @@ -3392,7 +3271,7 @@ sub set_discussion_fonts { sub discussion_vote_classes { my $classorder = ['twoplus','oneplus','zero','oneminus','twominus']; - my %classtitles = &Apache::lonlocal::texthash( + my %classtitles = &Apache::lonlocal::texthash( 'twoplus' => 'Two sigma above mean', 'oneplus' => 'One sigma above mean', 'zero' => 'Within one sigma of mean', @@ -3424,7 +3303,7 @@ sub print_classlists { push(@ordered,'defaultcredits'); } } elsif ($position eq 'middle') { - @ordered = ('nothideprivileged','checkforpriv'); + @ordered = ('nothideprivileged'); } else { @ordered = ('student_classlist_view', 'student_classlist_opt_in', @@ -3458,17 +3337,12 @@ sub print_classlists { 'defaultcredits' => { text => ''.&mt($itemtext->{'defaultcredits'}).'', }, - + 'nothideprivileged' => { text => ''.&mt($itemtext->{'nothideprivileged'}).'', input => 'checkbox', }, - 'checkforpriv' => { - text => ''.&mt($itemtext->{'checkforpriv'}).'', - input => 'selectbox', - }, - 'student_classlist_view' => { text => ''.&mt($itemtext->{'student_classlist_view'}).'', input => 'selectbox', @@ -3489,7 +3363,7 @@ sub print_classlists { ($settings->{'student_classlist_view'} eq 'section')) { $settings->{'student_classlist_view'} = 'disabled'; } - return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'classlists'); + return &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype); } sub print_appearance { @@ -3525,12 +3399,11 @@ sub print_appearance { text => ''.&mt($itemtext->{'texengine'}).'', input => 'selectbox', options => { - MathJax => 'MathJax', jsMath => 'jsMath', mimetex => &mt('Convert to Images'), tth => &mt('TeX to HTML'), }, - order => ['MathJax','jsMath','mimetex','tth'], + order => ['jsMath','mimetex','tth'], nullval => $mathdef, }, 'tthoptions' => { @@ -3539,7 +3412,7 @@ sub print_appearance { size => 40, }, ); - return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'appearance'); + return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype); } sub print_grading { @@ -3554,11 +3427,12 @@ sub print_grading { input => 'selectbox', options => { standard => &mt('Standard: shows points'), + categories => &mt('Categories: shows points according to categories'), external => &mt('External: shows number of completed parts and totals'), externalnototals => &mt('External: shows only number of completed parts'), spreadsheet => &mt('Spreadsheet: (with link to detailed scores)'), }, - order => ['standard','external','externalnototals','spreadsheet'], + order => ['standard','categories','external','externalnototals','spreadsheet'], }, 'rndseed' => { text => ''.&mt($itemtext->{'rndseed'}).''. @@ -3594,7 +3468,7 @@ sub print_grading { input => 'radio', }, ); - return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'grading'); + return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype); } sub print_printouts { @@ -3647,7 +3521,7 @@ sub print_printouts { nullval => &mt('None specified - use domain default'), } ); - return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'printouts'); + return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype); } sub print_spreadsheet { @@ -3683,7 +3557,7 @@ sub print_spreadsheet { input => 'radio', }, ); - return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'spreadsheet'); + return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype); } sub print_bridgetasks { @@ -3725,7 +3599,7 @@ sub print_bridgetasks { input => 'radio', }, ); - return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype,'bridgetasks'); + return &make_item_rows($cdom,\%items,$ordered,$settings,$rowtotal,$crstype); } sub print_other { @@ -3750,7 +3624,7 @@ sub print_other { input => 'textbox', size => '30', }; - my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype,'other'); + my $output = &make_item_rows($cdom,\%items,\@ordered,$settings,$rowtotal,$crstype); } sub get_other_items { @@ -3768,9 +3642,7 @@ sub get_other_items { ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/) || ($parameter eq 'type') || ($parameter =~ m/^(cc|co|in|ta|ep|ad|st)\.plaintext$/) - || ($parameter =~ m/^discussion_post_fonts/) || - ($parameter =~ m{^(minimal|updated|uploaded|external)syllabus$}) || - ($parameter eq 'clonedfrom')) { + || ($parameter =~ m/^discussion_post_fonts/)) { push(@ordered,$parameter); } } @@ -3779,18 +3651,13 @@ sub get_other_items { } sub item_table_row_start { - my ($text,$count,$add_class,$colspan) = @_; + my ($text,$count,$add_class) = @_; my $output; - my $css_class = ($count % 2) ? 'LC_odd_row' : 'LC_even_row'; - $css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq ''); - $output .= ''."\n". - ''; - if ($colspan) { - $output .= ''."\n";; + $output .= '
'. - ''.&role_checkboxes($cdom,$cnum,$item,$settings). + $datatable .= '
'.&role_checkboxes($cdom,$cnum,$item,$settings). '
'; } elsif ($item eq 'plc.users.denied') { - $datatable .= '		'. - &user_table($cdom,$item,undef, + $datatable .= &user_table($cdom,$item,undef, $settings->{$item},\%lt); } elsif ($item eq 'pch.roles.denied') { - $datatable .= ''. - ''.&role_checkboxes($cdom,$cnum,$item,$settings). + $datatable .= '
'.&role_checkboxes($cdom,$cnum,$item,$settings). '
'; } elsif ($item eq 'pch.users.denied') { - $datatable .= '		'. - &user_table($cdom,$item,undef, + $datatable .= &user_table($cdom,$item,undef, $settings->{$item},\%lt); } elsif ($item eq 'allow_limited_html_in_feedback') { $datatable .= &yesno_radio($item,$settings); } elsif ($item eq 'allow_discussion_post_editing') { - $datatable .= '
'. - &Apache::loncommon::start_data_table(). + $datatable .= &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_row(). '		'.&mt('Role').''. &mt('Sections').'
'. - &Apache::loncommon::start_data_table(). + $datatable .= &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_row(). '		'.&mt('Sum of likes/dislikes').''.&mt('font-size').''.&mt('font-weight').''.&mt('font-style').''.&mt('Other css').''.&mt('Other css').'
'.$text. - ''; - } else { - $output .= ''; - } + my $css_class = ($count % 2) ? 'LC_odd_row' : 'LC_even_row'; + $css_class = (join(' ',$css_class,$add_class)) unless ($add_class eq ''); + $output .= '
'.$text. + ''; return $output; } @@ -3861,21 +3728,16 @@ sub select_from_options { } sub make_item_rows { - my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype,$caller) = @_; + my ($cdom,$items,$ordered,$settings,$rowtotal,$crstype) = @_; my $datatable; if ((ref($items) eq 'HASH') && (ref($ordered) eq 'ARRAY')) { my $count = 0; foreach my $item (@{$ordered}) { $count ++; - my $colspan; - if ((($caller eq 'classlists') && ($item eq 'nothideprivileged')) || - (($caller eq 'printouts') && ($item ne 'print_header_format'))) { - $colspan = 2; - } if (exists $items->{$item}{advanced} && $items->{$item}{advanced} == 1) { - $datatable .= &item_table_row_start($items->{$item}{text},$count,"advanced",$colspan); + $datatable .= &item_table_row_start($items->{$item}{text},$count,"advanced"); } else { - $datatable .= &item_table_row_start($items->{$item}{text},$count,undef,$colspan); + $datatable .= &item_table_row_start($items->{$item}{text},$count); } if ($item eq 'defaultcredits') { my $defaultcredits = $env{'course.'.$env{'request.course.id'}.'.internal.defaultcredits'}; @@ -3888,8 +3750,6 @@ sub make_item_rows { $datatable .= $showcredits; } elsif ($item eq 'nothideprivileged') { $datatable .= ¬hidepriv_row($cdom,$item,$settings,$crstype); - } elsif ($item eq 'checkforpriv') { - $datatable .= &checkforpriv_row($cdom,$item,$settings,$crstype); } elsif ($item eq 'print_header_format') { $datatable .= &print_hdrfmt_row($item,$settings); } elsif ($items->{$item}{input} eq 'dates') { @@ -3921,7 +3781,8 @@ sub make_item_rows { sub nothidepriv_row { my ($cdom,$item,$settings,$crstype) = @_; my ($cnum) = &get_course(); - my ($datatable,%nothide,@checkdoms); + my %nothide; + my $datatable; if (ref($settings) eq 'HASH') { if ($settings->{$item} ne '') { foreach my $user (split(/\s*\,\s*/,$settings->{$item})) { @@ -3932,30 +3793,38 @@ sub nothidepriv_row { } } } - if ($settings->{'checkforpriv'}) { - @checkdoms = split(/,/,$settings->{'checkforpriv'}); - } } - push(@checkdoms,$cdom); - my %coursepersonnel = - &Apache::lonnet::get_my_roles($cnum,$cdom,'',['previous','future','active']); + my %coursepersonnel = &Apache::lonnet::dump('nohist_userroles',$cdom,$cnum); + my $now = time; my @privusers; + my %privileged; foreach my $person (keys(%coursepersonnel)) { - my ($uname,$udom,$role) = split(/:/,$person); - my $user = $uname.':'.$udom; - my ($start,$end) = split(/:/,$coursepersonnel{$person}); + my ($role,$user,$usec) = ($person =~ /^([^:]*):([^:]+:[^:]+):([^:]*)/); + $user =~ s/:$//; + my ($end,$start) = split(/:/,$coursepersonnel{$person}); if ($end == -1 || $start == -1) { next; } - foreach my $dom (@checkdoms) { - if (&Apache::lonnet::privileged($uname,$udom,\@checkdoms,['dc','su'])) { - unless (grep(/^\Q$user\E$/,@privusers)) { - push(@privusers,$user); + my ($uname,$udom) = split(':',$user); + unless (ref($privileged{$udom}) eq 'HASH') { + my %dompersonnel = &Apache::lonnet::get_domain_roles($udom,['dc'],undef,$now); + $privileged{$udom} = {}; + if (keys(%dompersonnel)) { + foreach my $server (keys(%dompersonnel)) { + foreach my $user (sort(keys(%{$dompersonnel{$server}}))) { + my ($trole,$uname,$udom) = split(/:/,$user); + $privileged{$udom}{$uname} = $trole; + } } } } + if (exists($privileged{$udom}{$uname})) { + unless (grep(/^\Q$user\E$/,@privusers)) { + push(@privusers,$user); + } + } } - if (@privusers > 0) { + if (@privusers) { $datatable .= ''; foreach my $user (sort(@privusers)) { my $hideon = ' checked="checked" '; @@ -3987,65 +3856,6 @@ sub nothidepriv_row { return $datatable; } -sub checkforpriv_row { - my ($cdom,$item,$settings,$crstype) = @_; - my $datatable; - my %domains=map { $_ => 1; } &Apache::lonnet::all_domains(); - if (keys(%domains) == 1) { - $datatable = ''. - &Apache::loncommon::end_data_table_row(); - $num ++; - unless (grep(/^\Q$currdom\E$/,@excdoms)) { - push(@excdoms,$currdom); - } - } - } - if ((scalar(keys(%domains)) - scalar(@excdoms)) > 0) { - $datatable .= - &Apache::loncommon::start_data_table_row(). - ''.&Apache::loncommon::end_data_table_row(); - } - $datatable .= &Apache::loncommon::end_data_table(). - ''. - '
'; - } - return $datatable; -} - sub print_hdrfmt_row { my ($item,$settings) = @_; my @curr; @@ -4118,8 +3928,7 @@ function getIndexByName(item) { ENDJS - $output .= '
'. - &mt("Course's domain is only domain"); - return $datatable; - } - my @excdoms = ($cdom); - my $num = 0; - if ($settings->{$item} eq '') { - $datatable = ''. - &Apache::loncommon::select_dom_form('','checkforpriv_'.$num, - 1,1,undef,undef,\@excdoms); - } else { - my @privdoms = split(/,/,$settings->{$item}); - my %domains=map { $_ => 1; } &Apache::lonnet::all_domains(); - $datatable = '
'. - &Apache::loncommon::start_data_table(); - if (@privdoms > 0) { - foreach my $currdom (@privdoms) { - next unless ($domains{$currdom}); - my $domdesc = &Apache::lonnet::domain($currdom,'description'); - if ($domdesc eq '') { - $domdesc = $currdom; - } - $datatable .= - &Apache::loncommon::start_data_table_row(). - '		'. - &mt('Domain:').' '.$domdesc. - '
'. - '		'. - &mt('Additional domain:'). '
'. - &Apache::loncommon::select_dom_form('','checkforpriv_'.$num,1, - 1,undef,undef,\@excdoms). - '
'. - $currstr.''; + $output .= $currstr.'
'; if (@curr > 0) { for (my $i=0; $i<@curr; $i++) { my $pos = $i+1; @@ -4159,7 +3968,7 @@ ENDJS ''. ''. - '

'; + '
'; return $output; }