--- loncom/interface/lonuserutils.pm	2009/12/16 13:00:45	1.108
+++ loncom/interface/lonuserutils.pm	2010/01/05 22:08:48	1.109.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.108 2009/12/16 13:00:45 bisitz Exp $
+# $Id: lonuserutils.pm,v 1.109.2.2 2010/01/05 22:08:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -386,7 +386,7 @@ sub javascript_validations {
         if (($context eq 'course') || ($context eq 'domain')) {
             if ($context eq 'course') {
                 if ($env{'request.course.sec'} eq '') {
-                    $setsection_call = 'setSections(document.'.$param{'formname'}."'$crstype'".');';
+                    $setsection_call = 'setSections(document.'.$param{'formname'}.",'$crstype'".');';
                     $setsections_js =
                         &setsections_javascript($param{'formname'},$groupslist,
                                                 $mode,'',$crstype);
@@ -1185,8 +1185,10 @@ sub default_role_selector {
                     'exs'  => "Existing sections",
                     'new'  => "New section",
                   );
-    $options = '<select name="defaultrole">'."\n".
-               ' <option value="">'.&mt('Please select').'</option>'."\n"; 
+    $options = '<select name="defaultrole">'."\n";
+    unless (($context eq 'course') && (&Apache::loncommon::needs_gci_custom())) {
+        $options .= ' <option value="">'.&mt('Please select').'</option>'."\n";
+    }
     if ($context eq 'course') {
         $options .= &default_course_roles($context,$checkpriv,$crstype,%customroles);
     } elsif ($context eq 'author') {
@@ -3655,7 +3657,7 @@ sub print_first_users_upload_form {
     $str .= '<input type="hidden" name="action" value="upload" />';
     $str .= '<input type="hidden" name="state"  value="got_file" />';
 
-    $str .= '<h2>'.&mt('Upload a file containing information about users').'</h2>'."\n";
+    $str .= '<h3>'.&mt('Upload a file containing information about users').'</h3>'."\n";
 
     # Excel and CSV Help
     $str .= '<div class="LC_left_float">'
@@ -3666,15 +3668,8 @@ sub print_first_users_upload_form {
                 &mt("How do I create a CSV file from a spreadsheet"))
            .'</div><br clear="all" />'."\n";
     $str .= &Apache::lonhtmlcommon::start_pick_box()
-           .&Apache::lonhtmlcommon::row_title(&mt('File'));
-    if (&Apache::lonlocal::current_language() ne 'en') {
-        if ($context eq 'course') { 
-            $str .= '<p class="LC_info">'."\n"
-                   .&mt('Please upload an UTF8 encoded file to ensure a correct character encoding in your classlist.')."\n"
-                   .'</p>'."\n";
-        }
-    }
-    $str .= &Apache::loncommon::upfile_select_html()
+           .&Apache::lonhtmlcommon::row_title(&mt('File'))
+           .&Apache::loncommon::upfile_select_html()
            .&Apache::lonhtmlcommon::row_closure()
            .&Apache::lonhtmlcommon::row_title(
                 '<label for="noFirstLine">'
@@ -3688,8 +3683,6 @@ sub print_first_users_upload_form {
            .'<input type="submit" name="fileupload" value="'.&mt('Next').'" />'
            .'</p>';
 
-    $str .= &Apache::loncommon::end_page();
-
     $r->print($str);
     return;
 }
@@ -5032,14 +5025,22 @@ sub roles_by_context {
         if ($env{'request.role'} =~ m{^dc\./}) {
             push(@allroles,'ad');
         }
-        push(@allroles,('ta','ep','in'));
-        if ($crstype eq 'Community') {
-            push(@allroles,'co');
+        if (&Apache::loncommon::needs_gci_custom()) {
+            if ($crstype eq 'Community') {
+                push(@allroles,'co');
+            } else {
+                push(@allroles,'cc');
+            }
         } else {
-            push(@allroles,'cc');
-        }
-        if ($custom) {
-            push(@allroles,'cr');
+            push(@allroles,('ta','ep','in'));
+            if ($crstype eq 'Community') {
+                push(@allroles,'co');
+            } else {
+                push(@allroles,'cc');
+            }
+            if ($custom) {
+                push(@allroles,'cr');
+            }
         }
     } elsif ($context eq 'author') {
         @allroles = ('ca','aa');