--- loncom/homework/structuretags.pm	2008/02/08 18:01:30	1.418
+++ loncom/homework/structuretags.pm	2008/08/26 03:18:29	1.429
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.418 2008/02/08 18:01:30 bisitz Exp $
+# $Id: structuretags.pm,v 1.429 2008/08/26 03:18:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -148,6 +148,10 @@ sub page_start {
 
     $extra_head .= &homework_js();
 
+    unless ($env{'environment.wysiwygeditor'} eq 'on') {
+        $extra_head .= &Apache::lonhtmlcommon::dragmath_js();
+    }
+
     my %body_args;
     if (defined($found{'html'})) {
 	$body_args{'skip_phases'}{'head'}=1;
@@ -312,24 +316,28 @@ sub remember_problem_state {
        <input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />';
 }
 
-sub problem_edit_header {
-    return '<input type="hidden" name="submitted" 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>
+sub problem_edit_buttons {
+   return  '
 <div class="LC_edit_problem_discards">
-       <input type="hidden" name="problemmode" value="edit" />
        <input type="button" name="submitmode" accesskey="d" value="'.&mt('Discard Edits and View').'" '.
-       ' onclick="javscript:setmode(this.form,'."'discard.'".')"  />
+       ' 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>
+</div>';
+}
+
+sub problem_edit_header {
+    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>'.
+&problem_edit_buttons().'
 <hr class="LC_edit_problem_divide" />
 '.&Apache::lonxml::message_location().'
 </div>
@@ -340,17 +348,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="button" name="submitmode" accesskey="d" value="'.&mt('Discard Edits and View').'" '.
-     'onclick=javascript: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" value="'.&mt('Save and Edit').'" />
-    <input type="submit" name="submitbutton" value="'.&mt('Save and View').'" />
-  </div>
+  <hr class="LC_edit_problem_divide" />'.
+&problem_edit_buttons().'
   <hr class="LC_edit_problem_divide" />
 </div>
 '.
@@ -417,8 +416,9 @@ sub problem_web_to_edit_header {
 <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>
 </span>
 $show_all
@@ -451,7 +451,6 @@ $show_all
 $show_all
 ";
     }
-
     $result.='
        <span class="LC_nobreak">
        '.&mt('Apply style file: ').'
@@ -459,6 +458,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').'" />
@@ -477,8 +479,8 @@ $show_all
 	$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="'.
+                '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>';
@@ -864,8 +866,7 @@ sub start_problem {
 		    '</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.=&practice_problem_header();
             }
 	    $form_tag_start.='<hr />';
 	}
@@ -939,6 +940,11 @@ sub start_problem {
 	    # create a page header and exit
 	    if ($env{'request.state'} eq "construct") {
 		$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'}) {
@@ -1174,6 +1180,11 @@ sub start_library {
 	$result.=" \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;
 }
@@ -1381,7 +1392,11 @@ sub end_languageblock {
 	    my $result = &Apache::lonxml::endredirection();
 	    my $which = &Apache::lonxml::get_param('which',$parstack,
 						   $safeeval);
-	    $available_texts{$which} = $result;
+            foreach my $language (split(/\s*\,\s*/,$which)) {
+               unless ($language=~/\w/) { next; }
+               $available_texts{$language} = $result;
+            }
+
 	}
 	return '';
     }
@@ -1838,7 +1853,8 @@ 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') {
@@ -1871,16 +1887,22 @@ sub end_startouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';
     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:').
                  &Apache::edit::deletelist($target,$token)
-		 ."</td>
-<td>".
-                 &Apache::edit::insertlist($target,$token).
-		 '</td><td align="right" valign="top">' .
+		 ."</td>";
+        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".
@@ -1955,5 +1977,11 @@ 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>';
+}
+
 1;
 __END__