--- loncom/interface/domainprefs.pm 2010/01/26 15:47:27 1.102.2.8 +++ loncom/interface/domainprefs.pm 2009/09/23 02:40:13 1.102.4.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.102.2.8 2010/01/26 15:47:27 raeburn Exp $ +# $Id: domainprefs.pm,v 1.102.4.1 2009/09/23 02:40:13 gci Exp $ # # Copyright Michigan State University Board of Trustees # @@ -202,12 +202,11 @@ sub handler { 'quotas','autoenroll','autoupdate','directorysrch', 'usercreation','usermodification','contacts','defaults', 'scantron','coursecategories','serverstatuses', - 'requestcourses','coursedefaults'],$dom); + 'requestcourses'],$dom); my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', 'autoupdate','directorysrch','contacts', 'usercreation','usermodification','scantron', - 'requestcourses','coursecategories','serverstatuses', - 'coursedefaults'); + 'requestcourses','coursecategories','serverstatuses'); my %prefs = ( 'rolecolors' => { text => 'Default color schemes', @@ -303,7 +302,7 @@ sub handler { col2 => 'Value'}], }, 'coursecategories' => - { text => 'Cataloging of courses/communities', + { text => 'Cataloging of courses', help => 'Domain_Configuration_Cataloging_Courses', header => [{col1 => 'Category settings', col2 => '',}, @@ -319,12 +318,6 @@ sub handler { col3 => 'Specific IPs', }], }, - 'coursedefaults' => - {text => 'Course/Community defaults', - help => 'Domain_Configuration_Course_Defaults', - header => [{col1 => 'Setting', - col2 => 'Value',}], - }, ); my @roles = ('student','coordinator','author','admin'); my @actions = &Apache::loncommon::get_env_multiple('form.actions'); @@ -411,8 +404,6 @@ sub process_changes { $output = &modify_serverstatuses($dom,%domconfig); } elsif ($action eq 'requestcourses') { $output = &modify_quotas($dom,$action,%domconfig); - } elsif ($action eq 'coursedefaults') { - $output = &modify_coursedefaults($dom,%domconfig); } return $output; } @@ -590,8 +581,6 @@ sub print_config_box { $output .= &print_scantronformat($r,$dom,$confname,$settings,\$rowtotal); } elsif ($action eq 'serverstatuses') { $output .= &print_serverstatuses($dom,$settings,\$rowtotal); - } elsif ($action eq 'coursedefaults') { - $output .= &print_coursedefaults($dom,$settings,\$rowtotal); } } $output .= ' @@ -739,7 +728,7 @@ sub print_login { sub login_choices { my %choices = &Apache::lonlocal::texthash ( - coursecatalog => 'Display Course/Community Catalog link?', + coursecatalog => 'Display Course Catalog link?', adminmail => "Display Administrator's E-mail Address?", newuser => "Link to create a user account", img => "Header", @@ -1839,67 +1828,6 @@ sub print_contacts { return $datatable; } -sub radiobutton_prefs { - my ($settings,$toggles,$defaultchecked,$choices,$itemcount) = @_; - return unless ((ref($toggles) eq 'ARRAY') && (ref($defaultchecked) eq 'HASH') && - (ref($choices) eq 'HASH')); - - my (%checkedon,%checkedoff,$datatable,$css_class); - - foreach my $item (@{$toggles}) { - if ($defaultchecked->{$item} eq 'on') { - $checkedon{$item} = ' checked="checked" '; - $checkedoff{$item} = ' '; - } elsif ($defaultchecked->{$item} eq 'off') { - $checkedoff{$item} = ' checked="checked" '; - $checkedon{$item} = ' '; - } - } - if (ref($settings) eq 'HASH') { - foreach my $item (@{$toggles}) { - if ($settings->{$item} eq '1') { - $checkedon{$item} = ' checked="checked" '; - $checkedoff{$item} = ' '; - } elsif ($settings->{$item} eq '0') { - $checkedoff{$item} = ' checked="checked" '; - $checkedon{$item} = ' '; - } - } - } - foreach my $item (@{$toggles}) { - $css_class = $itemcount%2?' class="LC_odd_row"':''; - $datatable .= - ''.$choices->{$item}. - ''. - ''. - ' '. - ''. - ''; - $itemcount ++; - } - return ($datatable,$itemcount); -} - -sub print_coursedefaults { - my ($dom,$settings,$rowtotal) = @_; - my ($css_class,$datatable); - my $itemcount = 1; - my (%checkedon,%checkedoff,%choices,%defaultchecked,@toggles); - %choices = - &Apache::lonlocal::texthash ( - canuse_pdfforms => 'Course/Community users can create/upload PDF forms', - ); - %defaultchecked = ('canuse_pdfforms' => 'off'); - @toggles = ('canuse_pdfforms',); - ($datatable,$itemcount) = &radiobutton_prefs($settings,\@toggles,\%defaultchecked, - \%choices,$itemcount); - $$rowtotal += $itemcount; - return $datatable; -} - sub contact_titles { my %titles = &Apache::lonlocal::texthash ( 'supportemail' => 'Support E-mail address', @@ -2511,11 +2439,6 @@ sub print_coursecategories { my $toggle_cats_dom = ' checked="checked" '; my $can_cat_crs = ' '; my $can_cat_dom = ' checked="checked" '; - my $toggle_catscomm_comm = ' '; - my $toggle_catscomm_dom = ' checked="checked" '; - my $can_catcomm_comm = ' '; - my $can_catcomm_dom = ' checked="checked" '; - if (ref($settings) eq 'HASH') { if ($settings->{'togglecats'} eq 'crs') { $toggle_cats_crs = $toggle_cats_dom; @@ -2525,25 +2448,14 @@ sub print_coursecategories { $can_cat_crs = $can_cat_dom; $can_cat_dom = ' '; } - if ($settings->{'togglecatscomm'} eq 'comm') { - $toggle_catscomm_comm = $toggle_catscomm_dom; - $toggle_catscomm_dom = ' '; - } - if ($settings->{'categorizecomm'} eq 'comm') { - $can_catcomm_comm = $can_catcomm_dom; - $can_catcomm_dom = ' '; - } } my %title = &Apache::lonlocal::texthash ( - togglecats => 'Show/Hide a course in catalog', - togglecatscomm => 'Show/Hide a community in catalog', - categorize => 'Assign a category to a course', - categorizecomm => 'Assign a category to a community', + togglecats => 'Show/Hide a course in the catalog', + categorize => 'Assign a category to a course', ); my %level = &Apache::lonlocal::texthash ( - dom => 'Set in Domain', - crs => 'Set in Course', - comm => 'Set in Community', + dom => 'Set in "Modify Course" (Domain)', + crs => 'Set in "Modify Parameters" (Course)', ); $datatable = ''. ''.$title{'togglecats'}.''. @@ -2559,22 +2471,8 @@ sub print_coursecategories { $can_cat_dom.' value="dom" />'.$level{'dom'}.' '. ''. - ''. - ''.$title{'togglecatscomm'}.''. - ' '. - ''. - ''. - ''.$title{'categorizecomm'}.''. - ''. - ' '. - ''. ''; - $$rowtotal += 4; + $$rowtotal += 2; } else { my $css_class; my $itemcount = 1; @@ -2596,15 +2494,7 @@ sub print_coursecategories { if (ref($cats[0]) eq 'ARRAY') { my $numtop = @{$cats[0]}; my $maxnum = $numtop; - my %default_names = ( - instcode => &mt('Official courses'), - communities => &mt('Communities'), - ); - - if ((!grep(/^instcode$/,@{$cats[0]})) || - ($cathash->{'instcode::0'} eq '') || - (!grep(/^communities$/,@{$cats[0]})) || - ($cathash->{'communities::0'} eq '')) { + if ((!grep(/^instcode$/,@{$cats[0]})) || ($cathash->{'instcode::0'} eq '')) { $maxnum ++; } my $lastidx; @@ -2625,33 +2515,14 @@ sub print_coursecategories { $datatable .= ''; } $datatable .= ''; - if ($parent eq 'instcode' || $parent eq 'communities') { - $datatable .= '' - .$default_names{$parent}.''; - if ($parent eq 'instcode') { - $datatable .= '
(' - .&mt('with institutional codes') - .')'; - } else { - $datatable .= '
'; - } - $datatable .= '' - .''; - if ($parent eq 'instcode') { - $datatable .= ' '; - } else { - $datatable .= '
' - .''; - } - $datatable .= ''; - if ($parent eq 'communities') { - $datatable .= '
'; - } - $datatable .= ''; + if ($parent eq 'instcode') { + $datatable .= ''.&mt('Official courses') + .'
(' + .&mt('with institutional codes').')' + .' ' + .''; } else { $datatable .= $parent .'