--- loncom/interface/lonuserutils.pm	2008/01/06 05:32:43	1.46
+++ loncom/interface/lonuserutils.pm	2008/01/17 00:14:49	1.48
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.46 2008/01/06 05:32:43 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.48 2008/01/17 00:14:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1467,9 +1467,9 @@ sub section_group_filter {
                                               all  => 'all',
                                               none => 'none',
                                             );
-    my ($output,@options);
+    my $output;
     foreach my $item (@filters) {
-        my $markup; 
+        my ($markup,@options); 
         if ($env{'form.'.$name{$item}} eq '') {
             $env{'form.'.$name{$item}} = 'all';
         }
@@ -1791,6 +1791,7 @@ sub make_keylist_array {
     $index->{'role'} = &Apache::loncoursedata::CL_ROLE();
     $index->{'extent'} = &Apache::loncoursedata::CL_EXTENT();
     $index->{'photo'} = &Apache::loncoursedata::CL_PHOTO();
+    $index->{'thumbnail'} = &Apache::loncoursedata::CL_THUMBNAIL();
     foreach my $key (keys(%{$index})) {
         $keylist->[$index->{$key}] = $key;
     }
@@ -1999,9 +2000,14 @@ function username_display_launch(usernam
         document.studentform.action.value = 'singleuser';
         document.studentform.submit();
     }
-    else {
+    if (target == 'aboutme') {
         document.location.href = '/adm/'+domain+'/'+username+'/aboutme';
     }
+    if (target == 'aboutmewin') {
+        var url = '/adm/'+domain+'/'+username+'/aboutme';
+        var options = 'height=600,width=800,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no';
+        aboutmewin = window.open(url,'',options,1);
+    }
 }
 </script>
 $date_sec_selector
@@ -2035,6 +2041,7 @@ END
                        'ac'         => "Action to take for selected users",
                        'link'       => "Behavior of username links",
                        'aboutme'    => "Display a user's personal page",
+                       'aboutmewin' => "Display a user's personal page in a new window",
                        'modify'     => "Modify a user's information",
                       );
     if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
@@ -2091,25 +2098,23 @@ END
 <input type="hidden" name="srchdomain" value="" /> 
 END
             $output = '<p>';
-            my @linkdests = ('aboutme');
+            my @linkdests = ('aboutme','aboutmewin');
             if ($permission->{'cusr'}) {
-                push (@linkdests,'modify');
-                $output .= '<span class="LC_nobreak">'.$lt{'link'}.':&nbsp;';
-                my $usernamelink = $env{'form.usernamelink'};
-                if ($usernamelink eq '') {
-                    $usernamelink = 'aboutme';
-                }
-                foreach my $item (@linkdests) {
-                    my $checkedstr = '';
-                    if ($item eq $usernamelink) {
-                        $checkedstr = ' checked="checked" ';
-                    }
-                    $output .= '<label><input type="radio" name="usernamelink" value="'.$item.'"'.$checkedstr.'>&nbsp;'.$lt{$item}.'</label>&nbsp;&nbsp;';
+                unshift (@linkdests,'modify');
+            }
+            $output .= '<span class="LC_nobreak">'.$lt{'link'}.':&nbsp;';
+            my $usernamelink = $env{'form.usernamelink'};
+            if ($usernamelink eq '') {
+                $usernamelink = 'aboutme';
+            }
+            foreach my $item (@linkdests) {
+                my $checkedstr = '';
+                if ($item eq $usernamelink) {
+                    $checkedstr = ' checked="checked" ';
                 }
-                $output .= '</span><br />';
-            } else {
-                $output .= &mt("Click on a username to view the user's personal page.").'<br />';
+                $output .= '<label><input type="radio" name="usernamelink" value="'.$item.'"'.$checkedstr.'>&nbsp;'.$lt{$item}.'</label>&nbsp;&nbsp;';
             }
+            $output .= '</span><br />';
             if ($actionselect) {
                 $output .= <<"END";
 $lt{'ac'}:&nbsp;$actionselect <input type="button" value="$lt{'go'}" onclick="javascript:opendatebrowser(this.form,'studentform','go')" /></p>
@@ -2243,7 +2248,6 @@ END
     }
 
 # Done with header lines in all formats
-
     my %index;
     my $i;
     foreach my $idx (@$keylist) {
@@ -2345,6 +2349,8 @@ END
                 if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
                     if (($displayphotos eq 'on') && ($role eq 'st')) {
                         $userlist->{$user}->[$index{'photo'}] =
+                            &Apache::lonnet::retrievestudentphoto($udom,$uname,'jpg');
+                        $userlist->{$user}->[$index{'thumbnail'}] =
                             &Apache::lonnet::retrievestudentphoto($udom,$uname,
                                                                 'gif','thumbnail');
                     }
@@ -2461,8 +2467,7 @@ END
             }
             foreach my $item (@cols) {
                 if ($item eq 'username') {
-                    $r->print('<td>'.&print_username_link($mode,$permission,
-                                                          \%in).'</td>');
+                    $r->print('<td>'.&print_username_link($mode,\%in).'</td>');
                 } elsif (($item eq 'start' || $item eq 'end') && ($actionselect)) {
                     $r->print('<td>'.$in{$item}.'<input type="hidden" name="'.$checkval.'_'.$item.'" value="'.$sdata->[$index{$item}].'" /></td>'."\n");
                 } else {
@@ -2481,7 +2486,7 @@ END
                     }
                     if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
                         if ($displayphotos eq 'on' && $role eq 'st' && $in{'photo'} ne '') {
-                            $r->print('    <td align="right"><a href="javascript:photowindow('."'".&Apache::lonnet::studentphoto($in{'domain'},$in{'username'},'jpg')."'".')"><img src="'.$in{'photo'}.'" border="1"></a></td>');
+                            $r->print('    <td align="right"><a href="javascript:photowindow('."'".$in{'photo'}."'".')"><img src="'.$in{'thumbnail'}.'" border="1"></a></td>');
                         } else {
                             $r->print('    <td>&nbsp;</td>  ');
                         }
@@ -2546,14 +2551,10 @@ END
 }
 
 sub print_username_link {
-    my ($mode,$permission,$in) = @_;
+    my ($mode,$in) = @_;
     my $output;
     if ($mode eq 'autoenroll') {
         $output = $in->{'username'};
-    } elsif (!$permission->{'cusr'}) {
-        $output = &Apache::loncommon::aboutmewrapper($in->{'username'},
-                                                     $in->{'username'},
-                                                     $in->{'domain'});
     } else {
         $output = '<a href="javascript:username_display_launch('.
                   "'$in->{'username'}','$in->{'domain'}'".')" />'.