--- loncom/homework/structuretags.pm	2012/02/01 18:51:52	1.465.2.14.2.1
+++ loncom/homework/structuretags.pm	2010/12/31 02:40:14	1.483
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.465.2.14.2.1 2012/02/01 18:51:52 raeburn Exp $
+# $Id: structuretags.pm,v 1.483 2010/12/31 02:40:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -129,16 +129,8 @@ sub homework_js {
 	<<'JS';
 <script type="text/javascript">
 // <![CDATA[
-function setSubmittedPart (part,prefix) {
-    if (typeof(prefix) == 'undefined') {
-        this.document.lonhomework.submitted.value="part_"+part;
-    } else {
-        for (var i=0;i<this.document.lonhomework.elements.length;i++) {
-            if (this.document.lonhomework.elements[i].name == prefix+'submitted') {
-                this.document.lonhomework.elements[i].value="part_"+part;
-            }
-        }
-    }
+function setSubmittedPart (part) {
+   this.document.lonhomework.submitted.value="part_"+part;
 }
 
 function image_response_click (which, e) {
@@ -152,7 +144,7 @@ function image_response_click (which, e)
     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;
+    img_element.src = '/adm/randomlabel.png?token='+token+'&amp;clickdata='+click;
 }
 // ]]>
 </script>
@@ -162,19 +154,18 @@ JS
 sub setmode_javascript {
     return <<"ENDSCRIPT";
 <script type="text/javascript">
-// <![CDATA[
 function setmode(form,probmode) {
     form.problemmode.value = probmode;
     form.submit();
 }
-// ]]>
 </script>
 ENDSCRIPT
 }
 
 sub file_delchk_js {
-    my $delfilewarn = &mt('You have indicated you wish to remove some files previously included in your submission.').'\\n'.
-                      &mt('Continue submission with these files removed?');
+    my $delfilewarn = &mt('You have indicated you wish to delete some files previously included for submission.').'\\n'.
+                          &mt('Deleted files will not be graded.').' '.
+                          &mt('Submit Answer?');
     return <<"ENDSCRIPT";
 <script type="text/javascript">
 // <![CDATA[
@@ -185,7 +176,7 @@ function file_deletion_check(formname) {
     }
     var str = new RegExp("^HWFILE.+_delete\$");
     var delboxes = new Array();
-    for (i=0; i<formname.elements.length; i++) {
+    for (var i=0; i<formname.elements.length; i++) {
         var id = formname.elements[i].id;
         if (id != '') {
             if (str.test(id)) {
@@ -268,9 +259,6 @@ sub page_start {
     } 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({
@@ -304,8 +292,7 @@ sub page_start {
         # $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') {
+        if ( $env{'request.state'} eq   'construct') {
             $body_args{'only_body'}  = 1;
         }
     }
@@ -406,7 +393,7 @@ sub setup_rndseed {
 	    }
 	    $env{'form.rndseed'}=$rndseed;
 	}
-        if (($env{'request.state'} eq "construct") &&
+        if (($env{'request.state'} eq "construct") && 
             ($Apache::lonhomework::type eq 'randomizetry')) {
             my $tries = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.tries"};
             if ($tries) {
@@ -476,48 +463,27 @@ sub remember_problem_state {
        <input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />';
 }
 
-sub problem_edit_action_button {
-    my ($name,$action,$accesskey,$text,$flag)=@_;
-    my $actionscript="setmode(this.form,'$action')";
-    return "\n<input type='button' name='$name' accesskey='$accesskey' value='".&mt($text)."'".
-           ($flag?&Apache::edit::submit_ask_anyway($actionscript):&Apache::edit::submit_dont_ask($actionscript))." />";
-}
-
 sub problem_edit_buttons {
-    my ($mode)=@_;
-# Buttons that do not save
-    my $result='<div class="LC_edit_problem_discards">'.
-              &problem_edit_action_button('subdiscview','discard','d','Discard Edits and View',1);
-    if ($mode eq 'editxml') {
-        $result.=&problem_edit_action_button('subedit','edit','e','Edit',1);
-        $result.=&problem_edit_action_button('subundo','undoxml','u','Undo',1);
-        $result.=&Apache::lonhtmlcommon::dragmath_button("LC_editxmltext",1);
-    } else {
-        $result.=&problem_edit_action_button('subeditxml','editxml','x','EditXML',1);
-        $result.=&problem_edit_action_button('subundo','undo','u','Undo',1);
-    }
-    $result.="\n</div>";
-# Buttons that save
-    $result.='<div class="LC_edit_problem_saves">';
-    if ($mode eq 'editxml') {
-        $result.=&problem_edit_action_button('subsaveedit','saveeditxml','s','Save and EditXML');
-        $result.=&problem_edit_action_button('subsaveview','saveviewxml','v','Save and View');
-    } else {
-        $result.=&problem_edit_action_button('subsaveedit','saveedit','s','Save and Edit');
-        $result.=&problem_edit_action_button('subsaveview','saveview','v','Save and View');
-    }
-    $result.="\n</div>\n";
-    return $result;
+   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" />'.
-	&remember_problem_state('edit').'
+    return '<input type="hidden" name="submitted" value="edit" /><input type="hidden" name="problemmode" value="edit" />'.
+	&Apache::structuretags::remember_problem_state().'
 <div class="LC_edit_problem_header">
 <div class="LC_edit_problem_header_title">
 '.&mt('Problem Editing').&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
 </div>'.
-'<input type="hidden" name="problemmode" value="saveedit" />'.
 &problem_edit_buttons().'
 <hr style="clear:both;" />
 '.&Apache::lonxml::message_location().'
@@ -793,15 +759,15 @@ sub store_aggregates {
     foreach my $part (@parts) {
         if ($env{'request.role'} =~/^st/) {
             if ($Apache::lonhomework::results{'resource.'.$part.'.award'}
-                eq 'APPROX_ANS' ||
-                $Apache::lonhomework::results{'resource.'.$part.'.award'}
-                eq 'EXACT_ANS') {
+	        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]);
+                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;
@@ -810,7 +776,7 @@ sub store_aggregates {
             }
             $aggregate{$symb."\0".$part."\0attempts"} = 1;
         }
-        if (($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurvey') ||
+        if (($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurvey') || 
             ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurveycred') ||
             ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'randomizetry')) {
             if ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'randomizetry') {
@@ -819,7 +785,7 @@ sub store_aggregates {
                 $anoncounter{$symb."\0".$part} = 1;
             }
             my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}};
-            if ($needsrelease) {
+            if ($needsrelease) {   
                 my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
                 if ($curr_required eq '') {
                     &Apache::lonnet::update_released_required($needsrelease);
@@ -945,9 +911,6 @@ sub reset_problem_globals {
     undef(%Apache::lonhomework::history);
     undef(%Apache::lonhomework::results);
     undef($Apache::inputtags::part);
-    if ($type eq 'Task') {
-        undef($Apache::inputtags::slot_name);
-    }
 #don't undef this, lonhomework.pm takes care of this, we use this to 
 #detect if we try to do 2 problems in one file
 #   undef($Apache::lonhomework::parsing_a_problem);
@@ -1060,17 +1023,6 @@ sub start_problem {
     if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval,$target); }
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex') {
-	#handle exam checkout
-	if ($Apache::lonhomework::type eq 'exam') {
-	    my $token=
-		$Apache::lonhomework::history{"resource.0.outtoken"};
-	    if (($env{'form.doescheckout'}) && (!$token)) {
-		$token=&Apache::lonxml::maketoken();
-		$Apache::lonhomework::history{"resource.0.outtoken"}=
-		    $token;
-	    }
-	    $result.=&Apache::lonxml::printtokenheader($target,$token);
-	}
 	if ($env{'form.markaccess'}) {
 	    my @interval=&Apache::lonnet::EXT("resource.0.interval");
 	    &Apache::lonnet::set_first_access($interval[1]);
@@ -1196,13 +1148,12 @@ sub start_problem {
 		    $result .= '<input type="hidden" name="grade_'.$field.
 			'" value="'.$env{"form.grade_$field"}.'" />'."\n";
 		}
-                foreach my $field ('questiontype','rndseed') {
+                foreach my $field ('trial','questiontype') {
                     if ($env{"form.grade_$field"} ne '') {
                         $result .= '<input type="hidden" name="grade_'.$field.
                             '" value="'.$env{"form.grade_$field"}.'" />'."\n";
                     }
                 }
-
 	    }
 	} elsif ($target eq 'tex') {
 	    $result .= 'INSERTTEXFRONTMATTERHERE';
@@ -1308,7 +1259,7 @@ sub end_problem {
 		} else {
 		    $frontmatter.= $begin_doc.$toc_line;
 		    if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { 
-			$frontmatter .= '\fbox{\textit{'.&mt('[quant,_1,pt,pt]',$weight ).'}}';
+			$frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
 		    }
 		}
 	    } else {
@@ -1318,7 +1269,7 @@ sub end_problem {
 	    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{'.&mt('[quant,_1,pt,pt]',$weight ).'}}';
+		    $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
 		}
 	    } else {
 		$frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;
@@ -1342,7 +1293,7 @@ sub end_problem {
 	    }
 	} elsif ( ($target eq 'web' || $target eq 'tex') &&
 		  $Apache::inputtags::part eq '0' &&
-		  $status ne 'UNCHECKEDOUT' && $status ne 'NOT_YET_VIEWED') { 
+		  $status ne 'UNCHECKEDOUT' && $status ne 'NOT_YET_VIEWED') {
 	    # if part is zero, no <part>s existed, so we need show the current
 	    # grading status
 	    my $gradestatus = &Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
@@ -1352,8 +1303,8 @@ sub end_problem {
 	    (($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')) {
+	    if ($target ne 'tex' &&
+		$env{'form.answer_output_mode'} ne 'tex') {
 		$result.="</form>";
 	    }
 	    if ($target eq 'web') {
@@ -1879,6 +1830,7 @@ sub ordered_show_check {
     return $in_order_show;
 }
 
+
 sub start_startpartmarker {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
@@ -1887,7 +1839,7 @@ sub start_startpartmarker {
         $result.=&mt('Marker for the start of a part. Place end marker below to wrap in-between tags into a new part.').'</td></tr>';
         $result.=&Apache::edit::end_table();
 
-    }
+    } 
     return $result;
 }
 
@@ -1917,6 +1869,10 @@ sub end_endpartmarker {
     return @result;
 }
 
+
+
+
+
 sub start_part {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if (!$Apache::lonxml::metamode) {
@@ -2002,12 +1958,12 @@ sub start_part {
 			$allow_print_points=0;
 		    }
 		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { 
-			$result .= '\vskip 10mm\fbox{\textit{'.&mt('[quant,_1,pt,pt]',$weight ).'}}';
+			$result .= '\vskip 10mm\fbox{\textit{'.$weight.' pt}}';
 
 		    }
 		} elsif ($target eq 'web') {
                     if ($status eq 'CAN_ANSWER') {
-                        my $problemstatus = &get_problem_status($Apache::inputtags::part);
+                        my $problemstatus = &get_problem_status($Apache::inputtags::part); 
                         my $probrandomize = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[0].type");
                         my $probrandtries = &Apache::lonnet::EXT("resource.$Apache::inputtags::partlist[0].randomizeontries");
                         my $num = scalar(@Apache::inputtags::partlist)-1;
@@ -2025,7 +1981,7 @@ sub start_part {
                             $result .= &randomizetry_part_header($problemstatus,$reqtries,$num);
                         }
                     }
-		    $result.='<a name="'.&escape($Apache::inputtags::part).'"></a>';
+		    $result.='<a name="'.&escape($Apache::inputtags::part).'" ></a>';
 		}
 	    }
 	}
@@ -2239,7 +2195,7 @@ sub end_startouttext {
                  .'</span></td>'
 	         .'<td align="left"><span id="math_'.$areaid.'" />'
 		 .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
-		 .'</td>'
+		 .'<span></td>'
 		 .'<td>'
 		 .&Apache::edit::insertlist($target,$token)
 		 .'</td>'
@@ -2312,12 +2268,11 @@ sub start_simpleeditbutton {
 #              .&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::loncommon::head_subbox(
-                 &Apache::lonhtmlcommon::start_funclist()
+        $result.=&Apache::lonhtmlcommon::start_funclist()
                 .&Apache::lonhtmlcommon::add_item_funclist(
                      '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'
                     .&mt('Edit').'</a>')
-                .&Apache::lonhtmlcommon::end_funclist());
+                .&Apache::lonhtmlcommon::end_funclist();
 
     }
     return $result;