loncom/homework/structuretags.pm - diff

Return to structuretags.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/structuretags.pm between versions 1.273 and 1.464

-version 1.273, 2004/11/30 23:28:57
+version 1.464, 2010/02/10 20:17:44
  Line 27
  #
  ###
+ =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;
- Line 36  use Apache::File();
+ Line 59  use Apache::File();
  use Apache::lonmenu;
  use Apache::lonlocal;
  use Apache::lonxml;
+ use Apache::londefdef;
+ use Apache::lonenc();
  use Time::HiRes qw( gettimeofday tv_interval );
+ use lib '/home/httpd/lib/perl/';
+ use LONCAPA;
  BEGIN {
-     &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
+     &Apache::lonxml::register('Apache::structuretags',('block','languageblock','translated','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
  }
  sub start_web {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-     my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
+     if ($target ne 'edit' && $target ne 'modified') {
-     if ($target eq 'web') {
+ 	my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style);
- 	return $bodytext;
+ 	if ($target eq 'web' || $target eq 'webgrade') {
+ 	    return $bodytext;
+ 	}
+     } elsif ($target eq "edit" ) {
+ 	my $bodytext =
+ 	    &Apache::lonxml::get_all_text_unbalanced("/web",$parser);
+ 	my $result = &Apache::edit::tag_start($target,$token);
+ 	$result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1);
+ 	return $result;
+     } elsif ( $target eq "modified" ) {
+ 	return $token->[4].&Apache::edit::modifiedfield("/web",$parser);
      }
      return '';
  }
- Line 55  sub end_web {
+ Line 93  sub end_web {
  }
  sub start_tex {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
      my $result='';
-     my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
+     if ($target ne 'edit' && $target ne 'modified') {
-     if ($target eq 'tex') {
+ 	my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);
- 	return $bodytext.' ';
+ 	if ($target eq 'tex') {
+ 	    # If inside a table, occurrences of \\ must be removed;
+ 	    # else the table blows up.
+ 	    if (&Apache::londefdef::is_inside_of($tagstack, "table")) {
+ 		$bodytext =~ s/\\\\//g;
+ 	    }
+ 	    return $bodytext.'{}';
+ 	}
+     } elsif ($target eq "edit" ) {
+ 	my $bodytext =
+ 	    &Apache::lonxml::get_all_text_unbalanced("/tex",$parser);
+ 	my $result = &Apache::edit::tag_start($target,$token);
+ 	$result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1);
+ 	return $result;
+     } elsif ( $target eq "modified" ) {
+ 	return $token->[4].&Apache::edit::modifiedfield("/tex",$parser);
      }
      return $result;;
  }
- Line 68  sub end_tex {
+ Line 123  sub end_tex {
      return '';
  }
+ sub homework_js {
+     return &Apache::loncommon::resize_textarea_js().
+            &setmode_javascript().
+ 	<<'JS';
+ <script type="text/javascript">
+ function setSubmittedPart (part) {
+    this.document.lonhomework.submitted.value="part_"+part;
+ }
+ function image_response_click (which, e) {
+     init_geometry();
+     if (!e) { e = window.event; } //IE
+     var input_element = document.lonhomework.elements[which];
+     var token_element = document.lonhomework.elements[which+'_token'];
+     var token = token_element.value;
+     var img_element   = document.getElementById(which+'_imageresponse');
+     var x= e.clientX-getX(img_element)+Geometry.getHorizontalScroll();
+     var y= e.clientY-getY(img_element)+Geometry.getVerticalScroll();
+     var click = x+':'+y;
+     input_element.value = click;
+     img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;
+ }
+ </script>
+ JS
+ }
+ sub setmode_javascript {
+     return <<"ENDSCRIPT";
+ <script type="text/javascript">
+ function setmode(form,probmode) {
+     form.problemmode.value = probmode;
+     form.submit();
+ }
+ </script>
+ ENDSCRIPT
+ }
  sub page_start {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name,
+ 	$extra_head)=@_;
      my %found;
      foreach my $taginside (@$tagstack) {
  	foreach my $taglookedfor ('html','body','form') {
- Line 77  sub page_start {
+ Line 171  sub page_start {
  	}
      }
-     my $result;
+     if ($target eq 'tex') {
-     my $head_tag_start;
+ 	return
-     if (!defined($found{'html'})) {
+ 	    &Apache::londefdef::start_html($target,$token,$tagstack,
- 	$result=&Apache::londefdef::start_html($target,$token,$tagstack,
+ 					   $parstack,$parser,$safeeval);
- 					       $parstack,$parser,$safeeval);
+     }
- 	$head_tag_start='<head>'.&Apache::lonmenu::registerurl(undef,$target).
- 	    &Apache::lonhtmlcommon::htmlareaheaders().
+     $extra_head .= &homework_js();
- 	    &Apache::lonhtmlcommon::spellheader().
- 	    &Apache::lonxml::fontsettings();
+     if ($env{'environment.wysiwygeditor'} eq 'on') {
-     }
+ 	$extra_head .= &Apache::lonhtmlcommon::dragmath_js("FCKEditMathPopup");
-     my $body_tag_start;
+     } else {
-     if (!defined($found{'body'}) && $ENV{'request.state'} eq 'construct'
+         $extra_head .= &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
- 	&& $ENV{'environment.remote'} eq 'off') {
+     }
- 	$body_tag_start=&Apache::loncommon::bodytag();
+     my %body_args;
+     if (defined($found{'html'})) {
+ 	$body_args{'skip_phases'}{'head'}=1;
+     } else {
+ 	$extra_head .= &Apache::lonhtmlcommon::spellheader();
+ 	$extra_head .= &Apache::londefdef::generate_css_links();
+ 	if ($env{'request.state'} eq 'construct') {
+ 	    $extra_head.=&Apache::edit::js_change_detection().
+ 		"<script type=\"text/javascript\">\n".
+ 		"if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".
+ 		&Apache::loncommon::browser_and_searcher_javascript().
+                 "\n</script>\n";
+ 	}
+     }
+     my $pageheader = '';
+     if (defined($found{'body'})) {
+ 	$body_args{'skip_phases'}{'body'}=1;
+     } elsif (!defined($found{'body'})
+ 	     && $env{'request.state'} eq 'construct') {
+ 	if ($target eq 'web' || $target eq 'edit') {
+ 	    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(),
+         });
+         # breadcrumbs (and tools) will be created
+         # in start_page->bodytag->innerregister
+ # FIXME Where are we?
+ #        &Apache::lonhtmlcommon::add_breadcrumb({
+ #            'text'  => 'Problem Editing', # 'Problem Testing'
+ #            'href'  => '',
+ #        });
+         $pageheader =&Apache::loncommon::head_subbox(
+                 &Apache::loncommon::CSTR_pageheader());
+ 	}
      } elsif (!defined($found{'body'})) {
- 	$body_tag_start='<body onload="'.&Apache::lonmenu::loadevents().'" '.
+ 	my %add_entries;
- 	    'onunload="'.&Apache::lonmenu::unloadevents().'" ';
  	my $background=&Apache::lonxml::get_param('background',$parstack,
  						  $safeeval);
- 	if ($ENV{'browser.imagesuppress'} eq 'on') { $background=''; }
+ 	if ($background ne '' ) {
- 	if ($background) {
+ 	    $add_entries{'background'} = $background;
- 	    $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
- 		$background;
- 	    $body_tag_start.='background="'.$background.'" ';
- 	} else {
- 	    my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
- 						   $safeeval);
- 	    if (($bgcolor) && ($ENV{'browser.blackwhite'} ne 'on')) {
- 		$body_tag_start.='bgcolor="'.$bgcolor.'" ';
- 	    } else {
- 		$body_tag_start.='bgcolor="#ffffff"';
- 	    }
- 	}
- 	if ($ENV{'browser.fontenhance'} eq 'on') {
- 	    $body_tag_start.=' style="font-size: x-large;" ';
- 	}
- 	$body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
- 	if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {
- 	    my ($symb,undef,undef,undef,$publicuser)=
- 		&Apache::lonxml::whichuser();
- 	    if ($symb eq '' && !$publicuser) {
- 		my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
- 		$help=&mt("Browsing resource, all submissions are temporary.")."<br />";
- 		$body_tag_start.=$help;
- 	    }
  	}
- 	$body_tag_start.=&Apache::lonxml::message_location();
+ 	my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
+ 					       $safeeval);
+         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{'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')) {
+ 	my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();
+         if ($symb eq '' && !$publicuser) {
+             $page_start .= '<p class="LC_info">'
+                           .&mt('Browsing resource, all submissions are temporary.')
+                           .'</p>';
+         }
+     }
+     if (!defined($found{'body'}) && $env{'request.state'} ne 'construct') {
+ 	$page_start .= &Apache::lonxml::message_location();
+     }
      my $form_tag_start;
      if (!defined($found{'form'})) {
- 	$form_tag_start='<form name="lonhomework" method="post" action="';
+ 	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';
- 	my $uri=$ENV{'request.uri'};
+ 	my $uri = Apache::loncommon::inhibit_menu_check(
- 	if ($ENV{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
+                 &Apache::lonenc::check_encrypt($env{'request.uri'}));
- 	$form_tag_start.=$uri.'">';
+         $uri = &HTML::Entities::encode($uri,'<>&"');
+ 	$form_tag_start.=$uri.'" ';
+ 	if ($target eq 'edit') {
+ 	    $form_tag_start.=&Apache::edit::form_change_detection();
+ 	}
+ 	$form_tag_start.='>'."\n";
+ 	my $symb=&Apache::lonnet::symbread();
+ 	if ($symb =~ /\S/) {
+ 	    $symb=
+ 		&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb));
+ 	    $form_tag_start.=
+ 		"\t".'<input type="hidden" name="symb" value="'.$symb.'" />'."\n";
+ 	}
      }
-     return ($result,$head_tag_start,$body_tag_start,$form_tag_start);
+     return ($page_start,$form_tag_start);
  }
  #use Time::HiRes();
  sub get_resource_name {
      my ($parstack,$safeeval)=@_;
+     my $name;
      if (defined($Apache::lonhomework::name)) {
- 	return $Apache::lonhomework::name;
+ 	$name = $Apache::lonhomework::name;
-     }
+     } else {
-     my $name=&Apache::lonnet::gettitle();
+ 	my ($symb)=&Apache::lonnet::whichuser();
-     if ($name eq '') {
+ 	$name=&Apache::lonnet::gettitle($symb);
- 	$name=&Apache::lonnet::EXT('resource.title');
+ 	if ($name eq '') {
- 	if ($name eq 'con_lost') { $name = ''; }
+ 	    $name=&Apache::lonnet::EXT('resource.title');
-     }
+ 	    if ($name eq 'con_lost') { $name = ''; }
-     if ($name!~/\S+/) {
+ 	}
- 	$name=$ENV{'request.uri'};
+ 	if ($name!~/\S+/) {
- 	$name=~s-.*/([^/]+)$-$1-;
+ 	    $name=$env{'request.uri'};
+ 	    $name=~s-.*/([^/]+)$-$1-;
+ 	}
+ 	# The name has had html tags escaped:
+ 	$name=~s/&lt;/</gs;
+ 	$name=~s/&gt;/>/gs;
+ 	$Apache::lonhomework::name=$name;
      }
-     $Apache::lonhomework::name=$name;
      return $name;
  }
  sub setup_rndseed {
      my ($safeeval)=@_;
      my $rndseed;
-     my ($symb)=&Apache::lonxml::whichuser();
+     my ($symb)=&Apache::lonnet::whichuser();
-     if ($ENV{'request.state'} eq "construct" || $symb eq '' ||
+     if ($env{'request.state'} eq "construct"
-           $Apache::lonhomework::history{'resource.CODE'}) {
+ 	|| $symb eq ''
- 	$rndseed=$ENV{'form.rndseed'};
+ 	|| $Apache::lonhomework::type eq 'practice'
+ 	|| $Apache::lonhomework::history{'resource.CODE'}) {
+ 	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ 						['rndseed']);
+ 	$rndseed=$env{'form.rndseed'};
  	if (!$rndseed) {
  	    $rndseed=$Apache::lonhomework::history{'rndseed'};
  	    if (!$rndseed) {
  		$rndseed=time;
  	    }
- 	    $ENV{'form.rndseed'}=$rndseed;
+ 	    $env{'form.rndseed'}=$rndseed;
  	}
- 	if ($ENV{'form.resetdata'} eq &mt('New Problem Variation') ||
+ 	if ( ($env{'form.resetdata'} eq &mt('New Problem Variation')
- 	    $ENV{'form.newrandomization'} eq &mt('New Randomization')) {
+ 	      && $env{'form.submitted'} eq 'yes')  ||
+ 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
  	    srand(time);
  	    $rndseed=int(rand(2100000000));
- 	    $ENV{'form.rndseed'}=$rndseed;
+ 	    $env{'form.rndseed'}=$rndseed;
- 	    delete($ENV{'form.resetdata'});
+ 	    delete($env{'form.resetdata'});
- 	    delete($ENV{'form.newrandomization'});
+ 	    delete($env{'form.newrandomization'});
  	}
  	if (defined($rndseed) && $rndseed ne int($rndseed)) {
- 	   $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed));
+ 	    $rndseed=join(':',&Apache::lonnet::digest($rndseed));
          }
          if ($Apache::lonhomework::history{'resource.CODE'}) {
  	   $rndseed=&Apache::lonnet::rndseed();
- Line 192  sub setup_rndseed {
+ Line 363  sub setup_rndseed {
  sub remember_problem_state {
      return '
-        <input type="hidden" name="problemstate" value="'.$ENV{'form.problemstate'}.'" />
+        <input type="hidden" name="problemstate" value="'.$env{'form.problemstate'}.'" />
-        <input type="hidden" name="problemtype" value="'.$ENV{'form.problemtype'}.'" />
+        <input type="hidden" name="problemtype" value="'.$env{'form.problemtype'}.'" />
-        <input type="hidden" name="problemstatus" value="'.$ENV{'form.problemstatus'}.'" />';
+        <input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />';
+ }
+ sub problem_edit_buttons {
+    return  '
+ <div class="LC_edit_problem_discards">
+        <input type="button" name="submitmode" accesskey="d" value="'.&mt('Discard Edits and View').'" '.
+        ' onclick="javscript:setmode(this.form,'."'discard'".')"  />
+        <input '.&Apache::edit::submit_ask_anyway('setmode(this.form,'."'editxml'".')').' type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" />
+        <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
+ </div>
+ <div class="LC_edit_problem_saves">
+        <input type="submit" name="submitbutton" accesskey="s" value="'.&mt('Save and Edit').'" />
+        <input type="submit" name="submitbutton" accesskey="v" value="'.&mt('Save and View').'" />
+ </div>';
  }
  sub problem_edit_header {
-     return '<input type="hidden" name="submitted" value="edit" />'.
+     return '<input type="hidden" name="submitted" value="edit" /><input type="hidden" name="problemmode" value="edit" />'.
  	&Apache::structuretags::remember_problem_state().'
-        <input type="hidden" name="problemmode" value="'.&mt('Edit').'" />
+ <div class="LC_edit_problem_header">
-        <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
+ <div class="LC_edit_problem_header_title">
-        <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
+ '.&mt('Problem Editing').&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
-        <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr />
+ </div>'.
-        <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" />
+ &problem_edit_buttons().'
-        <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.
+ <hr style="clear:both;" />
-        &Apache::loncommon::help_open_menu('','Problem Editing Help','Problem_Editor_XML_Index','',5,'Authoring',undef,undef,undef,'Problem Editing Help')
+ '.&Apache::lonxml::message_location().'
-        .'</td></tr></table>'.
+ </div>
-        '<table border="0"><tr><td bgcolor="#DDDDDD">';
+ '.
+        '<table border="0" width="100%"><tr><td bgcolor="#F8F8F8">';
  }
  sub problem_edit_footer {
-     return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />
+     return '</td></tr></table><br />
-     <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />'.
+ <div class="LC_edit_problem_footer">
-     &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields).
+   <hr />'.
-     "\n</form>\n</body>\n</html>";
+ &problem_edit_buttons().'
+   <hr style="clear:both;" />
+ </div>
+ '.
+     &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).
+     "\n</form>\n".&Apache::loncommon::end_page();
  }
  sub option {
      my ($value,$name) = @_;
      my $result ="<option value='".$value."' ";
-     if ($ENV{'form.'.$name} eq $value) {
+     if ($env{'form.'.$name} eq $value) {
  	$result.=" selected='on' ";
      }
      $result.='>';
- Line 230  sub option {
+ Line 422  sub option {
  sub problem_web_to_edit_header {
      my ($rndseed)=@_;
-     my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />
+     my $result .= '<div class="LC_edit_problem_header">';
-              <input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />
-              <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
+     if (!$Apache::lonhomework::parsing_a_task) {
-              <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
+ 	$result .=
-              <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
+ 	    '<div class="LC_edit_problem_header_title">'.
-              <nobr><input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
+ 	    &mt('Problem Testing').
-               <input type="text" name="rndseed" size="10" value="'.
+ 	    &Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area').
- 	       $rndseed.'"
+ 	    '</div>';
-            onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr>
+     } else {
-              <input type="checkbox" name="showallfoils" ';
+ 	$result .=
-     if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }
+ 	    '<div class="LC_edit_problem_header_title">'.
-     $result.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
+ 	    &mt('Task Testing').
- 	&Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
+ 	    '</div>';
- 	'<hr />';
+     }
-     $result.="
- <nobr>
+     my $show_all_foils_text =
- Problem Status:
+ 	($Apache::lonhomework::parsing_a_task) ?
+ 	&mt('Show All Instances')
+ 	: &mt('Show All Foils');
+     my $show_all= '<span class="LC_nobreak"><label for="showallfoils">'
+                  .'<input type="checkbox" name="showallfoils"';
+     if (defined($env{'form.showallfoils'})) { $show_all.=' checked="checked"'; }
+     $show_all.= ' /> '.$show_all_foils_text
+                .'</label></span>';
+     $result .= '<div class="LC_edit_problem_header_status_row">';
+     if (!$Apache::lonhomework::parsing_a_task) {
+ 	$result.="
+ <div class='LC_edit_problem_header_row1'>
+ <span class=\"LC_nobreak\">
+ ".&mt("Problem Status:")."
  <select name='problemstate'>
    <option value=''></option>
    ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>
- Line 255  Problem Status:
+ Line 464  Problem Status:
    ".&option('CANNOT_ANSWER_correct','problemstate').&mt("Open and correct")."</option>
    ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Answer")."</option>
  </select>
- </nobr>
+ </span>
- <nobr>
+ <span class=\"LC_nobreak\">
- Problem Type:
+ ".&mt("Problem Type:")."
  <select name='problemtype'>
    <option value=''></option>
    ".&option('exam'   ,'problemtype').&mt("Exam Problem")."</option>
-   ".&option('problem','problemtype').&mt("Homework problem")."</option>
+   ".&option('problem','problemtype').&mt("Homework Problem")."</option>
    ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
+   ".&option('practice' ,'problemtype').&mt("Practice Problem")."</option>
  </select>
- </nobr>
+ </span>
- <nobr>
+ $show_all
- Feedback Mode:
+ </div>
+ <div class='LC_edit_problem_header_row2'>
+ <span class=\"LC_nobreak\">
+ ".&mt("Feedback Mode:")."
  <select name='problemstatus'>
    <option value=''></option>
    ".&option('yes','problemstatus').&mt("Show Feedback")."</option>
-   ".&option('no', 'problemstatus').&mt("Don't Show Feedback")."</option>
+   ".&option('no', 'problemstatus').&mt("Don't Show Incorect/Correct Feedback")."</option>
+   ".&option('no_feedback_ever', 'problemstatus').&mt("Don't Show Any Feedback")."</option>
+ </select>
+ </span>
+ ";
+     } elsif ($Apache::lonhomework::parsing_a_task) {
+ 	$result.="
+ <div class='LC_edit_problem_header_row1'>
+ <span class=\"LC_nobreak\">
+ ".&mt("Problem Status:")."
+ <select name='problemstate'>
+   <option value=''></option>
+   ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>
+   ".&option('CAN_ANSWER'           ,'problemstate').&mt("Answerable")."</option>
+   ".&option('WEB_GRADE'            ,'problemstate').&mt("Criteria Grading")."</option>
+   ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Feedback")."</option>
  </select>
- </nobr>
+ </span>
- <input type='submit' name='changeproblemmode' value='".&mt("Change")."' />
+ $show_all
- <hr />";
+ ";
-     my $numtoanalyze=$ENV{'form.numtoanalyze'};
+     }
-     if (!$numtoanalyze) { $numtoanalyze=20; }
+     $result.='
-     $result.= '<input type="submit" name="problemmode" value='.
+        <span class="LC_nobreak">
- 	&mt('"Calculate answers').'" /> for
+        '.&mt('Apply style file: ').'
-              <input type="text" name="numtoanalyze" value="'.
+          <input type="text" name="style_file" value="'.&HTML::Entities::encode($env{'construct.style'},'"<>&').'" />
- 	     $numtoanalyze.'" size="5" /> '.&mt('versions of this problem').
+          <a href="javascript:openbrowser(\'lonhomework\',\'style_file\',\'sty\')">'.&mt('Select').'</a>
- 	     '.'.&Apache::loncommon::help_open_topic("Analyze_Problem",
+        </span>
- 						     '',undef,undef,300).
+      </div>
- 						     '<hr />';
+      <div class="LC_edit_problem_header_row1">'.
+        &Apache::lonxml::renderingoptions().'
+      </div>
+      <input type="submit" name="changeproblemmode" value="'.&mt("Change View").'" />
+      <input type="submit" name="clear_style_file" accesskey="d" value="'.&mt('Show Default View').'" />
+      <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
+    </div>
+    <hr />
+    <div class="LC_edit_problem_header_randomize_row">
+      <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
+      <input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
+      <input type="text" name="rndseed" size="10" value="'.
+ 	       $rndseed.'"
+              onchange="javascript:document.lonhomework.changerandseed.click()" />';
+     if (!$Apache::lonhomework::parsing_a_task) {
+ 	my $numtoanalyze=$env{'form.numtoanalyze'};
+ 	if (!$numtoanalyze) { $numtoanalyze=20; }
+ 	$result .= '<span class="LC_nobreak">'.
+ 	    &mt('[_1] for [_2] versions.',
+ 		'<input type="button" name="submitmode" value="'.&mt('Calculate answers').'" '.
+                 'onclick="javascript:setmode(this.form,'."'calcanswers'".')" />'
+                ,'<input type="text" name="numtoanalyze" value="'.
+ 		$numtoanalyze.'" size="5" />').
+ 		&Apache::loncommon::help_open_topic("Analyze_Problem",'',undef,undef,300).
+ 		'</span>';
+     }
+     $result.='
+    </div>
+    <hr />
+    <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'".')" />';
+     $result .= '<input type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" '.
+                'onclick="javascript:setmode(this.form,'."'editxml'".')" />';
+     $result.='
+    </div>
+    <hr />
+    '.&Apache::lonxml::message_location().'
+ </div>';
      return $result;
  }
  sub initialize_storage {
-     %Apache::lonhomework::results=();
+     my ($given_symb) = @_;
-     %Apache::lonhomework::history=();
+     undef(%Apache::lonhomework::results);
-     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+     undef(%Apache::lonhomework::history);
-     if ($ENV{'request.state'} eq 'construct' || $symb eq '') {
+     my ($symb,$courseid,$domain,$name) =
+ 	&Apache::lonnet::whichuser($given_symb);
+     # anonymous users (CODEd exams) have no data
+     if ($name eq 'anonymous'
+ 	&& !defined($domain)) {
+ 	return;
+     }
+     if ($env{'request.state'} eq 'construct'
+ 	|| $symb eq ''
+ 	|| $Apache::lonhomework::type eq 'practice') {
+ 	my $namespace = $symb || $env{'request.uri'};
+ 	if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
+ 	    ($env{'form.resetdata'} eq &mt('New Problem Variation')
+ 	     && $env{'form.submitted'} eq 'yes') ||
+ 	    $env{'form.newrandomization'} eq &mt('New Randomization')) {
+ 	    &Apache::lonnet::tmpreset($namespace,'',$domain,$name);
+ 	    &Apache::lonxml::debug("Attempt reset");
+ 	}
  	%Apache::lonhomework::history=
- 	    &Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name);
+ 	    &Apache::lonnet::tmprestore($namespace,'',$domain,$name);
  	my ($temp)=keys %Apache::lonhomework::history ;
  	&Apache::lonxml::debug("Return message of $temp");
      } else {
  	%Apache::lonhomework::history=
  	    &Apache::lonnet::restore($symb,$courseid,$domain,$name);
      }
      #ignore error conditions
      my ($temp)=keys %Apache::lonhomework::history ;
      if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
  }
- # -------------------------------------------------------------finalize_storage
+ =pod
- # Stores away the result has to a student's environment
- # checks form.grade_ for specific values, other wises stores
+ =item finalize_storage()
- # to the running users environment
+ 	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;
-     my ($temp) = keys %Apache::lonhomework::results;
+     if (%Apache::lonhomework::results) {
-     if ( $temp ne '' ) {
+ 	my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results));
- 	my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+ 	delete(@Apache::lonhomework::results{@remove});
- 	if ($ENV{'request.state'} eq 'construct' || $symb eq '') {
+ 	my ($symb,$courseid,$domain,$name) =
- 	    $Apache::lonhomework::results{'rndseed'}=$ENV{'form.rndseed'};
+ 	    &Apache::lonnet::whichuser($given_symb);
+ 	if ($env{'request.state'} eq 'construct'
+ 	    || $symb eq ''
+ 	    || $Apache::lonhomework::type eq 'practice') {
+ 	    my $namespace = $symb || $env{'request.uri'};
+ 	    $Apache::lonhomework::results{'rndseed'}=$env{'form.rndseed'};
  	    $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,
- 					$ENV{'request.uri'},'',$domain,$name);
+ 					      $namespace,'',$domain,$name);
  	    &Apache::lonxml::debug('Construct Store return message:'.$result);
  	} else {
  	    $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
  					    $symb,$courseid,$domain,$name);
  	    &Apache::lonxml::debug('Store return message:'.$result);
+             if ($env{'request.role'} =~/^st/) {
+                 &store_aggregates($symb,$courseid);
+             }
  	}
+     } else {
+ 	&Apache::lonxml::debug('Nothing to store');
      }
      return $result;
  }
+ =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;
+     my @parts;
+     my $cdomain = $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my $cname = $env{'course.'.$env{'request.course.id'}.'.num'};
+     foreach my $key (keys(%Apache::lonhomework::results)) {
+         if ($key =~ /resource\.([^\.]+)\.tries/) {
+             push(@parts, $1);
+         }
+     }
+     foreach my $part (@parts) {
+         if ($Apache::lonhomework::results{'resource.'.$part.'.award'}
+ 	    eq 'APPROX_ANS' ||
+ 	    $Apache::lonhomework::results{'resource.'.$part.'.award'}
+ 	    eq 'EXACT_ANS') {
+             $aggregate{$symb."\0".$part."\0correct"} = 1;
+         }
+         if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {
+             $aggregate{$symb."\0".$part."\0users"} = 1;
+         } else {
+             my (undef,$last_reset) = &Apache::grades::get_last_resets($symb,$env{'request.course.id'},[$part]);
+             if ($last_reset) {
+                 if (&Apache::grades::get_num_tries(\%Apache::lonhomework::history,$last_reset,$part) == 0) {
+                     $aggregate{$symb."\0".$part."\0users"} = 1;
+                 }
+             }
+         }
+         $aggregate{$symb."\0".$part."\0attempts"} = 1;
+     }
+     if (keys (%aggregate) > 0) {
+ 	&Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
+                             $cdomain,$cname);
+     }
+ }
  sub checkout_msg {
      my %lt=&Apache::lonlocal::texthash(
  		'resource'=>'The resource needs to be checked out',
- Line 335  sub checkout_msg {
+ Line 693  sub checkout_msg {
                  'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',
                  'checkout'=>'Check out Exam for Viewing',
  		'checkout?'=>'Check out Exam?');
+     my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
      return (<<ENDCHECKOUT);
  <h2>$lt{'resource'}</h2>
      <p>$lt{'id_expln'}</p>
- <font color="red">
+ <p class="LC_warning">$lt{'warning'}</p>
- <p>$lt{'warning'}</p>
+ <form name="checkout" method="post" action="$uri">
- </font>
- <form name="checkout" method="post" action="$ENV{'request.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>
- Line 350  ENDCHECKOUT
+ Line 707  ENDCHECKOUT
  sub firstaccess_msg {
      my ($time,$symb)=@_;
-     my ($map)=&Apache::lonnet::decode_symb($symb);
+     my $result;
-     my $foldertitle=&Apache::lonnet::gettitle($map);
+     my @interval=&Apache::lonnet::EXT("resource.0.interval");
-     &Apache::lonxml::debug("map is $map title is $foldertitle");
+     if ($interval[1] eq 'map') {
-     return (<<ENDCHECKOUT);
+ 	my ($map)=&Apache::lonnet::decode_symb($symb);
- <h2>The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".</h2>
+ 	my $foldertitle=&Apache::lonnet::gettitle($map);
- <form name="markaccess" method="post" action="$ENV{'request.uri'}">
+ 	&Apache::lonxml::debug("map is $map title is $foldertitle");
+ 	$result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.'
+                              .' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
+                              ,$foldertitle,$time)."</h2>";
+     } elsif ($interval[1] eq 'course') {
+ 	my $course = $env{'course.'.$env{'request.course.id'}.'.description'};
+         $result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.'
+                              .' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
+                              ,$course,$time)."</h2>";
+     } else {
+ 	my $title=&Apache::lonnet::gettitle($symb);
+         $result .= "<h2>".&mt('This resource "[_1]" is open for a limited time.'
+                              .' Once you click the "Show Resource" button below you have [_2] to complete this resource "[_1]".'
+                              ,$title,$time)."</h2>";
+     }
+     my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
+     my $buttontext = &mt('Show Resource');
+     my $timertext = &mt('Start Timer?');
+     $result .= (<<ENDCHECKOUT);
+ <form name="markaccess" method="post" action="$uri">
  <input type="hidden" name="markaccess" value="yes" />
- <input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" />
+ <input type="button" name="accessbutton" value="$buttontext" onClick="javascript:if (confirm('$timertext')) { document.markaccess.submit(); }" />
  </form>
  ENDCHECKOUT
+     return $result;
  }
  sub init_problem_globals {
      my ($type)=@_;
      #initialize globals
+     #   For problems, we start out in part 0 (outside a <part> tag).
+     #   and part 0 is used to describe the main body of the <problem>
+     #
      if ($type eq 'problem') {
  	$Apache::inputtags::part='0';
  	@Apache::inputtags::partlist=('0');
- 	$Apache::lonhomework::problemstatus=&get_problem_status('0');
+ 	&Apache::lonhomework::set_show_problem_status(&get_problem_status('0'));
  	$Apache::lonhomework::ignore_response_errors=0;
      } elsif ($type eq 'library') {
  	$Apache::inputtags::part='';
  	@Apache::inputtags::partlist=();
- 	$Apache::lonhomework::problemstatus='';
+ 	&Apache::lonhomework::reset_show_problem_status();
+ 	$Apache::lonhomework::ignore_response_errors=1;
+     } elsif ($type eq 'Task') {
+ 	$Apache::inputtags::part='0';
+ 	@Apache::inputtags::partlist=('0');
+ 	&Apache::lonhomework::reset_show_problem_status();
  	$Apache::lonhomework::ignore_response_errors=1;
      }
      @Apache::inputtags::responselist = ();
- Line 386  sub init_problem_globals {
+ Line 774  sub init_problem_globals {
      @Apache::structuretags::whileline=();
      $Apache::lonhomework::scantronmode=0;
      undef($Apache::lonhomework::name);
+     undef($Apache::lonhomework::default_type);
+     undef($Apache::lonhomework::type);
  }
  sub reset_problem_globals {
- Line 398  sub reset_problem_globals {
+ Line 787  sub reset_problem_globals {
  #detect if we try to do 2 problems in one file
  #   undef($Apache::lonhomework::parsing_a_problem);
      undef($Apache::lonhomework::name);
+     undef($Apache::lonhomework::default_type);
+     undef($Apache::lonhomework::type);
+     undef($Apache::lonhomework::scantronmode);
+     undef($Apache::lonhomework::ignore_response_errors);
+     &Apache::lonhomework::reset_show_problem_status();
  }
  sub set_problem_state {
      my ($part)=@_;
-     if ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {
+     if ($env{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {
  	$Apache::lonhomework::history{"resource.$part.solved"}=
  	    'correct_by_student';
      }
- Line 411  sub set_problem_state {
+ Line 805  sub set_problem_state {
  sub get_problem_status {
      my ($part)=@_;
      my $problem_status;
-     if ($ENV{'request.state'} eq 'construct' &&
+     if ($env{'request.state'} eq 'construct' &&
- 	defined($ENV{'form.problemstatus'})) {
+ 	defined($env{'form.problemstatus'})) {
- 	$problem_status=$ENV{'form.problemstatus'};
+ 	$problem_status=$env{'form.problemstatus'};
      } else {
  	$problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
  	&Apache::lonxml::debug("problem status for $part is $problem_status");
- 	&Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
+ 	&Apache::lonxml::debug("env probstat is ".$env{'form.problemstatus'});
      }
      return $problem_status;
  }
  sub start_problem {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     # We'll use the redirection to fix up printing of duedates.
+     if (!$Apache::lonxml::metamode) {
+ 	&Apache::lonxml::startredirection();
+     }
+     # Problems don't nest and we don't allow more than one <problem> in
+     # a .problem file.
+     #
      if ( $Apache::inputtags::part ne '' ||
  	 $Apache::lonhomework::parsing_a_problem) {
  	&Apache::lonxml::error('Only one &lt;problem&gt; allowed in a .problem file');
- 	#my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
+ 	#my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,$style);
  	return '';
      }
      $Apache::lonhomework::parsing_a_problem=1;
      &init_problem_globals('problem');
-     if (defined($ENV{'scantron.maxquest'})) {
+     if (defined($env{'scantron.maxquest'})) {
  	$Apache::lonhomework::scantronmode=1;
      }
-     &initialize_storage();
      if ($target ne 'analyze') {
- 	if ($target eq 'web') {
+         my $type = &Apache::lonnet::EXT('resource.0.type');
- 	    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
+ 	$Apache::lonhomework::type=$type;
- 	}
+ 	if (($env{'request.state'} eq 'construct') &&
-        	if ($ENV{'request.state'} eq 'construct') { &set_problem_state('0'); }
+ 	    $env{'form.problemtype'} =~ /\S/) {
- 	$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
+ 	    $Apache::lonhomework::type=$env{'form.problemtype'};
- 	if (($ENV{'request.state'} eq 'construct') &&
- 	    defined($ENV{'form.problemtype'})) {
- 	    $Apache::lonhomework::type=$ENV{'form.problemtype'};
  	}
- 	&Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");
+ 	&Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
      }
      if ($Apache::lonhomework::type eq '' ) {
- 	my $uri=$ENV{'request.uri'};
+ 	my $uri=$env{'request.uri'};
  	if ($uri=~/\.(\w+)$/) {
  	    $Apache::lonhomework::type=$1;
  	    &Apache::lonxml::debug("Using type of $1");
- Line 462  sub start_problem {
+ Line 860  sub start_problem {
  	    &Apache::lonxml::debug("Using default type, problem, :$uri:");
  	}
      }
+     $Apache::lonhomework::default_type = $Apache::lonhomework::type;
+     &initialize_storage();
+     if ($target ne 'analyze'
+        	&& $env{'request.state'} eq 'construct') {
+ 	&set_problem_state('0');
+     }
+     if ($target eq 'web') {
+ 	&Apache::lonxml::debug(" grading history ");
+ 	&Apache::lonhomework::showhash(%Apache::lonhomework::history);
+     }
      #added vars to the scripting enviroment
      my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
- Line 470  sub start_problem {
+ Line 880  sub start_problem {
      my $status;
      my $accessmsg;
-     #should get back a <html> or the neccesary stuff to start XML/MathML
+     my $name= &get_resource_name($parstack,$safeeval);
-     my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
+     my ($result,$form_tag_start);
- 	&page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+     if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex'
-     if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) {$result='';}
+ 	|| $target eq 'edit') {
+ 	($result,$form_tag_start) =
+ 	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
+ 			$name);
+     }
+     if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}
      if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }
      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
- Line 482  sub start_problem {
+ Line 898  sub start_problem {
  	if ($Apache::lonhomework::type eq 'exam') {
  	    my $token=
  		$Apache::lonhomework::history{"resource.0.outtoken"};
- 	    if (($ENV{'form.doescheckout'}) && (!$token)) {
+ 	    if (($env{'form.doescheckout'}) && (!$token)) {
  		$token=&Apache::lonxml::maketoken();
  		$Apache::lonhomework::history{"resource.0.outtoken"}=
  		    $token;
  	    }
- 	    $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
+ 	    $result.=&Apache::lonxml::printtokenheader($target,$token);
  	}
- 	if ($ENV{'form.markaccess'}) {
+ 	if ($env{'form.markaccess'}) {
- 	    &Apache::lonnet::set_first_access('map');
+ 	    my @interval=&Apache::lonnet::EXT("resource.0.interval");
+ 	    &Apache::lonnet::set_first_access($interval[1]);
  	}
  	#handle rand seed in construction space
  	my $rndseed=&setup_rndseed($safeeval);
- 	my ($symb)=&Apache::lonxml::whichuser();
+ 	my ($symb)=&Apache::lonnet::whichuser();
- 	if ($ENV{'request.state'} ne "construct" && $symb eq '') {
+ 	if ($env{'request.state'} ne "construct" &&
+ 	    ($symb eq '' || $Apache::lonhomework::type eq 'practice')) {
  	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
  		$rndseed.'" />'.
  		    '<input type="submit" name="resetdata"
-                              value="'.&mt('New Problem Variation').'" />'.
+                              value="'.&mt('New Problem Variation').'" />';
- 		    '<input type="hidden" name="username"
+ 	    if (exists($env{'form.username'})) {
-                              value="'.$ENV{'form.username'}.'" />';
- 	    if ($ENV{'user.adv'}) {
  		$form_tag_start.=
- 		    ' <input type="checkbox" name="showallfoils" ';
+ 		    '<input type="hidden" name="username"
- 		if (defined($ENV{'form.showallfoils'})) {
+                              value="'.$env{'form.username'}.'" />';
- 		    $form_tag_start.='checked="on"';
+ 	    }
+ 	    if ($env{'request.role.adv'}) {
+ 		$form_tag_start.= ' <label class="LC_nobreak">'
+                          .'<input type="checkbox" name="showallfoils"';
+ 		if (defined($env{'form.showallfoils'})) {
+ 		    $form_tag_start.=' checked="checked"';
  		}
- 		$form_tag_start.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils');
+                 $form_tag_start.= ' /> '
+                                  .&mt('Show All Foils')
+                                  .'</label>';
  	    }
+             if ($Apache::lonhomework::type eq 'practice') {
+                 $form_tag_start.=&practice_problem_header();
+             }
  	    $form_tag_start.='<hr />';
  	}
- 	($status,$accessmsg) = &Apache::lonhomework::check_access('0');
+ 	($status,$accessmsg,my $slot_name,my $slot) =
+ 	    &Apache::lonhomework::check_slot_access('0','problem');
  	push (@Apache::inputtags::status,$status);
  	my $expression='$external::datestatus="'.$status.'";';
  	$expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
  	&Apache::run::run($expression,$safeeval);
  	&Apache::lonxml::debug("Got $status");
  	if (( $status eq 'CLOSED' ) ||
  	    ( $status eq 'UNCHECKEDOUT') ||
  	    ( $status eq 'NOT_YET_VIEWED') ||
  	    ( $status eq 'BANNED') ||
  	    ( $status eq 'UNAVAILABLE') ||
+ 	    ( $status eq 'NOT_IN_A_SLOT') ||
  	    ( $status eq 'INVALID_ACCESS')) {
- 	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
+ 	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
+ 						       $style);
  	    if ( $target eq "web" ) {
- 		$result.= $head_tag_start.'</head>';
+ 		my $msg;
- 		my $msg=$body_tag_start;
  		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>';
  		}
  		if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
- 		    $msg.='The problem '.$accessmsg;
+ 		    $msg.=&mt('The problem ').$accessmsg;
  		} elsif ($status eq 'UNCHECKEDOUT') {
- 		    $msg.=&checkout_msg;
+ 		    $msg.=&checkout_msg();
  		} 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");
  		}
  		$result.=$msg.'<br />';
  	    } elsif ($target eq 'tex') {
- 		$result.='\begin{document}\noindent \vskip 1 mm  \begin{minipage}{\textwidth}\vskip 0 mm';
+ 		my $startminipage = ($env{'form.problem_split'}=~/yes/i)? ''
+ 		                    : '\begin{minipage}{\textwidth}';
+ 		$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 ';
  		} else {
  		    $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
  		}
  	    }
+ 	} elsif ($status eq 'NEEDS_CHECKIN') {
+ 	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
+ 						       $style);
+ 	    if ($target eq 'web') {
+ 		$result .=
+ 		    &Apache::bridgetask::proctor_validation_screen($slot);
+ 	    } elsif ($target eq 'grade') {
+ 		&Apache::bridgetask::proctor_check_auth($slot_name,$slot,
+ 							'problem');
+ 	    }
  	} elsif ($target eq 'web') {
- 	    my $name= &get_resource_name($parstack,$safeeval);
+ 	    if ($status eq 'CAN_ANSWER'
- 	    $result.="$head_tag_start<title>$name</title></head>
+ 		&& $slot_name ne ''
-               $body_tag_start \n $form_tag_start".
+ 		&& $Apache::lonhomework::history{'resource.0.checkedin'} eq '') {
+ 		# unproctored slot access, self checkin
+ 		&Apache::bridgetask::check_in('problem',undef,undef,
+ 					      $slot_name);
+ 	    }
+ 	    $result.="\n $form_tag_start \t".
  	      '<input type="hidden" name="submitted" value="yes" />';
  	    # create a page header and exit
- 	    if ($ENV{'request.state'} eq "construct") {
+ 	    if ($env{'request.state'} eq "construct") {
- 		$result.= &problem_web_to_edit_header($ENV{'form.rndseed'});
+ 		$result.= &problem_web_to_edit_header($env{'form.rndseed'});
+                 if ($Apache::lonhomework::type eq 'practice') {
+                     $result.= '<input type="submit" name="resetdata" '.
+                               'value="'.&mt('New Problem Variation').'" />'.
+                               &practice_problem_header().'<hr />';
+                 }
  	    }
  	    # if we are viewing someone else preserve that info
- 	    if (defined $ENV{'form.grade_symb'}) {
+ 	    if (defined $env{'form.grade_symb'}) {
  		foreach my $field ('symb','courseid','domain','username') {
  		    $result .= '<input type="hidden" name="grade_'.$field.
- 			'" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
+ 			'" value="'.$env{"form.grade_$field"}.'" />'."\n";
  		}
  	    }
  	} elsif ($target eq 'tex') {
- 	    my $startminipage = '';
+ 	    $result .= 'INSERTTEXFRONTMATTERHERE';
- 	    if (not $ENV{'form.problem_split'}=~/yes/) {
- 		$startminipage = '\begin{minipage}{\textwidth}';
- 	    }
- 	    my $id = $Apache::inputtags::part;
- 	    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
- 	    my $packages=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');
- 	    my @packages = split /,/,$packages;
- 	    my $allow_print_points = 0;
- 	    foreach my $partial_key (@packages) {
- 		if ($partial_key=~m/^part_0$/) {
- 		    $allow_print_points=1;
- 		}
- 	    }
- 	    my $duedate = &Apache::lonnet::EXT("resource.$id.duedate");
- 	    $duedate = POSIX::strftime("%c",localtime($duedate));
- 	    my $temp_file;
- 	    my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";
- 	    if (-e $filename) {
- 		$temp_file = Apache::File->new($filename);
- 	    } else {
- 		$temp_file = Apache::File->new('>>'.$filename);
- 	    }
- 	    my @due_file_content = <$temp_file>;
- 	    my $due_file_content = $due_file_content[$#due_file_content];
- 	    chomp $due_file_content;
- 	    my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');
- 	    if ($due_file_content ne $duedate) {
- 		$temp_file = Apache::File->new('>'.$filename);
- 		print $temp_file "$duedate\n";
- 		if (not $ENV{'request.symb'} =~ m/\.page_/) {
- 		    if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
- 			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
- 		    } else {
- 			$result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
- 			if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
- 		    }
- 		} else {
- 		    $result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
- 		}
- 	    } else {
- 		if (not $ENV{'request.symb'} =~ m/\.page_/) {
- 		    $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
- 		    if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
- 		} else {
- 		    $result .= '\vskip 1mm \\\\\\\\';
- 		}
- 	    }
  	}
      } elsif ($target eq 'edit') {
- 	$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
+ 	$result .= $form_tag_start.&problem_edit_header();
- 	    &problem_edit_header();
  	$Apache::lonxml::warnings_error_header=
  	    &mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."<br />";
  	my $temp=&Apache::edit::insertlist($target,$token);
  	$result.=$temp;
      } elsif ($target eq 'modified') {
  	$result=$token->[4];
- 	$result.=&Apache::edit::handle_insert();
      } else {
  	# page_start returned a starting result, delete it if we don't need it
  	$result = '';
- Line 634  sub start_problem {
+ Line 1044  sub start_problem {
  sub end_problem {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-     my $result='';
+     my $result;
+     if (!$Apache::lonxml::metamode) {
+ 	$result = &Apache::lonxml::endredirection(); #started in &start_problem
+ 	$Apache::lonxml::post_evaluate=0;
+     }
+     if ($target eq 'tex') {
+ 	# Figure out the front matter and replace the
+ 	# INSERTTEXFRONTMATTERHERE in result with it.  note that we do
+ 	# this in end_problem because whether or not we display due
+ 	# dates depends on whether due dates have already been
+ 	# displayed in the problem parts.
+ 	my $frontmatter   = '';
+ 	my $startminipage = '';
+ 	if (not $env{'form.problem_split'}=~/yes/) {
+ 	    $startminipage = '\begin{minipage}{\textwidth}';
+ 	}
+ 	my $id = $Apache::inputtags::part;
+ 	my $weight = &Apache::lonnet::EXT("resource.$id.weight");
+ 	my $packages=&Apache::lonnet::metadata($env{'request.uri'},'packages');
+ 	my @packages = split /,/,$packages;
+ 	my $allow_print_points = 0;
+ 	foreach my $partial_key (@packages) {
+ 	    if ($partial_key=~m/^part_0$/) {
+ 		$allow_print_points=1;
+ 	    }
+ 	}
+ 	my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
+ 	if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; }
+ 	if (lc($env{'course.'.$env{'request.course.id'}.
+ 			'.disableexampointprint'}) eq 'yes') {
+ 	    $allow_print_points=0;
+ 	}
+ 	my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');
+ 	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.'}';
+ 	#  Figure out what the due date is and if we need to print
+ 	#  it in the problem header.  We have been logging the
+ 	#  last due date written to file.
+ 	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";
+ 	# Figure out what the last printed due date is or set it
+ 	# to the epoch if no duedates have been printed.
+ 	my $due_file_content = 0;      #   If the file does not yet exist, time is the epoch.
+ 	if (-e $filename) {
+ 	    $temp_file = Apache::File->new($filename);
+ 	    my @due_file      = <$temp_file>;
+ 	    $due_file_content = $due_file[$#due_file];
+ 	    chomp $due_file_content;
+ 	}
+ 	# We display the due date iff it is not the same as the last
+ 	# duedate in problem header ($due_file_content), and
+ 	# none of our parts displayed a duedate.
+ 	#
+ 	my $parts_with_displayduedate;
+ 	if (defined $Apache::outputtags::showonce{'displayduedate'}) {
+ 	    $parts_with_displayduedate =
+ 		scalar(@{$Apache::outputtags::showonce{'displayduedate'}});
+ 	} else {
+ 	    $parts_with_displayduedate = 0;
+ 	}
+ 	if (($due_file_content != $duetime) && ($parts_with_displayduedate == 0) ) {
+ 	    $temp_file = Apache::File->new('>'.$filename);
+ 	    print $temp_file "$duetime\n";
+ 	    if (not $env{'request.symb'} =~ m/\.page_/) {
+ 		if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
+ 		    $frontmatter .= $begin_doc.
+ 			'\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{'.$duedate_text.'} \\\\\\\\'.$startminipage;
+ 	    }
+ 	} else {
+ 	    if (not $env{'request.symb'} =~ m/\.page_/) {
+ 		$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 \\\\\\\\'.$startminipage;
+ 	    }
+ 	}
+ 	$result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/;
+     }
      my $status=$Apache::inputtags::status['-1'];
      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
  	$target eq 'tex') {
- Line 642  sub end_problem {
+ Line 1153  sub end_problem {
  	    # if part is zero, no <part>s existed, so we need to the grading
  	    if ($status eq 'CAN_ANSWER' ||$Apache::lonhomework::scantronmode) {
  		&Apache::inputtags::grade;
+ 	    } elsif ($status eq 'NEEDS_CHECKIN') {
+ 		# no need to grade, and don't want to hide data
  	    } else {
  		# move any submission data to .hidden
  		&Apache::inputtags::hidealldata($Apache::inputtags::part);
- Line 655  sub end_problem {
+ Line 1168  sub end_problem {
  	    $result.= $gradestatus;
  	}
  	if (
- 	    (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||
+ 	    (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
  	    ($target eq 'answer') || ($target eq 'tex')
  	   ) {
  	    if ($target ne 'tex' &&
- 		$ENV{'form.answer_output_mode'} ne 'tex') {
+ 		$env{'form.answer_output_mode'} ne 'tex') {
  		$result.="</form>";
- 		$result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
+ 		$result.= &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields());
- 		$result.="</body>\n";
  	    }
  	    if ($target eq 'web') {
- 		$result.=&Apache::lonxml::xmlend();
+ 		$result.= &Apache::loncommon::end_page({'discussion' => 1});
  	    } elsif ($target eq 'tex') {
  		my $endminipage = '';
- 		if (not $ENV{'form.problem_split'}=~/yes/) {
+ 		if (not $env{'form.problem_split'}=~/yes/) {
  		    $endminipage = '\end{minipage}';
  		}
-                 if ($ENV{'form.print_discussions'} eq 'yes') {
+                 if ($env{'form.print_discussions'} eq 'yes') {
  		    $result.=&Apache::lonxml::xmlend($target,$parser);
- 		    $result=~s/<\/html>//;
  		} else {
  		    $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
- 		    if (not $ENV{'request.symb'} =~ m/\.page_/) {
+ 		    if (not $env{'request.symb'} =~ m/\.page_/) {
  			$result .= $endminipage.'\end{document} ';
  		    } else {
- 			$result .= '';
+ 			$result .= $endminipage;
  		    }
  		}
  	    }
- Line 688  sub end_problem {
+ Line 1199  sub end_problem {
  	    &Apache::lonhomework::showhash(%Apache::lonhomework::results);
  	    &finalize_storage();
  	}
- 	if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct')
+ 	if ($target eq 'answer' && ($env{'request.state'} eq 'construct')
- 	    && $ENV{'form.answer_output_mode'} ne 'tex') {
+ 	    && $env{'form.answer_output_mode'} ne 'tex') {
- 	    $result.='</html>'; # normally we get it from xmlend, but in CSTR
+ 	    $result.=&Apache::loncommon::end_page({'discussion' => 1});
+ 	                        # normally we get it from above, but in CSTR
  	                        # we always show answer mode too.
  	}
      } elsif ($target eq 'meta') {
- Line 702  sub end_problem {
+ Line 1214  sub end_problem {
  	$result.=&Apache::response::meta_response_order();
      } elsif ($target eq 'edit') {
  	&Apache::lonxml::debug("in end_problem with $target, edit");
- 	$result = &problem_edit_footer();
+ 	$result .= &problem_edit_footer();
+     } elsif ($target eq 'modified') {
+ 	 $result .= $token->[2];
      }
-     if ($ENV{'request.state'} eq 'construct' && $target eq 'web') {
+     if ($env{'request.state'} eq 'construct' && $target eq 'web') {
  	&Apache::inputtags::check_for_duplicate_ids();
      }
- Line 717  sub end_problem {
+ Line 1231  sub end_problem {
  sub start_library {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-     my ($result,$head_tag_start,$body_tag_start,$form_tag_start);
+     my ($result,$form_tag_start);
-     if ($$tagstack[0] eq 'library') {
+     if ($#$tagstack eq 0 && $$tagstack[0] eq 'library') {
  	&init_problem_globals('library');
  	$Apache::lonhomework::type='problem';
      }
      if ($target eq 'edit') {
- 	($result,$head_tag_start,$body_tag_start,$form_tag_start)=
+ 	($result,$form_tag_start)=
- 	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
+ 	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
- 	$result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.
+ 			'Edit');
- 	    &problem_edit_header();
+ 	$result.=$form_tag_start.&problem_edit_header();
  	my $temp=&Apache::edit::insertlist($target,$token);
  	$result.=$temp;
      } elsif ($target eq 'modified') {
  	$result=$token->[4];
- 	$result.=&Apache::edit::handle_insert();
+     } elsif (($target eq 'web' || $target eq 'webgrade')
-     } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
+ 	     && ($#$tagstack eq 0 && $$tagstack[0] eq 'library')
- 	     $ENV{'request.state'} eq "construct" ) {
+ 	     && $env{'request.state'} eq "construct" ) {
- 	($result,$head_tag_start,$body_tag_start,$form_tag_start)=
- 	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
  	my $name=&get_resource_name($parstack,$safeeval);
+ 	($result,$form_tag_start)=
+ 	    &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
+ 			$name);
  	my $rndseed=&setup_rndseed($safeeval);
- 	$result.="$head_tag_start<title>$name</title></head>
+ 	$result.=" \n $form_tag_start".
-               $body_tag_start \n $form_tag_start".
  		  '<input type="hidden" name="submitted" value="yes" />';
  	$result.=&problem_web_to_edit_header($rndseed);
+         if ($Apache::lonhomework::type eq 'practice') {
+             $result.= '<input type="submit" name="resetdata" '.
+                       'value="'.&mt('New Problem Variation').'" />'.
+                       &practice_problem_header().'<hr />';
+         }
      }
      return $result;
  }
- Line 751  sub end_library {
+ Line 1270  sub end_library {
      my $result='';
      if ($target eq 'edit') {
  	$result=&problem_edit_footer();
-     } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
+     } elsif ($target eq 'web'
- 	     $ENV{'request.state'} eq "construct") {
+ 	     && ($#$tagstack eq 0 && $$tagstack[0] eq 'library')
- 	$result.='</form></body>'.&Apache::lonxml::xmlend();
+ 	     && $env{'request.state'} eq "construct") {
+ 	$result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});
+     }
+     if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {
+ 	&reset_problem_globals('library');
      }
-     if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };
      return $result;
  }
  sub start_definetag {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
      my $result;
      my $name = $token->[2]->{'name'};
-     my $skip=&Apache::lonxml::get_all_text("/definetag",$parser);
+     my $skip=&Apache::lonxml::get_all_text("/definetag",$parser,$style);
-     if ($name=~/^\//) {
+     if ($target eq 'web') {
- 	$result=
+ 	if ($name=~/^\//) {
-  '<br /><table bgcolor="#FFBBBB"><tr><th>END <tt>'.$name.'</tt></th></tr>';
+ 	    $result=
-     } else {
+ 		'<br /><table class="LC_sty_end"><tr><th>'.
- 	$result=
+ 		&mt('END [_1]'.'<tt>'.$name.'</tt>').'</th></tr>';
-  '<br /><table bgcolor="#BBFFBB"><tr><th>BEGIN <tt>'.$name.'</tt></th></tr>';
+ 	} else {
+ 	    $result=
+ 		'<br /><table class="LC_sty_begin"><tr><th>'.
+ 		&mt('BEGIN [_1]'.'<tt>'.$name.'</tt>').'</th></tr>';
+ 	}
+ 	$skip = &HTML::Entities::encode($skip, '<>&"');
+ 	$result.='<tr><td><pre>'.$skip.'</pre></td></tr></table>';
      }
-     $skip=~s/\</\&lt\;/gs;
-     $skip=~s/\>/\&gt\;/gs;
-     $result.='<tr><td><pre>'.$skip.'</pre></td></tr></table>';
      return $result;
  }
- Line 788  sub start_block {
+ Line 1313  sub start_block {
      my $result;
-     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+     if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer'  ||
- 	$target eq 'tex' || $target eq 'analyze') {
+ 	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
  	my $code = $token->[2]->{'condition'};
- 	if (defined($code)) {
+ 	if (defined($code) && $code ne '') {
  	    if (!$Apache::lonxml::default_homework_loaded) {
  		&Apache::lonxml::default_homework_load($safeeval);
  	    }
- Line 832  sub start_languageblock {
+ Line 1357  sub start_languageblock {
      my $result;
-     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+     if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
- 	$target eq 'tex' || $target eq 'analyze') {
+ 	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
  	my $include = $token->[2]->{'include'};
  	my $exclude = $token->[2]->{'exclude'};
-         my %languages=&Apache::loncommon::display_languages();
+         my @preferred_languages=&Apache::lonlocal::preferred_languages();
-         $result='1';
+ # This should not even happen, since we should at least have the server language
- 	if ($include) {
+         if (!$preferred_languages[0]) { $preferred_languages[0]='en'; }
-             $result='';
+ # Now loop over all languages in order of preference
-             foreach (split(/\,/,$include)) {
+         foreach my $preferred_language (@preferred_languages) {
-                 if ($languages{$_}) { $result='1'; }
+ # If the languageblock has no arguments, show the contents
-             }
+            $result=1;
- 	}
+            my $found=0;
-         if ($exclude) {
+ # Do we have an include argument?
-             foreach (split(/\,/,$exclude)) {
+ 	   if ($include) {
-                 if ($languages{$_}) { $result='0'; }
+ # If include is specified, by default, don't render the block
-             }
+               $result=0;
- 	}
+               foreach my $included_language (split(/\,/,$include)) {
+ # ... but if my preferred language is included, render it
+                  if ($included_language eq $preferred_language) {
+                     $result=1;
+                     $found=1;
+                  }
+               }
+ 	   }
+ # Do we have an exclude argument?
+            if ($exclude) {
+               $result=1;
+               foreach my $excluded_language (split(/\,/,$exclude)) {
+                  if ($excluded_language eq $preferred_language) {
+                     $result=0;
+                     $found=1;
+                  }
+               }
+ 	   }
+            if ($found) { last; }
+         }
  	if ( ! $result ) {
  	    my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser,
  						   $style);
- Line 880  sub end_languageblock {
+ Line 1424  sub end_languageblock {
      return $result;
  }
+ {
+     my %available_texts;
+     sub start_translated {
+ 	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ 	&Apache::lonxml::register('Apache::structuretags',('lang'));
+ 	undef(%available_texts);
+     }
+     sub end_translated {
+ 	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ 	my $result;
+ 	#show the translation on viewable targets
+ 	if ($target eq 'web'     || $target eq 'tex' || $target eq 'webgrade'||
+ 	    # or non-viewable targets, if it's embedded in something that
+ 	    # wants the output
+ 	    (($target eq 'answer' || $target eq 'analyze'|| $target eq 'grade')
+ 	     && &Apache::lonxml::in_redirection() ) ) {
+ 	    my @possibilities = keys(%available_texts);
+ 	    my $which =
+ 		&Apache::loncommon::languages(\@possibilities) || 'default';
+ 	    $result = $available_texts{$which};
+ 	}
+ 	undef(%available_texts);
+ 	&Apache::lonxml::deregister('Apache::structuretags',('lang'));
+ 	return $result;
+     }
+     sub start_lang {
+ 	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ 	if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+ 	    $target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
+ 	    &Apache::lonxml::startredirection();
+ 	}
+ 	return '';
+     }
+     sub end_lang {
+ 	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ 	if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
+ 	    $target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
+ 	    my $result = &Apache::lonxml::endredirection();
+ 	    my $which = &Apache::lonxml::get_param('which',$parstack,
+ 						   $safeeval);
+             if ($which=~/\w/) {
+                 $available_texts{$which} = $result;
+             }
+             my $otherlangs = &Apache::lonxml::get_param('other',$parstack,
+                                                         $safeeval);
+             foreach my $language (split(/\s*\,\s*/,$otherlangs)) {
+                 if ($language=~/\w/) {
+                     $available_texts{$language} = $result;
+                 }
+             }
+ 	}
+ 	return '';
+     }
+ }
  sub start_instructorcomment {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
      my $result;
-     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+     if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
- 	$target eq 'tex' || $target eq 'analyze') {
+ 	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
-         $result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);
+         $result=($env{'request.role'}=~/^(in|cc|au|ca|li)/);
- 	if ( (! $result) or ($ENV{'form.instructor_comments'} eq 'hide')) {
+ 	if ( (! $result) or ($env{'form.instructor_comments'} eq 'hide')) {
  	    my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
  						   $parser,$style);
  	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
- Line 911  sub end_instructorcomment {
+ Line 1515  sub end_instructorcomment {
  }
  sub start_while {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
      my $result;
-     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+     if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
- 	$target eq 'tex' || $target eq 'analyze') {
+ 	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
  	my $code = $token->[2]->{'condition'};
  	push( @Apache::structuretags::whileconds, $code);
- Line 923  sub start_while {
+ Line 1527  sub start_while {
  	    &Apache::lonxml::default_homework_load($safeeval);
  	}
  	my $result = &Apache::run::run($code,$safeeval);
- 	my $bodytext=&Apache::lonxml::get_all_text("/while",$parser);
+ 	my $bodytext=&Apache::lonxml::get_all_text("/while",$parser,$style);
  	push( @Apache::structuretags::whilebody, $bodytext);
  	push( @Apache::structuretags::whileline, $token->[5]);
  	&Apache::lonxml::debug("s code $code got -$result-");
- Line 947  sub end_while {
+ Line 1551  sub end_while {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
      my $result;
-     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+     if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
- 	$target eq 'tex' || $target eq 'analyze') {
+ 	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
  	my $code = pop(@Apache::structuretags::whileconds);
  	my $bodytext = pop(@Apache::structuretags::whilebody);
  	my $line = pop(@Apache::structuretags::whileline);
- Line 958  sub end_while {
+ Line 1562  sub end_while {
  	while ($return) {
  	    if (time-$starttime >
  		$Apache::lonnet::perlvar{'lonScriptTimeout'}) {
- 		#$return = 0; $error=1; next;
+ 		$return = 0; $error=1; next;
  	    }
  	    $result.=&Apache::scripttag::xmlparse($bodytext);
+ 	    if ($target eq 'grade' || $target eq 'answer' ||
+ 		$target eq 'analyze') {
+ 		# grade/answer/analyze should produce no output but if we
+ 		# are redirecting, the redirecter should know what to do
+ 		# with the output
+ 		if (!$Apache::lonxml::redirection) { undef($result); }
+ 	    }
  	    $return = &Apache::run::run($code,$safeeval);
  	}
  	if ($error) {
- 	    &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occured while running &lt;while&gt; on line').' '.$line.'</pre>');
+ 	    &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running &lt;while&gt; on line').' '.$line.'</pre>');
  	}
      } elsif ($target eq "edit") {
  	$result.= &Apache::edit::tag_end($target,$token,'');
- Line 979  sub end_while {
+ Line 1590  sub end_while {
  #  ...
  # </randomlist>
  sub start_randomlist {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
      my $result;
-     if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' ||
+     if ($target eq 'answer' || $target eq 'grade'   || $target eq 'web' ||
- 	$target eq 'tex' || $target eq 'analyze') {
+ 	$target eq 'tex'    || $target eq 'analyze' || $target eq 'webgrade') {
  	my $body= &Apache::lonxml::get_all_text("/randomlist",$parser);
- 	my $b_parser= HTML::TokeParser->new(\$body);
+ 	my $b_parser= HTML::LCParser->new(\$body);
+ 	$b_parser->xml_mode(1);
+ 	$b_parser->marked_sections(1);
  	my $b_tok;
  	my @randomlist;
  	my $list_item;
- Line 1008  sub start_randomlist {
+ Line 1621  sub start_randomlist {
  	    #  print "<b>END-TAG $b_tok->[1]</b><br />";
  	    # }
  	}
- 	my @idx_arr = (0 .. $#randomlist);
+ 	if (@randomlist) {
- 	&Apache::structuretags::shuffle(\@idx_arr);
+ 	    my @idx_arr = (0 .. $#randomlist);
- 	my $bodytext = '';
+ 	    &Apache::structuretags::shuffle(\@idx_arr);
- 	my $show=$#randomlist;
+ 	    my $bodytext = '';
- 	my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
+ 	    my $show=$#randomlist;
- 	$showarg--;
+ 	    my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
- 	if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; }
+ 	    $showarg--;
- 	for(0 .. $show) {
+ 	    if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; }
- 	    $bodytext .= "$randomlist[ $idx_arr[$_] ]";
+             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[$_] ]";
+ 	    }
+ 	    &Apache::lonxml::newparser($parser,\$bodytext);
  	}
- 	&Apache::lonxml::newparser($parser,\$bodytext);
      } elsif ($target eq 'edit' ) {
  	$result .=&Apache::edit::tag_start($target,$token);
  	$result .=&Apache::edit::text_arg('Maximum Tags to Show:','show',
- Line 1035  sub start_randomlist {
+ Line 1664  sub start_randomlist {
  sub shuffle {
      my $a=shift;
      my $i;
-     if (defined(@$a)) {
+     if (ref($a) eq 'ARRAY' && @$a) {
  	&Apache::response::pushrandomnumber();
  	for($i=@$a;--$i;) {
  	    my $j=int(&Math::Random::random_uniform() * ($i+1));
- Line 1056  sub end_randomlist {
+ Line 1685  sub end_randomlist {
      return $result;
  }
+ sub ordered_show_check {
+     my $last_part=$Apache::inputtags::partlist[-2];
+     my $in_order=
+ 	&Apache::lonnet::EXT('resource.'.$Apache::inputtags::part.'.ordered');
+     my $in_order_show=1;
+     if ($last_part ne '0' && lc($in_order) eq 'yes') {
+ 	$in_order_show=&Apache::response::check_status($last_part);
+     }
+     return $in_order_show;
+ }
  sub start_part {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+     if (!$Apache::lonxml::metamode) {
+ 	&Apache::lonxml::startredirection(); # we'll use redirection to fix up
+ 	                                     # duedates.
+     }
      my $result='';
-     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+     my $id= &Apache::lonxml::get_id($parstack,$safeeval);
-     if ($id eq '') { $id = $Apache::lonxml::curdepth; }
      $Apache::inputtags::part=$id;
      push(@Apache::inputtags::partlist,$id);
      @Apache::inputtags::response=();
      @Apache::inputtags::previous=();
      @Apache::inputtags::previous_version=();
-     $Apache::lonhomework::problemstatus=&get_problem_status($id);
+     &Apache::lonhomework::set_show_problem_status(&get_problem_status($id));
+     &Apache::response::reset_params();
      my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
      my $newtype=&Apache::lonnet::EXT("resource.$id.type");
      if ($newtype) { $Apache::lonhomework::type=$newtype; }
+     my $in_order_show=&ordered_show_check();
      my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
      $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
      &Apache::run::run($expression,$safeeval);
- Line 1081  sub start_part {
+ Line 1726  sub start_part {
  	       &Apache::response::meta_parameter_write('display','string',$display,'Part Description');
      } elsif ($target eq 'web' || $target eq 'grade' ||
  	     $target eq 'answer' || $target eq 'tex') {
- 	if ($hidden) {
+ 	if ($hidden || !$in_order_show) {
- 	    my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
+ 	    my $bodytext=&Apache::lonxml::get_all_text("/part",$parser,$style);
  	} else {
  	    my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
  	    push (@Apache::inputtags::status,$status);
  	    my $expression='$external::datestatus="'.$status.'";';
  	    $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
  	    &Apache::run::run($expression,$safeeval);
- 	    if ($ENV{'request.state'} eq 'construct') {
+ 	    if ($env{'request.state'} eq 'construct') {
  		&set_problem_state($Apache::inputtags::part);
  	    }
  	    if (( $status eq 'CLOSED' ) ||
- Line 1098  sub start_part {
+ Line 1743  sub start_part {
  		( $status eq 'BANNED') ||
  		( $status eq 'UNAVAILABLE') ||
  		( $status eq 'INVALID_ACCESS')) {
- 		my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
+ 		my $bodytext=&Apache::lonxml::get_all_text("/part",$parser,
+ 							   $style);
  		if ( $target eq "web" ) {
  		    $result="<br />".&mt('Part is not open to be viewed. It')." $accessmsg<br />";
  		} elsif ( $target eq 'tex' ) {
- 		    if (not $ENV{'form.problem_split'}=~/yes/) {
+ 		    if (not $env{'form.problem_split'}=~/yes/) {
  			$result="\\end{minipage}\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\\\begin{minipage}{\\textwidth}";
  		    } else {
  			$result="\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\";
- Line 1110  sub start_part {
+ Line 1756  sub start_part {
  		}
  	    } else {
  		if ($target eq 'tex') {
- 		    if (not $ENV{'form.problem_split'}=~/yes/) {
+ 		    if (not $env{'form.problem_split'}=~/yes/) {
  			if ($$tagstack[-2] eq 'td') {
- 			    $result.='\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+ 			    $result.='\noindent \begin{minipage}{\textwidth}\noindent';
  			} else {
  			    $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
  			}
  		    }
  		    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
- 		    my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');
+ 		    my $allkeys=&Apache::lonnet::metadata($env{'request.uri'},'packages');
  		    my @allkeys = split /,/,$allkeys;
  		    my $allow_print_points = 0;
  		    foreach my $partial_key (@allkeys) {
- Line 1126  sub start_part {
+ Line 1772  sub start_part {
  			    if ($1 ne '0') {$allow_print_points=1;}
  			}
  		    }
- 		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
+ 		    my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
+ 		    if (defined($maxtries) && $maxtries < 0) {
+ 			$allow_print_points=0;
+ 		    }
+ 		    if (lc($env{'course.'.$env{'request.course.id'}.
+ 				    '.disableexampointprint'}) eq 'yes') {
+ 			$allow_print_points=0;
+ 		    }
+ 		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) {
+ 			$result .= '\vskip 10mm\fbox{\textit{'.$weight.' pt}}';
+ 		    }
  		} elsif ($target eq 'web') {
- 		    $result.='<a name="'.&Apache::lonnet::escape($Apache::inputtags::part).'" />';
+ 		    $result.='<a name="'.&escape($Apache::inputtags::part).'" />';
  		}
  	    }
  	}
- Line 1146  sub start_part {
+ Line 1803  sub start_part {
  	    #limiting ids to only letters numbers, and space
  	    $token->[2]->{'id'}=~s/[^A-Za-z0-9 ]//gs;
  	    $result = &Apache::edit::rebuild_tag($token);
- 	    $result.=&Apache::edit::handle_insert();
  	}
      }
      return $result;
- Line 1157  sub end_part {
+ Line 1813  sub end_part {
      &Apache::lonxml::debug("in end_part $target ");
      my $status=$Apache::inputtags::status['-1'];
      my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
-     my $result='';
+     my $in_order_show=&ordered_show_check();
-     if ( $target eq 'meta' ) {
+     my $result;
- 	$result='';
+     if (!$Apache::lonxml::metamode) {
-     } elsif ($target eq 'grade') {
+ 	$result = &Apache::lonxml::endredirection(); # started in &start_part
+ 	$Apache::lonxml::post_evaluate=0;
+     }
+     if ($target eq 'grade') {
  	if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
- 	    !$hidden) {
+ 	    !$hidden && $in_order_show) {
- 	    $result=&Apache::inputtags::grade;
+ 	    $result.=&Apache::inputtags::grade;
  	} else {
  	    # move any submission data to .hidden
  	    &Apache::inputtags::hidealldata($Apache::inputtags::part);
  	}
-     } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) {
+     } elsif (($target eq 'web' || $target eq 'tex') &&
+ 	     !$hidden && $in_order_show) {
  	my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
  							$target);
  	if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {
  	    $gradestatus='';
  	}
- 	$result=$gradestatus;
+ 	$result.=$gradestatus;
  	if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';}
      } elsif ($target eq 'edit') {
- 	$result=&Apache::edit::end_table();
+ 	$result.=&Apache::edit::end_table();
+     } elsif ($target eq 'modified') {
+ 	 $result .= $token->[2];
      }
      pop @Apache::inputtags::status;
      $Apache::inputtags::part='';
+     $Apache::lonhomework::type = $Apache::lonhomework::default_type;
      return $result;
  }
  sub start_preduedate {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
+     if ($target eq 'web' || $target eq 'grade'    || $target eq 'answer' ||
+ 	$target eq 'tex' || $target eq 'webgrade') {
  	&Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']);
- 	if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
+ 	if (!$Apache::lonhomework::scantronmode &&
+ 	    $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
  	    $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
  	    &Apache::lonxml::debug("Wha? ". ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER'));
- 	    &Apache::lonxml::get_all_text("/preduedate",$parser);
+ 	    &Apache::lonxml::get_all_text("/preduedate",$parser,$style);
  	}
      }
      return '';
- Line 1201  sub end_preduedate {
+ Line 1866  sub end_preduedate {
      return '';
  }
+ # In all the modes where <postanswerdate> text is
+ # displayable,  all we do is eat up the text between the start/stop
+ # tags if the conditions are not right to display it.
  sub start_postanswerdate {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-     if ($target eq 'web' || $target eq 'grade') {
+     my $pav = &Apache::lonnet::allowed('pav', $env{'request.course.id'}) ||
- 	if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
+ 	&Apache::lonnet::allowed('pav',
- 	    &Apache::lonxml::get_all_text("/postanswerdate",$parser);
+ 			   $env{'request.course.id'}.'/'.$env{'request.course.sec'});
+     if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade' ||
+ 	$target eq 'tex' ) {
+ 	if ($Apache::lonhomework::scantronmode ||
+ 	    $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER' ||
+ 	    (($target eq 'tex') && !$pav)) {
+ 	    &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);
  	}
-     } elsif ($target eq 'tex') {
- 	&Apache::lonxml::get_all_text("/postanswerdate",$parser);
      }
      return '';
  }
- Line 1218  sub end_postanswerdate {
+ Line 1890  sub end_postanswerdate {
  }
  sub start_notsolved {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
- 	$target eq 'tex') {
+ 	$target eq 'tex' || $target eq 'webgrade') {
  	my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
  	&Apache::lonxml::debug("not solved has :$gradestatus:");
  	if ($gradestatus =~ /^correct/ &&
  	    &Apache::response::show_answer()) {
  	    &Apache::lonxml::debug("skipping");
- 	    &Apache::lonxml::get_all_text("/notsolved",$parser);
+ 	    &Apache::lonxml::get_all_text("/notsolved",$parser,$style);
  	}
      }
      return '';
- Line 1237  sub end_notsolved {
+ Line 1909  sub end_notsolved {
  }
  sub start_solved {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
  	$target eq 'tex') {
  	my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
  	if ($gradestatus !~ /^correct/ ||
  	    !&Apache::response::show_answer()) {
- 	    &Apache::lonxml::get_all_text("/solved",$parser);
+ 	    &Apache::lonxml::get_all_text("/solved",$parser,$style);
  	}
      }
      return '';
- Line 1254  sub end_solved {
+ Line 1926  sub end_solved {
  }
  sub start_problemtype {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
      my $result;
-     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+     if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
- 	$target eq 'tex' || $target eq 'analyze') {
+ 	$target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
  	my $mode=lc(&Apache::lonxml::get_param('mode',$parstack,$safeeval));
  	if (!defined($mode)) { $mode='show'; }
  	my $for=&Apache::lonxml::get_param('for',$parstack,$safeeval);
- Line 1266  sub start_problemtype {
+ Line 1938  sub start_problemtype {
  	    if ($Apache::lonhomework::type eq lc($type)) { $found=1; }
  	}
  	if ($mode eq 'show' && !$found) {
- 	    &Apache::lonxml::get_all_text("/problemtype",$parser);
+ 	    &Apache::lonxml::get_all_text("/problemtype",$parser,$style);
  	}
  	if ($mode eq 'hide' && $found) {
- 	    &Apache::lonxml::get_all_text("/problemtype",$parser);
+ 	    &Apache::lonxml::get_all_text("/problemtype",$parser,$style);
  	}
      } elsif ($target eq 'edit') {
  	$result .=&Apache::edit::tag_start($target,$token);
- Line 1280  sub start_problemtype {
+ Line 1952  sub start_problemtype {
  	$result .=&Apache::edit::checked_arg('When used as type(s):','for',
  					     [ ['exam','Exam/Quiz Problem'],
  					       ['survey','Survey'],
- 					       ['problem','Homework Problem'] ]
+ 					       ['problem','Homework Problem'],
+                                                ['practice','Practice Problem'] ]
  					     ,$token);
  	$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
      } elsif ($target eq 'modified') {
- Line 1299  sub start_startouttext {
+ Line 1972  sub start_startouttext {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
      my @result=(''.'');
      if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); }
+     my $nesting =
+ 	&Apache::lonxml::set_state('outtext',
+ 				   &Apache::lonxml::get_state('outtext')+1);
+     if ($nesting > 1 && $env{'request.state'} eq 'construct') {
+ 	&Apache::lonxml::error("Nesting of &lt;startouttext /&gt; not allowed, on line ".$token->[5]);
+     }
      return (@result);
  }
  sub end_startouttext {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
      my $result='';
      my $text='';
      if ($target eq 'edit') {
- 	$text=&Apache::lonxml::get_all_text("endouttext",$parser);
+ 	my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth;
- 	$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>
+ 	$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
- <td>".&mt('Delete:').
+ 	$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>"
-                  &Apache::edit::deletelist($target,$token)
+                  .'<td><span class="LC_nobreak">'.&mt('Delete?').' '
- 		 ."</td>
+                  .&Apache::edit::deletelist($target,$token)
- <td>".
+                  .'</span></td>';
-                  &Apache::edit::insertlist($target,$token).
+         unless ($env{'environment.wysiwygeditor'} eq 'on') {
+ 	    $result .= '<td align="left">'
+ 		.&Apache::lonhtmlcommon::dragmath_button($areaid,1)
+ 		.'</td>'
+ 		.'<td>'
+ 		.&Apache::edit::insertlist($target,$token)
+ 		.'</td>';
+ 	}
+ 	$result.='<td align="right" valign="top">' .
+ 	    &Apache::loncommon::helpLatexCheatsheet().
  		 &Apache::edit::end_row().
-                  &Apache::edit::start_spanning_row()."\n"
+                  &Apache::edit::start_spanning_row()."\n".
- 		 . &Apache::loncommon::helpLatexCheatsheet () .
  		 &Apache::edit::editfield($token->[1],$text,"",80,8,1);
      }
      if ($target eq 'modified') {
- Line 1335  sub start_endouttext {
+ Line 2022  sub start_endouttext {
      if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; }
      if ($target eq "modified") {
  	$result='<endouttext />'.
- 	    &Apache::edit::handle_insertafter('startouttext'); }
+ 	    &Apache::edit::handle_insertafter('startouttext');
+     }
+     my $nesting =
+ 	&Apache::lonxml::set_state('outtext',
+ 				   &Apache::lonxml::get_state('outtext')-1);
+     if ($nesting < 0 && $env{'request.state'} eq 'construct') {
+ 	&Apache::lonxml::error(" Extraneous &lt;endouttext /&gt; not allowed on line ".$token->[5]);
+ 	&Apache::lonxml::set_state('outtext', 0);
+     }
      return $result;
  }
- Line 1347  sub end_endouttext {
+ Line 2043  sub end_endouttext {
  }
  sub delete_startouttext {
-     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-     #  my $text=&Apache::lonxml::get_all_text("endouttext",$parser);
+     #  my $text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
      my $text=$$parser['-1']->get_text("/endouttext");
      my $ntoken=$$parser['-1']->get_token();
      &Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext");
- Line 1363  sub delete_startouttext {
+ Line 2059  sub delete_startouttext {
  sub start_simpleeditbutton {
      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
      my $result='';
-     if (($ENV{'form.simple_edit_button'} ne 'off') &&
+     if (($env{'form.simple_edit_button'} ne 'off') &&
  	($target eq 'web') &&
-         (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+         (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
-         my $url=$ENV{'request.noversionuri'};
+         my $url=$env{'request.noversionuri'};
          $url=~s/\?.*$//;
- 	$result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
+ 	my ($symb) = &Apache::lonnet::whichuser();
-                 '<a href="'.$url.'/smpedit">'.&mt('Edit').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').
+ #       Warning makes more sense and is more important on edit screen
- &Apache::loncommon::help_open_topic('Caching').'</td></tr></table><br />';
+ #       $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::lonhtmlcommon::start_funclist()
+                 .&Apache::lonhtmlcommon::add_item_funclist(
+                      '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'
+                     .&mt('Edit').'</a>')
+                 .&Apache::lonhtmlcommon::end_funclist();
      }
      return $result;
  }
- Line 1379  sub end_simpleeditbutton {
+ Line 2084  sub end_simpleeditbutton {
      return '';
  }
+ sub practice_problem_header {
+     return '<span class="LC_info"><h3>'.&mt('Practice Problem').'</h3></span>'.
+            '<span class="LC_info">'.&mt('Submissions are not permanently recorded').
+            '</span>';
+ }
 ;
  __END__
+ =pod
+ =back
+ =cut

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.273
changed lines
	Added in v.1.464