--- loncom/interface/domainprefs.pm	2009/03/08 20:26:32	1.90
+++ loncom/interface/domainprefs.pm	2009/08/06 15:14:08	1.100
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.90 2009/03/08 20:26:32 weissno Exp $
+# $Id: domainprefs.pm,v 1.100 2009/08/06 15:14:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,6 +37,7 @@ use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
 use Apache::lonmsg();
+use Apache::lonconfigsettings;
 use LONCAPA qw(:DEFAULT :match);
 use LONCAPA::Enrollment;
 use LONCAPA::lonauthcgi();
@@ -53,6 +54,7 @@ sub handler {
         return OK;
     }
 
+    my $context = 'domain';
     my $dom = $env{'request.role.domain'};
     my $domdesc = &Apache::lonnet::domain($dom,'description');
     if (&Apache::lonnet::allowed('mau',$dom)) {
@@ -160,7 +162,7 @@ sub handler {
                                 col2 => 'Information settable when self-creating account (if directory data blank)'}],
                   },
         'scantron' =>
-                  { text => 'Scantron format file',
+                  { text => 'Bubblesheet format file',
                     help => 'Domain_Configuration_Scantron_Format',
                     header => [ {col1 => 'Item',
                                  col2 => '',
@@ -197,98 +199,10 @@ sub handler {
       text=>"Pick functionality"});
     my $confname = $dom.'-domainconfig';
     if ($phase eq 'process') {
-        &Apache::lonhtmlcommon::add_breadcrumb
-          ({href=>"javascript:changePage(document.$phase,'display')",
-            text=>"Domain Configuration"},
-           {href=>"javascript:changePage(document.$phase,'$phase')",
-            text=>"Updated"});
-        &print_header($r,$phase);
-        foreach my $item (@prefs_order) {
-            if (grep(/^\Q$item\E$/,@actions)) {
-                $r->print('<h3>'.&mt($prefs{$item}{'text'}).'</h3>'.
-                          &process_changes($r,$dom,$confname,$item,
-                          \@roles,%domconfig));
-            }
-        }
-        $r->print('<p>');
-        &print_footer($r,$phase,'display','Back to configuration display',
-                      \@actions);
-        $r->print('</p>');
+        &Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles);
     } elsif ($phase eq 'display') {
-        &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>"javascript:changePage(document.$phase,'display')",
-              text=>"Domain Configuration"});
-        &print_header($r,$phase);
-        if (@actions > 0) {
-            my $rowsum = 0;
-            my (%output,%rowtotal,@items);
-            my $halfway = @actions/2;
-            foreach my $item (@prefs_order) {
-                if (grep(/^\Q$item\E$/,@actions)) {
-                    push(@items,$item);
-                    ($output{$item},$rowtotal{$item}) = 
-                        &print_config_box($r,$dom,$confname,$phase,
-                                          $item,$prefs{$item},
-                                          $domconfig{$item});
-                    $rowsum += $rowtotal{$item};
-                }
-            }
-            my $colend;
-            my $halfway = $rowsum/2;
-            my $aggregate = 0;
-            my $sumleft = 0;
-            my $sumright = 0;
-            my $crossover;
-            for (my $i=0; $i<@items; $i++) {
-                $aggregate += $rowtotal{$items[$i]};
-                if ($aggregate > $halfway) {
-                    $crossover = $i;
-                    last;
-                }
-            }
-            for (my $i=0; $i<$crossover; $i++) {
-                $sumleft += $rowtotal{$items[$i]}; 
-            }
-            for (my $i=$crossover+1; $i<@items; $i++) {
-                $sumright += $rowtotal{$items[$i]};
-            }
-            if ((@items > 1) && ($env{'form.numcols'} == 2)) {
-                my $sumdiff = $sumright - $sumleft;
-                if ($sumdiff > 0) {
-                    $colend = $crossover + 1;
-                } else {
-                    $colend = $crossover;
-                }
-            } else {
-                $colend = @items;
-            }
-            $r->print('<p><table class="LC_double_column"><tr><td class="LC_left_col">');
-            for (my $i=0; $i<$colend; $i++) {
-                $r->print($output{$items[$i]});
-            }
-            $r->print('</td><td></td><td class="LC_right_col">');
-            if ($colend < @items) {
-                for (my $i=$colend; $i<@items; $i++) { 
-                    $r->print($output{$items[$i]});
-                }
-            }
-            $r->print('</td></tr></table></p>');
-            $r->print(&print_footer($r,$phase,'process','Save',\@actions));
-        } else {
-            $r->print('<input type="hidden" name="phase" value="" />'.
-                      '<input type="hidden" name="numcols" value="'.
-                      $env{'form.numcols'}.'" />'."\n".
-                      '<span class="LC_error">'.&mt('No settings chosen').
-                      '</span>');
-        }
-        $r->print('</form>');
-        $r->print(&Apache::loncommon::end_page());
+        &Apache::lonconfigsettings::display_settings($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname);
     } else {
-        if ($phase eq '') {
-            $phase = 'pickactions';
-        }
-        my %helphash;
-        &print_header($r,$phase);
         if (keys(%domconfig) == 0) {
             my $primarylibserv = &Apache::lonnet::domain($dom,'primary');
             my @ids=&Apache::lonnet::current_machine_ids();
@@ -307,6 +221,7 @@ sub handler {
                     }
                 }
                 if ($custom_img_count > 0) {
+                    &Apache::lonconfigsettings::print_header($r,$phase,$context);
                     my $switch_server = &check_switchserver($dom,$confname);
                     $r->print(
     &mt('Domain configuration settings have yet to be saved for this domain via the web-based domain preferences interface.').'<br />'.
@@ -316,53 +231,22 @@ sub handler {
                     if ($switch_server) {
                         $r->print($switch_server.' '.&mt('to primary library server for domain: [_1]',$dom));
                     }
+                    $r->print(&Apache::loncommon::end_page());
                     return OK;
                 }
             }
         }
-        $r->print('<h3>'.&mt('Functionality to display/modify').'</h3>');
-        $r->print('<script type="text/javascript">'."\n".
-              &Apache::loncommon::check_uncheck_jscript()."\n".
-              '</script>'."\n".'<p><input type="button" value="'.&mt('check all').'" '.
-              'onclick="javascript:checkAll(document.pickactions.actions)"'.
-              ' />&nbsp;&nbsp;'.
-              '<input type="button" value="'.&mt('uncheck all').'" '.
-              'onclick="javascript:uncheckAll(document.pickactions.actions)"'.
-              ' /></p><div class="LC_left_float">');
-        my ($numitems,$midpoint,$seconddiv,$count); 
-        $numitems = @prefs_order;
-        $midpoint = int($numitems/2);
-        if ($numitems%2) {
-            $midpoint ++;
-        }
-        $count = 0;
-        foreach my $item (@prefs_order) {
-            $r->print('<h4>'.
-                      &Apache::loncommon::help_open_topic($prefs{$item}->{'help'}).
-                      '<label><input type="checkbox" name="actions" value="'.$item.
-                      '" />&nbsp;'.&mt($prefs{$item}->{'text'}).'</label></h4>');
-            $count ++;
-            if ((!$seconddiv) && ($count >= $midpoint)) {
-                $r->print('</div>'."\n".'<div class="LC_left_float">'."\n");
-                $seconddiv = 1;
-            }
-        }
-        $r->print('</div><div class="LC_clear_float_footer"></div><h3>'.
-                  &mt('Display options').'</h3>'."\n".
-                  '<p><span class="LC_nobreak">'.&mt('Display using: ')."\n".
-                  '<label><input type="radio" name="numcols" value="1" />'.
-                  &mt('one column').'</label>&nbsp;&nbsp;<label>'.
-                  '<input type="radio" name="numcols" value="2" />'.
-                  &mt('two columns').'</label></span></p>');
-        $r->print(&print_footer($r,$phase,'display','Go'));
-        $r->print('</form>');
-        $r->print(&Apache::loncommon::end_page());
+        &Apache::lonconfigsettings::display_choices($r,$phase,$context,\@prefs_order,\%prefs);
     }
     return OK;
 }
 
 sub process_changes {
-    my ($r,$dom,$confname,$action,$roles,%domconfig) = @_;
+    my ($r,$dom,$confname,$action,$roles,$values) = @_;
+    my %domconfig;
+    if (ref($values) eq 'HASH') {
+        %domconfig = %{$values};
+    }
     my $output;
     if ($action eq 'login') {
         $output = &modify_login($r,$dom,$confname,%domconfig);
@@ -403,7 +287,7 @@ sub print_config_box {
     my $output;
     if ($action eq 'coursecategories') {
         $output = &coursecategories_javascript($settings);
-    }  
+    }
     $output .= 
          '<table class="LC_nested_outer">
           <tr>
@@ -578,107 +462,6 @@ sub print_config_box {
     return ($output,$rowtotal);
 }
 
-sub print_header {
-    my ($r,$phase) = @_;
-    my $alert = &mt('You must select at least one functionality type to display.'); 
-    my $js = '
-<script type="text/javascript">
-function changePage(formname,newphase) {
-    formname.phase.value = newphase;
-    numchecked = 0;
-    if (formname == document.pickactions) {
-        if (formname.actions.length > 0) {
-            for (var i = 0; i<formname.actions.length; i++) {
-                if (formname.actions[i].checked) {
-                    numchecked ++;
-                }
-            }
-        } else {
-            if (formname.actions.checked) {
-                numchecked ++;
-            }
-        }
-        if (numchecked > 0) {
-            formname.submit();
-        } else {
-            alert("'.$alert.'");
-            return;
-        }
-    }
-    formname.submit();
-}'."\n";
-    if ($phase eq 'pickactions') {
-        $js .= 
-            &Apache::lonhtmlcommon::set_form_elements({actions => 'checkbox',numcols => 'radio',})."\n".
-            &javascript_set_colnums();
-    } elsif ($phase eq 'display') {
-        $js .= &color_pick_js()."\n";
-    }
-    $js .= &Apache::loncommon::viewport_size_js().'
-</script>
-';
-    my $additem;
-    if ($phase eq 'pickactions') {
-        my %loaditems = (
-                    'onload' => "javascript:getViewportDims(document.$phase.width,document.$phase.height);setDisplayColumns();setFormElements(document.pickactions);",
-                        );
-        $additem = {'add_entries' => \%loaditems,};
-    } else {
-        my %loaditems = (
-                    'onload' => "javascript:getViewportDims(document.$phase.width,document.$phase.height);",
-                        );
-        $additem = {'add_entries' => \%loaditems,};
-    }
-    $r->print(&Apache::loncommon::start_page('View/Modify Domain Settings',
-                                           $js,$additem));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Domain Settings'));
-    $r->print('
-<form name="parmform" action="">
-<input type="hidden" name="pres_marker" />
-<input type="hidden" name="pres_type" />
-<input type="hidden" name="pres_value" />
-</form>
-');
-    $r->print('<form method="post" name="'.$phase.'" action="/adm/domainprefs"'.
-              ' enctype="multipart/form-data">');
-    return;
-}
-
-sub print_footer {
-    my ($r,$phase,$newphase,$button_text,$actions) = @_;
-    $button_text = &mt($button_text);
-    $r->print('<input type="hidden" name="phase" value="" />'.
-              '<input type="hidden" name="width" value="'.
-              $env{'form.width'}.'" />'.
-              '<input type="hidden" name="height" value="'.
-              $env{'form.height'}.'" />');
-    if (($phase eq 'display') || ($phase eq 'process')) {
-        if (ref($actions) eq 'ARRAY') {
-            foreach my $item (@{$actions}) {
-                $r->print('<input type="hidden" name="actions" value="'.$item.'" />')."\n";
-            }
-        }
-        $r->print('<input type="hidden" name="numcols" value="'.$env{'form.numcols'}.'" />');
-    }
-    my $dest='"javascript:changePage(document.'.$phase.','."'$newphase'".')"';
-    if ($phase eq 'process') {
-        $r->print('<p><a href='.$dest.'>'.$button_text.'</a></p>');
-    } else {
-        my $onclick;
-        if ($phase eq 'display') {
-            $onclick = '"javascript:changePage(document.'.$phase.','."'$newphase'".')"';
-        } else {
-            $onclick = '"javascript:changePage(document.'.$phase.','."'$newphase'".')"';
-        } 
-        $r->print('<p><input type="button" name="store" value="'.
-                  $button_text.'" onclick='.$onclick.' /></p>');
-    }
-    if ($phase eq 'process') {
-        $r->print('</form>'.&Apache::loncommon::end_page());
-    }
-    return;
-}
-
 sub print_login {
     my ($dom,$confname,$phase,$settings,$rowtotal) = @_;
     my %choices = &login_choices();
@@ -851,6 +634,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};
@@ -868,6 +652,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};
@@ -886,6 +674,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;
@@ -914,7 +706,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 = '<tr'.$css_class.'>'.
+    my $datatable = '<tr>'.
         '<td>'.$choices->{'font'}.'</td>';
     if (!$is_custom->{'font'}) {
         $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>';
@@ -928,6 +720,20 @@ sub display_color_options {
                   '&nbsp;<span id="css_'.$role.'_font" style="background-color: '.
                   $designs->{'font'}.';">&nbsp;&nbsp;&nbsp;</span>'.
                   '</span></td></tr>';
+    $datatable .= '<tr'.$css_class.'>'.
+        '<td>'.$choices->{'fontmenu'}.'</td>';
+    if (!$is_custom->{'fontmenu'}) {
+        $datatable .=  '<td>'.&mt('Default in use:').'&nbsp;<span id="css_default_'.$role.'_font" style="color: '.$defaults->{'fontmenu'}.';">'.$defaults->{'fontmenu'}.'</span></td>';
+    } else {
+        $datatable .= '<td>&nbsp;</td>';
+    }
+    $fontlink = &color_pick($phase,$role,'fontmenu',$choices->{'fontmenu'},$designs->{'fontmenu'});
+    $datatable .= '<td><span class="LC_nobreak">'.
+                  '<input type="text" size="10" name="'.$role.'_fontmenu"'.
+                  ' value="'.$designs->{'fontmenu'}.'" />&nbsp;'.$fontlink.
+                  '&nbsp;<span id="css_'.$role.'_fontmenu" style="background-color: '.
+                  $designs->{'fontmenu'}.';">&nbsp;&nbsp;&nbsp;</span>'.
+                  '</span></td></tr>';
     my $switchserver = &check_switchserver($dom,$confname);
     foreach my $img (@{$images}) {
 	$itemcount ++;
@@ -1200,52 +1006,6 @@ sub color_pick {
     return $link;
 }
 
-sub color_pick_js {
-    my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
-    my $output = <<"ENDCOL";
-    function pclose() {
-        parmwin=window.open("/adm/rat/empty.html","LONCAPAparms","height=350,width=350,scrollbars=no,menubar=no");
-        parmwin.close();
-    }
-
-    $pjump_def
-
-    function psub() {
-        pclose();
-        if (document.parmform.pres_marker.value!='') {
-            if (document.parmform.pres_type.value!='') {
-                eval('document.display.'+
-                     document.parmform.pres_marker.value+
-                     '.value=document.parmform.pres_value.value;');
-            }
-        } else {
-            document.parmform.pres_value.value='';
-            document.parmform.pres_marker.value='';
-        }
-    }
-
-    function get_id (span_id) {
-	if (document.getElementById) {
-            return document.getElementById(span_id);
-        }
-	if (document.all) {
-            return document.all[span_id];
-        } 
-	return false;
-    }
-
-    function colchg_span (span_id_str,new_color_item) {
-	var span_ref = get_id(span_id_str);
-	if (span_ref.style) { span_ref = span_ref.style; }
-	span_ref.background = new_color_item.value;
-	span_ref.backgroundColor = new_color_item.value;
-	span_ref.bgColor = new_color_item.value;
-    }
-
-ENDCOL
-    return $output;
-}
-
 sub print_quotas {
     my ($dom,$settings,$rowtotal,$action) = @_;
     my $context;
@@ -1259,7 +1019,7 @@ sub print_quotas {
     my $typecount = 0;
     my $css_class;
     if ($context eq 'requestcourses') {
-        @usertools = ('official','unofficial');
+        @usertools = ('official','unofficial','community');
     } else {
         @usertools = ('aboutme','blog','portfolio');
     }
@@ -1357,7 +1117,9 @@ sub print_quotas {
     $typecount ++;
     $css_class = $typecount%2?' class="LC_odd_row"':'';
     $datatable .= '<tr'.$css_class.'>'.
-                  '<td><br/>'.&mt('LON-CAPA Advanced Users').'</td>'.
+                  '<td>'.&mt('LON-CAPA Advanced Users').
+                  ' <span class="LC_nobreak">('.
+                  &mt('overrides affiliation').')</span></td>'.
                   '<td class="LC_left_item" colspan="2"><br />';
     foreach my $item (@usertools) {
         my $checked;
@@ -1378,8 +1140,7 @@ sub print_quotas {
                       '" value="_LC_adv" '.$checked.'/>'.$titles{$item}.
                       '</label></span>&nbsp; ';
     }
-    $datatable .= '<span class="LC_nobreak">('.&mt('overrides affiliation').
-                  ')</span></td></tr>';
+    $datatable .= '</td></tr>';
     $$rowtotal += $typecount;
     return $datatable;
 }
@@ -1562,8 +1323,8 @@ sub print_directorysrch {
     $$rowtotal += 2;
     if (ref($usertypes) eq 'HASH') {
         if (keys(%{$usertypes}) > 0) {
-            $datatable .= &users_cansearch_row($settings,$types,$usertypes,$dom,
-                                               $numinrow,$othertitle);
+            $datatable .= &insttypes_row($settings,$types,$usertypes,$dom,
+                                         $numinrow,$othertitle,'cansearch');
             $cansrchrow = 1;
         }
     }
@@ -1578,7 +1339,7 @@ sub print_directorysrch {
     foreach my $title (@{$titleorder}) {
         if (defined($searchtitles->{$title})) {
             my $check = ' ';
-            if (ref($settings) eq 'HASH') { 
+            if (ref($settings) eq 'HASH') {
                 if (ref($settings->{'searchby'}) eq 'ARRAY') {
                     if (grep(/^\Q$title\E$/,@{$settings->{'searchby'}})) {
                         $check = ' checked="checked" ';
@@ -1711,6 +1472,7 @@ sub tool_titles {
                      portfolio  => 'Portfolio',
                      official   => 'Official courses (with institutional codes)',
                      unofficial => 'Unofficial courses',
+                     community  => 'Communities',
                  );
     return %titles;
 }
@@ -1756,7 +1518,7 @@ sub print_usercreation {
             $rowcount ++;
         }
     } elsif ($position eq 'middle') {
-        my @creators = ('author','course','selfcreate');
+        my @creators = ('author','course','requestcrs','selfcreate');
         my ($rules,$ruleorder) =
             &Apache::lonnet::inst_userrules($dom,'username');
         my %lt = &usercreation_types();
@@ -1833,6 +1595,20 @@ sub print_usercreation {
             }
             $datatable .= '</td></tr>';
         }
+        my ($othertitle,$usertypes,$types) =
+            &Apache::loncommon::sorted_inst_types($dom);
+        if (ref($usertypes) eq 'HASH') {
+            if (keys(%{$usertypes}) > 0) {
+                my $createsettings;
+                if (ref($settings) eq 'HASH') {
+                    $createsettings = $settings->{cancreate};
+                }
+                $datatable .= &insttypes_row($createsettings,$types,$usertypes,
+                                             $dom,$numinrow,$othertitle,
+                                             'statustocreate');
+                $$rowtotal ++;
+            }
+        }
     } else {
         my @contexts = ('author','course','domain');
         my @authtypes = ('int','krb4','krb5','loc');
@@ -1945,6 +1721,7 @@ sub usercreation_types {
     my %lt = &Apache::lonlocal::texthash (
                     author     => 'When adding a co-author',
                     course     => 'When adding a user to a course',
+                    requestcrs => 'When requesting a course',
                     selfcreate => 'User creates own account', 
                     any        => 'Any',
                     official   => 'Institutional only ',
@@ -2086,8 +1863,8 @@ sub print_scantronformat {
         %confhash);
     my $switchserver = &check_switchserver($dom,$confname);
     my %lt = &Apache::lonlocal::texthash (
-                default => 'Default scantron format file error',
-                custom  => 'Custom scantron format file error',
+                default => 'Default bubblesheet format file error',
+                custom  => 'Custom bubblesheet format file error',
              );
     my %scantronfiles = (
         default => 'default.tab',
@@ -2160,7 +1937,7 @@ sub print_scantronformat {
                 }
             }
         } else {
-            $error{'default'} = &mt("Unable to copy default scantron formatfile to domain's RES space: [_1]",$switchserver);
+            $error{'default'} = &mt("Unable to copy default bubblesheet formatfile to domain's RES space: [_1]",$switchserver);
         }
     }
     if (ref($settings) eq 'HASH') {
@@ -2723,10 +2500,18 @@ sub modifiable_userdata_row {
     return $output;
 }
 
-sub users_cansearch_row {
-    my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle) = @_;
+sub insttypes_row {
+    my ($settings,$types,$usertypes,$dom,$numinrow,$othertitle,$context) = @_;
+    my %lt = &Apache::lonlocal::texthash (
+                      cansearch => 'Users allowed to search',
+                      statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)',
+             );
+    my $showdom;
+    if ($context eq 'cansearch') {
+        $showdom = ' ('.$dom.')';
+    }
     my $output =  '<tr class="LC_odd_row">'.
-                  '<td>'.&mt('Users allowed to search').' ('.$dom.')'.
+                  '<td>'.$lt{$context}.$showdom.
                   '</td><td class="LC_left_item" colspan="2"><table>';
     my $rem;
     if (ref($types) eq 'ARRAY') {
@@ -2740,14 +2525,18 @@ sub users_cansearch_row {
                     $output .= '<tr>';
                 }
                 my $check = ' ';
-                if (ref($settings->{'cansearch'}) eq 'ARRAY') {
-                    if (grep(/^\Q$types->[$i]\E$/,@{$settings->{'cansearch'}})) {
+                if (ref($settings) eq 'HASH') {
+                    if (ref($settings->{$context}) eq 'ARRAY') {
+                        if (grep(/^\Q$types->[$i]\E$/,@{$settings->{$context}})) {
+                            $check = ' checked="checked" ';
+                        }
+                    } elsif ($context eq 'statustocreate') {
                         $check = ' checked="checked" ';
                     }
                 }
                 $output .= '<td class="LC_left_item">'.
                            '<span class="LC_nobreak"><label>'.
-                           '<input type="checkbox" name="cansearch" '.
+                           '<input type="checkbox" name="'.$context.'" '.
                            'value="'.$types->[$i].'"'.$check.'/>'.
                            $usertypes->{$types->[$i]}.'</label></span></td>';
             }
@@ -2762,13 +2551,17 @@ sub users_cansearch_row {
         $output .= '<td class="LC_left_item">';
     }
     my $defcheck = ' ';
-    if (ref($settings->{'cansearch'}) eq 'ARRAY') {
-        if (grep(/^default$/,@{$settings->{'cansearch'}})) {
+    if (ref($settings) eq 'HASH') {  
+        if (ref($settings->{$context}) eq 'ARRAY') {
+            if (grep(/^default$/,@{$settings->{$context}})) {
+                $defcheck = ' checked="checked" ';
+            }
+        } elsif ($context eq 'statustocreate') {
             $defcheck = ' checked="checked" ';
         }
     }
     $output .= '<span class="LC_nobreak"><label>'.
-               '<input type="checkbox" name="cansearch" '.
+               '<input type="checkbox" name="'.$context.'" '.
                'value="default"'.$defcheck.'/>'.
                $othertitle.'</label></span></td>'.
                '</tr></table></td></tr>';
@@ -2938,6 +2731,7 @@ sub color_font_choices {
             links => "Link colors",
             images => "Images",
             font => "Font color",
+            fontmenu => "Font Menu",
             pgbg => "Page",
             tabbg => "Header",
             sidebg => "Border",
@@ -3004,6 +2798,7 @@ sub modify_colors {
             @bgs = ('pgbg','tabbg','sidebg'); 
         }
         $confhash->{$role}{'font'} = $env{'form.'.$role.'_font'};
+	$confhash->{$role}{'fontmenu'} = $env{'form.'.$role.'_fontmenu'};
         foreach my $item (@bgs,@links,@logintext) {
             $confhash->{$role}{$item} = $env{'form.'.$role.'_'.$item};
         }
@@ -3117,6 +2912,15 @@ sub modify_colors {
                         $changes{$role}{'font'} = 1;
                     }
                 }
+                if ($domconfig->{$role}{'fontmenu'} ne '') {
+                    if ($confhash->{$role}{'fontmenu'} ne $domconfig->{$role}{'fontmenu'}) {
+                        $changes{$role}{'fontmenu'} = 1;
+                    }
+                } else {
+                    if ($confhash->{$role}{'fontmenu'}) {
+                        $changes{$role}{'fontmenu'} = 1;
+                    }
+                }
                 foreach my $item (@bgs) {
                     if ($domconfig->{$role}{$item} ne '') {
                         if ($confhash->{$role}{$item} ne $domconfig->{$role}{$item}) {
@@ -3546,18 +3350,6 @@ sub check_switchserver {
     return $switchserver;
 }
 
-sub javascript_set_colnums {
-    return <<END;
-function setDisplayColumns() {
-    if (document.pickactions.width.value > 1100) {
-        document.pickactions.numcols[1].checked = true;
-    } else {
-        document.pickactions.numcols[0].checked = true;
-    }
-}
-END
-}
-
 sub modify_quotas {
     my ($dom,$action,%domconfig) = @_;
     my ($context,@usertools);
@@ -3567,7 +3359,7 @@ sub modify_quotas {
         $context = $action;
     }
     if ($context eq 'requestcourses') {
-        @usertools = ('official','unofficial');
+        @usertools = ('official','unofficial','community');
     } else {
         @usertools = ('aboutme','blog','portfolio');
     }
@@ -4237,7 +4029,7 @@ sub modify_usercreation {
     my @username_rule = &Apache::loncommon::get_env_multiple('form.username_rule');
     my @id_rule = &Apache::loncommon::get_env_multiple('form.id_rule');
     my @email_rule = &Apache::loncommon::get_env_multiple('form.email_rule');
-    my @contexts = ('author','course','selfcreate');
+    my @contexts = ('author','course','requestcrs','selfcreate');
     foreach my $item(@contexts) {
         if ($item eq 'selfcreate') {
             @{$cancreate{$item}} = &Apache::loncommon::get_env_multiple('form.can_createuser_'.$item);
@@ -4253,10 +4045,19 @@ sub modify_usercreation {
             $cancreate{$item} = $env{'form.can_createuser_'.$item};
         }
     }
+    my ($othertitle,$usertypes,$types) = 
+        &Apache::loncommon::sorted_inst_types($dom);
+    if (ref($types) eq 'ARRAY') {
+        if (@{$types} > 0) {
+            @{$cancreate{'statustocreate'}} = 
+                &Apache::loncommon::get_env_multiple('form.statustocreate');
+        }
+        push(@contexts,'statustocreate');
+    }
     if (ref($curr_usercreation{'cancreate'}) eq 'HASH') {
         foreach my $item (@contexts) {
-            if ($item eq 'selfcreate') {
-                if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') { 
+            if (($item eq 'selfcreate') || ($item eq 'statustocreate')) {
+                if (ref($curr_usercreation{'cancreate'}{$item}) eq 'ARRAY') {
                     foreach my $curr (@{$curr_usercreation{'cancreate'}{$item}}) {
                         if (!grep(/^$curr$/,@{$cancreate{$item}})) {
                             if (!grep(/^$item$/,@{$changes{'cancreate'}})) {
@@ -4432,16 +4233,65 @@ sub modify_usercreation {
             if (ref($changes{'cancreate'}) eq 'ARRAY') {
                 my %lt = &usercreation_types();
                 foreach my $type (@{$changes{'cancreate'}}) {
-                    my $chgtext =  $lt{$type}.', ';
+                    my $chgtext;
+                    unless ($type eq 'statustocreate') {
+                        $chgtext = $lt{$type}.', ';
+                    }
                     if ($type eq 'selfcreate') {
                         if (@{$cancreate{$type}} == 0) {
                             $chgtext .= &mt('creation of a new user account is not permitted.');
                         } else {
-                            $chgtext .= &mt('creation of a new account is permitted for:<ul>');
+                            $chgtext .= &mt('creation of a new account is permitted for:').'<ul>';
                             foreach my $case (@{$cancreate{$type}}) {
                                 $chgtext .= '<li>'.$selfcreatetypes{$case}.'</li>';
                             }
                             $chgtext .= '</ul>';
+                            if (ref($cancreate{$type}) eq 'ARRAY') {
+                                if (grep(/^(login|sso)$/,@{$cancreate{$type}})) {
+                                    if (ref($cancreate{'statustocreate'}) eq 'ARRAY') {
+                                        if (@{$cancreate{'statustocreate'}} == 0) {
+                                            $chgtext .= '<br /><span class="LC_warning">'.&mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts.").'</span>';
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    } elsif ($type eq 'statustocreate') {
+                        if ((ref($cancreate{'selfcreate'}) eq 'ARRAY') &&
+                            (ref($cancreate{'statustocreate'}) eq 'ARRAY')) {
+                            if (@{$cancreate{'selfcreate'}} > 0) {
+                                if (@{$cancreate{'statustocreate'}} == 0) {
+
+                                    $chgtext .= &mt("Institutional affiliations permitted to create accounts set to 'None'.");
+                                    if (!grep(/^email$/,@{$cancreate{'selfcreate'}})) {
+                                        $chgtext .= '<br /><span class="LC_warning">'.&mt("However, no institutional affiliations (including 'other') are currently permitted to create accounts.").'</span>';
+                                    } 
+                                } elsif (ref($usertypes) eq 'HASH') {
+                                    if (grep(/^(login|sso)$/,@{$cancreate{'selfcreate'}})) {
+                                        $chgtext .= &mt('Creation of a new account for an institutional user is restricted to the following institutional affiliation(s):');
+                                    } else {
+                                        $chgtext .= &mt('Institutional affiliations permitted to create accounts with institutional authentication were set as follows:');
+                                    }
+                                    $chgtext .= '<ul>';
+                                    foreach my $case (@{$cancreate{$type}}) {
+                                        if ($case eq 'default') {
+                                            $chgtext .= '<li>'.$othertitle.'</li>';
+                                        } else {
+                                            $chgtext .= '<li>'.$usertypes->{$case}.'</li>';
+                                        }
+                                    }
+                                    $chgtext .= '</ul>';
+                                    if (!grep(/^(login|sso)$/,@{$cancreate{'selfcreate'}})) {
+                                        $chgtext .= '<br /><span class="LC_warning">'.&mt('However, users authenticated by institutional login/single sign on are not currently permitted to create accounts.').'</span>';
+                                    }
+                                }
+                            } else {
+                                if (@{$cancreate{$type}} == 0) {
+                                    $chgtext .= &mt("Institutional affiliations permitted to create accounts were set to 'none'.");
+                                } else {
+                                    $chgtext .= &mt('Although institutional affiliations permitted to create accounts were changed, self creation of accounts is not currently permitted for any authentication types.');
+                                }
+                            }
                         }
                     } else {
                         if ($cancreate{$type} eq 'none') {