--- loncom/homework/structuretags.pm	2009/08/14 12:32:04	1.444.4.2
+++ loncom/homework/structuretags.pm	2010/02/10 21:06:07	1.444.4.6
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.444.4.2 2009/08/14 12:32:04 raeburn Exp $
+# $Id: structuretags.pm,v 1.444.4.6 2010/02/10 21:06:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -256,7 +256,9 @@ sub page_start {
     my $form_tag_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'});
+        my $uri = Apache::loncommon::inhibit_menu_check(
+                &Apache::lonenc::check_encrypt($env{'request.uri'}));
+        $uri = &HTML::Entities::encode($uri,'<>&"');
 	$form_tag_start.=$uri.'" ';
 	if ($target eq 'edit') {
 	    $form_tag_start.=&Apache::edit::form_change_detection();
@@ -1106,7 +1108,9 @@ sub end_problem {
 			'\textit{'.$duedate_text.'} '.$toc_line;
 		} else {
 		    $frontmatter.= $begin_doc.$toc_line;
-		    if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
+                    if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) {
+                        $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
+                    }
 		}
 	    } else {
 		$frontmatter .= '\vskip 1mm\textit{'.$duedate_text.'} \\\\\\\\'.$startminipage;
@@ -1114,7 +1118,9 @@ sub end_problem {
 	} else {
 	    if (not $env{'request.symb'} =~ m/\.page_/) {
 		$frontmatter .= $begin_doc.$toc_line;
-		if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
+                if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) {
+                    $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';
+                }
 	    } else {
 		$frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;
 	    }
@@ -1756,7 +1762,9 @@ sub start_part {
 				    '.disableexampointprint'}) eq 'yes') {
 			$allow_print_points=0;
 		    }
-		    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
+                    if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { 
+                        $result .= '\vskip 10mm\fbox{\textit{'.$weight.' pt}}';
+                    }
 		} elsif ($target eq 'web') {
 		    $result.='<a name="'.&escape($Apache::inputtags::part).'" />';
 		}
@@ -2043,10 +2051,9 @@ sub start_simpleeditbutton {
 #              .&mt('Note: it can take up to 10 minutes for changes to take effect for all users.')
 #              .&Apache::loncommon::help_open_topic('Caching')
 #              .'</p>';
-        $result.=&Apache::lontemplate::start_functionslist()
-                .&Apache::lontemplate::item_functionslist(
-                     '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'.&mt('Edit').'</a>')
-                .&Apache::lontemplate::end_functionslist();
+        $result .= '<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
+                   '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'.
+                   &mt('Edit').'</a></td></tr></table><br />';
 
     }
     return $result;