--- loncom/homework/structuretags.pm	2008/11/10 11:44:54	1.434
+++ loncom/homework/structuretags.pm	2009/06/09 12:56:27	1.449
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.434 2008/11/10 11:44:54 foxr Exp $
+# $Id: structuretags.pm,v 1.449 2009/06/09 12:56:27 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,6 +27,29 @@
 #
 ###
 
+=pod
+
+=head1 NAME
+
+Apache::structuretags
+
+=head1 SYNOPSIS
+
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+
+=head1 NOTABLE SUBROUTINES
+
+=over
+
+=item 
+
+=back
+
+=cut
+
 
 package Apache::structuretags; 
 
@@ -180,6 +203,7 @@ sub page_start {
 	}
     }
 
+    my $pageheader = '';
     if (defined($found{'body'})) {
 	$body_args{'skip_phases'}{'body'}=1;
     } elsif (!defined($found{'body'}) 
@@ -188,6 +212,9 @@ sub page_start {
 	    if ($env{'environment.remote'} ne 'off') {
 		$body_args{'only_body'}  = 1;
 	    }
+        $pageheader = &Apache::lonhtmlcommon::breadcrumbs() # FIXME add breadcrumbs
+                     .&Apache::loncommon::head_subbox(
+                &Apache::loncommon::CSTR_pageheader());
 	}
     } elsif (!defined($found{'body'})) {
 	my %add_entries;
@@ -199,21 +226,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')) {
@@ -400,8 +427,8 @@ sub problem_web_to_edit_header {
 	&mt(' Show All Instances')
 	: &mt(' Show All Foils');
 
-    my $show_all= '<span class="LC_nobreak"><label><input type="checkbox" name="showallfoils" ';
-    if (defined($env{'form.showallfoils'})) { $show_all.='checked="checked"'; }
+    my $show_all= '<span class="LC_nobreak"><label><input type="checkbox" name="showallfoils"';
+    if (defined($env{'form.showallfoils'})) { $show_all.=' checked="checked"'; }
     $show_all.= ' />'.$show_all_foils_text.'</label></span>';
 
 
@@ -499,7 +526,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'".')" />';
@@ -507,6 +535,7 @@ $show_all
                'onclick="javascript:setmode(this.form,'."'editxml'".')" />';
     $result.='
    </div>
+   <hr class="LC_edit_problem_divide" />
    '.&Apache::lonxml::message_location().'
 </div>';
     return $result;
@@ -551,12 +580,19 @@ sub initialize_storage {
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
 }
 
-# -------------------------------------------------------------finalize_storage
-# Stores away the result has to a student's environment
-# checks form.grade_ for specific values, other wises stores
-# to the running users environment
-# Will increment totals for attempts, students, and corrects
-# if running user has student role.  
+=pod
+
+=item finalize_storage()
+
+	Stores away the result has to a student's environment
+	checks form.grade_ for specific values, other wises stores
+	to the running users environment
+	Will increment totals for attempts, students, and corrects
+	if running user has student role.
+	
+=cut
+
+
 sub finalize_storage {
     my ($given_symb) = @_;
     my $result;
@@ -587,10 +623,16 @@ sub finalize_storage {
     return $result;
 }
 
-# -------------------------------------------------------------store_aggregates
-# Sends hash of values to be incremented in nohist_resourcetracker.db
-# for the course. Increments total number of attempts, unique students 
-# and corrects for each part for an instance of a problem, as appropriate.
+=pod
+
+item store_aggregates()
+
+	Sends hash of values to be incremented in nohist_resourcetracker.db
+	for the course. Increments total number of attempts, unique students 
+	and corrects for each part for an instance of a problem, as appropriate.
+	
+=cut
+
 sub store_aggregates {
     my ($symb,$courseid) = @_;
     my %aggregate;
@@ -638,10 +680,8 @@ sub checkout_msg {
     return (<<ENDCHECKOUT);
 <h2>$lt{'resource'}</h2>
     <p>$lt{'id_expln'}</p>
-<font color="red">
-<p>$lt{'warning'}</p>
-</font>
-<form name="checkout" method="POST" action="$uri">
+<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(); }" />
 </form>
@@ -675,7 +715,7 @@ sub firstaccess_msg {
     my $buttontext = &mt('Show Resource');
     my $timertext = &mt('Start Timer?');
     $result .= (<<ENDCHECKOUT);
-<form name="markaccess" method="POST" action="$uri">
+<form name="markaccess" method="post" action="$uri">
 <input type="hidden" name="markaccess" value="yes" />
 <input type="button" name="accessbutton" value="$buttontext" onClick="javascript:if (confirm('$timertext')) { document.markaccess.submit(); }" />
 </form>
@@ -868,9 +908,9 @@ sub start_problem {
 	    }
 	    if ($env{'request.role.adv'}) {
 		$form_tag_start.=
-		    ' <label><input type="checkbox" name="showallfoils" ';
+		    ' <label><input type="checkbox" name="showallfoils"';
 		if (defined($env{'form.showallfoils'})) {
-		    $form_tag_start.='checked="on"';
+		    $form_tag_start.=' checked="checked"';
 		}
 		$form_tag_start.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
 		    '</label>';
@@ -903,6 +943,8 @@ sub start_problem {
 		my $msg;
 		if ($status eq 'UNAVAILABLE') {
 		    $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
+                } elsif ($status eq 'NOT_IN_A_SLOT') {
+                    $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
 		} elsif ($status ne 'NOT_YET_VIEWED') {
 		    $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
 		}
@@ -913,13 +955,13 @@ sub start_problem {
 		} elsif ($status eq 'NOT_YET_VIEWED') {
 		    $msg.=&firstaccess_msg($accessmsg,$symb);
 		} elsif ($status eq 'NOT_IN_A_SLOT') {
-		    $msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work.");
+		    $msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work");
 		}
 		$result.=$msg.'<br />';
 	    } elsif ($target eq 'tex') {
 		my $startminipage = ($env{'form.problem_split'}=~/yes/i)? ''
 		                    : '\begin{minipage}{\textwidth}';
-		$result.='\begin{document}\noindent \vskip 1 mm '.
+		$result.='\noindent \vskip 1 mm '.
 		    $startminipage.'\vskip 0 mm';
 		if ($status eq 'UNAVAILABLE') {
 		    $result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
@@ -1020,7 +1062,7 @@ sub end_problem {
 	    $allow_print_points=0;
 	}
 	my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');
-	my $begin_doc='\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent ';
+	my $begin_doc=' \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent ';
 	my $toc_line='\vskip 1 mm\noindent '.$startminipage.
 	    '\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
 	
@@ -1030,6 +1072,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";
 	
@@ -1061,13 +1105,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_/) {
@@ -1295,7 +1339,7 @@ sub start_languageblock {
 	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
 	my $include = $token->[2]->{'include'};
 	my $exclude = $token->[2]->{'exclude'};
-        my @preferred_languages=&Apache::loncommon::preferred_languages();
+        my @preferred_languages=&Apache::lonlocal::preferred_languages();
 # This should not even happen, since we should at least have the server language
         if (!$preferred_languages[0]) { $preferred_languages[0]='en'; }
 # Now loop over all languages in order of preference
@@ -1563,6 +1607,20 @@ sub start_randomlist {
 	    my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
 	    $showarg--;
 	    if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; }
+            if (($target eq 'analyze') && ($env{'form.check_parts_withrandomlist'})) {
+                my @currlist;
+                my $part = $Apache::inputtags::part;
+                if ($part ne '') {
+                    if (ref($Apache::lonhomework::analyze{'parts_withrandomlist'}) eq 'ARRAY') {
+                        my @currlist = @{$Apache::lonhomework::analyze{'parts_withrandomlist'}};
+                        if (!(grep(/^\Q$part\E$/,@currlist))) {
+                            push(@{$Apache::lonhomework::analyze{'parts_withrandomlist'}},$part);
+                        }
+                    } else {
+                        push(@{$Apache::lonhomework::analyze{'parts_withrandomlist'}},$part);
+                    }
+                }
+            }
 	    for(0 .. $show) {
 		$bodytext .= "$randomlist[ $idx_arr[$_] ]";
 	    }
@@ -1906,11 +1964,10 @@ sub end_startouttext {
     if ($target eq 'edit') {
 	my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth;
 	$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
-
-	$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>
-<td>".&mt('Delete:').
-                 &Apache::edit::deletelist($target,$token)
-		 ."</td>";
+	$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>"
+                 .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
+                 .&Apache::edit::deletelist($target,$token)
+                 .'</span></td>';
         unless ($env{'environment.wysiwygeditor'} eq 'on') {
 	    $result .= '<td align="left">'
 		.&Apache::lonhtmlcommon::dragmath_button($areaid,1)
@@ -1983,9 +2040,16 @@ sub start_simpleeditbutton {
         my $url=$env{'request.noversionuri'};
         $url=~s/\?.*$//;
 	my ($symb) = &Apache::lonnet::whichuser();
-	$result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
-                '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'.&mt('Edit').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').
-&Apache::loncommon::help_open_topic('Caching').'</td></tr></table><br />';
+#       Warning make 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();
+
     }
     return $result;
 }
@@ -2002,3 +2066,9 @@ sub practice_problem_header {
 
 1;
 __END__
+
+=pod
+
+=back
+
+=cut