--- loncom/homework/structuretags.pm	2009/06/11 16:48:28	1.451
+++ loncom/homework/structuretags.pm	2009/07/06 17:10:10	1.454
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.451 2009/06/11 16:48:28 bisitz Exp $
+# $Id: structuretags.pm,v 1.454 2009/07/06 17:10:10 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -272,6 +272,7 @@ sub page_start {
     if (!defined($found{'form'})) {
 	$form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="post" action="';
 	my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
+    $uri .= '?inhibitmenu=yes' if $env{'form.inhibitmenu'};
 	$form_tag_start.=$uri.'" ';
 	if ($target eq 'edit') {
 	    $form_tag_start.=&Apache::edit::form_change_detection();
@@ -386,7 +387,7 @@ sub problem_edit_header {
 '.&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" />
+<hr />
 '.&Apache::lonxml::message_location().'
 </div>
 '.
@@ -396,9 +397,9 @@ 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" />'.
+  <hr />'.
 &problem_edit_buttons().'
-  <hr class="LC_edit_problem_divide" />
+  <hr />
 </div>
 '.
 
@@ -435,12 +436,14 @@ sub problem_web_to_edit_header {
     
     my $show_all_foils_text = 
 	($Apache::lonhomework::parsing_a_task) ?
-	&mt('&nbsp;Show&nbsp;All&nbsp;Instances')
-	: &mt('&nbsp;Show&nbsp;All&nbsp;Foils');
+	&mt('Show All Instances')
+	: &mt('Show All Foils');
 
-    my $show_all= '<span class="LC_nobreak"><label><input type="checkbox" name="showallfoils"';
+    my $show_all= '<span class="LC_nobreak"><label for="showallfoils">'
+                 .'<input type="checkbox" name="showallfoils"';
     if (defined($env{'form.showallfoils'})) { $show_all.=' checked="checked"'; }
-    $show_all.= ' />'.$show_all_foils_text.'</label></span>';
+    $show_all.= ' /> '.$show_all_foils_text
+               .'</label></span>';
 
 
 
@@ -513,7 +516,7 @@ $show_all
      <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').'" />
    </div>
-   <hr class="LC_edit_problem_divide" />
+   <hr />
    <div class="LC_edit_problem_header_randomize_row">
      <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
      <input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
@@ -537,7 +540,7 @@ $show_all
 
     $result.='
    </div>
-   <hr class="LC_edit_problem_divide" />
+   <hr />
    <div>';
     $result.='<input type="hidden" name="problemmode" value="view" />';
     $result .= '<input type="button" name="submitmode" accesskey="e" value="'.&mt('Edit').'" '.
@@ -546,7 +549,7 @@ $show_all
                'onclick="javascript:setmode(this.form,'."'editxml'".')" />';
     $result.='
    </div>
-   <hr class="LC_edit_problem_divide" />
+   <hr />
    '.&Apache::lonxml::message_location().'
 </div>';
     return $result;