--- loncom/homework/structuretags.pm	2007/11/20 17:53:22	1.414
+++ loncom/homework/structuretags.pm	2008/07/08 09:54:30	1.424
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.414 2007/11/20 17:53:22 albertel Exp $
+# $Id: structuretags.pm,v 1.424 2008/07/08 09:54:30 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -94,6 +94,7 @@ sub end_tex {
 
 sub homework_js {
     return &Apache::loncommon::resize_textarea_js().
+           &setmode_javascript().
 	<<'JS';
 <script type="text/javascript">
 function setSubmittedPart (part) {
@@ -113,10 +114,22 @@ function image_response_click (which, e)
     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,$name,
 	$extra_head)=@_;
@@ -299,23 +312,28 @@ sub remember_problem_state {
        <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().'
 <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>
-<div class="LC_edit_problem_discards">
-       <input type="hidden" name="problemmode" value="'.&mt('Edit').'" />
-       <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
-       <input '.&Apache::edit::submit_ask_anyway().' type="submit" name="problemmode" 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="submit" accesskey="s" value="'.&mt('Save and Edit').'" />
-       <input type="submit" name="submit" accesskey="v" value="'.&mt('Save and View').'" />
-  </div>
+</div>'.
+&problem_edit_buttons().'
 <hr class="LC_edit_problem_divide" />
 '.&Apache::lonxml::message_location().'
 </div>
@@ -326,16 +344,8 @@ sub problem_edit_header {
 sub problem_edit_footer {
     return '</td></tr></table><br />
 <div class="LC_edit_problem_footer">
-  <hr class="LC_edit_problem_divide" />
-  <div class="LC_edit_problem_discards">
-     <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
-     <input '.&Apache::edit::submit_ask_anyway().' type="submit" name="problemmode" 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="submit" value="'.&mt('Save and Edit').'" />
-    <input type="submit" name="submit" value="'.&mt('Save and View').'" />
-  </div>
+  <hr class="LC_edit_problem_divide" />'.
+&problem_edit_buttons().'
   <hr class="LC_edit_problem_divide" />
 </div>
 '.
@@ -436,7 +446,6 @@ $show_all
 $show_all
 ";
     }
-
     $result.='
        <span class="LC_nobreak">
        '.&mt('Apply style file: ').'
@@ -444,6 +453,9 @@ $show_all
          <a href="javascript:openbrowser(\'lonhomework\',\'style_file\',\'sty\')">'.&mt('Select').'</a>
        </span>
      </div>
+     <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').'" />
@@ -461,8 +473,9 @@ $show_all
 	if (!$numtoanalyze) { $numtoanalyze=20; }
 	$result .= '<span class="LC_nobreak">'.
 	    &mt('[_1] for [_2] versions.',
-		'<input type="submit" name="problemmode" value='.&mt('"Calculate answers').'" />',
-		'<input type="text" name="numtoanalyze" value="'.
+		'<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>';
@@ -472,9 +485,11 @@ $show_all
     $result.='
    </div>
    <div class="LC_edit_problem_header_edit_row">';
-    $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />';
-    $result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />';
-    $result .= '<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />';
+    $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>
    '.&Apache::lonxml::message_location().'
@@ -627,26 +642,27 @@ sub firstaccess_msg {
 	my $foldertitle=&Apache::lonnet::gettitle($map);
     
 	&Apache::lonxml::debug("map is $map title is $foldertitle");
-	$result .= (<<ENDCHECKOUT);
-<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>
-ENDCHECKOUT
+	$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 .= (<<ENDCHECKOUT);
-<h2>The resources in "$course" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources in "$course".</h2>
-ENDCHECKOUT
+        $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 .= (<<ENDCHECKOUT);
-<h2>This resource "$title" is open for a limited time. Once you click the 'Show Resource' button below you have $time to complete this resource "$title".</h2>
-ENDCHECKOUT
-
+        $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;
@@ -754,7 +770,8 @@ sub start_problem {
     }
 
     if ($target ne 'analyze') {
-	$Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
+        my $type = &Apache::lonnet::EXT('resource.0.type');
+	$Apache::lonhomework::type=$type;
 	if (($env{'request.state'} eq 'construct') &&
 	    $env{'form.problemtype'} =~ /\S/) {
 	    $Apache::lonhomework::type=$env{'form.problemtype'};
@@ -843,6 +860,10 @@ sub start_problem {
 		$form_tag_start.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
 		    '</label>';
 	    }
+            if ($Apache::lonhomework::type eq 'practice') {
+               $form_tag_start.='<span class="LC_info"><h3>'.&mt('Practice Problem').'</h3></span>'.
+                                '<span class="LC_info">'.&mt('Submissions are not permanently recorded').'</span>';
+            }
 	    $form_tag_start.='<hr />';
 	}
 
@@ -1849,6 +1870,7 @@ sub end_startouttext {
     my $text='';
 
     if ($target eq 'edit') {
+	my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth;
 	$text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
 	$result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>
 <td>".&mt('Delete:').
@@ -1856,7 +1878,9 @@ sub end_startouttext {
 		 ."</td>
 <td>".
                  &Apache::edit::insertlist($target,$token).
-		 '</td><td align="right" valign="top">' .
+		 '</td><td>'.
+		 &Apache::lonhtmlcommon::dragmath($areaid).'</td>'.
+		 '<td align="right" valign="top">' .
 		 &Apache::loncommon::helpLatexCheatsheet().
 		 &Apache::edit::end_row().
                  &Apache::edit::start_spanning_row()."\n".