--- loncom/interface/lonpdfupload.pm	2009/05/23 04:07:09	1.10
+++ loncom/interface/lonpdfupload.pm	2009/06/17 13:00:38	1.13
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
-# Publication Handler
+# PDF Form Upload Handler
 #
-# $Id: lonpdfupload.pm,v 1.10 2009/05/23 04:07:09 onken Exp $
+# $Id: lonpdfupload.pm,v 1.13 2009/06/17 13:00:38 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,7 +65,15 @@ sub handler() {
     $env{'request.uri'}=$r->uri;
     $r->content_type('text/html');
     $r->send_http_header();
-    $r->print(&Apache::loncommon::start_page('Upload PDF Form'));
+
+    # Breadcrumbs
+    my $brcrum = [{'href' => '/pdfupload',
+                   'text' => 'Upload PDF Form'}];
+
+    $r->print(&Apache::loncommon::start_page('Upload PDF Form',
+                                             undef,
+                                             {'bread_crumbs' => $brcrum,})
+    );
 
     #load post data into environment
     &Apache::lonacc::get_posted_cgi($r);
@@ -164,7 +172,9 @@ sub get_uploadform() {
        .'<input type="file" name="file" id="filename" />'
        .&Apache::lonhtmlcommon::row_closure(1)
        .&Apache::lonhtmlcommon::end_pick_box()
+       .'<p>'
        .'<input type="submit" name="Uploaded" value="'.$lt{'submit'}.'" />'
+       .'</p>'
        .'</form>'
        .'<br />';
 
@@ -217,13 +227,6 @@ sub grade_pdf {
     my $debug = ();
 
     $debug  .= "Found: ". scalar @pdfdata." Entries \n";
-    $result .= '<h2>'.&mt('Results of PDF Form problems').'</h2>';
-    $result .= &Apache::loncommon::start_data_table()
-              .&Apache::loncommon::start_data_table_header_row()
-              .'<th>'.&mt('Problem Name').'</th>'
-              .'<th>'.&mt('Grading').'</th>'
-              .&Apache::loncommon::start_data_table_header_row()
-              .&Apache::loncommon::end_data_table_header_row();
 
     foreach my $entry (sort(@pdfdata)) {
         if ($entry =~ /^meta.*/) {
@@ -233,7 +236,11 @@ sub grade_pdf {
             $user =~ s/(.*)\n/$1/; #TODO is that equals to chomp?
             
             if($user ne $env{'user.name'} or  $domain ne $env{'user.domain'}) {
-                return "<pre>".&mt('Wrong username in PDF-File').": $user $domain -> $env{'user.domain'} $env{'user.name'} </pre>";    
+                return '<p class="LC_error">'
+                      .&mt('Wrong username ([_1]) found in PDF file. Expected username: [_2]'
+                          ,$user.':'.$domain
+                          ,$env{'user.domain'}.':'.$env{'user.name'})
+                      .'</p>';
             }
 
         } elsif($entry =~ /^upload.*/)  {
@@ -254,7 +261,7 @@ sub grade_pdf {
                  $problems{$symb.$part}{$HWVAL} = $value;
             } else {
                  $problems{$symb.$part} =  { 'resource' => $resource,
-                                        'symb' => &Apache::lonenc::encrypted($symb),
+                                        'symb' => $symb,
                                         'submitted' => $part,
                                         $submit => 'Answer',
                                         $HWVAL => $value};
@@ -266,6 +273,14 @@ sub grade_pdf {
     }
     #$result .= $debug;
 
+    $result .= '<h2>'.&mt('Results of PDF Form problems').'</h2>';
+    $result .= &Apache::loncommon::start_data_table()
+              .&Apache::loncommon::start_data_table_header_row()
+              .'<th>'.&mt('Problem Name').'</th>'
+              .'<th>'.&mt('Grading').'</th>'
+              .&Apache::loncommon::start_data_table_header_row()
+              .&Apache::loncommon::end_data_table_header_row();
+
     foreach my $key (sort (keys %problems)) {
         my %problem = %{$problems{$key}};
         my ($problemname, $grade) = &grade_problem(%problem);