--- loncom/homework/lonsimpleproblemedit.pm	2009/12/02 18:33:20	1.30
+++ loncom/homework/lonsimpleproblemedit.pm	2012/11/08 21:55:11	1.33
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Problem Parameter Setting "Editor"
 #
-# $Id: lonsimpleproblemedit.pm,v 1.30 2009/12/02 18:33:20 bisitz Exp $
+# $Id: lonsimpleproblemedit.pm,v 1.33 2012/11/08 21:55:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -110,13 +110,19 @@ ENDSCRIPT
 
 sub foil {
     my $number=shift;
-    my %values='';
+    my (%values,%defaultvalues,%customvalues);
+    %defaultvalues = &Apache::lonlocal::texthash(
+                         'unused' => 'Not shown, not used'
+                     );
     if ($qtype eq 'radio') {
-	%values=('true' => 'True', 'false' => 'False');
+        %customvalues = &Apache::lonlocal::texthash(
+                                       'true' => 'True',
+                                       'false' => 'False'
+        );
     } elsif ($qtype eq 'option') {
-	%values=&evaloptionhash($qparms{$prefix.'options'});
+        %customvalues=&evaloptionhash($qparms{$prefix.'options'});
     }
-    $values{'unused'}='Not shown, not used';
+    %values = (%defaultvalues,%customvalues);
     my $value=$qparms{$prefix.'value'.$number};
     unless (defined($value)) { $value='unused'; }
     unless ($values{$value}) { $value='unused'; }
@@ -131,11 +137,11 @@ sub foil {
     my $selectvalue=&Apache::loncommon::select_form(
                         $value,
                         'value'.$number,
-                        &Apache::lonlocal::texthash(%values));
+                        \%values);
     my $selectposition=&Apache::loncommon::select_form(
                            $position,
                            'position'.$number,
-                           &Apache::lonlocal::texthash(%positions));
+                           {&Apache::lonlocal::texthash(%positions)});
     my $text=$qparms{$prefix.'text'.$number};
     my %lt=&Apache::lonlocal::texthash('foil'  => 'Foil',
 				       'value' => 'Value',
@@ -256,15 +262,8 @@ sub handler {
 					     $spell_header));
     if ($symb) {
 	    my $title='<h1>'.&Apache::lonnet::gettitle($symb).'</h1>';
-        my $displaylink = &get_parent_uri($symb);
-        if ($displaylink ne '') {
-            my $functions=&Apache::lonhtmlcommon::start_funclist()
-                         .&Apache::lonhtmlcommon::add_item_funclist(
-                              '<a href="'.$displaylink.'">'
-                             .&mt('Student View').'</a>')
-                             .&Apache::lonhtmlcommon::end_funclist();
-            $r->print(&Apache::loncommon::head_subbox($functions)
-                     .$title);
+        if (&get_parent_uri($symb)) {
+            $r->print($title);
         } else {
             $r->print($title
                      .'<p class="LC_error">'
@@ -303,7 +302,7 @@ sub handler {
            .&Apache::loncommon::select_form(
                 $qtype,
                 'questiontype',
-                &Apache::lonlocal::texthash(%questiontypes))
+                {&Apache::lonlocal::texthash(%questiontypes)})
            .'</fieldset>'
         );
         $r->print(
@@ -337,7 +336,7 @@ sub handler {
                       &Apache::loncommon::select_form(
                           $randomize,
                           'randomize',
-                          &Apache::lonlocal::texthash(%randomizes)).
+                          {&Apache::lonlocal::texthash(%randomizes)}).
 		  '</td></tr><tr><td bgcolor="#F0F0F0">');
 # Option Response: Options
 	    if ($qtype eq 'option') {
@@ -350,7 +349,7 @@ sub handler {
                   $options.'" />'.&mt('Add new option').': '.
           '<input type="text" name="newopt" size="15" />'.
           &mt('Delete an option').': '.
-          &Apache::loncommon::select_form('','delopt',('' => '',%optionshash)).
+          &Apache::loncommon::select_form('','delopt',{'' => '',%optionshash}).
           '</td></tr><tr><td>');
 	    }
 # Foils
@@ -383,7 +382,7 @@ sub handler {
                       &Apache::loncommon::select_form(
                           $stringtype,
                           'stringtype',
-                          &Apache::lonlocal::texthash(%stringtypes)).
+                          {&Apache::lonlocal::texthash(%stringtypes)}).
 		  '</td></tr></table><br />');
 # Hint
 	    $r->print(&hint());
@@ -414,7 +413,7 @@ sub handler {
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;
-} 
+}
 
 1;
 __END__