--- loncom/interface/lonpickcode.pm	2006/03/16 21:54:40	1.10
+++ loncom/interface/lonpickcode.pm	2007/11/13 01:47:56	1.15
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a CODE from the list of possible CODEs
 #
-# $Id: lonpickcode.pm,v 1.10 2006/03/16 21:54:40 albertel Exp $
+# $Id: lonpickcode.pm,v 1.15 2007/11/13 01:47:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,6 +75,8 @@ sub handler {
     }
     if      ($env{'form.command'} eq 'codelist') {
 	&code_list($r);
+        $r->print(&Apache::grades::show_grading_menu_form($env{'form.symb'},
+						      $env{'form.url'}));	
     } elsif ($env{'form.command'} eq 'showcodes') {
 	&show_codes($r);
     } else {
@@ -85,23 +87,44 @@ sub handler {
 }
 
 sub code_list {
-    my ($r,$secondview)=@_;
-    if (!$secondview) {
+    my ($r,$context)=@_;
+    # $context = 0 Print page header and enclosing table
+    # $context = 1 No page header, print enclosing table
+    # $context = 2 No page header, no enclosing table
+    my $table_head;
+    my $extra_css;
+    if (!$context) {
 	$r->print(&Apache::loncommon::start_page("View CODEs",undef,
 						 {'no_nav_bar' => 1}));
-	$r->print("<p>".&mt('Select a set of saved CODEs to view.')."</p>");
-    } else {
-	$r->print("<p>".&mt('Select another set of saved CODEs to view.')."</p>");
-    }
-    $r->print("<form method='POST' action='/adm/pickcode' name='pickcode'>");
+	$table_head = &mt('Select a set of saved CODEs to view.');
+    } elsif ($context eq 1) {
+	$table_head = &mt('Select another set of saved CODEs to view.');
+    } elsif ($context eq 2) {
+        $table_head = &mt('Select a set of saved CODEs to view.');
+	$extra_css = 'LC_scantron_action';
+    }
+    $r->print("<form method='post' action='/adm/pickcode' name='pickcode'>");
+    $r->print('
+     '.&Apache::loncommon::start_data_table($extra_css).'
+       '.&Apache::loncommon::start_data_table_header_row());
+    $r->print('<th>');
+    $r->print($table_head);
+    $r->print('</th>');
+    $r->print('
+       '.&Apache::loncommon::end_data_table_header_row().'
+       '.&Apache::loncommon::start_data_table_row());
+    $r->print('<td>');
+    $r->print("<input type='submit' name='submit' value='".&mt("View:")."' /> ");
     $r->print(&Apache::grades::scantron_CODElist());
+    $r->print('</td>');
+    $r->print('
+       '.&Apache::loncommon::end_data_table_row().'
+       '.&Apache::loncommon::end_data_table());
     $r->print("<input type='hidden' name='command' value='showcodes' />");
     $r->print("<input type='hidden' name='symb' value='".$env{'form.symb'}."' />");
     $r->print("<input type='hidden' name='url' value='".$env{'form.url'}."' />");
-    $r->print("<input type='submit' name='submit' value='".&mt("View")."' />");
     $r->print("</form>");
-    $r->print(&Apache::grades::show_grading_menu_form($env{'form.symb'},
-						      $env{'form.url'}));
+    
 }
 
 sub show_codes {
@@ -116,6 +139,8 @@ sub show_codes {
     }
     $r->print('</pre>');
     &code_list($r,1);
+    $r->print(&Apache::grades::show_grading_menu_form($env{'form.symb'},
+						      $env{'form.url'}));
 }
 
 sub picking_a_code {
@@ -143,7 +168,7 @@ ENDSCRIPT
     my %code_freq=&get_code_freq($r);
     my $num_matches=length($env{'form.curCODE'});
     for (my $i=$num_matches;$i>=0;$i--) {
-	my $to_print="<p> CODEs with $i matches</p>";
+	my $to_print="<p>".&mt("CODEs with [_1] matching letters",$i)."</p>";
 	$to_print.='<table border="1"><tr><td></td><td>CODE</td><td>exams using this CODE</td>';
 	my $print;
 	foreach my $code (sort(keys(%codes))) {