--- loncom/interface/statistics/lonstudentassessment.pm	2007/10/03 17:39:13	1.145
+++ loncom/interface/statistics/lonstudentassessment.pm	2008/09/16 13:10:19	1.150
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentassessment.pm,v 1.145 2007/10/03 17:39:13 albertel Exp $
+# $Id: lonstudentassessment.pm,v 1.150 2008/09/16 13:10:19 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -372,7 +372,7 @@ sub CreateInterface {
     $Str .= ' 'x5;
     $Str .= 
         &mt('Status [_1]',
-            '<input type="text" name="stats_status" size="60" value="" />');
+            '<input type="text" name="stats_status" size="60" value="" readonly="readonly" />');
     $Str .= '<br />';
     return $Str;
 }
@@ -671,9 +671,10 @@ sub html_initialize {
     # If we're showing links, show a checkbox to open in new
     # windows.
     if ($show_links ne 'no') {
+        my $labeltext = &mt('Show links in new window:');
         $r->print(<<NEW_WINDOW_CHECKBOX);
 <script type="text/javascript">new_window = true;</script>
-<p><label>Show links in new window: 
+<p><label>$labeltext 
 <input type="checkbox" checked="1" onclick="new_window=this.checked" />
 </label></p>
 NEW_WINDOW_CHECKBOX
@@ -684,7 +685,7 @@ NEW_WINDOW_CHECKBOX
               "&nbsp;&nbsp;".localtime(time)."</h3>");
     #
     if ($chosen_output->{'base'} !~ /^final table/) {
-        $r->print("<h3>".$chosen_output->{'shortdesc'}."</h3>");        
+        $r->print("<h3>".&mt($chosen_output->{'shortdesc'})."</h3>");        
     }
     my $Str = "<pre>\n";
     # First, the @StudentData fields need to be listed
@@ -848,10 +849,13 @@ sub html_outputstudent {
     } else {
 	my $error = $1;
 	if (scalar(@tmp) < 1) {
-	    $Str .= '<font color="blue">No Course Data</font>'."\n";
+	    $Str .= '<span class="LC_warning">'
+                   .&mt('No Course Data')
+                   .'</span>'."\n";
 	} else {
-	    $Str .= '<span class="LC_error">Error getting student data ('.
-		$error.') </span>'."\n";
+            $Str .= '<span class="LC_error">'
+                   .&mt('Error getting student data ([_1])',$error)
+                   .'</span>'."\n";
 	}
         $nodata_count++;
         $r->print($Str);
@@ -958,12 +962,12 @@ sub html_finish {
 
 sub StudentAverageTotal {
     my $Str = '<h3>'.&mt('Summary Tables').'</h3>'.$/;
-    $Str .= '<table border=2 cellspacing="1">'."\n";
-    $Str .= '<tr>'.
+    $Str .= &Apache::loncommon::start_data_table();
+    $Str .= &Apache::loncommon::start_data_table_header_row().
         '<th>'.&mt('Title').'</th>'.
         '<th>'.&mt('Average').'</th>'.
         '<th>'.&mt('Maximum').'</th>'.
-        '</tr>'.$/;
+        &Apache::loncommon::end_data_table_header_row().$/;
     foreach my $seq (@sequences) {
         my $symb = $seq->symb;
         my $ave;
@@ -977,11 +981,13 @@ sub StudentAverageTotal {
         }
         my $max = $Statistics->{$symb}->{'max'};
         $ave = sprintf("%.2f",$ave);
-        $Str .= '<tr><td>'.$seq->compTitle.'</td>'.
+        $Str .= &Apache::loncommon::start_data_table_row().
+            '<td>'.$seq->compTitle.'</td>'.
             '<td align="right">'.$ave.'&nbsp;</td>'.
-            '<td align="right">'.$max.'&nbsp;'.'</td></tr>'."\n";
+            '<td align="right">'.$max.'&nbsp;'.'</td>'.
+            &Apache::loncommon::end_data_table_row()."\n";
     }
-    $Str .= "</table>\n";
+    $Str .= &Apache::loncommon::end_data_table()."\n";
     return $Str;
 }
 
@@ -992,31 +998,36 @@ sub SingleStudentTotal {
                          $student->{'fullname'},
                          $student->{'username'},$student->{'domain'}).'</h3>';
     $Str .= $/;
-    $Str .= '<table border=2 cellspacing="1">'."\n";
+    $Str .= &Apache::loncommon::start_data_table()."\n";
     $Str .= 
-        '<tr>'.
+        &Apache::loncommon::start_data_table_header_row().
         '<th>'.&mt('Sequence or Folder').'</th>';
     if ($chosen_output->{'base'} eq 'tries') {
         $Str .= '<th>'.&mt('Parts Correct').'</th>';
     } else {
         $Str .= '<th>'.&mt('Score').'</th>';
     }
-    $Str .= '<th>'.&mt('Maximum').'</th>'."</tr>\n";
+    $Str .= '<th>'.&mt('Maximum').'</th>'.
+            &Apache::loncommon::end_data_table_header_row()."\n";
     my $total = 0;
     my $total_max = 0;
     foreach my $seq (@sequences) {
         my $value = $Statistics->{$seq->symb}->{'score'};
         my $max = $Statistics->{$seq->symb}->{'max'};
-        $Str .= '<tr><td>'.&HTML::Entities::encode($seq->compTitle).'</td>'.
+        $Str .= &Apache::loncommon::start_data_table_row().
+            '<td>'.&HTML::Entities::encode($seq->compTitle).'</td>'.
             '<td align="right">'.$value.'</td>'.
-                '<td align="right">'.$max.'</td></tr>'."\n";
+            '<td align="right">'.$max.'</td>'.
+            &Apache::loncommon::end_data_table_row()."\n";
         $total += $value;
         $total_max +=$max;
     }
-    $Str .= '<tr><td><b>'.&mt('Total').'</b></td>'.
+    $Str .= &Apache::loncommon::start_data_table_row().
+        '<td><b>'.&mt('Total').'</b></td>'.
         '<td align="right">'.$total.'</td>'.
-        '<td align="right">'.$total_max."</td></tr>\n";
-    $Str .= "</table>\n";
+        '<td align="right">'.$total_max.'</td>'.
+        &Apache::loncommon::end_data_table_row()."\n";
+    $Str .= &Apache::loncommon::end_data_table()."\n";
     return $Str;
 }
 
@@ -1825,7 +1836,7 @@ sub csv_finish {
     #
     # Tell the user where to get their csv file
     $r->print('<br />'.
-              '<a href="'.$filename.'">'.&mt('Your csv file.').'</a>'."\n");
+              '<a href="'.$filename.'">'.&mt('Your CSV file.').'</a>'."\n");
     $r->rflush();
     &csv_cleanup();
     return;
@@ -1957,7 +1968,7 @@ sub student_tries_on_sequence {
             if ( ($links eq 'yes' && $symbol ne ' ') ||
                  ($links eq 'all')) {
                 my $link = '/adm/grades'.
-                    '?symb='.&escape($resource->symb).
+                    '?symb='.&escape($resource->shown_symb).
                         '&student='.$student->{'username'}.
                             '&userdom='.$student->{'domain'}.
                                 '&command=submission';
@@ -2112,7 +2123,7 @@ sub student_performance_on_sequence {
             #
             if ( ($links eq 'yes' && $symbol ne ' ') || ($links eq 'all')) {
                 my $link = '/adm/grades' .
-                    '?symb='.&escape($symb).
+                    '?symb='.&escape($resource->shown_symb).
                     '&student='.$student->{'username'}.
                     '&userdom='.$student->{'domain'}.
                     '&command=submission';