--- loncom/interface/spreadsheet/studentcalc.pm	2003/12/08 19:58:39	1.25
+++ loncom/interface/spreadsheet/studentcalc.pm	2004/12/08 00:56:00	1.27
@@ -1,5 +1,5 @@
 #
-# $Id: studentcalc.pm,v 1.25 2003/12/08 19:58:39 matthew Exp $
+# $Id: studentcalc.pm,v 1.27 2004/12/08 00:56:00 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -111,12 +111,8 @@ sub get_title {
     my @title = ();
     #
     # Determine the students name
-    my %userenv = &Apache::loncoursedata::GetUserName($self->{'name'},
-                                                      $self->{'domain'});
-    my $name = join(' ',
-                 @userenv{'firstname','middlename','lastname','generation'});
-    $name =~ s/\s+$//;
-
+    my $name = &Apache::loncommon::plainname($self->{'name'},
+					     $self->{'domain'});
     push (@title,$name);
     push (@title,$self->{'coursedesc'});
     push (@title,&Apache::lonlocal::locallocaltime(time));
@@ -147,18 +143,9 @@ sub parent_link {
 sub convenience_links {
     my $self = shift;
     my ($resource) = @_;
-    my $symb = &Apache::lonnet::escape($resource->{'symb'});
-    my $result = <<"END";
-<a href="/adm/grades?symb=$symb&command=submission" target="LONcatInfo">
-    <img src="/adm/lonMisc/subm_button.gif" border=0 />
-    </a>
-<a href="/adm/grades?symb=$symb&command=gradingmenu" target="LONcatInfo">
-    <img src="/adm/lonMisc/pgrd_button.gif" border=0 />
-    </a>
-<a href="/adm/parmset?symb=$symb" target="LONcatInfo">
-    <img src="/adm/lonMisc/pprm_button.gif" border=0 />
-    </a>
-END
+    my $result=&Apache::loncommon::submlink('<img src="/adm/lonMisc/subm_button.gif" border="0" />',$self->{'name'},$self->{'domain'},$resource->{'symb'},'LONcatInfo');
+    $result .= &Apache::loncommon::pgrdlink('<img src="/adm/lonMisc/pgrd_button.gif" border="0" />',$self->{'name'},$self->{'domain'},$resource->{'symb'},'LONcatInfo');
+    $result .= &Apache::loncommon::pprmlink('<img src="/adm/lonMisc/pprm_button.gif" border="0" />',$self->{'name'},$self->{'domain'},$resource->{'symb'},'LONcatInfo');
     return $result;
 }