--- loncom/interface/loncreateuser.pm	2009/08/14 14:21:00	1.295.2.4
+++ loncom/interface/loncreateuser.pm	2009/06/30 14:02:33	1.296
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.295.2.4 2009/08/14 14:21:00 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.296 2009/06/30 14:02:33 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -143,7 +143,6 @@ sub portfolio_quota {
     $custom_off = ' checked="checked" ';
     my $quota_javascript = <<"END_SCRIPT";
 <script type="text/javascript">
-// <![CDATA[
 function quota_changes(caller) {
     if (caller == "custom") {
         if (document.cu.customquota[0].checked) {
@@ -154,7 +153,6 @@ function quota_changes(caller) {
         document.cu.customquota[1].checked = true;
     }
 }
-// ]]>
 </script>
 END_SCRIPT
     if ($quotatype eq 'custom') {
@@ -284,94 +282,6 @@ sub build_tools_display {
     return $output;
 }
 
-sub coursereq_externaluser {
-    my ($ccuname,$ccdomain,$cdom) = @_;
-    my (@usertools,@options,%validations,%userenv,$output);
-    my %lt = &Apache::lonlocal::texthash (
-                   'official'   => 'Can request creation of official courses',
-                   'unofficial' => 'Can request creation of unofficial courses',
-                   'community'  => 'Can request creation of communities',
-    );
-
-    %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
-                      'reqcrsotherdom.official','reqcrsotherdom.unofficial',
-                      'reqcrsotherdom.community');
-    @usertools = ('official','unofficial','community');
-    @options = ('approve','validate','autolimit');
-    %validations = &Apache::lonnet::auto_courserequest_checks($cdom);
-    my $optregex = join('|',@options);
-    my %reqtitles = &courserequest_titles();
-    foreach my $item (@usertools) {
-        my ($curroption,$currlimit,$tooloff);
-        if ($userenv{'reqcrsotherdom.'.$item} ne '') {
-            my @curr = split(',',$userenv{'reqcrsotherdom.'.$item});
-            if (grep(/^\Q$cdom\E:($optregex)=?(\d*)$/,@curr)) {
-                $curroption = $1;
-                $currlimit = $2;
-                if (!$curroption) {
-                    $curroption = 'norequest';
-                }
-            }
-        } else {
-            $curroption = 'norequest';
-            $tooloff = ' checked="checked"';
-        }
-        $output.= &Apache::loncommon::start_data_table_row()."\n".
-                  '  <td><span class="LC_nobreak">'.$lt{$item}.': '.
-                  '<label><input type="radio" name="reqcrsotherdom_'.$item.
-                  '" value="0"'.$tooloff.' />'.$reqtitles{'norequest'}.
-                  '</label>&nbsp;';
-        foreach my $option (@options) {
-            if ($option eq 'validate') {
-                my $canvalidate = 0;
-                if (ref($validations{$item}) eq 'HASH') {
-                    if ($validations{$item}{'_external_'}) {
-                        $canvalidate = 1;
-                    }
-                }
-                next if (!$canvalidate);
-            }
-            my $checked = '';
-            if ($option eq $curroption) {
-                $checked = ' checked="checked"';
-            }
-            $output .= '<span class="LC_nobreak"><label>'.
-                       '<input type="radio" name="reqcrsotherdom_'.$item.
-                       '" value="'.$option.'"'.$checked.' />'.
-                       $reqtitles{$option}.'</label>&nbsp;';
-            if ($option eq 'autolimit') {
-                $output .= '<input type="text" name="reqcrsotherdom_'.
-                           $item.'_limit" size="1" '.
-                           'value="'.$currlimit.'" />';
-            }
-            $output .= '&nbsp;'
-        }
-        $output .= '</span></td>'."\n".
-                   &Apache::loncommon::end_data_table_row()."\n";
-    }
-    return $output;
-}
-
-sub courserequest_titles {
-    my %titles = &Apache::lonlocal::texthash (
-                                   official   => 'Official',                                   unofficial => 'Unofficial',
-                                   community  => 'Communities',                                   norequest  => 'Not allowed',
-                                   approve    => 'Approval by Dom. Coord.',
-                                   validate   => 'With validation',
-                                   autolimit  => 'Numerical limit',
-                 );
-    return %titles;   
-}                     
-    
-sub courserequest_display {
-    my %titles = &Apache::lonlocal::texthash (
-                                   approve    => 'Yes, need approval',
-                                   validate   => 'Yes, with validation',
-                                   norequest  => 'No',
-   );   
-   return %titles;
-}
-
 # =================================================================== Phase one
 
 sub print_username_entry_form {
@@ -389,9 +299,7 @@ sub print_username_entry_form {
 
     my $jscript = &Apache::loncommon::studentbrowser_javascript()."\n".
         '<script type="text/javascript">'."\n".
-        '// <![CDATA['."\n".
-        &Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset})."\n".
-        '// ]]>'."\n".
+        &Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset}).
         '</script>'."\n";
 
     my %loaditems = (
@@ -558,7 +466,6 @@ sub user_modification_js {
     
     return <<END;
 <script type="text/javascript" language="Javascript">
-// <![CDATA[
 
     function pclose() {
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
@@ -576,7 +483,7 @@ sub user_modification_js {
     }
 
     $nondc_setsection_code
-// ]]>
+
 </script>
 END
 }
@@ -595,7 +502,6 @@ sub print_user_selection_page {
 
     my $jscript = (<<ENDSCRIPT);
 <script type="text/javascript">
-// <![CDATA[
 function pickuser(uname,udom) {
     document.usersrchform.seluname.value=uname;
     document.usersrchform.seludom.value=udom;
@@ -604,7 +510,6 @@ function pickuser(uname,udom) {
 }
 
 $jsback
-// ]]>
 </script>
 ENDSCRIPT
 
@@ -853,9 +758,7 @@ $crumbs
 $response
 $forminfo
 <script type="text/javascript" language="Javascript">
-// <![CDATA[
 $loginscript
-// ]]>
 </script>
 <input type='hidden' name='makeuser' value='1' />
 <h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain
@@ -912,7 +815,7 @@ KERB
                             } else {
                                 if ($authtype eq 'int') {
                                     $varauth = '<br />'.
-&mt('[_1] Internally authenticated (with initial password [_2])','','<input type="password" size="10" name="intarg" value="" />')."<label><input type=\"checkbox\" name=\"visible\" onclick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
+&mt('[_1] Internally authenticated (with initial password [_2])','','<input type="password" size="10" name="intarg" value="" />')."<label><input type=\"checkbox\" name=\"visible\" onClick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
                                 } elsif ($authtype eq 'loc') {
                                     $varauth = '<br />'.
 &mt('[_1] Local Authentication with argument [_2]','','<input type="text" name="'.$authtype.'arg" value="" />')."\n";
@@ -971,14 +874,9 @@ ENDCHANGEUSER
         }
         if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
             $r->print('<h3>'.&mt('User Can Request Creation of Courses?').'</h3>'.
-                      &Apache::loncommon::start_data_table());
-            if ($env{'request.role.domain'} eq $ccdomain) {
-                $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses'));
-            } else {
-                $r->print(&coursereq_externaluser($ccuname,$ccdomain,
-                                                  $env{'request.role.domain'}));
-            }
-            $r->print(&Apache::loncommon::end_data_table());
+                      &Apache::loncommon::start_data_table().
+                      &build_tools_display($ccuname,$ccdomain,'requestcourses').
+                      &Apache::loncommon::end_data_table());
         }
         $r->print('</div>');
         my $user_auth_text =  &user_authentication($ccuname,$ccdomain,$formname);
@@ -1054,7 +952,7 @@ ENDNOTOOLSPRIV
     } ## End of new user/old user logic
 
     if ($env{'form.action'} eq 'singlestudent') {
-        $r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onclick="setSections(this.form)" />'."\n");
+        $r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onClick="setSections(this.form)" />'."\n");
     } else {
         $r->print('<h3>'.&mt('Add Roles').'</h3>');
         my $addrolesdisplay = 0;
@@ -1067,14 +965,14 @@ ENDNOTOOLSPRIV
                 $addrolesdisplay = $add_domainroles;
             }
             $r->print(&course_level_dc($env{'request.role.domain'},'Course'));
-            $r->print('<br /><input type="button" value="'.&mt('Save').'" onclick="setCourse()" />'."\n");
+            $r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setCourse()" />'."\n");
         } elsif ($context eq 'author') {
             if ($addrolesdisplay) {
                 $r->print('<br /><input type="button" value="'.&mt('Save').'"');
                 if ($newuser) {
-                    $r->print(' onclick="auth_check()" \>'."\n");
+                    $r->print(' onClick="auth_check()" \>'."\n");
                 } else {
-                    $r->print('onclick="this.form.submit()" \>'."\n");
+                    $r->print('onClick="this.form.submit()" \>'."\n");
                 }
             } else {
                 $r->print('<br /><a href="javascript:backPage(document.cu)">'.
@@ -1082,7 +980,7 @@ ENDNOTOOLSPRIV
             }
         } else {
             $r->print(&course_level_table(%inccourses));
-            $r->print('<br /><input type="button" value="'.&mt('Save').'" onclick="setSections(this.form)" />'."\n");
+            $r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setSections(this.form)" />'."\n");
         }
     }
     $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
@@ -1150,11 +1048,7 @@ sub validation_javascript {
                                    $nondc_setsection_code,$groupslist);
     my ($jsback,$elements) = &crumb_utilities();
     $js .= "\n".
-           '<script type="text/javascript">'."\n".
-           '// <![CDATA['."\n".
-           $jsback."\n".
-           '// ]]>'."\n".
-           '</script>'."\n";
+           '<script type="text/javascript">'."\n".$jsback."\n".'</script>';
     return $js;
 }
 
@@ -1507,9 +1401,7 @@ sub user_authentication {
             my $choices = &Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc);
             $outcome = <<ENDBADAUTH;
 <script type="text/javascript" language="Javascript">
-// <![CDATA[
 $loginscript
-// ]]>
 </script>
 <span class="LC_error">$lt{'err'}:
 $lt{'uuas'} ($currentauth). $lt{'sldb'}.</span>
@@ -1538,9 +1430,7 @@ ENDBADAUTH
                                                );
             $outcome =
                        '<script type="text/javascript" language="Javascript">'."\n".
-                       '// <![CDATA['."\n".
                        $loginscript."\n".
-                       '// ]]>'."\n".
                        '</script>'."\n".
                        '<h3>'.$lt{'ld'}.'</h3>'.
                        &Apache::loncommon::start_data_table().
@@ -1871,10 +1761,7 @@ sub update_user_data {
     my $newuser = 0;
     my ($jsback,$elements) = &crumb_utilities();
     my $jscript = '<script type="text/javascript">'."\n".
-                  '// <![CDATA['."\n".
-                  $jsback."\n".
-                  '// ]]>'."\n".
-                  '</script>'."\n";
+                  $jsback."\n".'</script>'."\n";
     my %breadcrumb_text = &singleuser_breadcrumb();
     my $args;
     if ($env{'form.popup'}) {
@@ -2111,9 +1998,7 @@ sub update_user_data {
             ('environment',['firstname','middlename','lastname','generation',
              'id','permanentemail','portfolioquota','inststatus','tools.aboutme',
              'tools.blog','tools.portfolio','requestcourses.official',
-             'requestcourses.unofficial','requestcourses.community',
-             'reqcrsotherdom.official','reqcrsotherdom.unofficial',
-             'reqcrsotherdom.community'],
+             'requestcourses.unofficial'],
               $env{'form.ccdomain'},$env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
@@ -2242,7 +2127,7 @@ sub update_user_data {
             $oldinststatuses,$newinststatuses);
         my ($defquota,$settingstatus) = 
             &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus);
-        my ($showquota,$showtools,$showrequestcourses,$showinststatus,$showreqotherdom);
+        my ($showquota,$showtools,$showrequestcourses,$showinststatus);
         if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
             $showquota = 1;
         }
@@ -2251,8 +2136,6 @@ sub update_user_data {
         }
         if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {
             $showrequestcourses = 1;
-        } elsif (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
-            $showreqotherdom = 1;
         }
         if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {
             $showinststatus = 1;
@@ -2336,14 +2219,8 @@ sub update_user_data {
         }
         &tool_changes('tools',\@usertools,\%oldaccess,\%oldaccesstext,\%userenv,
                       \%changeHash,\%changed,\%newaccess,\%newaccesstext);
-
-        if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) {
-            &tool_changes('requestcourses',\@requestcourses,\%oldaccess,\%oldaccesstext,
-                          \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext);
-        } else {
-            &tool_changes('reqcrsotherdom',\@requestcourses,\%oldaccess,\%oldaccesstext,
-                          \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext);
-        }
+        &tool_changes('requestcourses',\@requestcourses,\%oldaccess,\%oldaccesstext,
+                      \%userenv, \%changeHash,\%changed,\%newaccess,\%newaccesstext);
         if ($env{'form.cfirstname'}  ne $userenv{'firstname'}  ||
             $env{'form.cmiddlename'} ne $userenv{'middlename'} ||
             $env{'form.clastname'}   ne $userenv{'lastname'}   ||
@@ -2456,11 +2333,6 @@ END
                         $r->print("
     <th>$lt{$item}</th>\n");
                     }
-                } elsif ($showreqotherdom) {
-                    foreach my $item (@requestcourses) {
-                        $r->print("
-    <th>$lt{$item}</th>\n");
-                    }
                 }
                 if ($showquota) {
                     $r->print("
@@ -2492,11 +2364,6 @@ END
                         $r->print("
     <td>$oldaccess{$item} $oldaccesstext{$item}</td>\n");
                     }
-                } elsif ($showreqotherdom) {
-                    foreach my $item (@requestcourses) {
-                        $r->print("
-    <td>$oldaccess{$item} $oldaccesstext{$item}</td>\n");
-                    }
                 }
                 if ($showquota) {
                     $r->print("
@@ -2528,11 +2395,6 @@ END
                         $r->print("
     <td>$newaccess{$item} $newaccesstext{$item} </td>\n");
                     }
-                } elsif ($showreqotherdom) {
-                    foreach my $item (@requestcourses) {
-                        $r->print("
-    <td>$newaccess{$item} $newaccesstext{$item} </td>\n");
-                    }
                 }
                 if ($showquota) {
                     $r->print("
@@ -2601,11 +2463,6 @@ END
                     $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.
                               $newaccesstext{$item}.']'."\n");
                 }
-            } elsif ($showreqotherdom) {
-                foreach my $item (@requestcourses) {
-                    $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.
-                              $newaccesstext{$item}.']'."\n");
-                }
             }
             if ($showtools) {
                 foreach my $item (@usertools) {
@@ -2697,84 +2554,6 @@ sub tool_changes {
           (ref($newaccess) eq 'HASH') && (ref($newaccesstext) eq 'HASH'))) {
         return;
     }
-    if ($context eq 'reqcrsotherdom') {
-        my @options = ('approve','validate','autolimit');
-        my $optregex = join('|',@options);
-        my %reqdisplay = &courserequest_display();
-        my $cdom = $env{'request.role.domain'};
-        foreach my $tool (@{$usertools}) {
-            $oldaccesstext->{$tool} = &mt('no');
-            $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool
-};
-            if ($userenv->{$context.'.'.$tool} eq '') {
-                if ($env{'form.'.$context.'_'.$tool}) {
-                    $changed->{$tool}=&tool_admin($tool,$cdom,
-                                                  $changeHash,$context);
-                    if ($changed->{$tool}) {
-                        $newaccesstext->{$tool} = &mt('yes');
-                    } else {
-                        $newaccesstext->{$tool} = $oldaccesstext->{$tool};                    }
-                }
-            } else {
-                my @curr = split(',',$userenv->{$context.'.'.$tool});
-                my @new;
-                my $changedoms;
-                my $newop = $env{'form.'.$context.'_'.$tool};
-                if ($newop eq 'autolimit') {
-                    $newop .= '=';
-                    unless ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/
-) {
-                        $newop .= $env{'form.'.$context.'_'.$tool.'_limit'};
-                    }
-                }
-                if (grep(/^\Q$cdom:($optregex\=?\d*)\E$/,@curr)) {
-                    $oldaccesstext->{$tool} = &mt('yes');
-                    my $oldop = $1;
-                    if ($oldop ne $newop) {
-                        $changedoms = 1;
-                        foreach my $dom (@curr) {
-                            unless ($dom eq $cdom) {
-                                push(@new,$dom);
-                            }
-                        }
-                        if ($newop) {
-                            push(@new,$cdom.':'.$newop);
-                        }
-                        @new = sort(@new);
-                    }
-                } elsif ($env{'form.'.$context.'_'.$tool}) {
-                    $changedoms = 1;
-                    $changedoms = 1;
-                    @new = sort(@curr,$cdom.':'.$newop);
-                }
-                $newaccesstext->{$tool} = $oldaccesstext->{$tool};
-                if ($changedoms) {
-                    my $newdomstr;
-                    if (@new) {
-                        $newdomstr = join(',',@new);
-                    }
-                    $changed->{$tool}=&tool_admin($tool,$newdomstr,$changeHash,
-                                                  $context);
-                    if ($changed->{$tool}) {
-                        if ($env{'form.'.$context.'_'.$tool}) {
-                            if ($env{'form.'.$context.'_'.$tool} eq 'autolimit') {
-                                if ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/) {
-                                    $newaccesstext->{$tool} = &mt('Yes, processed automatically');
-                                } else {
-                                    $newaccesstext->{$tool} = &mt('Yes, up to limit of [quant,_1,request] per user).',$env{'form.'.$context.'_'.$tool.'_limit'});
-                                }
-                            } else {
-                                $newaccesstext->{$tool} = $reqdisplay{$env{'form.'.$context.'_'.$tool}};
-                            }
-                        } else {
-                            $newaccesstext->{$tool} = &mt('No');
-                        }
-                    }
-                }
-            }
-        }
-        return;
-    }
     foreach my $tool (@{$usertools}) {
         if ($userenv->{$context.'.'.$tool} ne '') {
             $oldaccess->{$tool} = &mt('custom');
@@ -3213,10 +2992,6 @@ sub tool_admin {
         if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) {
             $canchange = 1;
         }
-    } elsif ($context eq 'reqcrsotherdom') {
-        if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
-            $canchange = 1;
-        }
     } elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {
         # Current user has quota modification privileges
         $canchange = 1;
@@ -3336,16 +3111,13 @@ sub custom_role_editor {
     my ($jsback,$elements) = &crumb_utilities();
     my $button_code = "\n";
     my $head_script = "\n";
-    $head_script .= '<script type="text/javascript">'."\n".
-                    '// <![CDATA['."\n";
+    $head_script .= '<script type="text/javascript">'."\n";
     my @template_roles = ("cc","in","ta","ep","st");
     foreach my $role (@template_roles) {
         $head_script .= &make_script_template($role);
         $button_code .= &make_button_code($role).' ';
     }
-    $head_script .= "\n".$jsback."\n".
-                    '// ]]>'."\n".
-                    '</script>'."\n";
+    $head_script .= "\n".$jsback."\n".'</script>'."\n";
     $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
    &Apache::lonhtmlcommon::add_breadcrumb
      ({href=>"javascript:backPage(document.form1,'pickrole','')",
@@ -3475,7 +3247,7 @@ sub make_script_template {
 sub make_button_code {
     my ($role) = @_;
     my $label = &Apache::lonnet::plaintext($role);
-    my $button_code = '<input type="button" onclick="set_'.$role.'()" value="'.$label.'" />';
+    my $button_code = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />';
     return ($button_code);
 }
 # ---------------------------------------------------------- Call to definerole
@@ -3488,11 +3260,7 @@ sub set_custom_role {
         return;
     }
     my ($jsback,$elements) = &crumb_utilities();
-    my $jscript = '<script type="text/javascript">'.
-                  '// <![CDATA['."\n".
-                  $jsback."\n".
-                  '// ]]>'."\n".
-                  '</script>';
+    my $jscript = '<script type="text/javascript">'.$jsback."\n".'</script>';
 
     $r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -3864,11 +3632,7 @@ sub header {
 
 sub add_script {
     my ($js) = @_;
-    return '<script type="text/javascript">'."\n".
-           '// <![CDATA['."\n".
-           "\n".$js."\n".
-           '// ]]>'."\n"
-           '</script>'."\n";
+    return '<script type="text/javascript">'."\n".$js."\n".'</script>';
 }
 
 sub verify_user_display {
@@ -3902,110 +3666,137 @@ sub print_main_menu {
                                    listusers => 'Display Co-authors and Manage Multiple Users',
                                  },
                        course => {
-                                   upload => 'Upload a File of Course Users',
-                                   singleuser => 'Add/Modify a Single Course User',
-                                   listusers => 'Display Class Lists and Manage Multiple Users',
+                                   upload => 'File of Course Users',
+                                   singleuser => 'Single Course User',
+                                   listusers => 'Course User Lists',
                                  },
-                );
-
-    my @menu =
-        (
-          { text => $links{$context}{'upload'},
-            help => 'Course_Create_Class_List',
-            action => 'upload',
-            permission => $permission->{'cusr'},
-            },
-          { text => $links{$context}{'singleuser'},
-            help => 'Course_Change_Privileges',
-            action => 'singleuser',
-            permission => $permission->{'cusr'},
-            },
-          { text => $links{$context}{'listusers'},
-            help => 'Course_View_Class_List',
-            action => 'listusers',
-            permission => ($permission->{'view'} || $permission->{'cusr'}),
-          },
-        );
-    if ($context eq 'domain' || $context eq 'course') {
-        my $customlink =  { text => 'Edit Custom Roles',
-                            help => 'Course_Editing_Custom_Roles',
-                            action => 'custom',
-                            permission => $permission->{'custom'},
-                          };
-        push(@menu,$customlink);
-    }
-    if ($context eq 'course') {
-        my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
-        my @courselinks =
-            (
-              { text => 'Enroll a Single Student',
-                 help => 'Course_Add_Student',
-                 action => 'singlestudent',
-                 permission => $permission->{'cusr'},
-                 },
-              { text => 'Drop Students',
-                help => 'Course_Drop_Student',
-                action => 'drop',
-                permission => $permission->{'cusr'},
-              });
-        if (!exists($permission->{'cusr_section'})) {
-            push(@courselinks,
-               { text => 'Automated Enrollment Manager',
-                 help => 'Course_Automated_Enrollment',
-                 permission => (&Apache::lonnet::auto_run($cnum,$cdom)
-                                && $permission->{'cusr'}),
-                 url  => '/adm/populate',
-                 },
-               { text => 'Configure User Self-enrollment',
-                 help => 'Course_Self_Enrollment',
-                 action => 'selfenroll',
-                 permission => $permission->{'cusr'},
-               });
-        }
+                     );
+  my @menu = ( {categorytitle => 'Add Users',
+	     items =>
+	     [{
+	         linktext => $links{$context}{'upload'},
+	         icon => 'sctr.png',
+	         #help => 'Course_Create_Class_List',
+	         url => '/adm/createuser?action=upload',
+	         permission => $permission->{'cusr'},
+	         linktitle => 'Upload a CSV or a text file containing users.',
+	     },
+	     {
+	         linktext => $links{$context}{'singleuser'},
+	         icon => 'edit-redo.png',
+	         #help => 'Course_Change_Privileges',
+	         url => '/adm/createuser?action=singleuser',
+	         permission => $permission->{'cusr'},
+	         linktitle => 'Add a user with a certain role to this course.',
+	     }]},
+	     {categorytitle => 'Administration',
+	     items =>
+	     [{	
+	         linktext => $links{$context}{'listusers'},
+                 icon => 'edit-find.png',
+                 #help => 'Course_View_Class_List',
+                 url => '/adm/createuser?action=listusers',
+	         permission => ($permission->{'view'} || $permission->{'cusr'}),
+	         linktitle => 'Show and manage users of this course.',
+	     }]},
+	     {categorytitle => 'Configuration',
+	     items =>
+	     [
+	     ]},
+	   );
+			
+    if ($context eq 'domain'){
+		
+		push(@{ $menu[1]->{items} },
+		{	linktext => 'Custom Roles',
+			icon => 'emblem-photos.png',
+			#help => 'Course_Editing_Custom_Roles',
+			url => '/adm/createuser?action=custom',
+			permission => $permission->{'custom'},
+			linktitle => 'Configure a custom role.',
+		});
+		
+    }elsif ($context eq 'course'){
+    	my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
+	
+        push(@{ $menu[0]->{items} },
+		{	linktext => 'Single Student',
+            		#help => 'Course_Add_Student',
+			icon => 'list-add.png',
+            		url => '/adm/createuser?action=singlestudent',
+			permission => $permission->{'cusr'},
+            		linktitle => 'Add a user with the role student to this course.',
+        	});
+		
+        push(@{ $menu[1]->{items} },  
+		{	linktext => 'Drop Students',
+			icon => 'edit-undo.png',
+           		#help => 'Course_Drop_Student',
+           		url => '/adm/createuser?action=drop',
+			permission => $permission->{'cusr'},
+           		linktitle =>'Remove a student from this course.',
+        	},
+		{	linktext => 'Custom Roles',
+			icon => 'emblem-photos.png',
+           		#help => 'Course_Editing_Custom_Roles',
+           		url => '/adm/createuser?action=custom',
+			permission => $permission->{'custom'},
+			linktitle => 'Configure a custom role.',
+        	});
         if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) {
-            push(@courselinks,
-                    {   text => 'Enrollment Requests',
-                        help => 'Course_Approve_Selfenroll',
-                        action => 'selfenrollqueue',
+            push(@{ $menu[1]->{items} },
+                    {   linktext => 'Enrollment Requests',
+                        icon => 'selfenrl-queue.png',
+                        #help => 'Course_Approve_Selfenroll',
+                        url => '/adm/createuser?action=selfenrollqueue',
                         permission => $permission->{'cusr'},
-                    });
+                        linktitle =>'Approve or reject enrollment requests.',
+                });
         }
-        push(@courselinks,
-               { text => 'Manage Course Groups',
-                 help => 'Course_Manage_Group',
-                 permission => $permission->{'grp_manage'},
-                 url => '/adm/coursegroups?refpage=cusr',
-               },
-               { text => 'View Change Logs',
-                 help => 'Course_User_Logs',
-                 action => 'changelogs',
-                 permission => $permission->{'cusr'},
-               },);
+		
+        if (!exists($permission->{'cusr_section'})){
+        	
+		push(@{ $menu[2]->{items} },
+		{	linktext => 'Automated Enrollment',
+			icon => 'roles.png',
+         		#help => 'Course_Automated_Enrollment',
+        		permission => (&Apache::lonnet::auto_run($cnum,$cdom)
+                                	&& $permission->{'cusr'}),
+			url  => '/adm/populate',
+			linktitle => 'Automated enrollment manager.',
+		},
+		{	linktext => 'User Self-Enrollment',
+			icon => 'cstr.png',
+	       		#help => 'Course_Self_Enrollment',
+			url => '/adm/createuser?action=selfenroll',
+			permission => $permission->{'cusr'},
+			linktitle => 'Configure user self enrollment.',
+       		});
+		
+	}
+
+	push(@{ $menu[2]->{items} },
+	{	linktext => 'Course Groups',
+		icon => 'conf.png',
+        	#help => 'Course_Manage_Group',
+           	url => '/adm/coursegroups?refpage=cusr',
+		permission => $permission->{'grp_manage'},
+		linktitle => 'Manage course groups.',
+        },
+        {	linktext => 'Change Logs',
+		icon => 'document-properties.png',
+        	#help => 'Course_User_Logs',
+        	url => '/adm/createuser?action=changelogs',
+		permission => $permission->{'cusr'},
+		linktitle => 'View change log.',
+        });
+    };
+return Apache::lonhtmlcommon::generate_menu(@menu);
 #               { text => 'View Log-in History',
 #                 help => 'Course_User_Logins',
 #                 action => 'logins',
 #                 permission => $permission->{'cusr'},
 #               });
-        push(@menu,@courselinks);
-    }
-    my $menu_html = '';
-    foreach my $menu_item (@menu) {
-        next if (! $menu_item->{'permission'});
-        $menu_html.='<p>';
-        if (exists($menu_item->{'help'})) {
-            $menu_html.=
-                &Apache::loncommon::help_open_topic($menu_item->{'help'});
-        }
-        $menu_html.='<font size="+1">';
-        if (exists($menu_item->{'url'})) {
-            $menu_html.=qq{<a href="$menu_item->{'url'}">};
-        } else {
-            $menu_html.=
-                qq{<a href="/adm/createuser?action=$menu_item->{'action'}">};      }
-        $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
-        $menu_html.='</p>';
-    }
-    return $menu_html;
 }
 
 sub restore_prev_selections {
@@ -4202,9 +3993,7 @@ ENDSCRIPT
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
 
     my $output = '<script type="text/javascript">'."\n".
-                 '// <![CDATA['."\n".
                  $setsec_js."\n".$selfenroll_js."\n".
-                 '// ]]>'."\n".
                  '</script>'."\n".
                  '<h3>'.$lt->{'selfenroll'}.'</h3>'."\n";
     my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum);
@@ -5096,7 +4885,6 @@ sub print_userchangelogs_display {
             $r->print('</tr></table>');
             $r->print(<<"ENDSCRIPT");
 <script type="text/javascript">
-// <![CDATA[
 function chgPage(caller) {
     if (caller == 'previous') {
         document.$formname.page.value --;
@@ -5107,14 +4895,11 @@ function chgPage(caller) {
     document.$formname.submit(); 
     return;
 }
-// ]]>
 </script>
 ENDSCRIPT
         }
     } else {
-        $r->print('<p class="LC_info">'.
-                  &mt('There are no records to display').
-                  '</p>');
+        $r->print(&mt('There are no records to display'));
     }
     $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
               '<input type="hidden" name="action" value="changelogs" /></form>');
@@ -5126,7 +4911,7 @@ sub role_display_filter {
     my $context = 'course';
     my $nolink = 1;
     my $output = '<table><tr><td valign="top">'.
-                 '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'.
+                 '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b><br />'.
                  &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
                                               (&mt('all'),5,10,20,50,100,1000,10000)).
                  '</td><td>&nbsp;&nbsp;</td>';
@@ -5167,7 +4952,7 @@ sub role_display_filter {
     foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll') {
         my $selstr = '';
         if ($curr->{'chgcontext'} eq $chgtype) {
-            $selstr = ' selected="selected"';
+            $output .= $selstr = ' selected="selected"';
         }
         if (($chgtype eq 'auto') || ($chgtype eq 'updatenow')) {
             next if (!&Apache::lonnet::auto_run($cnum,$cdom));
@@ -5809,7 +5594,7 @@ sub course_level_dc {
                  '<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
                  &Apache::loncommon::end_data_table_header_row();
     my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
-                     '<td><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
+                     '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
                      '<td><select name="role">'."\n";
     foreach my $role (@roles) {
         my $plrole=&Apache::lonnet::plaintext($role);