--- loncom/interface/domainprefs.pm 2010/03/11 02:51:44 1.102.2.11 +++ loncom/interface/domainprefs.pm 2009/10/20 14:29:44 1.114 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to set domain-wide configuration settings # -# $Id: domainprefs.pm,v 1.102.2.11 2010/03/11 02:51:44 raeburn Exp $ +# $Id: domainprefs.pm,v 1.114 2009/10/20 14:29:44 jms Exp $ # # Copyright Michigan State University Board of Trustees # @@ -199,15 +199,14 @@ sub handler { } my %domconfig = &Apache::lonnet::get_dom('configuration',['login','rolecolors', - 'quotas','autoenroll','autoupdate','autocreate', - 'directorysrch','usercreation','usermodification', - 'contacts','defaults','scantron','coursecategories', - 'serverstatuses','requestcourses','coursedefaults'],$dom); + 'quotas','autoenroll','autoupdate','directorysrch', + 'usercreation','usermodification','contacts','defaults', + 'scantron','coursecategories','serverstatuses', + 'requestcourses'],$dom); my @prefs_order = ('rolecolors','login','defaults','quotas','autoenroll', - 'autoupdate','autocreate','directorysrch','contacts', + 'autoupdate','directorysrch','contacts', 'usercreation','usermodification','scantron', - 'requestcourses','coursecategories','serverstatuses', - 'coursedefaults'); + 'requestcourses','coursecategories','serverstatuses'); my %prefs = ( 'rolecolors' => { text => 'Default color schemes', @@ -221,12 +220,13 @@ sub handler { {col1 => 'Administrator Settings', col2 => '',}], }, - 'login' => + 'login' => { text => 'Log-in page options', help => 'Domain_Configuration_Login_Page', header => [{col1 => 'Item', col2 => '',}], }, + 'defaults' => { text => 'Default authentication/language/timezone', help => 'Domain_Configuration_LangTZAuth', @@ -254,12 +254,6 @@ sub handler { {col1 => 'User population', col2 => 'Updataeable user data'}], }, - 'autocreate' => - { text => 'Auto-course creation settings', - help => 'Domain_Configuration_Auto_Creation', - header => [{col1 => 'Configuration Setting', - col2 => 'Value',}], - }, 'directorysrch' => { text => 'Institutional directory searches', help => 'Domain_Configuration_InstDirectory_Search', @@ -309,7 +303,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 => '',}, @@ -325,14 +319,8 @@ sub handler { col3 => 'Specific IPs', }], }, - 'coursedefaults' => - {text => 'Course/Community defaults', - help => 'Domain_Configuration_Course_Defaults', - header => [{col1 => 'Setting', - col2 => 'Value',}], - }, ); - my %servers = &dom_servers($dom); + my %servers = &Apache::lonnet::get_servers($dom); if (keys(%servers) > 1) { $prefs{'login'} = { text => 'Log-in page options', help => 'Domain_Configuration_Login_Page', @@ -409,8 +397,6 @@ sub process_changes { $output = &modify_autoenroll($dom,%domconfig); } elsif ($action eq 'autoupdate') { $output = &modify_autoupdate($dom,%domconfig); - } elsif ($action eq 'autocreate') { - $output = &modify_autocreate($dom,%domconfig); } elsif ($action eq 'directorysrch') { $output = &modify_directorysrch($dom,%domconfig); } elsif ($action eq 'usercreation') { @@ -429,8 +415,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; } @@ -606,8 +590,6 @@ sub print_config_box { $output .= &print_quotas($dom,$settings,\$rowtotal,$action); } elsif ($action eq 'autoenroll') { $output .= &print_autoenroll($dom,$settings,\$rowtotal); - } elsif ($action eq 'autocreate') { - $output .= &print_autocreate($dom,$settings,\$rowtotal); } elsif ($action eq 'directorysrch') { $output .= &print_directorysrch($dom,$settings,\$rowtotal); } elsif ($action eq 'contacts') { @@ -618,8 +600,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 .= ' @@ -634,17 +614,15 @@ sub print_login { my ($position,$dom,$confname,$phase,$settings,$rowtotal) = @_; my ($css_class,$datatable); my %choices = &login_choices(); + my $itemcount = 1; if ($position eq 'top') { - my %servers = &dom_servers($dom); + my %servers = &Apache::lonnet::get_servers($dom); my $choice = $choices{'disallowlogin'}; $css_class = ' class="LC_odd_row"'; - $datatable .= ''.$choice.''. + $datatable .= ''.$choices{'disallowlogin'}.''. ''. - ''. - ''. - ''. - ''."\n"; + ''."\n"; my %disallowed; if (ref($settings) eq 'HASH') { if (ref($settings->{'loginvia'}) eq 'HASH') { @@ -653,52 +631,23 @@ sub print_login { } foreach my $lonhost (sort(keys(%servers))) { my $direct = 'selected="selected"'; - if (ref($disallowed{$lonhost}) eq 'HASH') { - if ($disallowed{$lonhost}{'server'} ne '') { - $direct = ''; - } + if ($disallowed{$lonhost} eq '') { + $direct = ''; } - $datatable .= ''. - ''. + ''. - ''; - my ($custom,$exempt); - if (ref($disallowed{$lonhost}) eq 'HASH') { - $custom = $disallowed{$lonhost}{'custompath'}; - $exempt = $disallowed{$lonhost}{'exempt'}; - } - $datatable .= ''. - ''. - ''; + $datatable .= ''; } $datatable .= '
'.$choices{'hostid'}.''.$choices{'server'}.''.$choices{'serverpath'}.''.$choices{'custompath'}.''.$choices{'exempt'}.'
'.$choices{'serverurl'}.'
'.$servers{$lonhost}.'
'.$lonhost.'
'; return $datatable; @@ -708,8 +657,9 @@ sub print_login { 'coursecatalog' => 'on', 'adminmail' => 'off', 'newuser' => 'off', + 'submitbugs' => 'on', ); - my @toggles = ('coursecatalog','adminmail','newuser'); + my @toggles = ('coursecatalog','adminmail','newuser','submitbugs'); my (%checkedon,%checkedoff); foreach my $item (@toggles) { if ($defaultchecked{$item} eq 'on') { @@ -838,31 +788,29 @@ sub print_login { sub login_choices { my %choices = &Apache::lonlocal::texthash ( - coursecatalog => 'Display Course/Community Catalog link?', - adminmail => "Display Administrator's E-mail Address?", + coursecatalog => 'Display Course Catalog link?', + adminmail => "Display Administrator's E-mail Address?", disallowlogin => "Login page requests redirected", + submitbugs => "Display "Submit Bug" link?", hostid => "Server", - server => "Redirect to:", - serverpath => "Path", - custompath => "Custom", - exempt => "Exempt IP(s)", + serverurl => "Redirect to log-in via:", directlogin => "No redirect", - newuser => "Link to create a user account", - img => "Header", - logo => "Main Logo", - domlogo => "Domain Logo", - login => "Log-in Header", - textcol => "Text color", - bgcol => "Box color", - bgs => "Background colors", - links => "Link colors", - font => "Font color", - pgbg => "Header", - mainbg => "Page", - sidebg => "Login box", - link => "Link", - alink => "Active link", - vlink => "Visited link", + newuser => "Link to create a user account", + img => "Header", + logo => "Main Logo", + domlogo => "Domain Logo", + login => "Log-in Header", + textcol => "Text color", + bgcol => "Box color", + bgs => "Background colors", + links => "Link colors", + font => "Font color", + pgbg => "Header", + mainbg => "Page", + sidebg => "Login box", + link => "Link", + alink => "Active link", + vlink => "Visited link", ); return %choices; } @@ -880,6 +828,7 @@ sub print_rolecolors { my %defaults = ( img => $defaultdesign{$role.'.img'}, font => $defaultdesign{$role.'.font'}, + fontmenu => $defaultdesign{$role.'.fontmenu'}, ); foreach my $item (@bgs) { $defaults{'bgs'}{$item} = $defaultdesign{$role.'.'.$item}; @@ -897,6 +846,10 @@ sub print_rolecolors { $designs{'font'} = $settings->{$role}->{'font'}; $is_custom{'font'} = 1; } + if ($settings->{$role}->{'fontmenu'} ne '') { + $designs{'fontmenu'} = $settings->{$role}->{'fontmenu'}; + $is_custom{'fontmenu'} = 1; + } foreach my $item (@bgs) { if ($settings->{$role}->{$item} ne '') { $designs{'bgs'}{$item} = $settings->{$role}->{$item}; @@ -915,6 +868,10 @@ sub print_rolecolors { $designs{img} = $designhash{$dom.'.'.$role.'.img'}; $is_custom{'img'} = 1; } + if ($designhash{$dom.'.'.$role.'.fontmenu'} ne '') { + $designs{fontmenu} = $designhash{$dom.'.'.$role.'.fontmenu'}; + $is_custom{'fontmenu'} = 1; + } if ($designhash{$dom.'.'.$role.'.font'} ne '') { $designs{font} = $designhash{$dom.'.'.$role.'.font'}; $is_custom{'font'} = 1; @@ -943,7 +900,7 @@ sub display_color_options { my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs, $images,$bgs,$links,$alt_text,$rowtotal,$logintext,$loginheader) = @_; my $css_class = $itemcount%2?' class="LC_odd_row"':''; - my $datatable = ''. + my $datatable = ''. ''.$choices->{'font'}.''; if (!$is_custom->{'font'}) { $datatable .= ''.&mt('Default in use:').' '.$defaults->{'font'}.''; @@ -957,6 +914,22 @@ sub display_color_options { '    '. ''; + unless ($role eq 'login') { + $datatable .= ''. + ''.$choices->{'fontmenu'}.''; + if (!$is_custom->{'fontmenu'}) { + $datatable .= ''.&mt('Default in use:').' '.$defaults->{'fontmenu'}.''; + } else { + $datatable .= ' '; + } + $fontlink = &color_pick($phase,$role,'fontmenu',$choices->{'fontmenu'},$designs->{'fontmenu'}); + $datatable .= ''. + ' '.$fontlink. + '    '. + ''; + } my $switchserver = &check_switchserver($dom,$confname); foreach my $img (@{$images}) { $itemcount ++; @@ -1312,15 +1285,15 @@ sub print_quotas { $cell{$item} .= ''; + $titles{$option}.' '; if ($option eq 'autolimit') { - $cell{$item} .= ' '; } - $cell{$item} .= ' '; + $cell{$item} .= '  '; if ($option eq 'autolimit') { - $cell{$item} .= $titles{'unlimited'}; + $cell{$item} .= $titles{'unlimited'} } } } else { @@ -1343,7 +1316,7 @@ sub print_quotas { if ($context eq 'requestcourses') { $datatable .= ''; foreach my $item (@usertools) { - $datatable .= ''.$cell{$item}.''; + $datatable .= ''.$cell{$item}.''; } $datatable .= ''; } @@ -1420,13 +1393,13 @@ sub print_quotas { '_default" value="'.$val.'"'.$checked.' />'. $titles{$option}.''; if ($option eq 'autolimit') { - $defcell{$item} .= ' '; } - $defcell{$item} .= ' '; + $defcell{$item} .= '  '; if ($option eq 'autolimit') { - $defcell{$item} .= $titles{'unlimited'}; + $defcell{$item} .= $titles{'unlimited'} } } } else { @@ -1449,7 +1422,7 @@ sub print_quotas { if ($context eq 'requestcourses') { $datatable .= ''; foreach my $item (@usertools) { - $datatable .= ''.$defcell{$item}.''; + $datatable .= ''.$defcell{$item}.''; } $datatable .= ''; } @@ -1523,13 +1496,13 @@ sub print_quotas { '__LC_adv" value="'.$val.'"'.$checked.' />'. $titles{$option}.''; if ($option eq 'autolimit') { - $advcell{$item} .= ' '; } - $advcell{$item} .= ' '; + $advcell{$item} .= '  '; if ($option eq 'autolimit') { - $advcell{$item} .= $titles{'unlimited'}; + $advcell{$item} .= $titles{'unlimited'} } } } else { @@ -1552,7 +1525,7 @@ sub print_quotas { if ($context eq 'requestcourses') { $datatable .= ''; foreach my $item (@usertools) { - $datatable .= ''.$advcell{$item}.''; + $datatable .= ''.$advcell{$item}.''; } $datatable .= ''; } @@ -1642,7 +1615,7 @@ sub print_courserequestmail { sub print_autoenroll { my ($dom,$settings,$rowtotal) = @_; my $autorun = &Apache::lonnet::auto_run(undef,$dom), - my ($defdom,$runon,$runoff,$coownerson,$coownersoff); + my ($defdom,$runon,$runoff); if (ref($settings) eq 'HASH') { if (exists($settings->{'run'})) { if ($settings->{'run'} eq '0') { @@ -1661,18 +1634,6 @@ sub print_autoenroll { $runon = ' '; } } - if (exists($settings->{'co-owners'})) { - if ($settings->{'co-owners'} eq '0') { - $coownersoff = ' checked="checked" '; - $coownerson = ' '; - } else { - $coownerson = ' checked="checked" '; - $coownersoff = ' '; - } - } else { - $coownersoff = ' checked="checked" '; - $coownerson = ' '; - } if (exists($settings->{'sender_domain'})) { $defdom = $settings->{'sender_domain'}; } @@ -1703,16 +1664,8 @@ sub print_autoenroll { &mt('username').': '. '  '.&mt('domain'). - ': '.$domform.''. - ''. - ''.&mt('Automatically assign co-ownership').''. - ' '. - ''. - ''; - $$rowtotal += 3; + ': '.$domform.''; + $$rowtotal += 2; return $datatable; } @@ -1777,57 +1730,6 @@ sub print_autoupdate { return $datatable; } -sub print_autocreate { - my ($dom,$settings,$rowtotal) = @_; - my (%createon,%createoff); - my $curr_dc; - my @types = ('xml','req'); - if (ref($settings) eq 'HASH') { - foreach my $item (@types) { - $createoff{$item} = ' checked="checked" '; - $createon{$item} = ' '; - if (exists($settings->{$item})) { - if ($settings->{$item}) { - $createon{$item} = ' checked="checked" '; - $createoff{$item} = ' '; - } - } - } - $curr_dc = $settings->{'xmldc'}; - } else { - foreach my $item (@types) { - $createoff{$item} = ' checked="checked" '; - $createon{$item} = ' '; - } - } - $$rowtotal += 2; - my $datatable=''. - ''.&mt('Create pending official courses from XML files').''. - ' '. - ''; - my ($numdc,$dctable) = &active_dc_picker($dom,$curr_dc); - if ($numdc > 1) { - $datatable .= ''. - &mt('XML files processed as: (choose Dom. Coord.)'). - ''.$dctable.''. - ''; - $$rowtotal ++ ; - } else { - $datatable .= ''; - } - $datatable .= ''.&mt('Create pending requests for official courses (if validated)').''. - ' '. - ''. - ''; - return $datatable; -} - sub print_directorysrch { my ($dom,$settings,$rowtotal) = @_; my $srchon = ' '; @@ -2016,67 +1918,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', @@ -2122,7 +1963,7 @@ sub courserequest_titles { sub courserequest_conditions { my %conditions = &Apache::lonlocal::texthash ( - approval => '(Processing of request subject to approval by Domain Coordinator).', + approval => '(Processing of request subject to approval by Domain Coordinator).', validate => '(Processing of request subject to instittutional validation).', ); return %conditions; @@ -2688,11 +2529,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; @@ -2702,25 +2538,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'}.''. @@ -2736,22 +2561,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; @@ -2773,15 +2584,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; @@ -2802,33 +2605,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 .'