--- loncom/homework/lonsimpleproblemedit.pm	2009/10/19 15:15:03	1.29
+++ 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.29 2009/10/19 15:15:03 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'; }
@@ -128,10 +134,14 @@ sub foil {
     unless ($positions{$position}) {
 	$position='random';
     }
-    my $selectvalue=&Apache::loncommon::select_form
-	                                ($value,'value'.$number,%values);
-    my $selectposition=&Apache::loncommon::select_form
-                               ($position,'position'.$number,%positions);
+    my $selectvalue=&Apache::loncommon::select_form(
+                        $value,
+                        'value'.$number,
+                        \%values);
+    my $selectposition=&Apache::loncommon::select_form(
+                           $position,
+                           'position'.$number,
+                           {&Apache::lonlocal::texthash(%positions)});
     my $text=$qparms{$prefix.'text'.$number};
     my %lt=&Apache::lonlocal::texthash('foil'  => 'Foil',
 				       'value' => 'Value',
@@ -252,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">'
@@ -284,20 +287,22 @@ sub handler {
         );
         $r->print('<form name="simpleedit" method="post">');
 # Question Type        
-	my %questiontypes=('radio'  => 
-                               '1 out of N multiple choice (radio button)',
-			   'option' => 'Option response',
-                           'string' => 'Short string response',
-                           'essay'  => 'Essay, open end',
-                           'numerical' => 'Numerical response');
+        my %questiontypes=(
+               'radio'     => '1 out of N multiple choice (radio button)',
+               'option'    => 'Option Response',
+               'string'    => 'Short string response',
+               'essay'     => 'Essay, open end',
+               'numerical' => 'Numerical Response');
         $qtype=$qparms{$prefix.'questiontype'};
         unless (defined($qtype)) { $qtype='radio'; }
         unless ($questiontypes{$qtype}) { $qtype='radio'; }
         $r->print(
             '<fieldset style="width:400px;">'
            .'<legend>'.&mt('Question Type').'</legend>'
-           .&Apache::loncommon::select_form
-	            ($qtype,'questiontype',%questiontypes)
+           .&Apache::loncommon::select_form(
+                $qtype,
+                'questiontype',
+                {&Apache::lonlocal::texthash(%questiontypes)})
            .'</fieldset>'
         );
         $r->print(
@@ -318,8 +323,9 @@ sub handler {
             unless (defined($maxfoils)) { $maxfoils=10; }
             unless ($maxfoils=~/^\d+$/) { $maxfoils=10; }
             if ($maxfoils<=0) { $maxfoils=10; }
-	    my %randomizes=('yes' => 'Display foils in random order',
-			    'no'  => 'Display foils in order given');
+            my %randomizes=(
+                   'yes' => 'Display foils in random order',
+                   'no'  => 'Display foils in order given');
 	    my $randomize=$qparms{$prefix.'randomize'};
             unless (defined($randomize)) { $randomize='yes'; }
             unless ($randomizes{$randomize}) { $randomize='yes'; }
@@ -327,8 +333,10 @@ sub handler {
 		  '<table bgcolor="#00ee44" cellspacing="4" cellpadding="2" style="width:100%">'.
 	          '<tr><td>'.&mt('Max number of foils displayed').
 ': <input type="text" size="3" name="maxfoils" value="'.$maxfoils.'" />&nbsp;&nbsp;'.
-		      &Apache::loncommon::select_form
-		      ($randomize,'randomize',%randomizes).
+                      &Apache::loncommon::select_form(
+                          $randomize,
+                          'randomize',
+                          {&Apache::lonlocal::texthash(%randomizes)}).
 		  '</td></tr><tr><td bgcolor="#F0F0F0">');
 # Option Response: Options
 	    if ($qtype eq 'option') {
@@ -341,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
@@ -371,8 +379,10 @@ sub handler {
 	    $r->print(
 		  '<table bgcolor="#00ee44" cellspacing="4" cellpadding="2" style="width:100%">'.
 	          '<tr><td><label>'.&mt('Correct answer').': <input type="text" size="20" name="stringanswer" value="'.$stringanswer.'" /></label>&nbsp;&nbsp;'.
-		      &Apache::loncommon::select_form
-		      ($stringtype,'stringtype',%stringtypes).
+                      &Apache::loncommon::select_form(
+                          $stringtype,
+                          'stringtype',
+                          {&Apache::lonlocal::texthash(%stringtypes)}).
 		  '</td></tr></table><br />');
 # Hint
 	    $r->print(&hint());
@@ -403,7 +413,7 @@ sub handler {
     }
     $r->print(&Apache::loncommon::end_page());
     return OK;
-} 
+}
 
 1;
 __END__