--- loncom/homework/structuretags.pm	2008/11/25 13:16:17	1.435
+++ loncom/homework/structuretags.pm	2009/05/19 22:52:19	1.446
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.435 2008/11/25 13:16:17 jms Exp $
+# $Id: structuretags.pm,v 1.446 2009/05/19 22:52:19 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,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;
@@ -222,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')) {
@@ -423,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>';
 
 
@@ -677,7 +681,7 @@ sub checkout_msg {
 <font color="red">
 <p>$lt{'warning'}</p>
 </font>
-<form name="checkout" method="POST" action="$uri">
+<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>
@@ -711,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>
@@ -904,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>';
@@ -939,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>';
 		}
@@ -949,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 ';
@@ -1056,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.'}';
 	
@@ -1331,7 +1337,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
@@ -1599,6 +1605,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[$_] ]";
 	    }
@@ -1942,11 +1962,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)
@@ -2019,9 +2038,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;
 }