--- loncom/interface/loncommon.pm	2010/10/04 18:01:31	1.925.2.14
+++ loncom/interface/loncommon.pm	2010/05/18 02:26:39	1.948.2.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.925.2.14 2010/10/04 18:01:31 raeburn Exp $
+# $Id: loncommon.pm,v 1.948.2.5 2010/05/18 02:26:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -483,9 +483,9 @@ ENDAUTHORBRW
 
 sub coursebrowser_javascript {
     my ($domainfilter,$sec_element,$formname,$role_element,$crstype) = @_;
-    my $wintitle = &mt('Course Browser');
-    if ($crstype ne '') {
-        $wintitle = &mt($crstype);
+    my $wintitle = 'Course_Browser';
+    if ($crstype eq 'Community') {
+        $wintitle = 'Community_Browser';
     }
     my $id_functions = &javascript_index_functions();
     my $output = '
@@ -1127,7 +1127,7 @@ sub help_open_topic {
     $template.=' <a target="_top" href="'.$link.'" title="'.$title.'">'
               .'<img src="'.$helpicon.'" border="0"'
               .' alt="'.&mt('Help: [_1]',$topic).'"'
-              .' title="'.$title.'"' 
+              .' title="'.$title.'" style="vertical-align:middle;"' 
               .' /></a>';
     if ($text ne "") {	
         $template.='</span>';
@@ -1719,10 +1719,13 @@ sub create_workbook {
     my $workbook  = Spreadsheet::WriteExcel->new('/home/httpd'.$filename);
     if (! defined($workbook)) {
         $r->log_error("Error creating excel spreadsheet $filename: $!");
-        $r->print('<p>'.&mt("Unable to create new Excel file.  ".
-                            "This error has been logged.  ".
-                            "Please alert your LON-CAPA administrator").
-                  '</p>');
+        $r->print(
+            '<p class="LC_error">'
+           .&mt('Problems occurred in creating the new Excel file.')
+           .' '.&mt('This error has been logged.')
+           .' '.&mt('Please alert your LON-CAPA administrator.')
+           .'</p>'
+        );
         return (undef);
     }
     #
@@ -1762,9 +1765,13 @@ sub create_text_file {
     $fh = Apache::File->new('>/home/httpd'.$filename);
     if (! defined($fh)) {
         $r->log_error("Couldn't open $filename for output $!");
-        $r->print(&mt('Problems occurred in creating the output file. '
-                     .'This error has been logged. '
-                     .'Please alert your LON-CAPA administrator.'));
+        $r->print(
+            '<p class="LC_error">'
+           .&mt('Problems occurred in creating the output file.')
+           .' '.&mt('This error has been logged.')
+           .' '.&mt('Please alert your LON-CAPA administrator.')
+           .'</p>'
+        );
     }
     return ($fh,$filename)
 }
@@ -1978,16 +1985,7 @@ sub select_dom_form {
             ($dom eq $defdom ? 'selected="selected" ' : '').'>'.$dom;
         if ($showdomdesc) {
             if ($dom ne '') {
-                my $domdesc;
-                if ($name eq 'srchdomain') {
-                    if ($dom eq 'gci') {
-                        $domdesc = 'Faculty';
-                    } else {
-                        $domdesc = 'Students';
-                    }
-                } else {
-                    $domdesc = &Apache::lonnet::domain($dom,'description');
-                }
+                my $domdesc = &Apache::lonnet::domain($dom,'description');
                 if ($domdesc ne '') {
                     $selectdomain .= ' ('.$domdesc.')';
                 }
@@ -2478,11 +2476,9 @@ sub authform_internal{
     }
     $autharg = '<input type="password" size="10" name="intarg" value="'.
                $intarg.'" onchange="'.$jscall.'" />';
-    my $authtext = '[_1] Internally authenticated (with initial password [_2])';
-    if ($in{'caller'} eq 'requestcrs') {
-        $authtext = "[_1] Students' password, if none in the uploaded file: [_2]";
-    }
-    $result = &mt($authtext,'<label>'.$authtype,'</label>'.$autharg);
+    $result = &mt
+        ('[_1] Internally authenticated (with initial password [_2])',
+         '<label>'.$authtype,'</label>'.$autharg);
     $result.="<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>';
     return $result;
 }
@@ -3416,12 +3412,22 @@ sub get_previous_attempt {
       }
       $prevattempts=&start_data_table().&start_data_table_header_row();
       $prevattempts.='<th>'.&mt('History').'</th>';
+      my %typeparts;
+      my $showsurv=&Apache::lonnet::allowed('vas',$env{'request.course.id'});
       foreach my $key (sort(keys(%lasthash))) {
 	my ($ign,@parts) = split(/\./,$key);
 	if ($#parts > 0) {
 	  my $data=$parts[-1];
 	  pop(@parts);
-	  $prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.'&nbsp;</th>';
+          if ($data eq 'type') {
+              unless ($showsurv) {
+                  my $id = join(',',@parts);
+                  $typeparts{$ign.'.'.$id} = $lasthash{$key};
+              }
+              delete($lasthash{$key});
+          } else {
+	      $prevattempts.='<th>'.&mt('Part ').join('.',@parts).'<br />'.$data.'&nbsp;</th>';
+          }
 	} else {
 	  if ($#parts == 0) {
 	    $prevattempts.='<th>'.$parts[0].'</th>';
@@ -3431,23 +3437,98 @@ sub get_previous_attempt {
 	}
       }
       $prevattempts.=&end_data_table_header_row();
+      my %lasthidden;
       if ($getattempt eq '') {
 	for ($version=1;$version<=$returnhash{'version'};$version++) {
-	  $prevattempts.=&start_data_table_row().
-	      '<td>'.&mt('Transaction [_1]',$version).'</td>';
-	    foreach my $key (sort(keys(%lasthash))) {
-		my $value = &format_previous_attempt_value($key,
-							   $returnhash{$version.':'.$key});
-		$prevattempts.='<td>'.$value.'&nbsp;</td>';   
-	    }
-	  $prevattempts.=&end_data_table_row();
+            my @hidden;
+            if (%typeparts) {
+                foreach my $id (keys(%typeparts)) {
+                    if (($returnhash{$version.':'.$id.'.type'} eq 'anonsurvey') || ($returnhash{$version.':'.$id.'.type'} eq 'anonsurveycred')) {
+                        push(@hidden,$id);
+                        $lasthidden{$id} = 1;
+                    } elsif ($lasthidden{$id}) {
+                        if (exists($returnhash{$version.':'.$id.'.award'})) {
+                            delete($lasthidden{$id});
+                        }
+                    }
+                }
+            }
+            $prevattempts.=&start_data_table_row().
+                           '<td>'.&mt('Transaction [_1]',$version).'</td>';
+            if (@hidden) {
+                foreach my $key (sort(keys(%lasthash))) {
+                    my $hide;
+                    foreach my $id (@hidden) {
+                        if ($key =~ /^\Q$id\E/) {
+                            $hide = 1;
+                            last;
+                        }
+                    }
+                    if ($hide) {
+                        my ($id,$data) = ($key =~ /^(.+)\.([^.]+)$/);
+                        if (($data eq 'award') || ($data eq 'awarddetail')) {
+                            my $value = &format_previous_attempt_value($key,
+                                             $returnhash{$version.':'.$key});
+                            $prevattempts.='<td>'.$value.'&nbsp;</td>';
+                        } else {
+                            $prevattempts.='<td>&nbsp;</td>';
+                        }
+                    } else {
+                        if ($key =~ /\./) {
+                            my $value = &format_previous_attempt_value($key,
+                                              $returnhash{$version.':'.$key});
+                            $prevattempts.='<td>'.$value.'&nbsp;</td>';
+                        } else {
+                            $prevattempts.='<td>&nbsp;</td>';
+                        }
+                    }
+                }
+            } else {
+	        foreach my $key (sort(keys(%lasthash))) {
+		    my $value = &format_previous_attempt_value($key,
+			            $returnhash{$version.':'.$key});
+		    $prevattempts.='<td>'.$value.'&nbsp;</td>';
+	        }
+            }
+	    $prevattempts.=&end_data_table_row();
 	 }
       }
+      my @currhidden = keys(%lasthidden);
       $prevattempts.=&start_data_table_row().'<td>'.&mt('Current').'</td>';
       foreach my $key (sort(keys(%lasthash))) {
-	my $value = &format_previous_attempt_value($key,$lasthash{$key});
-	if ($key =~/$regexp$/ && (defined &$gradesub)) {$value = &$gradesub($value)}
-	$prevattempts.='<td>'.$value.'&nbsp;</td>';
+          if (%typeparts) {
+              my $hidden;
+              foreach my $id (@currhidden) {
+                  if ($key =~ /^\Q$id\E/) {
+                      $hidden = 1;
+                      last;
+                  }
+              }
+              if ($hidden) {
+                  my ($id,$data) = ($key =~ /^(.+)\.([^.]+)$/);
+                  if (($data eq 'award') || ($data eq 'awarddetail')) {
+                      my $value = &format_previous_attempt_value($key,$lasthash{$key});
+                      if ($key =~/$regexp$/ && (defined &$gradesub)) {
+                          $value = &$gradesub($value);
+                      }
+                      $prevattempts.='<td>'.$value.'&nbsp;</td>';
+                  } else {
+                      $prevattempts.='<td>&nbsp;</td>';
+                  }
+              } else {
+                  my $value = &format_previous_attempt_value($key,$lasthash{$key});
+                  if ($key =~/$regexp$/ && (defined &$gradesub)) {
+                      $value = &$gradesub($value);
+                  }
+                  $prevattempts.='<td>'.$value.'&nbsp;</td>';
+              }
+          } else {
+	      my $value = &format_previous_attempt_value($key,$lasthash{$key});
+	      if ($key =~/$regexp$/ && (defined &$gradesub)) {
+                  $value = &$gradesub($value);
+              }
+	      $prevattempts.='<td>'.$value.'&nbsp;</td>';
+          }
       }
       $prevattempts.= &end_data_table_row().&end_data_table();
     } else {
@@ -3620,10 +3701,13 @@ sub submlink {
     }
     if (!$symb) { $symb=&Apache::lonnet::symbread(); }
     $symb=&escape($symb);
-    if ($target) { $target="target=\"$target\""; }
-    return '<a href="/adm/grades?&command=submission&'.
-	'symb='.$symb.'&student='.$uname.
-	'&userdom='.$udom.'" '.$target.'>'.$text.'</a>';
+    if ($target) { $target=" target=\"$target\""; }
+    return
+        '<a href="/adm/grades?command=submission'.
+        '&amp;symb='.$symb.
+        '&amp;student='.$uname.
+        '&amp;userdom='.$udom.'"'.
+        $target.'>'.$text.'</a>';
 }
 ##############################################
 
@@ -4150,16 +4234,39 @@ sub get_domainconf {
     if (defined($cached)) { return %{$result}; }
 
     my %domconfig = &Apache::lonnet::get_dom('configuration',
-					     ['login','rolecolors'],$udom);
+					     ['login','rolecolors','autoenroll'],$udom);
     my (%designhash,%legacy);
     if (keys(%domconfig) > 0) {
         if (ref($domconfig{'login'}) eq 'HASH') {
             if (keys(%{$domconfig{'login'}})) {
                 foreach my $key (keys(%{$domconfig{'login'}})) {
                     if (ref($domconfig{'login'}{$key}) eq 'HASH') {
-                        foreach my $img (keys(%{$domconfig{'login'}{$key}})) {
-                            $designhash{$udom.'.login.'.$key.'_'.$img} = 
-                                $domconfig{'login'}{$key}{$img};
+                        if ($key eq 'loginvia') {
+                            if (ref($domconfig{'login'}{'loginvia'}) eq 'HASH') {
+                                my @ids = &Apache::lonnet::current_machine_ids();
+                                foreach my $hostname (@ids) {
+                                    if (ref($domconfig{'login'}{'loginvia'}{$hostname}) eq 'HASH') {
+                                        if ($domconfig{'login'}{'loginvia'}{$hostname}{'server'}) {
+                                            my $server = $domconfig{'login'}{'loginvia'}{$hostname}{'server'};
+                                            $designhash{$udom.'.login.loginvia'} = $server;
+                                            if ($domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'} eq 'custom') {
+
+                                                $designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'custompath'};
+                                            } else {
+                                                 $designhash{$udom.'.login.loginvia_'.$hostname} = $server.':'.$domconfig{'login'}{'loginvia'}{$hostname}{'serverpath'};
+                                            }
+                                            if ($domconfig{'login'}{'loginvia'}{$hostname}{'exempt'}) {
+                                                $designhash{$udom.'.login.loginvia_exempt_'.$hostname} = $domconfig{'login'}{'loginvia'}{$hostname}{'exempt'};
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            foreach my $img (keys(%{$domconfig{'login'}{$key}})) {
+                                $designhash{$udom.'.login.'.$key.'_'.$img} = 
+                                    $domconfig{'login'}{$key}{$img};
+                            }
                         }
                     } else {
                         $designhash{$udom.'.login.'.$key}=$domconfig{'login'}{$key};
@@ -4186,6 +4293,11 @@ sub get_domainconf {
         } else {
             $legacy{'rolecolors'} = 1;
         }
+        if (ref($domconfig{'autoenroll'}) eq 'HASH') {
+            if ($domconfig{'autoenroll'}{'co-owners'}) {
+                $designhash{$udom.'.autoassign.co-owners'}=$domconfig{'autoenroll'}{'co-owners'};
+            }
+        }
         if (keys(%legacy) > 0) {
             my %legacyhash = &get_legacy_domconf($udom);
             foreach my $item (keys(%legacyhash)) {
@@ -4463,6 +4575,11 @@ sub bodytag {
     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
         $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
 
+    my $public;
+    if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
+        || ($env{'user.name'} eq '') && ($env{'user.domain'} eq '')) {
+        $public = 1;
+    }
     if (!$args->{'no_auto_mt_title'}) { $title = &mt($title); }
 
     $function = &get_users_function() if (!$function);
@@ -4478,10 +4595,6 @@ sub bodytag {
 		   'link'    => &designparm($function.'.link',$domain),);
     @design{keys(%$addentries)} = @$addentries{keys(%$addentries)}; 
 
-    my $custommenu;
-    if ($env{'environment.remote'} eq 'off') {
-        $custommenu = &needs_gci_custom();
-    }
  # role and realm
     my ($role,$realm) = split(/\./,$env{'request.role'},2);
     if ($role  eq 'ca') {
@@ -4491,22 +4604,14 @@ sub bodytag {
 # realm
     if ($env{'request.course.id'}) {
         if ($env{'request.role'} !~ /^cr/) {
-            if (($custommenu) && ($role eq 'cm')) {
-                undef($role);
-            } else {
-                $role = &Apache::lonnet::plaintext($role,&course_type());
-            }
+            $role = &Apache::lonnet::plaintext($role,&course_type());
         }
         if ($env{'request.course.sec'}) {
             $role .= ('&nbsp;'x2).'-&nbsp;'.&mt('section:').'&nbsp;'.$env{'request.course.sec'};
         }   
 	$realm = $env{'course.'.$env{'request.course.id'}.'.description'};
     } else {
-        if (($custommenu) && ($role eq 'cm')) {
-            undef($role);
-        } else {
-            $role = &Apache::lonnet::plaintext($role);
-        }
+        $role = &Apache::lonnet::plaintext($role);
     }
 
     if (!$realm) { $realm='&nbsp;'; }
@@ -4524,12 +4629,12 @@ sub bodytag {
     } 
 
     my $name = &plainname($env{'user.name'},$env{'user.domain'});
-    if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
+    if ($public) {
 	undef($role);
     } else {
 	$name = &aboutmewrapper($name,$env{'user.name'},$env{'user.domain'});
     }
-    
+
     my $titleinfo = '<h1>'.$title.'</h1>';
     #
     # Extra info if you are the DC
@@ -4557,66 +4662,7 @@ sub bodytag {
         #        $titleinfo = &CSTR_pageheader(); #FIXME: Will be removed once all scripts have their own calls
         #    }
 
-        my $role_selector;
-        if (($custommenu) && ($env{'request.course.id'}) && 
-            ($env{'course.'.$env{'request.course.id'}.'.domain'} eq 'gcitest')) {
-            $role_selector = &Apache::lonmenu::roles_selector(
-                        $env{'course.' . $env{'request.course.id'} . '.domain'},
-                        $env{'course.' . $env{'request.course.id'} . '.num'}  );
-            if ($role_selector) {
-                $role_selector = '<br />'.$role_selector;
-            }
-        }
-        my $cid = $env{'request.course.id'};
-        my %gcicourses = (
-                           gci_9615072b469884921gcil1 => 'review',
-                           gci_1H96711d710194bfegcil1 => 'submit',
-                           gci_5422913620b814c90gcil1 => 'tutorial',
-                         );
-        if (($custommenu && $cid && !$gcicourses{$cid}) || ($env{'user.domain'} eq 'gcitest')) {
-            my $role = 'st';
-            if ($custommenu) {
-                $role = 'cc';
-            }
-            my ($switcher_js,$switcher,$formname);
-            $formname = 'pickrole';
-            my %courses = &existing_gcitest_courses($role);
-            my $numcourses = keys(%courses);
-            my $reqdcount = 0;
-            if ($cid) {
-                if ($courses{$cid}) {
-                    $reqdcount = 1; 
-                }
-            }
-            if ($numcourses > $reqdcount) {
-                $switcher = &gcitest_switcher($role,$formname,%courses);
-                my $current;
-                if ($cid) {
-                    $current = $role.'./'.$env{'course.'.$cid.'.domain'}.
-                               '/'.$env{'course.'.$cid.'.num'};
-                }
-                $switcher_js = &Apache::loncommon::gcitest_switcher_js($current,$numcourses,$formname);
-                if ($switcher_js) {  
-                    $switcher_js= <<"ENDSCRIPT";
-<script type="text/javascript">
-// <![CDATA[
 
-$switcher_js
-
-// ]]>
-</script>
-ENDSCRIPT
-                }
-            }
-            if ($switcher) {
-                $switcher = $switcher_js.$switcher;
-                if ($role_selector) {
-                    $role_selector .= '&nbsp;&nbsp;&nbsp;'.$switcher;
-                } else {
-                    $role_selector .= '<br />'.$switcher;
-                }
-            }
-        }
 
         if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) {
              if ($dc_info) {
@@ -4627,13 +4673,12 @@ ENDSCRIPT
             return $bodytag;
         }
 
-        if ($cid && $gcicourses{$cid} eq 'tutorial') {
-            $bodytag .= '<div class="LC_page_header">';
-        } 
-        $bodytag .= qq|<div id="LC_nav_bar">$name $role $role_selector</div>|;
+        unless ($env{'request.symb'} =~ m/\.page___\d+___/) {
+            $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>|;
+        }
 
         $bodytag .= Apache::lonhtmlcommon::scripttag(
-            Apache::lonmenu::utilityfunctions('',$custommenu), 'start');
+            Apache::lonmenu::utilityfunctions(), 'start');
 
         $bodytag .= Apache::lonmenu::primary_menu();
 
@@ -4641,18 +4686,10 @@ ENDSCRIPT
             $dc_info = &dc_courseid_toggle($dc_info);
         }
         $bodytag .= qq|<div id="LC_realm">$realm $dc_info</div>|;
-        if ($cid && $gcicourses{$cid} eq 'tutorial') {
-            $bodytag .= '</div>';
-        }
 
         #don't show menus for public users
-        if($env{'user.name'} ne 'public' && $env{'user.domain'} ne 'public'){
-            if (($custommenu) && 
-                ($env{'request.role'} !~ m{^st\./gcitest/$match_courseid})) {
-                $bodytag .= &Apache::lonmenu::gci_secondary_menu();
-            } else { 
-                $bodytag .= Apache::lonmenu::secondary_menu();
-            }
+        if (!$public){
+            $bodytag .= Apache::lonmenu::secondary_menu();
             $bodytag .= Apache::lonmenu::serverform();
             $bodytag .= Apache::lonhtmlcommon::scripttag('', 'end');
             if ($env{'request.state'} eq 'construct') {
@@ -4660,17 +4697,6 @@ ENDSCRIPT
                                 $args->{'bread_crumbs'});
             } elsif ($forcereg) { 
                 $bodytag .= &Apache::lonmenu::innerregister($forcereg);
-            } elsif ($custommenu && $env{'request.course.id'} && 
-                     &Apache::lonnet::allowed('mdc', $env{'request.course.id'})) {
-                if ($env{'request.noversionuri'} eq '/adm/navmaps') {
-                    my @advtools = &concept_test_manager();
-                    &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                                      'advtools',@advtools);
-                    my $advlinks;
-                    my $legendtext = '<a class="LC_menubuttons_link" href="/adm/menu">'.&mt('Management').'</a>';
-                    &Apache::lonhtmlcommon::render_advtools(\$advlinks,$legendtext);
-                    $bodytag .= $advlinks;
-                }
             }
         }else{
             # this is to seperate menu from content when there's no secondary
@@ -4716,52 +4742,6 @@ $bodytag
 ENDBODY
 }
 
-sub concept_test_manager {
-    my @advtools;
-    my  %items = (
-                   docs => { 
-                              desc    => 'Edit Test',
-                              action  => "go('/adm/coursedocs')",
-                              tooltip => 'Assemble or modify Concept Test'
-                           },
-                   cprv => {
-                              desc => 'Enrollment/Activity',
-                              action => "go('/adm/createuser')",
-                              tooltip => 'Enrollment and student activity',
-                           },
-                   new => { 
-                              desc   => "What's New?",
-                              action => "go('/adm/whatsnew')",
-                              tooltip => 'Recent events/action items in Concept Test' ,
-                           },
-                   prnt => {
-                              desc => 'Print Test',
-                              action => "go('/adm/printout');",
-                              tooltip => 'Prepare printable Concept Test',
-                           },
-                   chrt => { 
-                              desc   => 'Test Statistics',
-                              action => "go('/adm/statistics');",
-                              tooltip => 'Concept Test Statistics',
-                           },
-                   rcrs => {
-                              desc   => 'Create New Test',
-                              action  => "switchpage('createtest');",
-                              tooltip => 'Create new Concept Test',
-                           },
-                 );
-    my @ordered = ('docs','cprv','new','prnt','chrt','rcrs');
-    foreach my $item (@ordered) {
-         push(@advtools,
-                  '<a title="'.$items{$item}{tooltip}.'" class="LC_menubuttons_link" href="javascript:'.
-                  $items{$item}{action}.';">'.
-                  '<img src="'.'/res/adm/pages/'.$item.'22.png" alt="'.$items{$item}{tooltip}.
-                  '" border="0" class="LC_icon" />'.
-                  '<span class="LC_menubuttons_inline_text">'.$items{$item}{desc}.'</span></a>');
-    }
-    return @advtools;
-}
-
 sub dc_courseid_toggle {
     my ($dc_info) = @_;
     return ' <span id="dccidtext" class="LC_cusr_subheading">'.
@@ -4902,13 +4882,21 @@ sub standard_css {
     my $table_header         = '#DDDDDD';
     my $feedback_link_bg     = '#BBBBBB';
     my $lg_border_color      = '#C8C8C8';
+    my $button_hover         = '#BF2317';
 
     my $border = ($env{'browser.type'} eq 'explorer' ||
       $env{'browser.type'} eq 'safari'     ) ? '0 2px 0 2px'
                                              : '0 3px 0 4px';
 
-
     return <<END;
+
+/* needed for iframe to allow 100% height in FF */
+body, html { 
+    margin: 0;
+    padding: 0 0.5%;
+    height: 99%; /* to avoid scrollbars */
+}
+
 body {
   font-family: $sans;
   line-height:130%;
@@ -4916,7 +4904,8 @@ body {
   color:$font;
 }
 
-a:focus {
++a:focus,
++a:focus img {
   color: red;
   background: yellow;
 }
@@ -4933,11 +4922,23 @@ form, .inline {
   vertical-align:middle;
 }
 
-/* just for tests */
 .LC_400Box {
   width:400px;
 }
-/* end */
+
+.LC_iframecontainer {
+    width: 98%;
+    margin: 0;
+    position: fixed;
+    top: 8.5em;
+    bottom: 0;
+}
+
+.LC_iframecontainer iframe{
+    border: none;
+    width: 100%;
+    height: 100%;
+}
 
 .LC_filename {
   font-family: $mono;
@@ -5051,7 +5052,7 @@ table#LC_title_bar {
 }
 
 table#LC_title_bar,
-table.LC_breadcrumbs,
+table.LC_breadcrumbs, /* obsolete? */
 table#LC_title_bar.LC_with_remote {
   width: 100%;
   border-color: $pgbg;
@@ -5085,50 +5086,6 @@ ul.LC_breadcrumb_tools_outerlist li {
     float: right;
 }
 
-div.LC_GCI_Menu {
-    width:900px;
-}
-
-div.LC_GCI_Menu:after {
-    content:'';
-    display:block;
-    clear:both;
-}
-
-div.LC_GCI_Menu_left {
-    float:left;
-    width:400px;
-}
-
-div.LC_GCI_Menu_right {
-    float:left;
-    width:400px;;
-}
-
-dl.LC_GCI_Menu {
-    width:300px;
-    float:left;
-    margin-right:2em;
-}
-
-dl.LC_GCI_Menu dt {
-    font-weight: bold;
-    font-size:0.9em;
-    margin-bottom:0.7em;
-}
-
-dl.LC_GCI_Menu dt a {
-    color: $font;
-}
-
-dl.LC_GCI_Menu dd {
-    font-size:0.8em;
-    margin:0 0 2em 0;
-    padding-left:4.5em;
-    line-height:1.5em;
-    background:none no-repeat left top;
-}
-
 table#LC_title_bar td {
   background: $tabbg;
 }
@@ -5139,7 +5096,7 @@ table#LC_menubuttons img {
 
 .LC_breadcrumbs_component {
   float: right;
-  margin: 0.25em 1em;
+  margin: 0 1em;
 }
 .LC_breadcrumbs_component img {
   vertical-align: middle;
@@ -5161,7 +5118,6 @@ td.LC_table_cell_checkbox {
   overflow: hidden;
   margin: 0;
   padding: 0;
-  text-align: left;
 }
 
 /* Preliminary fix to hide breadcrumbs inside remote control window */
@@ -5173,7 +5129,7 @@ td.LC_table_cell_checkbox {
   clear:both;
   background: #F8F8F8; /* $sidebg; */
   border: 1px solid $sidebg;
-  margin: 0 0 0 0;      
+  margin: 0 0 10px 0;      
 }
 
 .LC_fontsize_medium {
@@ -5190,6 +5146,14 @@ td.LC_table_cell_checkbox {
   padding-left:3px;
 }
 
+.LC_menubuttons_inline_text img{
+  vertical-align: middle;
+}
+
+li.LC_menubuttons_inline_text img,a {
+  cursor:pointer;
+}
+
 .LC_menubuttons_link {
   text-decoration: none;
 }
@@ -5209,8 +5173,7 @@ td.LC_menubuttons_text {
   background: $tabbg;
 }
 
-table.LC_data_table,
-table.LC_mail_list {
+table.LC_data_table {
   border: 1px solid #000000;
   border-collapse: separate;
   border-spacing: 1px;
@@ -5236,9 +5199,16 @@ table.LC_nested {
   width: 100%;
 }
 
+.ui-accordion,
+.ui-accordion table.LC_data_table,
+.ui-accordion table.LC_nested_outer{
+  border: 0px;
+  border-spacing: 0px;
+  margin: 3px;
+}
+
 table.LC_data_table tr th,
 table.LC_calendar tr th,
-table.LC_mail_list tr th,
 table.LC_prior_tries tr th,
 table.LC_innerpickbox tr th {
   font-weight: bold;
@@ -5291,13 +5261,20 @@ table.LC_data_table tr td.LC_leftcol_hea
 
 table.LC_data_table tr.LC_empty_row td,
 table.LC_nested tr.LC_empty_row td {
-  background-color: #FFFFFF;
   font-weight: bold;
   font-style: italic;
   text-align: center;
   padding: 8px;
 }
 
+table.LC_data_table tr.LC_empty_row td {
+  background-color: $sidebg;
+}
+
+table.LC_nested tr.LC_empty_row td {
+  background-color: #FFFFFF;
+}
+
 table.LC_caption {
 }
 
@@ -5345,6 +5322,22 @@ table.LC_nested tr td.LC_right_item {
   text-align: right;
 }
 
+.ui-accordion table.LC_nested tr.LC_odd_row td.LC_left_item,
+.ui-accordion table.LC_nested tr.LC_even_row td.LC_left_item {
+  text-align: right;
+  width: 40%;
+  padding-right:10px;
+  vertical-align: top;
+  padding: 5px;
+}
+
+.ui-accordion table.LC_nested tr.LC_odd_row td.LC_right_item,
+.ui-accordion table.LC_nested tr.LC_even_row td.LC_right_item {
+  text-align: left;
+  width: 60%;
+  padding: 2px 4px;
+}
+
 table.LC_nested tr.LC_odd_row td {
   background-color: #EEEEEE;
 }
@@ -5386,37 +5379,43 @@ table.LC_calendar tr td.LC_calendar_day_
   background-color: $data_table_highlight;
 }
 
-table.LC_mail_list tr.LC_mail_new {
+table.LC_data_table tr td.LC_mail_new {
   background-color: $mail_new;
 }
 
-table.LC_mail_list tr.LC_mail_new:hover {
+table.LC_data_table tr.LC_mail_new:hover {
   background-color: $mail_new_hover;
 }
 
-table.LC_mail_list tr.LC_mail_read {
+table.LC_data_table tr td.LC_mail_read {
   background-color: $mail_read;
 }
 
-table.LC_mail_list tr.LC_mail_read:hover {
+/*
+table.LC_data_table tr.LC_mail_read:hover {
   background-color: $mail_read_hover;
 }
+*/
 
-table.LC_mail_list tr.LC_mail_replied {
+table.LC_data_table tr td.LC_mail_replied {
   background-color: $mail_replied;
 }
 
-table.LC_mail_list tr.LC_mail_replied:hover {
+/*
+table.LC_data_table tr.LC_mail_replied:hover {
   background-color: $mail_replied_hover;
 }
+*/
 
-table.LC_mail_list tr.LC_mail_other {
+table.LC_data_table tr td.LC_mail_other {
   background-color: $mail_other;
 }
 
-table.LC_mail_list tr.LC_mail_other:hover {
+/*
+table.LC_data_table tr.LC_mail_other:hover {
   background-color: $mail_other_hover;
 }
+*/
 
 table.LC_data_table tr > td.LC_browser_file,
 table.LC_data_table tr > td.LC_browser_file_published {
@@ -5446,23 +5445,23 @@ table.LC_data_table tr > td.LC_roles_is
 }
 
 table.LC_data_table tr > td.LC_roles_future {
-  background: #FFFF77;
+  border-right: 8px solid #FFFF77;
 }
 
 table.LC_data_table tr > td.LC_roles_will {
-  background: #FFAA77;
+  border-right: 8px solid #FFAA77;
 }
 
 table.LC_data_table tr > td.LC_roles_expired {
-  background: #FF7777;
+  border-right: 8px solid #FF7777;
 }
 
 table.LC_data_table tr > td.LC_roles_will_not {
-  background: #AAFF77;
+  border-right: 8px solid #AAFF77;
 }
 
 table.LC_data_table tr > td.LC_roles_selected {
-  background: #11CC55;
+  border-right: 8px solid #11CC55;
 }
 
 span.LC_current_location {
@@ -5686,10 +5685,6 @@ table.LC_notify_front_page td {
   font-size: 1.2em;
 }
 
-.LC_topic_bar img {
-  vertical-align: bottom;
-}
-
 table.LC_course_group_status {
   margin: 20px;
 }
@@ -5928,56 +5923,41 @@ div.LC_clear_float_footer {
 }
 
 div.LC_grade_show_user {
-  margin-top: 20px;
-  border: 1px solid black;
+/*  border-left: 5px solid $sidebg; */
+  border-top: 5px solid #000000;
+  margin: 50px 0 0 0;
+  padding: 15px 0 5px 10px;
 }
 
-div.LC_grade_user_name {
-  background: #DDDDEE;
-  border-bottom: 1px solid black;
-  font-weight: bold;
-  font-size: large;
+div.LC_grade_show_user_odd_row {
+/*  border-left: 5px solid #000000; */
 }
 
-div.LC_grade_show_user_odd_row div.LC_grade_user_name {
-  background: #DDEEDD;
+div.LC_grade_show_user div.LC_Box {
+  margin-right: 50px;
 }
 
-div.LC_grade_show_problem,
 div.LC_grade_submissions,
 div.LC_grade_message_center,
-div.LC_grade_info_links,
-div.LC_grade_assign {
+div.LC_grade_info_links {
   margin: 5px;
   width: 99%;
   background: #FFFFFF;
 }
 
-div.LC_grade_show_problem_header,
 div.LC_grade_submissions_header,
-div.LC_grade_message_center_header,
-div.LC_grade_assign_header {
+div.LC_grade_message_center_header {
   font-weight: bold;
   font-size: large;
 }
 
-div.LC_grade_show_problem_problem,
 div.LC_grade_submissions_body,
-div.LC_grade_message_center_body,
-div.LC_grade_assign_body {
+div.LC_grade_message_center_body {
   border: 1px solid black;
   width: 99%;
   background: #FFFFFF;
 }
 
-span.LC_grade_check_note {
-  font-weight: normal;
-  font-size: medium;
-  display: inline;
-  position: absolute;
-  right: 1em;
-}
-
 table.LC_scantron_action {
   width: 100%;
 }
@@ -6011,15 +5991,8 @@ div.LC_edit_problem_header_title {
 }
 
 table.LC_edit_problem_header_title {
-  font-size: larger;
-  font-weight:  bold;
   width: 100%;
-  border-color: $pgbg;
-  border-style: solid;
-  border-width: $border;
   background: $tabbg;
-  border-collapse: collapse;
-  padding: 0;
 }
 
 div.LC_edit_problem_discards {
@@ -6052,13 +6025,6 @@ div.LC_createcourse {
   display:none;
 }
 
-/* ---- Remove when done ----
-# The following styles is part of the redesign of LON-CAPA and are
-# subject to change during this project.
-# Don't rely on their current functionality as they might be 
-# changed or removed.
-# --------------------------*/
-
 a:hover,
 ol.LC_primary_menu a:hover,
 ol#LC_MenuBreadcrumbs a:hover,
@@ -6066,7 +6032,7 @@ ol#LC_PathBreadcrumbs a:hover,
 ul#LC_secondary_menu a:hover,
 .LC_FormSectionClearButton input:hover
 ul.LC_TabContent   li:hover a {
-  color:#BF2317;
+  color:$button_hover;
   text-decoration:none;
 }
 
@@ -6131,14 +6097,9 @@ fieldset > legend {
   padding: 0 5px 0 5px;
 }
 
-div.LC_page_header {
-  background-color: $pgbg_or_bgcolor;
-  margin: 0 0 1.0em 0;
-}
-
 #LC_nav_bar {
   float: left;
-  margin: 0.2em 0 0 0;
+  margin: 0;
 }
 
 #LC_realm {
@@ -6155,7 +6116,12 @@ div.LC_page_header {
 
 ol.LC_primary_menu {
   float: right;
-  margin: 0.2em 0 0 0;
+  margin: 0;
+}
+
+span.LC_new_message{
+  font-weight:bold;
+  color: darkred;
 }
 
 ol#LC_PathBreadcrumbs {
@@ -6170,10 +6136,10 @@ ol.LC_primary_menu li {
 
 ol.LC_primary_menu li img {
   vertical-align: bottom;
+  height: 1.1em;
 }
 
 ol.LC_primary_menu a {
-  font-size: 90%;
   color: RGB(80, 80, 80);
   text-decoration: none;
 }
@@ -6217,14 +6183,15 @@ ul#LC_secondary_menu li a {
 }
 
 ul.LC_TabContent {
-  min-height:1.5em;
+  min-height:20px;
 }
 
 ul.LC_TabContent li {
   vertical-align:middle;
-  padding: 0 10px 0 10px;
+  padding: 0 16px 0 10px;
   background-color:$tabbg;
   border-bottom:solid 1px $lg_border_color;
+  border-right: solid 1px $font;
 }
 
 ul.LC_TabContent .right {
@@ -6237,16 +6204,33 @@ ul.LC_TabContent li {
   text-decoration:none;
   font-size:95%;
   font-weight:bold;
-  padding-right: 16px;
+  min-height:20px;
+}
+
+ul.LC_TabContent li a:hover,
+ul.LC_TabContent li a:focus {
+  color: $button_hover;
+  background:none;
+  outline:none;
+}
+
+ul.LC_TabContent li:hover {
+  color: $button_hover;
+  cursor:pointer;
 }
 
-ul.LC_TabContent li:hover,
 ul.LC_TabContent li.active {
+  color: $font;
   background:#FFFFFF url(/adm/lonIcons/open.gif) no-repeat scroll right center;
-  border-bottom:solid 2px #FFFFFF;
-  padding-right: 16px;
+  border-bottom:solid 1px #FFFFFF;
+  cursor: default;
 }
 
+ul.LC_TabContent li.active a {
+  color:$font;
+  background:#FFFFFF;
+  outline: none;
+}
 #maincoursedoc {
   clear:both;
 }
@@ -6265,6 +6249,10 @@ ul.LC_TabContentBigger li {
   color: #737373;
 }
 
+ul.LC_TabContentBigger li.active {
+  position: relative;
+  top: 1px;
+}
 
 ul.LC_TabContentBigger li a {
   background:url('/adm/lonIcons/tabbgleft.gif') left bottom no-repeat;
@@ -6273,31 +6261,33 @@ ul.LC_TabContentBigger li a {
   text-align: center;
   display: block;
   text-decoration: none;
+  outline: none;
 }
 
-ul.LC_TabContentBigger li:hover a,
 ul.LC_TabContentBigger li.active a {
   background:url('/adm/lonIcons/tabbgleft.gif') left top no-repeat;
   color:$font;
-  text-decoration: underline;
 }
 
-
 ul.LC_TabContentBigger li b {
   background: url('/adm/lonIcons/tabbgright.gif') no-repeat right bottom;
   display: block;
   float: left;
   padding: 0 30px;
+  border-bottom: 1px solid $lg_border_color;
+}
+
+ul.LC_TabContentBigger li:hover b {
+  color:$button_hover;
 }
 
-ul.LC_TabContentBigger li:hover b,
 ul.LC_TabContentBigger li.active b {
   background:url('/adm/lonIcons/tabbgright.gif') right top no-repeat;
   color:$font;
-  border-bottom: 1px solid #FFFFFF;
+  border: 0;
+  cursor:default;
 }
 
-
 ul.LC_CourseBreadcrumbs {
   background: $sidebg;
   line-height: 32px;
@@ -6311,7 +6301,6 @@ ol#LC_MenuBreadcrumbs,
 ol#LC_PathBreadcrumbs {
   padding-left: 10px;
   margin: 0;
-  margin: 0;
   height: 2.5em;  /* equal to #LC_breadcrumbs line-height */
 }
 
@@ -6319,7 +6308,7 @@ ol#LC_MenuBreadcrumbs li,
 ol#LC_PathBreadcrumbs li,
 ul.LC_CourseBreadcrumbs li {
   display: inline;
-  white-space: normal;
+  white-space: normal;  
 }
 
 ol#LC_MenuBreadcrumbs li a,
@@ -6328,14 +6317,6 @@ ul.LC_CourseBreadcrumbs li a {
   font-size:90%;
 }
 
-ol#LC_MenuBreadcrumbs h1 {
-  display: inline;
-  font-size: 90%;
-  line-height: 2.5em;
-  margin: 0;
-  padding: 0;
-}
-
 ol#LC_PathBreadcrumbs li a {
   text-decoration:none;
   font-size:100%;
@@ -6581,7 +6562,7 @@ ul.LC_funclist {
 }
 
 ul.LC_funclist > li:first-child {
-    font-weight:bold;
+    font-weight:bold; 
     margin-left:0.8em;
 }
 
@@ -6605,36 +6586,10 @@ ul.LC_funclist li {
   line-height: 150%;
 }
 
-#gciheader {
-  float:left;
-  width:100%;
-  background:#DAE0D2 url("/gcimenu_bg.gif") repeat-x bottom;
-  font-size:93%;
-  line-height:normal;
-  margin: 0.5em 0 0.5em 0;
-}
-#gciheader ul {
-  margin:0;
-  padding:10px 5px 0;
-  list-style:none;
-}
-#gciheader li {
-  float:left;
-  background:url("/gcimenu_left.gif") no-repeat left top;
-  margin:0;
-  padding:0 0 0 9px;
-}
-#gciheader a {
-  display:block;
-  background:url("/gcimenu_right.gif") no-repeat right top;
-  padding:5px 15px 4px 6px;
-}
-#gciheader #current {
-  background-image:url("/gcimenu_left_on.gif");
-}
-#gciheader #current a {
-  background-image:url("/gcimenu_right_on.gif");
-  padding-bottom:5px;
+.ui-accordion .LC_advanced_toggle {
+  float: right;
+  font-size: 90%;
+  padding: 0px 4px
 }
 
 END
@@ -6930,8 +6885,8 @@ sub start_page {
 		#if bread_crumbs_component exists show it as headline else show only the breadcrumbs
 		if(exists($args->{'bread_crumbs_component'})){
 			$result .= &Apache::lonhtmlcommon::breadcrumbs($args->{'bread_crumbs_component'});
-		} else {
-                	$result .= &Apache::lonhtmlcommon::breadcrumbs(); 
+		}else{
+			$result .= &Apache::lonhtmlcommon::breadcrumbs();
 		}
     }
     return $result;
@@ -7048,15 +7003,26 @@ sub simple_error_page {
 
 {
     my @row_count;
+
+    sub start_data_table_count {
+        unshift(@row_count, 0);
+        return;
+    }
+
+    sub end_data_table_count {
+        shift(@row_count);
+        return;
+    }
+
     sub start_data_table {
 	my ($add_class) = @_;
 	my $css_class = (join(' ','LC_data_table',$add_class));
-	unshift(@row_count,0);
+        &start_data_table_count();
 	return '<table class="'.$css_class.'">'."\n";
     }
 
     sub end_data_table {
-	shift(@row_count);
+        &end_data_table_count();
 	return '</table>'."\n";;
     }
 
@@ -7862,9 +7828,9 @@ sub user_picker {
                     'whse'      => "When searching by last,first you must include at least one character in the first name.",
                      'thfo'     => "The following need to be corrected before the search can be run:",
                                        );
-    my $domform = &select_dom_form($currdom,'srchdomain',undef,1);
+    my $domform = &select_dom_form($currdom,'srchdomain',1,1);
     my $srchinsel = ' <select name="srchin">';
-     
+
     my @srchins = ('crs','dom','alc','instd');
 
     foreach my $option (@srchins) {
@@ -7874,13 +7840,12 @@ sub user_picker {
         next if ($option eq 'alc');
         next if (($option eq 'crs') && ($env{'form.form'} eq 'requestcrs'));  
         next if ($option eq 'crs' && !$env{'request.course.id'});
-        next if ($option eq 'instd');
         if ($curr_selected{'srchin'} eq $option) {
             $srchinsel .= ' 
-       <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
+   <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
         } else {
             $srchinsel .= '
-    <option value="'.$option.'">'.$lt{$option}.'</option>';
+   <option value="'.$option.'">'.$lt{$option}.'</option>';
         }
     }
     $srchinsel .= "\n  </select>\n";
@@ -7924,9 +7889,9 @@ sub user_picker {
                     );
                     $new_user_create = '<p class="LC_warning">'
                                       .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.")
-                                      .'<br />'
-                                      .&mt('Enter a valid e-mail address as the username for the new user.').' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.'
-                                      ,'<a href="'.$helplink.'">','</a>')
+                                      .' '
+                                      .&mt('Please contact the [_1]helpdesk[_2] for assistance.'
+                                          ,'<a href="'.$helplink.'">','</a>')
                                       .'</p><br />';
                 }
             }
@@ -10251,8 +10216,10 @@ sub check_clone {
                                          'userroles',['active'],[$ccrole],
 					 [$args->{'clonedomain'}]);
 	        if (($roleshash{$args->{'clonecourse'}.':'.$args->{'clonedomain'}.':'.$ccrole}) || (grep(/^\Q$args->{'ccuname'}\E:\Q$args->{'ccdomain'}\E$/,@cloners))) {
-		    $can_clone = 1;
-	        } else {
+                    $can_clone = 1;
+                } elsif (&Apache::lonnet::is_course_owner($args->{'clonedomain'},$args->{'clonecourse'},$args->{'ccuname'},$args->{'ccdomain'})) {
+                    $can_clone = 1;
+                } else {
                     if ($args->{'crstype'} eq 'Community') {
                         $clonemsg = &mt('No new community created.').$linefeed.&mt('The new community could not be cloned from the existing community because the new community owner ([_1]) does not have cloning rights in the existing community ([_2]).',$args->{'ccuname'}.':'.$args->{'ccdomain'},$clonedesc{'description'});
                     } else {
@@ -10312,11 +10279,19 @@ sub construct_course {
     # if anyone ever decides to not show this, and Utils::Course::new
     # will need to be suitably modified.
     $outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed;
+    if ($$courseid =~ /^error:/) {
+        return (0,$outcome);
+    }
+
 #
 # Check if created correctly
 #
     ($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid);
     my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom);
+    if ($crsuhome eq 'no_host') {
+        $outcome .= &mt('Course creation failed, unrecognized course home server.').$linefeed;
+        return (0,$outcome);
+    }
     $outcome .= &mt('Created on').': '.$crsuhome.$linefeed;
 
 #
@@ -10335,6 +10310,10 @@ sub construct_course {
 	$cenv{'url'}=$oldcenv{'url'};
 # Restore title
 	$cenv{'description'}=$oldcenv{'description'};
+# Restore creation date, creator and creation context.
+        $cenv{'internal.created'}=$oldcenv{'internal.created'};
+        $cenv{'internal.creator'}=$oldcenv{'internal.creator'};
+        $cenv{'internal.creationcontext'}=$oldcenv{'internal.creationcontext'};
 # Mark as cloned
 	$cenv{'clonedfrom'}=$cloneid;
 # Need to clone grading mode
@@ -10581,7 +10560,7 @@ sub construct_course {
 	    $title=&mt('Syllabus');
             $url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus';
         } else {
-            $title=&mt('Navigate Contents');
+            $title=&mt('Table of Contents');
             $url='/adm/navmaps';
         }
 
@@ -10592,21 +10571,6 @@ sub construct_course {
         $outcome .= ($fatal?$errtext:'write ok').$linefeed;
     }
 
-    if ($args->{'cloneroster'}) {
-        my ($numadded,$clisterror) = &Apache::lonclonecourse::copyroster($cloneid,$$courseid,$args->{'startaccess'},$args->{'endaccess'});
-        if ($clisterror) {
-            $outcome .= "\0".&mt('An error occurred when copying the student roster from the old course to the new course; the error was: [_1].',$clisterror).$linefeed;
-            if ($numadded) {
-                $outcome .= &mt('Although [quant,_1,student] have received roles in the new course the roster does not report this. It is  ').$linefeed;
-            } 
-        } else {
-            if ($numadded) {
-                $outcome .= "\0".&mt('[quant,_1,student] copied from roster for old course to roster for new course.',$numadded).$linefeed;
-            } else {
-                $outcome .= "\0".&mt('No students have been enrolled in the new Concept Test.').' '.&mt('This is because either (a) an error occurred, or (b) there were no students with either current access or access which ended on/after the current default end date set for access to the old course.').$linefeed;
-            }
-        }
-    }
     return (1,$outcome);
 }
 
@@ -10873,60 +10837,6 @@ sub _add_to_env {
     }
 }
 
-sub new_roles_update {
-    my $rolecount = 0;
-    foreach my $envkey (keys(%env)) {
-        next unless ($envkey =~ /^user\.role\./);
-        $rolecount ++;
-    }
-    my $newrolecount = 0;
-    if (!$rolecount) {
-        my %userenv;
-        foreach my $crstype ('official','unofficial','community') {
-            $userenv{'canrequest.'.$crstype} =
-                &Apache::lonnet::usertools_access($env{'user.name'},
-                $env{'user.domain'},$crstype,'reload','requestcourses');
-        }
-        my $then=$env{'user.login.time'};
-        my $refresh=time;
-        my (%userroles,%allroles,%allgroups,@newroles);
-        my %roleshash =
-            &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles',['active','future','previous'],undef,undef,1);
-        foreach my $item (keys(%roleshash)) {
-            my ($uname,$udom,$role,$section) = split(':',$item);
-            my $where = '/'.$udom.'/'.$uname;
-            my ($tstart,$tend) = split(':',$roleshash{$item});
-            if ($section ne '') {
-                $where .= '/'.$section;
-            }
-            my $spec = $role.'.'.$where;
-            &Apache::lonnet::set_arearole($role,$where,$tstart,$tend,
-                                          $env{'user.domain'},$env{'user.name'});
-            $userroles{'user.role.'.$spec} = $tstart.'.'.$tend;
-            $newrolecount ++;
-            unless (grep(/^\Q$role\E$/,@newroles)) {
-                push(@newroles,$role);
-            }
-            my $status =
-                &Apache::lonnet::curr_role_status($tstart,$tend,$refresh,$then);
-            if ($status eq 'active') {
-                &Apache::lonnet::gather_roleprivs(\%allroles,\%allgroups,\%userroles,
-                                                  $where,$role,$tstart,$tend);
-            }
-        }
-        if (@newroles) {
-            my ($author,$adv) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles,
-                                                               \%allgroups);
-            &Apache::lonnet::appenv(\%userroles,[@newroles,'cm']);
-            $userenv{'user.adv'} = $adv;
-            $userenv{'user.author'} = $author;
-            $userenv{'user.refresh.time'} = $refresh;
-        }
-        &Apache::lonnet::appenv(\%userenv);
-    }
-    return $newrolecount;
-}
-
 # --- Get the symbolic name of a problem and the url
 sub get_symb {
     my ($request,$silent) = @_;
@@ -10968,151 +10878,6 @@ sub clean_symb {
     return ($symb,$enc);
 }
 
-sub needs_gci_custom {
-    my $custommenu;
-    my $numdc = &check_for_gci_dc();
-    unless ($numdc) {
-        my $then=$env{'user.login.time'};
-        my $now = time;
-        my %cnums = (
-                        review => '9615072b469884921gcil1',
-                        submit => '1H96711d710194bfegcil1',
-                    );
-        if ($env{'user.role.st./gci/'.$cnums{'review'}}) {
-            my ($start,$end) =
-                split('.',$env{'user.role.st./gci/'.$cnums{'review'}});
-            if (((!$start) || ($start && $start <= $now)) &&
-                ((!$end) || ($end > $now))) {
-                $custommenu = 1;
-                if ($env{'user.role.cc./gci/'.$cnums{'review'}}) {
-                    my ($ccstart,$ccend) =
-                        split('.',$env{'user.role.cc./gci/'.$cnums{'review'}});
-                    if (((!$start) || ($start && $start <= $now)) &&
-                            ((!$end) || ($end > $now))) {
-                        $custommenu = '';
-                    }
-                }
-            }
-        }
-    }
-    return $custommenu;
-}
-
-sub check_for_gci_dc {
-    my $then=$env{'user.login.time'};
-    my $numdc = 0;
-    foreach my $dom ('gci','gcitest') {
-        if ($env{'user.role.dc./'.$dom.'/'}) {
-            my $livedc = 1;
-            my ($tstart,$tend)=split(/\./,$env{'user.role.dc./'.$dom.'/'});
-            if ($tstart && $tstart>$then) { $livedc = 0; }
-            if ($tend   && $tend  <$then) { $livedc = 0; }
-            if ($livedc) {
-                $numdc++;
-            }
-        }
-    }
-    return $numdc;
-}
-
-sub existing_gcitest_courses {
-    my ($role) = @_;
-    my %courses;
-    my $cdom = 'gcitest';
-    my $now = time;
-    foreach my $envkey (keys(%env)) {
-        my $cnum;
-        if ($envkey =~ m{^user\.role\.\Q$role\E\./\Q$cdom\E/($match_courseid)$}) {
-            $cnum = $1;
-        } else {
-            next;
-        }
-        my ($tstart,$tend) = split('.',$env{$envkey});
-        if (((!$tstart) || ($tstart < $now)) && ((!$tend) || ($tend > $now))) {
-            my $descr = $env{'course.'.$cdom.'_'.$cnum.'.description'};
-            if ($descr ne '') {
-                $courses{$cdom.'_'.$cnum}{'description'} = $descr;
-            }
-        }
-    }
-    return %courses;
-}
-
-sub gcitest_switcher {
-    my ($role,$formname,%courses) = @_;
-    my $output;
-    my %Sortby;
-    foreach my $course (sort(keys(%courses))) {
-        next unless (ref($courses{$course}) eq 'HASH');
-        my $clean_title = $courses{$course}{'description'};
-        $clean_title =~ s/\W+//g;
-        if ($clean_title eq '') {
-            $clean_title = $courses{$course}{'description'};
-        }
-        push(@{$Sortby{$clean_title}},$course);
-    }
-    my @sorted_courses = sort { lc($a) cmp lc($b) } (keys(%Sortby));
-    my $default;
-    if (@sorted_courses > 1) {
-        if (($env{'request.course.id'}) && ($courses{$env{'request.course.id'}})) {
-            $default = &mt('Switch concept test ...');
-        } else {
-            $default = &mt('Select a concept test ...');
-        }
-    } else {
-        unless (($env{'request.course.id'}) && ($courses{$env{'request.course.id'}})) {
-            $default = &mt('Select concept test ...');
-        }
-    }
-    if ($default) {
-        $output = '<form name="'.$formname.'" action="/adm/roles" method="post">'.
-                  '<select name="newrole" onchange="javascript:courseswitcher();">'.
-                  '<option value="" selected="selected">'.$default.'</option>';
-        foreach my $item (@sorted_courses) {
-            foreach my $course (@{$Sortby{$item}}) {
-                my ($cdom,$cnum) = split('_',$course);
-                $output .= '<option value="'.$role.'./'.$cdom.'/'.$cnum.'">'.$courses{$course}{'description'}.'</option>';
-            }
-        }
-        $output .= '</select><input type="hidden" name="selectrole" value="" /></form>';
-    }
-    return $output;
-}
-
-sub gcitest_switcher_js {
-    my ($current,$numcourses,$formname) = @_;
-    my $output = <<"ENDJS";
-
-function courseswitcher(caller) {
-    var numcourses = $numcourses;
-    var current = '$current';
-    var choice = document.$formname.newrole.options[document.$formname.newrole.selectedIndex].value;
-    if (choice == '') {
-        if (caller == 'icon') {
-            alert('No Concept Test selected');
-        }
-        document.$formname.selectrole.value = '';
-        return;
-    }
-    if (choice == current) {
-        if ((caller != 'icon') && (numcourses > 1)) {
-            alert('You have selected the current course.\\nPlease select a different Concept Test course');
-        }
-        document.$formname.newrole.selectedIndex = 0;
-        document.$formname.selectrole.value = '';
-        return;
-    }
-    document.$formname.selectrole.value = '1';
-    document.$formname.submit();
-    return;
-}
-
-ENDJS
-    return $output;
-}
-
-
-
 =pod
 
 =back