--- loncom/homework/lonhomework.pm	2009/03/30 04:49:35	1.309
+++ loncom/homework/lonhomework.pm	2009/05/19 22:52:19	1.311
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.309 2009/03/30 04:49:35 raeburn Exp $
+# $Id: lonhomework.pm,v 1.311 2009/05/19 22:52:19 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -689,11 +689,13 @@ sub analyze_header {
     my ($request) = @_;
     my $js = &Apache::structuretags::setmode_javascript();
     my $result =
-	&Apache::loncommon::start_page('Analyzing a problem',$js);
-
+        &Apache::loncommon::start_page('Analyzing a problem',$js)
+       .&Apache::lonhtmlcommon::breadcrumbs() # FIXME add breadcrumbs
+       .&Apache::loncommon::head_subbox(
+                &Apache::loncommon::CSTR_pageheader());
     $result .= 
 	&Apache::lonxml::message_location().'
-            <form name="lonhomework" method="POST" action="'.
+            <form name="lonhomework" method="post" action="'.
 	    &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
             '<input type="hidden" name="problemmode" value="'.
             $env{'form.problemmode'}.'" />'.
@@ -922,9 +924,13 @@ sub editxmlmode {
 						'onresize' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
 						'onload'   => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
 				    }});
-	$result.=$start_page.
-	    &renderpage($request,$file,['no_output_web'],1).
-            '<form '.&Apache::edit::form_change_detection().' name="lonhomework" method="POST" action="'.
+
+    $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).
+            '<form '.&Apache::edit::form_change_detection().' name="lonhomework" method="post" action="'.
 	    &HTML::Entities::encode($env{'request.uri'},'<>&"').'">'.
 	    &Apache::structuretags::remember_problem_state().'
             <div class="LC_edit_problem_editxml_header">
@@ -1136,17 +1142,21 @@ sub newproblem {
 	my $instructions;
 	my $start_page = 
 	    &Apache::loncommon::start_page("Create New $extension");
-	$request->print("
-$start_page
-<h1>".&mt("Creating a new $extension resource.")."</h1>
+
+	$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\">");
+      " list below. Then click on the \"Create $extension\" button.").'</b>
+</p><form action="'.$url.'" method="post">');
 
 	if (defined($templatelist)) {
 	    $request->print($templatelist);