--- loncom/homework/lonhomework.pm	2009/05/19 22:52:19	1.311
+++ loncom/homework/lonhomework.pm	2011/01/06 22:38:11	1.317.4.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.311 2009/05/19 22:52:19 bisitz Exp $
+# $Id: lonhomework.pm,v 1.317.4.3 2011/01/06 22:38:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,6 +47,7 @@ use Apache::externalresponse();
 use Apache::rankresponse();
 use Apache::matchresponse();
 use Apache::chemresponse();
+use Apache::functionplotresponse();
 use Apache::drawimage();
 use Apache::Constants qw(:common);
 use Apache::loncommon();
@@ -111,7 +112,11 @@ sub get_target {
 	} elsif ( $env{'form.grade_target'} eq 'webgrade'
 		  && ($Apache::lonhomework::queuegrade eq 'F' )) {
 	    return ($env{'form.grade_target'});
-	}
+        } elsif ($env{'form.grade_target'} eq 'answer') {
+            if ($env{'form.answer_output_mode'} eq 'tex') {
+                return ($env{'form.grade_target'});
+            }
+        }
 	if ($env{'form.webgrade'} &&
 	    ($Apache::lonhomework::modifygrades eq 'F'
 	     || $Apache::lonhomework::queuegrade eq 'F' )) {
@@ -265,8 +270,8 @@ sub check_slot_access {
     }
     if ($slotstatus eq 'NEEDS_CHECKIN' &&
 	&proctor_checked_in($slot_name,$returned_slot,$type)) {
-	&Apache::lonxml::debug("protoctor checked in");
-	$slotstatus='CAN_ANSWER';
+	&Apache::lonxml::debug("proctor checked in");
+	$slotstatus=$status;
     }
 
     my ($is_correct,$got_grade,$checkedin);
@@ -688,9 +693,19 @@ sub handle_save_or_undo {
 sub analyze_header {
     my ($request) = @_;
     my $js = &Apache::structuretags::setmode_javascript();
+
+    # Breadcrumbs
+    my $brcrum = [{'href' => &Apache::loncommon::authorspace(),
+                   'text' => 'Construction Space'},
+                  {'href' => '',
+                   'text' => 'Problem Testing'},
+                  {'href' => '',
+                   'text' => 'Analyzing a problem'}];
+
     my $result =
-        &Apache::loncommon::start_page('Analyzing a problem',$js)
-       .&Apache::lonhtmlcommon::breadcrumbs() # FIXME add breadcrumbs
+        &Apache::loncommon::start_page('Analyzing a problem',
+                                       $js,
+                                       {'bread_crumbs' => $brcrum,})
        .&Apache::loncommon::head_subbox(
                 &Apache::loncommon::CSTR_pageheader());
     $result .= 
@@ -705,10 +720,10 @@ sub analyze_header {
             'onclick="javascript:setmode(this.form,'."'editxml'".')" />
             <input type="button" name="submitmode" value="'.&mt('Edit').'" '.
             'onclick="javascript:setmode(this.form,'."'edit'".')" />
-            <hr class="LC_edit_problem_divide" />
+            <hr />
             <input type="button" name="submitmode" value="'.&mt("View").'" '.
             'onclick="javascript:setmode(this.form,'."'view'".')" />
-            <hr class="LC_edit_problem_divide" />
+            <hr />
             </div>
             </form>';
     &Apache::lonxml::add_messages(\$result);
@@ -782,7 +797,7 @@ sub analyze {
     }
     &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,
 					  &mt('Analyzing Results'));
-    $request->print('<hr class="LC_edit_problem_divide" />'
+    $request->print('<hr />'
                    .'<h3>'
                    .&mt('List of possible answers')
                    .'</h3>'
@@ -916,6 +931,13 @@ sub editxmlmode {
 	my $only_body =  ($env{'environment.remote'} eq 'off')? 0 : 1;
 	my $dragmath_button = 
             &Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
+
+    # Breadcrumbs
+    my $brcrum = [{'href' => &Apache::loncommon::authorspace(),
+                   'text' => 'Construction Space'},
+                  {'href' => '',
+                   'text' => 'Problem Editing'}];
+
 	my $start_page = 
 	    &Apache::loncommon::start_page(&mt("EditXML [_1]",$file),$js,
 					   {'no_auto_mt_title' => 1,
@@ -923,10 +945,11 @@ sub editxmlmode {
 					    'add_entries'      => {
 						'onresize' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
 						'onload'   => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
-				    }});
+                                    },
+                                                'bread_crumbs' => $brcrum,
+});
 
     $result=$start_page
-           .&Apache::lonhtmlcommon::breadcrumbs() # FIXME add breadcrumbs
            .&Apache::loncommon::head_subbox(
                 &Apache::loncommon::CSTR_pageheader());
 	$result.=&renderpage($request,$file,['no_output_web'],1).
@@ -935,7 +958,7 @@ sub editxmlmode {
 	    &Apache::structuretags::remember_problem_state().'
             <div class="LC_edit_problem_editxml_header">
               <table class="LC_edit_problem_header_title"><tr><td>
-               '.&mt('Problem Editing').&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index').'
+               <h2>'.&mt('Problem Editing').' '.&Apache::loncommon::help_open_topic('Problem_Editor_XML_Index').'</h2>
                 </td><td align="right">
                   '.&Apache::loncommon::helpLatexCheatsheet('Problem_LON-CAPA_Functions','Script Functions').'
                 </td></tr>
@@ -953,7 +976,7 @@ sub editxmlmode {
                 <input type="submit" name="submitbutton" accesskey="s" value="'.&mt('Save').'"  />
                 <input type="submit" name="submitbutton" accesskey="v" value="'.&mt('Save and View').'" />
               </div>
-              <hr class="LC_edit_problem_divide" />
+              <hr style="clear:both;" />
 	      '.&Apache::lonxml::message_location().'
             </div>
             '  . '
@@ -1083,15 +1106,21 @@ sub get_template_list {
     }
     my $count = 0;
     my $currentcategory='';
+    my $first = 1;
     foreach my $file (@files) {
 	next if ($file->[1] !~ /\S/);
         if ($file->[2] ne $currentcategory) {
            $currentcategory=$file->[2];
            if ((!$seconddiv) && ($count >= $midpoint)) {
-               $result .= '</div>'."\n".'<div class="LC_left_float">'."\n";
+               $result .= '</div></div>'."\n".'<div class="LC_left_float">'."\n";
                $seconddiv = 1;
+           } elsif (!$first) {
+               $result.='</div>'."\n";
+           } else {
+               $first = 0;
            }
-           $result.='<h3>'.$currentcategory.'</h3>';
+           $result.= '<div class="LC_Box">'."\n"
+                    .'<h3 class="LC_hcell">'.$currentcategory.'</h3>'."\n";
            $count++;
         }
 	$result .=
@@ -1102,11 +1131,13 @@ sub get_template_list {
         }
         my $filename=$file->[0];
         $filename=~s/^\/home\/httpd\/html//;
-        $result.=' <font size="-2"><a href="'.$filename.'" target="sample">'.&mt('Example').'</font></a><br />'."\n";
+        $result.=' <span class="LC_fontsize_small">'
+                .'<a href="'.$filename.'?inhibitmenu=yes" target="sample">'.&mt('Example').'</a>'
+                .'</span><br />'."\n";
         $count ++;
     }
     if ($numfiles > 0) {
-        $result .= '</div>'."\n".'<div class="LC_clear_float_footer"></div>'."\n";
+        $result .= '</div></div>'."\n".'<div class="LC_clear_float_footer"></div>'."\n";
     }
     return $result;
 }
@@ -1140,30 +1171,33 @@ sub newproblem {
 	my $dest = &Apache::lonnet::filelocation("",$request->uri);
 	my $errormsg;
 	my $instructions;
+        my $brcrum = [{'href' => &Apache::loncommon::authorspace(),
+                       'text' => 'Construction Space'},
+                      {'href' => '',
+                       'text' => "Create New $extension"}];
 	my $start_page = 
-	    &Apache::loncommon::start_page("Create New $extension");
-
+            &Apache::loncommon::start_page("Create New $extension",
+                                           undef,
+                                           {'bread_crumbs' => $brcrum,});
 	$request->print(
         $start_page
-       .&Apache::lonhtmlcommon::breadcrumbs() # FIXME add breadcrumbs
        .&Apache::loncommon::head_subbox(
                 &Apache::loncommon::CSTR_pageheader())
        .'<h1>'.&mt("Creating a new $extension resource.")."</h1>
 $errormsg
 ".&mt("The requested file [_1] currently does not exist.",
-      '<span class="LC_filename">'.$shownurl.'</span>')."
-<p>
-<b>
-".&mt("To create a new $extension, select a template from the".
-      " list below. Then click on the \"Create $extension\" button.").'</b>
-</p><form action="'.$url.'" method="post">');
+      '<span class="LC_filename">'.$shownurl.'</span>').'
+<p class="LC_info">
+'.&mt("To create a new $extension, select a template from the".
+      " list below. Then click on the \"Create $extension\" button.").'
+</p><div><form action="'.$url.'" method="post">');
 
 	if (defined($templatelist)) {
 	    $request->print($templatelist);
 	}
 	$request->print('<br /><input type="submit" name="newfile" value="'.
 			&mt("Create $extension").'" />');
-	$request->print("</form></p>".&Apache::loncommon::end_page());
+	$request->print('</form></div>'.&Apache::loncommon::end_page());
     }
     return;
 }