--- loncom/homework/structuretags.pm	2008/05/27 22:25:56	1.421
+++ loncom/homework/structuretags.pm	2008/08/13 16:56:15	1.427
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.421 2008/05/27 22:25:56 www Exp $
+# $Id: structuretags.pm,v 1.427 2008/08/13 16:56:15 bisitz 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>
 '.
@@ -451,33 +450,15 @@ $show_all
 $show_all
 ";
     }
-    my %langchoices=('' => '');
-    foreach (&Apache::loncommon::languageids()) {
-        if (&Apache::loncommon::supportedlanguagecode($_)) {
-            $langchoices{&Apache::loncommon::supportedlanguagecode($_)}
-                       = &Apache::loncommon::plainlanguagedescription($_);
-        }
-    }
     $result.='
        <span class="LC_nobreak">
        '.&mt('Apply style file: ').'
          <input type="text" name="style_file" value="'.&HTML::Entities::encode($env{'construct.style'},'"<>&').'" />
          <a href="javascript:openbrowser(\'lonhomework\',\'style_file\',\'sty\')">'.&mt('Select').'</a>
        </span>
-       </div><div class="LC_edit_problem_header_row1">
-       <span class="LC_nobreak">'.
-       &mt('Language: ').
-       &Apache::loncommon::select_form($env{'form.languages'},'languages',
-                                                     %langchoices).'
-     </span>
-     <span class="LC_nobreak">'.
-       &mt('Math Rendering: ').
-       &Apache::loncommon::select_form($env{'form.texengine'},'texengine',
-                                                     ('' => '',
-                                                      'tth' => 'tth',
-                                                      'jsMath' => 'jsMath',
-                                                      'mimetex' => 'mimetex')).'
-     </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').'" />
@@ -1401,7 +1382,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 '';
     }
@@ -1893,14 +1878,18 @@ 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:').
                  &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>';
+        }
+	$result.='<td align="right" valign="top">' .
 		 &Apache::loncommon::helpLatexCheatsheet().
 		 &Apache::edit::end_row().
                  &Apache::edit::start_spanning_row()."\n".