--- loncom/homework/structuretags.pm	2009/05/11 16:51:22	1.444
+++ loncom/homework/structuretags.pm	2009/06/11 16:48:28	1.451
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.444 2009/05/11 16:51:22 bisitz Exp $
+# $Id: structuretags.pm,v 1.451 2009/06/11 16:48:28 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -203,6 +203,7 @@ sub page_start {
 	}
     }
 
+    my $pageheader = '';
     if (defined($found{'body'})) {
 	$body_args{'skip_phases'}{'body'}=1;
     } elsif (!defined($found{'body'}) 
@@ -211,6 +212,20 @@ sub page_start {
 	    if ($env{'environment.remote'} ne 'off') {
 		$body_args{'only_body'}  = 1;
 	    }
+        # Breadcrumbs for Construction Space
+        &Apache::lonhtmlcommon::clear_breadcrumbs();
+        &Apache::lonhtmlcommon::add_breadcrumb({
+            'text'  => 'Construction Space',
+            'href'  => &Apache::loncommon::authorspace(),
+        });
+# FIXME Where are we?
+#        &Apache::lonhtmlcommon::add_breadcrumb({
+#            'text'  => 'Problem Editing', # 'Problem Testing'
+#            'href'  => '',
+#        });
+        $pageheader = &Apache::lonhtmlcommon::breadcrumbs()
+                     .&Apache::loncommon::head_subbox(
+                &Apache::loncommon::CSTR_pageheader());
 	}
     } elsif (!defined($found{'body'})) {
 	my %add_entries;
@@ -222,21 +237,21 @@ sub page_start {
 
 	my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
 					       $safeeval);
-       	if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; }
+        if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; }
 
-	$body_args{'bgcolor'}        = $bgcolor;
-	$body_args{'no_title'}       = 1;
-	$body_args{'force_register'} = 1;
-	$body_args{'add_entries'}    = \%add_entries;	
-	if ($env{'environment.remote'} eq 'off'
-	    && $env{'request.state'} eq   'construct') {
-	    $body_args{'only_body'}  = 1;
-	}
+        $body_args{'bgcolor'}        = $bgcolor;
+        # $body_args{'no_title'}       = 1;
+        $body_args{'force_register'} = 1;
+        $body_args{'add_entries'}    = \%add_entries;
+        if ($env{'environment.remote'} eq 'off'
+            && $env{'request.state'} eq   'construct') {
+            $body_args{'only_body'}  = 1;
+        }
     }
     $body_args{'no_auto_mt_title'} = 1;
     my $page_start = &Apache::loncommon::start_page($name,$extra_head,
 						    \%body_args);
-
+    $page_start .= $pageheader;
     if (!defined($found{'body'}) 
 	&& $env{'request.state'} ne 'construct'
 	&& ($target eq 'web' || $target eq 'webgrade')) {
@@ -522,7 +537,8 @@ $show_all
 
     $result.='
    </div>
-   <div class="LC_edit_problem_header_edit_row">';
+   <hr class="LC_edit_problem_divide" />
+   <div>';
     $result.='<input type="hidden" name="problemmode" value="view" />';
     $result .= '<input type="button" name="submitmode" accesskey="e" value="'.&mt('Edit').'" '.
                'onclick="javascript:setmode(this.form,'."'edit'".')" />';
@@ -530,6 +546,7 @@ $show_all
                'onclick="javascript:setmode(this.form,'."'editxml'".')" />';
     $result.='
    </div>
+   <hr class="LC_edit_problem_divide" />
    '.&Apache::lonxml::message_location().'
 </div>';
     return $result;
@@ -674,9 +691,7 @@ sub checkout_msg {
     return (<<ENDCHECKOUT);
 <h2>$lt{'resource'}</h2>
     <p>$lt{'id_expln'}</p>
-<font color="red">
-<p>$lt{'warning'}</p>
-</font>
+<p class="LC_warning">$lt{'warning'}</p>
 <form name="checkout" method="post" action="$uri">
 <input type="hidden" name="doescheckout" value="yes" />
 <input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />
@@ -1068,6 +1083,8 @@ sub end_problem {
 	
 	my $duetime = &Apache::lonnet::EXT("resource.$id.duedate"); 
 	my $duedate = POSIX::strftime("%c",localtime($duetime));
+        my $duedate_text = &mt('Due date: [_1]'
+                              ,&Apache::lonlocal::locallocaltime($duetime));
 	my $temp_file;
 	my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
 	
@@ -1099,13 +1116,13 @@ sub end_problem {
 	    if (not $env{'request.symb'} =~ m/\.page_/) {
 		if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
 		    $frontmatter .= $begin_doc.
-			'\textit{Due date: '.$duedate.'} '.$toc_line;
+			'\textit{'.$duedate_text.'} '.$toc_line;
 		} else {
 		    $frontmatter.= $begin_doc.$toc_line;
 		    if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
 		}
 	    } else {
-		$frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'.$startminipage;
+		$frontmatter .= '\vskip 1mm\textit{'.$duedate_text.'} \\\\\\\\'.$startminipage;
 	    }
 	} else {
 	    if (not $env{'request.symb'} =~ m/\.page_/) {
@@ -2034,15 +2051,16 @@ sub start_simpleeditbutton {
         my $url=$env{'request.noversionuri'};
         $url=~s/\?.*$//;
 	my ($symb) = &Apache::lonnet::whichuser();
-#       Warning make more sense and is more important on edit screen
+#       Warning makes more sense and is more important on edit screen
 #       $result='<p class="LC_warning">'
 #              .&mt('Note: it can take up to 10 minutes for changes to take effect for all users.')
 #              .&Apache::loncommon::help_open_topic('Caching')
 #              .'</p>';
-        $result.=&Apache::lontemplate::start_functionslist()
-                .&Apache::lontemplate::item_functionslist(
-                     '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'.&mt('Edit').'</a>')
-                .&Apache::lontemplate::end_functionslist();
+        $result.=&Apache::lonhtmlcommon::start_funclist()
+                .&Apache::lonhtmlcommon::add_item_funclist(
+                     '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'
+                    .&mt('Edit').'</a>')
+                .&Apache::lonhtmlcommon::end_funclist();
 
     }
     return $result;