--- loncom/homework/lonhomework.pm	2009/03/26 18:21:24	1.308
+++ loncom/homework/lonhomework.pm	2009/06/30 10:18:47	1.313
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.308 2009/03/26 18:21:24 bisitz Exp $
+# $Id: lonhomework.pm,v 1.313 2009/06/30 10:18:47 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -297,12 +297,15 @@ sub check_slot_access {
 	return ('WAITING_FOR_GRADE');
     }
 
-    # no slot is currently open, and has been checked in for this version
-    # previous slot is therefore CLOSED, so therefore the problem is
+    # Previously used slot is no longer open, and has been checked in for this version.
+    # However, the problem is not closed, and potentially, another slot might be
+    # used to gain access to it to work on it, until the due date is reached, and the
+    # problem then becomes CLOSED.  Therefore return the slotstatus - 
+    # (which will be NOT_IN_SLOT).
     if (!defined($slot_name)
 	&& $checkedin 
 	&& $type eq 'problem') {
-	return ('CLOSED',$datemsg);
+        return ($slotstatus);
     }
 
     if ($slotstatus eq 'NOT_IN_A_SLOT' 
@@ -685,12 +688,24 @@ sub handle_save_or_undo {
 sub analyze_header {
     my ($request) = @_;
     my $js = &Apache::structuretags::setmode_javascript();
-    my $result =
-	&Apache::loncommon::start_page('Analyzing a problem',$js);
 
+    # 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,
+                                       {'bread_crumbs' => $brcrum,})
+       .&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'}.'" />'.
@@ -700,10 +715,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);
@@ -777,7 +792,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>'
@@ -911,6 +926,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,
@@ -918,10 +940,15 @@ sub editxmlmode {
 					    'add_entries'      => {
 						'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="'.
+                                    },
+                                                'bread_crumbs' => $brcrum,
+});
+
+    $result=$start_page
+           .&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">
@@ -944,7 +971,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 />
 	      '.&Apache::lonxml::message_location().'
             </div>
             '  . '
@@ -1131,19 +1158,27 @@ 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");
-	$request->print("
-$start_page
-<h1>".&mt("Creating a new $extension resource.")."</h1>
+            &Apache::loncommon::start_page("Create New $extension",
+                                           undef,
+                                           {'bread_crumbs' => $brcrum,});
+	$request->print(
+        $start_page
+       .&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);