--- loncom/xml/lonxml.pm	2009/11/30 23:22:47	1.503
+++ loncom/xml/lonxml.pm	2010/03/10 21:26:10	1.506
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.503 2009/11/30 23:22:47 raeburn Exp $
+# $Id: lonxml.pm,v 1.506 2010/03/10 21:26:10 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -244,7 +244,7 @@ sub tokeninputfield {
         document.tokeninput.barcode.value='';
     }  
 </script>
-<form method="post" name="tokeninput">
+<form method="post" name="tokeninput" action="">
 <table border="2" bgcolor="#FFFFBB">
 <tr><th>DocID Checkin</th></tr>
 <tr><td>
@@ -252,7 +252,7 @@ sub tokeninputfield {
 <tr>
 <td>Scan in Barcode</td>
 <td><input type="text" size="22" name="barcode" 
-onChange="updatetoken()"/></td>
+onchange="updatetoken()"/></td>
 </tr>
 <tr><td><i>or</i> Type in DocID</td>
 <td>
@@ -261,7 +261,7 @@ onChange="updatetoken()"/></td>
 <input type="text" size="5" name="codetwo" />
 <b><font size="+2">*</font></b>
 <input type="text" size="10" name="codethree" value="$defhost" 
-onChange="this.value=this.value.toUpperCase()" />
+onchange="this.value=this.value.toUpperCase()" />
 </td></tr>
 </table>
 </td></tr>
@@ -1549,22 +1549,27 @@ sub renderingoptions {
     }
     my $output;
     unless ($env{'form.forceedit'}) {
-       $output .= '  
-           <span class="LC_nobreak">'.
+       $output .=
+           '<span class="LC_nobreak">'.
            &mt('Language:').' '.
-           &Apache::loncommon::select_form($env{'form.languages'},'languages',
-                                           %langchoices).'
-           </span>';
+           &Apache::loncommon::select_form(
+               $env{'form.languages'},
+               'languages',
+               &Apache::lonlocal::texthash(%langchoices)).
+           '</span>';
     }
-    $output .= '
-     <span class="LC_nobreak">'.
+    $output .=
+     ' <span class="LC_nobreak">'.
        &mt('Math Rendering:').' '.
-       &Apache::loncommon::select_form($env{'form.texengine'},'texengine',
-                                                     ('' => '',
-                                                      'tth' => 'tth (TeX to HTML)',
-                                                      'jsMath' => 'jsMath',
-                                                      'mimetex' => 'mimetex (Convert to Images)')).'
-     </span>';
+       &Apache::loncommon::select_form(
+           $env{'form.texengine'},
+           'texengine',
+           &Apache::lonlocal::texthash
+               (''        => '',
+                'tth'     => 'tth (TeX to HTML)',
+                'jsMath'  => 'jsMath',
+                'mimetex' => 'mimetex (Convert to Images)')).
+     '</span>';
     return $output;
 }
 
@@ -1850,26 +1855,22 @@ ENDNOTFOUND
                               '<tr><td><b><pre>'.$result.
                               '</pre></b></td></tr></table>';
                 }
-                if ($env{'environment.remote'} eq 'off') {
-                    my $brcrum;
-                    if ($env{'request.state'} eq 'construct') {
-                        $brcrum = [{'href' => &Apache::loncommon::authorspace(),
-                                    'text' => 'Construction Space'},
-                                   {'href' => '',
-                                    'text' => $breadcrumbtext}];
-                    } else {
-                        $brcrum = ''; # FIXME: Where are we?
-                    }
-                    my %options = ('bread_crumbs' => $brcrum,
-                                   'bgcolor'      => '#FFFFFF');
-                    $result =
-                        &Apache::loncommon::start_page(undef,undef,\%options)
-                       .$controls
-                       .$result
-                       .&Apache::loncommon::end_page();
+                my $brcrum;
+                if ($env{'request.state'} eq 'construct') {
+                    $brcrum = [{'href' => &Apache::loncommon::authorspace(),
+                                'text' => 'Construction Space'},
+                               {'href' => '',
+                                'text' => $breadcrumbtext}];
                 } else {
-                    $result = $controls.$result;
+                    $brcrum = ''; # FIXME: Where are we?
                 }
+                my %options = ('bread_crumbs' => $brcrum,
+                               'bgcolor'      => '#FFFFFF');
+                $result =
+                    &Apache::loncommon::start_page(undef,undef,\%options)
+                   .$controls
+                   .$result
+                   .&Apache::loncommon::end_page();
             }
         }
     }
@@ -1900,10 +1901,6 @@ ENDNOTFOUND
                 $header = &Apache::loncommon::head_subbox(
                               &Apache::loncommon::CSTR_pageheader());
             }
-	    if ($env{'environment.remote'} ne 'off') {
-		$options{'bgcolor'}   = '#FFFFFF';
-		$options{'only_body'} = 1;
-	    }
 	    my $js =
 		&Apache::edit::js_change_detection().
 		&Apache::loncommon::resize_textarea_js();